[oe-commits] org.oe.dev gcc: Move get_gcc_fpu_setting into gcc-common.inc

[rpurdie commit]

gcc: Move get_gcc_fpu_setting into gcc-common.inc

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: b5c863d160012e37fc61caae6a4dd1ac7dc22924
ViewMTN: http://monotone.openembedded.org/revision/info/b5c863d160012e37fc61caae6a4dd1ac7dc22924
Files:
1
packages/gcc/gcc-fpu.inc
packages/gcc/gcc-3.3.3.inc
packages/gcc/gcc-3.3.4.inc
packages/gcc/gcc-common.inc
packages/gcc/gcc3-build.inc
Diffs:

#
# mt diff -r5035508e402cf3e48527fcc8db840566e79eb2c0 -rb5c863d160012e37fc61caae6a4dd1ac7dc22924
#
#
#
# delete "packages/gcc/gcc-fpu.inc"
# 
# patch "packages/gcc/gcc-3.3.3.inc"
#  from [afccace08ae6812e358d266284f7311553fa6255]
#    to [666de337203890e193deb0c03dd8089cf3f82970]
# 
# patch "packages/gcc/gcc-3.3.4.inc"
#  from [a40b72617ce6f2554c74ea12143049493dcaf6c1]
#    to [ab3515883b504737cb87bf32159885c37b658bc0]
# 
# patch "packages/gcc/gcc-common.inc"
#  from [214ed6907a66a0cbde5861af41e11bece7863f30]
#    to [c53b48836aaa69bf6aafb7e60500575135b7c0f7]
# 
# patch "packages/gcc/gcc3-build.inc"
#  from [cc6ebb92d3e84b79c50cab4d8db8607496d214d7]
#    to [a42be9c224a09fcc234b1b148c61acef34ccf10f]
#
============================================================
--- packages/gcc/gcc-3.3.3.inc	afccace08ae6812e358d266284f7311553fa6255
+++ packages/gcc/gcc-3.3.3.inc	666de337203890e193deb0c03dd8089cf3f82970
@@ -69,8 +69,6 @@ EXTRA_OECONF += "${@get_gcc_fpu_setting(
 EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
 EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
 
-require gcc-fpu.inc
-
 python __anonymous () {
     import bb, re
     if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
============================================================
--- packages/gcc/gcc-3.3.4.inc	a40b72617ce6f2554c74ea12143049493dcaf6c1
+++ packages/gcc/gcc-3.3.4.inc	ab3515883b504737cb87bf32159885c37b658bc0
@@ -48,8 +48,6 @@ EXTRA_OECONF += "${@get_gcc_fpu_setting(
 EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
 EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
 
-require gcc-fpu.inc
-
 python __anonymous () {
     import bb, re
     if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
============================================================
--- packages/gcc/gcc-common.inc	214ed6907a66a0cbde5861af41e11bece7863f30
+++ packages/gcc/gcc-common.inc	c53b48836aaa69bf6aafb7e60500575135b7c0f7
@@ -4,3 +4,9 @@ inherit autotools gettext
 LICENSE = "GPL"
 
 inherit autotools gettext
+
+def get_gcc_fpu_setting(bb, d):
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+        return "--with-float=soft"
+    return ""
+
============================================================
--- packages/gcc/gcc3-build.inc	cc6ebb92d3e84b79c50cab4d8db8607496d214d7
+++ packages/gcc/gcc3-build.inc	a42be9c224a09fcc234b1b148c61acef34ccf10f
@@ -56,8 +56,6 @@ EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='
 ARCH_FLAGS_FOR_TARGET_unslung = "${TARGET_CC_ARCH}"
 EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
 
-require gcc-fpu.inc
-
 do_configure () {
 	# Setup these vars for cross building only
 	# ... because foo_FOR_TARGET apparently gets misinterpreted inside the