gcc-4.x: Cleanup and standardise the compiler configuration flags, fixing various...

diff --git a/packages/gcc/gcc-4.0.0.inc b/packages/gcc/gcc-4.0.0.inc
index 7b23177..5745ba0 100644 (file)
--- a/packages/gcc/gcc-4.0.0.inc
+++ b/packages/gcc/gcc-4.0.0.inc
@@ -7,3 +7,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 # Language Overrides
 FORTRAN = ",f95"
+
+EXTRA_OECONF_BASE = "--disable-libssp"

diff --git a/packages/gcc/gcc-4.0.2.inc b/packages/gcc/gcc-4.0.2.inc
index a0a6a6a..e3fafb8 100644 (file)
--- a/packages/gcc/gcc-4.0.2.inc
+++ b/packages/gcc/gcc-4.0.2.inc
@@ -25,5 +25,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 # Language Overrides
 FORTRAN = ""
 
-EXTRA_OECONF += "--disable-libssp"
+EXTRA_OECONF_BASE = "--disable-libssp"
 

diff --git a/packages/gcc/gcc-4.1.0.inc b/packages/gcc/gcc-4.1.0.inc
index 4e6dcfd..e12f93c 100644 (file)
--- a/packages/gcc/gcc-4.1.0.inc
+++ b/packages/gcc/gcc-4.1.0.inc
@@ -11,7 +11,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libssp"
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
 
 # Language Overrides
 FORTRAN = ""

diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc
index a892dc3..92ee2d7 100644 (file)
--- a/packages/gcc/gcc-4.1.1.inc
+++ b/packages/gcc/gcc-4.1.1.inc
@@ -42,4 +42,4 @@ SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
 FORTRAN = ""
 JAVA = ""
 
-EXTRA_OECONF += " --disable-libssp "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"

diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc
index fdce5af..614e2bb 100644 (file)
--- a/packages/gcc/gcc-4.1.2.inc
+++ b/packages/gcc/gcc-4.1.2.inc
@@ -55,6 +55,6 @@ do_compile_prepend_avr32() {
 FORTRAN = ""
 JAVA = ""
 
-EXTRA_OECONF += " --disable-libssp "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
 
 ARM_INSTRUCTION_SET = "arm"

diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc
index 6b75948..287fa3b 100644 (file)
--- a/packages/gcc/gcc-4.2.1.inc
+++ b/packages/gcc/gcc-4.2.1.inc
@@ -91,6 +91,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"
\ No newline at end of file

diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index 2674fcc..02fe116 100644 (file)
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -69,6 +69,6 @@ FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
-EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
 
 ARM_INSTRUCTION_SET = "arm"
\ No newline at end of file

diff --git a/packages/gcc/gcc-4.3.0.inc b/packages/gcc/gcc-4.3.0.inc
index 64d52ca..1d7184c 100644 (file)
--- a/packages/gcc/gcc-4.3.0.inc
+++ b/packages/gcc/gcc-4.3.0.inc
@@ -49,5 +49,5 @@ SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 FORTRAN = ""
 JAVA = ""
 
-EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
+EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
 

diff --git a/packages/gcc/gcc-configure-common.inc b/packages/gcc/gcc-configure-common.inc
index 9971c08..9085367 100644 (file)
--- a/packages/gcc/gcc-configure-common.inc
+++ b/packages/gcc/gcc-configure-common.inc
@@ -13,6 +13,9 @@ JAVA_sh3 ?= ""
 FORTRAN ?= ",f77"
 LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
 
+EXTRA_OECONF_BASE ?= ""
+EXTRA_OECONF_PATHS ?= ""
+
 EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
                 --enable-shared \
@@ -25,6 +28,8 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d,
                 --enable-symvers=gnu \
                 --enable-libstdcxx-pch \
                 --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_BASE} \
+                ${EXTRA_OECONF_FPU} \
                 ${EXTRA_OECONF_PATHS}"
 
 # Build uclibc compilers without cxa_atexit support
@@ -32,7 +37,7 @@ EXTRA_OECONF_append_linux               = " --enable-__cxa_atexit"
 EXTRA_OECONF_append_linux-gnueabi       = " --enable-__cxa_atexit"
 EXTRA_OECONF_append_linux-uclibc        = " --disable-__cxa_atexit"
 EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit"
-EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
+EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
 CPPFLAGS = ""
 
 # Used by configure to define additional values for FLAGS_FOR_TARGET -

diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 576d487..82be62a 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -5,4 +5,4 @@ require gcc-cross4.inc
 require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
-EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"

diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index bb3b5ff..a24370f 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -6,10 +6,7 @@ require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-# Do not build libssp libmudflap and libgomp
-# We might need them for some beefy targets
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
-               --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"

diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 8a7a21f..11e0459 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -6,10 +6,7 @@ require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-# Do not build libssp libmudflap and libgomp
-# We might need them for some beefy targets 
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
-               --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"

diff --git a/packages/gcc/gcc-cross_4.3.0.bb b/packages/gcc/gcc-cross_4.3.0.bb
index 0c4c10b..68c4d70 100644 (file)
--- a/packages/gcc/gcc-cross_4.3.0.bb
+++ b/packages/gcc/gcc-cross_4.3.0.bb
@@ -6,10 +6,7 @@ require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-# Do not build libssp libmudflap and libgomp
-# We might need them for some beefy targets 
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
-               --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"