merge of '58892f8690878f7ed6658262c62e3515f83d248a'

     and 'd9f628bbbe62d8fe9b1dfa860de027f41eb7ef11'

diff --cc packages/gcc/gcc-4.2.1.inc
index d48078384d57167b5af56b73d7d68088cc913379,287fa3bd8d3a62b516b9bfc84da0b2d3ec605be5..16e5b8f5bc368bf5fb8fa0aa5aa41096ef546db4
--- 1/packages/gcc/gcc-4.2.1.inc
--- 2/packages/gcc/gcc-4.2.1.inc
+++ b/packages/gcc/gcc-4.2.1.inc
@@@ -92,4 -91,6 +92,6 @@@ FORTRAN = "
  FORTRAN_linux-gnueabi = ",fortran"
  JAVA = ""
  
- EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap "
+ EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+ 
 -ARM_INSTRUCTION_SET = "arm"
++ARM_INSTRUCTION_SET = "arm"

diff --cc packages/gcc/gcc-cross_4.2.1.bb
Simple merge