[oe-commits] org.oe.dev gcc-4.x: Cleanup and standardise the compiler configuration flags, fixing various bugs in the 4.1.x and 4.0.x versions. Broken libssp and libmudflap libraries should no longer be staged into cross.

rpurdie commit oe at amethyst.openembedded.net
Thu Mar 27 15:50:43 UTC 2008


gcc-4.x: Cleanup and standardise the compiler configuration flags, fixing various bugs in the 4.1.x and 4.0.x versions. Broken libssp and libmudflap libraries should no longer be staged into cross.

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: fc44b8f578e69ba06c83e31af195cf42e5de98c2
ViewMTN: http://monotone.openembedded.org/revision/info/fc44b8f578e69ba06c83e31af195cf42e5de98c2
Files:
1
packages/gcc/gcc-4.0.0.inc
packages/gcc/gcc-4.0.2.inc
packages/gcc/gcc-4.1.0.inc
packages/gcc/gcc-4.1.1.inc
packages/gcc/gcc-4.1.2.inc
packages/gcc/gcc-4.2.1.inc
packages/gcc/gcc-4.2.2.inc
packages/gcc/gcc-4.3.0.inc
packages/gcc/gcc-configure-common.inc
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-cross_4.3.0.bb
Diffs:

#
# mt diff -r53735966757eebf5c5475ab6ee0b3cb2260b1ed5 -rfc44b8f578e69ba06c83e31af195cf42e5de98c2
#
#
#
# patch "packages/gcc/gcc-4.0.0.inc"
#  from [80dc261f1372a1378f6eef33de989261889507f0]
#    to [3b7d9cad6315aaf97c9755a38ddbbc397156c5d6]
# 
# patch "packages/gcc/gcc-4.0.2.inc"
#  from [8562f4dabb504c318f47bad1483bba2281f5613d]
#    to [37f8d8d18bb076072355cf1102c003fc01994a51]
# 
# patch "packages/gcc/gcc-4.1.0.inc"
#  from [9d906bb8346309a4dd23b1355ad4a5ef0fcbd05b]
#    to [b5320aafd4e7fe874b7d7f07ef9d243324ecbf48]
# 
# patch "packages/gcc/gcc-4.1.1.inc"
#  from [010291062a32f79d8b4d24e6da780d54d0dd701f]
#    to [639e9bc43be179780b1e1269677b06d08ea78604]
# 
# patch "packages/gcc/gcc-4.1.2.inc"
#  from [1619a1b453dcac8a8599b1ea8bf18166e0d4ea61]
#    to [ce38325915cffb4e8a715bd77ca405fa6bc0ed22]
# 
# patch "packages/gcc/gcc-4.2.1.inc"
#  from [0017ccaa6bb8bdd238a2d5b7a6ab9ad187a40ad1]
#    to [62a888f0d36616f98f5f9ed9355a03bfbfa9045e]
# 
# patch "packages/gcc/gcc-4.2.2.inc"
#  from [159d9938c42b817a2960cd20ff5f2f2389a3d437]
#    to [e1a01a5ff03489319241b841ece209ab4fdcbc72]
# 
# patch "packages/gcc/gcc-4.3.0.inc"
#  from [4e864f87d339da3edca7a3324d069a199a2599d4]
#    to [d89d85be3bd4d45e71d4562ceefcb4be49c537dc]
# 
# patch "packages/gcc/gcc-configure-common.inc"
#  from [9527c54496aeeaf2edc8fba8511c9407f24c713b]
#    to [f3486c3eed956973ea393e61adc3422aecb17606]
# 
# patch "packages/gcc/gcc-cross_4.1.0.bb"
#  from [14a8ed20c448ee203b13cd9f0d3cea8536d49404]
#    to [d4e6baedce0cf2ed7f366ae2f5a5eb2591d5980e]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [b9af3bf259095ef8cf6f60cd84b98a4e7e3a3354]
#    to [b2c9945ee36a3309a71b5524d434484a0e26c690]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [e9e4552a211d00fabca63b483931f83c7ba520a8]
#    to [92a221642f7dc1aab89b441260e03250310a208a]
# 
# patch "packages/gcc/gcc-cross_4.3.0.bb"
#  from [bf8a75927ac90439d281e8c06c605685a06ff72a]
#    to [63c34480bfc5b5e580649f1949515583ea852d09]
#
============================================================
--- packages/gcc/gcc-4.0.0.inc	80dc261f1372a1378f6eef33de989261889507f0
+++ packages/gcc/gcc-4.0.0.inc	3b7d9cad6315aaf97c9755a38ddbbc397156c5d6
@@ -7,3 +7,5 @@ FORTRAN = ",f95"
 
 # Language Overrides
 FORTRAN = ",f95"
+
+EXTRA_OECONF_BASE = "--disable-libssp"
============================================================
--- packages/gcc/gcc-4.0.2.inc	8562f4dabb504c318f47bad1483bba2281f5613d
+++ packages/gcc/gcc-4.0.2.inc	37f8d8d18bb076072355cf1102c003fc01994a51
@@ -25,5 +25,5 @@ FORTRAN = ""
 # Language Overrides
 FORTRAN = ""
 
-EXTRA_OECONF += "--disable-libssp"
+EXTRA_OECONF_BASE = "--disable-libssp"
 
============================================================
--- packages/gcc/gcc-4.1.0.inc	9d906bb8346309a4dd23b1355ad4a5ef0fcbd05b
+++ packages/gcc/gcc-4.1.0.inc	b5320aafd4e7fe874b7d7f07ef9d243324ecbf48
@@ -11,7 +11,7 @@ SRC_URI_append_fail-fast = " file://zeck
 
 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 = ""
============================================================
--- packages/gcc/gcc-4.1.1.inc	010291062a32f79d8b4d24e6da780d54d0dd701f
+++ packages/gcc/gcc-4.1.1.inc	639e9bc43be179780b1e1269677b06d08ea78604
@@ -42,4 +42,4 @@ JAVA = ""
 FORTRAN = ""
 JAVA = ""
 
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
-EXTRA_OECONF += " --disable-libssp "
============================================================
--- packages/gcc/gcc-4.1.2.inc	1619a1b453dcac8a8599b1ea8bf18166e0d4ea61
+++ packages/gcc/gcc-4.1.2.inc	ce38325915cffb4e8a715bd77ca405fa6bc0ed22
@@ -55,6 +55,6 @@ JAVA = ""
 FORTRAN = ""
 JAVA = ""
 
-EXTRA_OECONF += " --disable-libssp "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
 
 ARM_INSTRUCTION_SET = "arm"
============================================================
--- packages/gcc/gcc-4.2.1.inc	0017ccaa6bb8bdd238a2d5b7a6ab9ad187a40ad1
+++ packages/gcc/gcc-4.2.1.inc	62a888f0d36616f98f5f9ed9355a03bfbfa9045e
@@ -91,6 +91,6 @@ JAVA = ""
 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"
============================================================
--- packages/gcc/gcc-4.2.2.inc	159d9938c42b817a2960cd20ff5f2f2389a3d437
+++ packages/gcc/gcc-4.2.2.inc	e1a01a5ff03489319241b841ece209ab4fdcbc72
@@ -69,6 +69,6 @@ JAVA = ""
 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"
============================================================
--- packages/gcc/gcc-4.3.0.inc	4e864f87d339da3edca7a3324d069a199a2599d4
+++ packages/gcc/gcc-4.3.0.inc	d89d85be3bd4d45e71d4562ceefcb4be49c537dc
@@ -49,5 +49,5 @@ JAVA = ""
 FORTRAN = ""
 JAVA = ""
 
-EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
+EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
 
============================================================
--- packages/gcc/gcc-configure-common.inc	9527c54496aeeaf2edc8fba8511c9407f24c713b
+++ packages/gcc/gcc-configure-common.inc	f3486c3eed956973ea393e61adc3422aecb17606
@@ -13,6 +13,9 @@ LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
 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=ge
                 --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-uclibcgnueabi 
 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 -
============================================================
--- packages/gcc/gcc-cross_4.1.0.bb	14a8ed20c448ee203b13cd9f0d3cea8536d49404
+++ packages/gcc/gcc-cross_4.1.0.bb	d4e6baedce0cf2ed7f366ae2f5a5eb2591d5980e
@@ -5,4 +5,4 @@ require gcc-package-cross.inc
 require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
============================================================
--- packages/gcc/gcc-cross_4.2.1.bb	b9af3bf259095ef8cf6f60cd84b98a4e7e3a3354
+++ packages/gcc/gcc-cross_4.2.1.bb	b2c9945ee36a3309a71b5524d434484a0e26c690
@@ -6,10 +6,7 @@ SRC_URI_append_fail-fast = " file://zeck
 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}"
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb	e9e4552a211d00fabca63b483931f83c7ba520a8
+++ packages/gcc/gcc-cross_4.2.2.bb	92a221642f7dc1aab89b441260e03250310a208a
@@ -6,10 +6,7 @@ SRC_URI_append_fail-fast = " file://zeck
 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}"
============================================================
--- packages/gcc/gcc-cross_4.3.0.bb	bf8a75927ac90439d281e8c06c605685a06ff72a
+++ packages/gcc/gcc-cross_4.3.0.bb	63c34480bfc5b5e580649f1949515583ea852d09
@@ -6,10 +6,7 @@ SRC_URI_append_fail-fast = " file://zeck
 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}"






More information about the Openembedded-commits mailing list