From 0e2d55e3e345e55a4c9c7335d42501301834d732 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 8 Mar 2011 13:10:11 +0000 Subject: gcc: move the optimized assembler helpers back into the static libgcc and skip relinking for this arch. due to relocation constraints, the assembler functions cannot be in the shared libgcc and must always be linked in statically git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25952 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../gcc/patches/linaro/850-use_shared_libgcc.patch | 31 ++++++++-------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'toolchain') diff --git a/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch b/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch index a9cc80bfe0..5e33c9d4e1 100644 --- a/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch +++ b/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch @@ -35,18 +35,6 @@ /* Determine which dynamic linker to use depending on whether GLIBC or uClibc is the default C library and whether -muclibc or -mglibc has been passed to change the default. */ ---- a/gcc/config/rs6000/ppc-asm.h -+++ b/gcc/config/rs6000/ppc-asm.h -@@ -325,8 +325,7 @@ - FUNC_NAME(name): - - #define HIDDEN_FUNC(name) \ -- FUNC_START(name) \ -- .hidden FUNC_NAME(name); -+ FUNC_START(name); - - #define FUNC_END(name) \ - GLUE(.L,name): \ --- a/gcc/mkmap-symver.awk +++ b/gcc/mkmap-symver.awk @@ -132,5 +132,5 @@ @@ -56,14 +44,6 @@ - printf ("\n local:\n\t*;\n};\n"); + printf ("\n\t*;\n};\n"); } ---- a/libgcc/config/rs6000/t-ppccomm -+++ b/libgcc/config/rs6000/t-ppccomm -@@ -1,4 +1,4 @@ --LIB2ADD_ST += crtsavfpr.S crtresfpr.S \ -+LIB2ADD += crtsavfpr.S crtresfpr.S \ - crtsavgpr.S crtresgpr.S \ - crtresxfpr.S crtresxgpr.S \ - e500crtres32gpr.S \ --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -265,7 +265,7 @@ @@ -75,3 +55,14 @@ ifneq (,$(vis_hide)) +--- a/gcc/config/rs6000/linux.h ++++ b/gcc/config/rs6000/linux.h +@@ -85,6 +85,8 @@ + #define USE_LD_AS_NEEDED 1 + #endif + ++#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc" ++ + #undef TARGET_VERSION + #define TARGET_VERSION fprintf (stderr, " (PowerPC GNU/Linux)"); + -- cgit v1.2.3