gcc-4.7: Backport libgcc fixes to appease the new build sequence
This makes the libgcc builds identical when done with gcc-cross-initial or final gcc-cross. Since eglibc only sees gcc-cross-initial it is important that the final libgcc that appears on root file system is same as the one against which eglibc was built. (From OE-Core rev: bd0ab094d6c36b55848e23e63b96587773299a7f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
Richard Purdie
parent
86ae51246f
commit
42f0f96903
|
|
@ -1,6 +1,6 @@
|
|||
require gcc-common.inc
|
||||
|
||||
PR = "r12"
|
||||
PR = "r13"
|
||||
|
||||
# Third digit in PV should be incremented after a minor release
|
||||
# happens from this branch on gcc e.g. currently its 4.7.1
|
||||
|
|
@ -77,6 +77,8 @@ SRC_URI = "git://github.com/mirrors/gcc.git;branch=${BRANCH};protocol=git \
|
|||
file://libtool.patch \
|
||||
file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
|
||||
file://ppc_no_crtsavres.patch \
|
||||
file://0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch \
|
||||
file://0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch \
|
||||
"
|
||||
|
||||
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/git"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,93 @@
|
|||
From b78f422ee83d279a83c62491b252cfec5b94e92a Mon Sep 17 00:00:00 2001
|
||||
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Wed, 22 Aug 2012 08:36:23 +0000
|
||||
Subject: [PATCH] * Makefile.in (vis_hide, gen-hide-list): Do not make
|
||||
definitions depend on --enable-shared.
|
||||
($(lib1asmfuncs-o)): Use %.vis files independent of
|
||||
--enable-shared. * static-object.mk
|
||||
($(base)$(objext), $(base).vis)
|
||||
($(base)_s$(objext)): Use same rules for visibility
|
||||
handling as in shared-object.mk.
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190588 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
libgcc/ChangeLog | 10 ++++++++++
|
||||
libgcc/Makefile.in | 16 ++++------------
|
||||
libgcc/static-object.mk | 10 ++++++++--
|
||||
3 files changed, 22 insertions(+), 14 deletions(-)
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
-Khem
|
||||
05-Sep-2012
|
||||
|
||||
Index: gcc-4_7-branch/libgcc/Makefile.in
|
||||
===================================================================
|
||||
--- gcc-4_7-branch.orig/libgcc/Makefile.in 2012-08-21 22:33:20.000000000 -0700
|
||||
+++ gcc-4_7-branch/libgcc/Makefile.in 2012-09-05 17:30:28.572998745 -0700
|
||||
@@ -362,6 +362,7 @@
|
||||
ifneq ($(LIBUNWIND),)
|
||||
install-libunwind = install-libunwind
|
||||
endif
|
||||
+endif
|
||||
|
||||
# For -fvisibility=hidden. We need both a -fvisibility=hidden on
|
||||
# the command line, and a #define to prevent libgcc2.h etc from
|
||||
@@ -385,11 +386,8 @@
|
||||
gen-hide-list = echo > $@
|
||||
endif
|
||||
|
||||
-else
|
||||
-# Not enable_shared.
|
||||
+ifneq ($(enable_shared),yes)
|
||||
iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items))
|
||||
-vis_hide =
|
||||
-gen-hide-list = echo > \$@
|
||||
endif
|
||||
|
||||
LIB2ADD += enable-execute-stack.c
|
||||
@@ -438,7 +436,6 @@
|
||||
$(LIB2_DIVMOD_FUNCS))
|
||||
|
||||
# Build "libgcc1" (assembly) components.
|
||||
-ifeq ($(enable_shared),yes)
|
||||
|
||||
lib1asmfuncs-o = $(patsubst %,%$(objext),$(LIB1ASMFUNCS))
|
||||
$(lib1asmfuncs-o): %$(objext): $(srcdir)/config/$(LIB1ASMSRC) %.vis
|
||||
@@ -450,14 +447,9 @@
|
||||
lib1asmfuncs-s-o = $(patsubst %,%_s$(objext),$(LIB1ASMFUNCS))
|
||||
$(lib1asmfuncs-s-o): %_s$(objext): $(srcdir)/config/$(LIB1ASMSRC)
|
||||
$(gcc_s_compile) -DL$* -xassembler-with-cpp -c $<
|
||||
-libgcc-s-objects += $(lib1asmfuncs-s-o)
|
||||
-
|
||||
-else
|
||||
+ifeq ($(enable_shared),yes)
|
||||
|
||||
-lib1asmfuncs-o = $(patsubst %,%$(objext),$(LIB1ASMFUNCS))
|
||||
-$(lib1asmfuncs-o): %$(objext): $(srcdir)/config/$(LIB1ASMSRC)
|
||||
- $(gcc_compile) -DL$* -xassembler-with-cpp -c $<
|
||||
-libgcc-objects += $(lib1asmfuncs-o)
|
||||
+libgcc-s-objects += $(lib1asmfuncs-s-o)
|
||||
|
||||
endif
|
||||
|
||||
Index: gcc-4_7-branch/libgcc/static-object.mk
|
||||
===================================================================
|
||||
--- gcc-4_7-branch.orig/libgcc/static-object.mk 2012-08-21 22:33:20.000000000 -0700
|
||||
+++ gcc-4_7-branch/libgcc/static-object.mk 2012-09-05 17:30:28.572998745 -0700
|
||||
@@ -24,7 +24,13 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-$(base)$(objext): $o
|
||||
- $(gcc_compile) -c -xassembler-with-cpp $<
|
||||
+$(base)$(objext): $o $(base).vis
|
||||
+ $(gcc_compile) -c -xassembler-with-cpp -include $*.vis $<
|
||||
+
|
||||
+$(base).vis: $(base)_s$(objext)
|
||||
+ $(gen-hide-list)
|
||||
+
|
||||
+$(base)_s$(objext): $o
|
||||
+ $(gcc_s_compile) -c -xassembler-with-cpp $<
|
||||
|
||||
endif
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
From 935475158f45b9c55a54647543c0402b4b3043ae Mon Sep 17 00:00:00 2001
|
||||
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Sun, 19 Aug 2012 15:11:40 +0000
|
||||
Subject: [PATCH] * crtstuff.c (USE_PT_GNU_EH_FRAME): Define for
|
||||
systems using glibc even if inhibit_libc.
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190517 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
libgcc/ChangeLog | 5 +++++
|
||||
libgcc/crtstuff.c | 16 +++++++++++++++-
|
||||
2 files changed, 20 insertions(+), 1 deletion(-)
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
-Khem 05-Sep-2012
|
||||
Index: gcc-4_7-branch/libgcc/crtstuff.c
|
||||
===================================================================
|
||||
--- gcc-4_7-branch.orig/libgcc/crtstuff.c 2012-08-21 22:33:20.000000000 -0700
|
||||
+++ gcc-4_7-branch/libgcc/crtstuff.c 2012-09-05 17:28:49.248994968 -0700
|
||||
@@ -1,7 +1,7 @@
|
||||
/* Specialized bits of code needed to support construction and
|
||||
destruction of file-scope objects in C++ code.
|
||||
Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
|
||||
- 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
|
||||
+ 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012
|
||||
Free Software Foundation, Inc.
|
||||
Contributed by Ron Guilmette (rfg@monkeys.com).
|
||||
|
||||
@@ -113,6 +113,20 @@
|
||||
# define USE_PT_GNU_EH_FRAME
|
||||
# endif
|
||||
#endif
|
||||
+
|
||||
+#if defined(OBJECT_FORMAT_ELF) \
|
||||
+ && !defined(OBJECT_FORMAT_FLAT) \
|
||||
+ && defined(HAVE_LD_EH_FRAME_HDR) \
|
||||
+ && !defined(CRTSTUFFT_O) \
|
||||
+ && defined(inhibit_libc) \
|
||||
+ && (defined(__GLIBC__) || defined(__gnu_linux__) || defined(__GNU__))
|
||||
+/* On systems using glibc, an inhibit_libc build of libgcc is only
|
||||
+ part of a bootstrap process. Build the same crt*.o as would be
|
||||
+ built with headers present, so that it is not necessary to build
|
||||
+ glibc more than once for the bootstrap to converge. */
|
||||
+# define USE_PT_GNU_EH_FRAME
|
||||
+#endif
|
||||
+
|
||||
#if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)
|
||||
# define USE_EH_FRAME_REGISTRY
|
||||
#endif
|
||||
Loading…
Reference in New Issue