Patchwork gcc: Make it possbile for armcc and gcc to coexist.

login
register
mail settings
Submitter Martin Ertsaas
Date July 26, 2012, 8:11 a.m.
Message ID <1343290285-7095-1-git-send-email-mertsas@cisco.com>
Download mbox | patch
Permalink /patch/33109/
State New
Headers show

Comments

Martin Ertsaas - July 26, 2012, 8:11 a.m.
Signed-off-by: Martin Ertsaas <mertsas@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
Richard Purdie - July 27, 2012, 10:18 a.m.
On Thu, 2012-07-26 at 10:11 +0200, Martin Ertsaas wrote:
> Signed-off-by: Martin Ertsaas <mertsas@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

I'm afraid this patch caused some build failures on the automated
regression testing. Most of the red columns on the autobuilder:

http://autobuilder.yoctoproject.org:8010/waterfall

are due to this, e.g.:

http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/177/steps/shell_23/logs/stdio

The problem is we share a work directory between all the gcc component
builds (gcc-cross-initial, gcc-cross-intermediate, gcc-cross, libgcc and
gcc-runtime). For this to work, they all need to have matching SRC_URIs
which is an assumption this patch breaks. We'll therefore need to find a
different way to do this. Patches should really be applied by do_patch
anyway, it confuses things not to do that as if every recipe did this,
we'd end up in a huge mess.

The patch is also missing an Upstream-Status field, author information
and a description  of what it does.

Cheers,

Richard



> 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}
>  }
>

Patch

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}
 }