From 2ef14dff79230a67258995c27b49aaab1aae92ca Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 21 Jun 2012 16:05:16 -0700 Subject: gcc-4.6: Retire into toochain-layer If anyone wants it add toolchain-layer from meta-openembedded repo to your setup (From OE-Core rev: a78260d8d041e606ce4d10c0bb52f196dd27832e) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../gcc/gcc-4.6/gcc-with-linker-hash-style.patch | 196 --------------------- 1 file changed, 196 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch (limited to 'meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch') diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch deleted file mode 100644 index 94b61cdcc9..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch +++ /dev/null @@ -1,196 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Khem Raj - -commit 3cb9bbfa927aa187048534f9069202c017a78e38 -Author: ppluzhnikov -Date: Wed May 11 18:28:14 2011 +0000 - - 2011-05-11 Satoru Takabayashi - Paul Pluzhnikov - - * gcc/doc/install.texi (Configuration): Document - --with-linker-hash-style. - * gcc/gcc.c (init_spec): Handle LINKER_HASH_STYLE. - * gcc/config.in: Add LINKER_HASH_STYLE. - * gcc/configure.ac: Add --with-linker-hash-style. - * gcc/configure: Regenerate. - - - - git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173668 138bc75d-0d04-0410-961f-82ee72b054a4 - -Index: gcc-4_6-branch/gcc/config.in -=================================================================== ---- gcc-4_6-branch.orig/gcc/config.in 2012-03-04 09:30:04.000000000 -0800 -+++ gcc-4_6-branch/gcc/config.in 2012-03-04 09:32:30.878646575 -0800 -@@ -1583,6 +1583,12 @@ - #endif - - -+/* The linker hash style */ -+#ifndef USED_FOR_TARGET -+#undef LINKER_HASH_STYLE -+#endif -+ -+ - /* Define to the name of the LTO plugin DSO that must be passed to the - linker's -plugin=LIB option. */ - #ifndef USED_FOR_TARGET -Index: gcc-4_6-branch/gcc/configure -=================================================================== ---- gcc-4_6-branch.orig/gcc/configure 2012-03-04 09:30:05.000000000 -0800 -+++ gcc-4_6-branch/gcc/configure 2012-03-04 09:32:39.918647011 -0800 -@@ -915,6 +915,7 @@ - enable_poison_system_directories - enable_plugin - enable_libquadmath_support -+with_linker_hash_style - ' - ac_precious_vars='build_alias - host_alias -@@ -1667,6 +1668,8 @@ - with the compiler - --with-system-zlib use installed libz - --with-slibdir=DIR shared libraries in DIR [LIBDIR] -+ --with-linker-hash-style={sysv,gnu,both} -+ specify the linker hash style - - Some influential environment variables: - CC C compiler command -@@ -17501,7 +17504,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 17504 "configure" -+#line 17507 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -17607,7 +17610,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 17610 "configure" -+#line 17613 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -26432,6 +26435,36 @@ - fi - - -+# Specify what hash style to use by default. -+ -+# Check whether --with-linker-hash-style was given. -+if test "${with_linker_hash_style+set}" = set; then : -+ withval=$with_linker_hash_style; case x"$withval" in -+ xsysv) -+ LINKER_HASH_STYLE=sysv -+ ;; -+ xgnu) -+ LINKER_HASH_STYLE=gnu -+ ;; -+ xboth) -+ LINKER_HASH_STYLE=both -+ ;; -+ *) -+ as_fn_error "$withval is an invalid option to --with-linker-hash-style" "$LINENO" 5 -+ ;; -+ esac -+else -+ LINKER_HASH_STYLE='' -+fi -+ -+if test x"${LINKER_HASH_STYLE}" != x; then -+ -+cat >>confdefs.h <<_ACEOF -+#define LINKER_HASH_STYLE "$LINKER_HASH_STYLE" -+_ACEOF -+ -+fi -+ - # Configure the subdirectories - # AC_CONFIG_SUBDIRS($subdirs) - -Index: gcc-4_6-branch/gcc/configure.ac -=================================================================== ---- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-04 09:30:05.000000000 -0800 -+++ gcc-4_6-branch/gcc/configure.ac 2012-03-04 09:32:30.890646574 -0800 -@@ -4905,6 +4905,30 @@ - fi - - -+# Specify what hash style to use by default. -+AC_ARG_WITH([linker-hash-style], -+[AC_HELP_STRING([--with-linker-hash-style={sysv,gnu,both}], -+ [specify the linker hash style])], -+[case x"$withval" in -+ xsysv) -+ LINKER_HASH_STYLE=sysv -+ ;; -+ xgnu) -+ LINKER_HASH_STYLE=gnu -+ ;; -+ xboth) -+ LINKER_HASH_STYLE=both -+ ;; -+ *) -+ AC_MSG_ERROR([$withval is an invalid option to --with-linker-hash-style]) -+ ;; -+ esac], -+[LINKER_HASH_STYLE='']) -+if test x"${LINKER_HASH_STYLE}" != x; then -+ AC_DEFINE_UNQUOTED(LINKER_HASH_STYLE, "$LINKER_HASH_STYLE", -+ [The linker hash style]) -+fi -+ - # Configure the subdirectories - # AC_CONFIG_SUBDIRS($subdirs) - -Index: gcc-4_6-branch/gcc/doc/install.texi -=================================================================== ---- gcc-4_6-branch.orig/gcc/doc/install.texi 2012-03-03 00:46:39.000000000 -0800 -+++ gcc-4_6-branch/gcc/doc/install.texi 2012-03-04 09:32:30.894646574 -0800 -@@ -1665,6 +1665,11 @@ - support @option{--build-id} option, a warning is issued and the - @option{--enable-linker-build-id} option is ignored. The default is off. - -+@item --with-linker-hash-style=@var{choice} -+Tells GCC to pass @option{--hash-style=@var{choice}} option to the -+linker for all final links. @var{choice} can be one of -+@samp{sysv}, @samp{gnu}, and @samp{both} where @samp{sysv} is the default. -+ - @item --enable-gnu-unique-object - @itemx --disable-gnu-unique-object - Tells GCC to use the gnu_unique_object relocation for C++ template -Index: gcc-4_6-branch/gcc/gcc.c -=================================================================== ---- gcc-4_6-branch.orig/gcc/gcc.c 2012-03-04 09:30:04.000000000 -0800 -+++ gcc-4_6-branch/gcc/gcc.c 2012-03-04 09:32:30.894646574 -0800 -@@ -1427,7 +1427,8 @@ - } - #endif - --#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC -+#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC || \ -+ defined LINKER_HASH_STYLE - # ifdef LINK_BUILDID_SPEC - /* Prepend LINK_BUILDID_SPEC to whatever link_spec we had before. */ - obstack_grow (&obstack, LINK_BUILDID_SPEC, sizeof(LINK_BUILDID_SPEC) - 1); -@@ -1436,6 +1437,16 @@ - /* Prepend LINK_EH_SPEC to whatever link_spec we had before. */ - obstack_grow (&obstack, LINK_EH_SPEC, sizeof(LINK_EH_SPEC) - 1); - # endif -+# ifdef LINKER_HASH_STYLE -+ /* Prepend --hash-style=LINKER_HASH_STYLE to whatever link_spec we had -+ before. */ -+ { -+ static const char hash_style[] = "--hash-style="; -+ obstack_grow (&obstack, hash_style, sizeof(hash_style) - 1); -+ obstack_grow (&obstack, LINKER_HASH_STYLE, sizeof(LINKER_HASH_STYLE) - 1); -+ obstack_1grow (&obstack, ' '); -+ } -+# endif - obstack_grow0 (&obstack, link_spec, strlen (link_spec)); - link_spec = XOBFINISH (&obstack, const char *); - #endif -- cgit v1.2.3-54-g00ecf