[OE-core] [PATCH] gcc: Make it possbile for armcc and gcc to coexist.

[Martin Ertsaas]

Signed-off-by: Martin Ertsaas <mertsas at cisco.com>
---
 meta/recipes-devtools/gcc/gcc-4.7.inc              |    2 +-
 .../gcc/gcc-4.7/armcc-coexistence.patch.txt        |   12 ++++++++++++
 .../recipes-devtools/gcc/gcc-configure-runtime.inc |    6 ++++++
 3 files changed, 19 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt

diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 43d77ec..709d7d8 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
 require gcc-common.inc
 
-PR = "r7"
+PR = "r8"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt b/meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt
new file mode 100644
index 0000000..61c04ac
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt
@@ -0,0 +1,12 @@
+--- /usr/local/oecore-x86_64/sysroots/armv7ahf-vfp-neon-nimbus-linux-gnueabi/usr/include/c++/OE_TARGET_SYS/bits/c++config.h~	2012-06-15 11:47:57.000000000 +0200
++++ /usr/local/oecore-x86_64/sysroots/armv7ahf-vfp-neon-nimbus-linux-gnueabi/usr/include/c++/OE_TARGET_SYS/bits/c++config.h	2012-06-29 11:57:10.000000000 +0200
+@@ -1147,7 +1147,9 @@ namespace std
+ /* #undef _GLIBCXX_VERSION */
+ 
+ /* Define if the compiler supports C++11 atomics. */
++#ifndef __ARMCC_VERSION
+ #define _GLIBCXX_ATOMIC_BUILTINS 1
++#endif
+ 
+ /* Define to use concept checking code from the boost libraries. */
+ /* #undef _GLIBCXX_CONCEPT_CHECKS */
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index d40383c..cdb69bf 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -2,6 +2,8 @@ require gcc-configure-common.inc
 
 CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
 
+SRC_URI += "file://armcc-coexistence.patch.txt"
+
 EXTRA_OECONF_PATHS = " \
     --with-gxx-include-dir=${includedir}/c++/ \
     --with-sysroot=${STAGING_DIR_TARGET} \
@@ -49,6 +51,10 @@ do_install () {
 			rmdir --ignore-fail-on-non-empty -p ${D}${datadir}/info
 		fi
 	done
+	cd ${D}${prefix}
+	cat ${S}/../armcc-coexistence.patch.txt \
+		| sed -e "s|OE_TARGET_SYS|${TARGET_SYS}|g" \
+		| patch -p7
 	chown -R root:root ${D}
 }
 
-- 
1.7.8.6