From 1caf47754d044d04cd4f94885d3115d2914144b7 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 15 Mar 2008 16:50:01 +0000
Subject: gcc: Move get_gcc_fpu_setting into gcc-common.inc

---
 packages/gcc/gcc-3.3.3.inc  | 2 --
 packages/gcc/gcc-3.3.4.inc  | 2 --
 packages/gcc/gcc-common.inc | 6 ++++++
 packages/gcc/gcc-fpu.inc    | 6 ------
 packages/gcc/gcc3-build.inc | 2 --
 5 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 packages/gcc/gcc-fpu.inc

(limited to 'packages')

diff --git a/packages/gcc/gcc-3.3.3.inc b/packages/gcc/gcc-3.3.3.inc
index 657eb2acce..443cfc5975 100644
--- a/packages/gcc/gcc-3.3.3.inc
+++ b/packages/gcc/gcc-3.3.3.inc
@@ -69,8 +69,6 @@ EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
 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):
diff --git a/packages/gcc/gcc-3.3.4.inc b/packages/gcc/gcc-3.3.4.inc
index 6c280c49f6..baab2a53d8 100644
--- a/packages/gcc/gcc-3.3.4.inc
+++ b/packages/gcc/gcc-3.3.4.inc
@@ -48,8 +48,6 @@ EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
 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):
diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc
index cd2582e160..b066434cfd 100644
--- a/packages/gcc/gcc-common.inc
+++ b/packages/gcc/gcc-common.inc
@@ -4,3 +4,9 @@ SECTION = "devel"
 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 ""
+
diff --git a/packages/gcc/gcc-fpu.inc b/packages/gcc/gcc-fpu.inc
deleted file mode 100644
index bb03d95567..0000000000
--- a/packages/gcc/gcc-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_gcc_fpu_setting(bb, d):
-	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--with-float=soft"
-	return ""
-
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index e56dcdcc4d..a6f7d3b1f8 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -56,8 +56,6 @@ ARCH_FLAGS_FOR_TARGET_slugos = "${TARGET_CC_ARCH}"
 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
-- 
cgit v1.2.3