patches/eglibc/2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
changeset 3058 2800ef0ff450
parent 3052 06b663f297ad
     1.1 --- a/patches/eglibc/2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch	Wed Sep 19 10:43:04 2012 +0200
     1.2 +++ b/patches/eglibc/2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch	Sun Sep 23 11:18:30 2012 +0900
     1.3 @@ -17,10 +17,10 @@
     1.4   7 files changed, 206 insertions(+), 21 deletions(-)
     1.5   create mode 100644 elf/static-stubs.c
     1.6  
     1.7 -Index: a/libc/Makeconfig
     1.8 +Index: a/Makeconfig
     1.9  ===================================================================
    1.10 ---- a/libc/Makeconfig	2012-07-04 18:26:22.000000000 -0700
    1.11 -+++ b/libc/Makeconfig	2012-08-14 20:16:10.197093639 -0700
    1.12 +--- a/Makeconfig	2012-07-04 18:26:22.000000000 -0700
    1.13 ++++ b/Makeconfig	2012-08-14 20:16:10.197093639 -0700
    1.14  @@ -415,9 +415,9 @@
    1.15   LDFLAGS-rtld += $(hashstyle-LDFLAGS)
    1.16   endif
    1.17 @@ -150,10 +150,10 @@
    1.18   libc.so-gnulib := -lgcc
    1.19   endif
    1.20   +preinit = $(addprefix $(csu-objpfx),crti.o)
    1.21 -Index: a/libc/Rules
    1.22 +Index: a/Rules
    1.23  ===================================================================
    1.24 ---- a/libc/Rules	2012-07-04 18:25:47.000000000 -0700
    1.25 -+++ b/libc/Rules	2012-08-14 20:16:10.197093639 -0700
    1.26 +--- a/Rules	2012-07-04 18:25:47.000000000 -0700
    1.27 ++++ b/Rules	2012-08-14 20:16:10.197093639 -0700
    1.28  @@ -1,5 +1,4 @@
    1.29  -# Copyright (C) 1991-2000,2002,2003,2004,2005,2006,2011
    1.30  -#	Free Software Foundation, Inc.
    1.31 @@ -238,10 +238,10 @@
    1.32   ifeq ($(build-bounded),yes)
    1.33   binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs))
    1.34   $(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \
    1.35 -Index: a/libc/elf/Makefile
    1.36 +Index: a/elf/Makefile
    1.37  ===================================================================
    1.38 ---- a/libc/elf/Makefile	2012-07-04 18:26:34.000000000 -0700
    1.39 -+++ b/libc/elf/Makefile	2012-08-14 20:16:10.197093639 -0700
    1.40 +--- a/elf/Makefile	2012-07-04 18:26:34.000000000 -0700
    1.41 ++++ b/elf/Makefile	2012-08-14 20:16:10.197093639 -0700
    1.42  @@ -71,6 +71,8 @@
    1.43   install-bin	= sprof pldd
    1.44   others-static   = sln
    1.45 @@ -269,10 +269,10 @@
    1.46   $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
    1.47   
    1.48   $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o)
    1.49 -Index: a/libc/elf/static-stubs.c
    1.50 +Index: a/elf/static-stubs.c
    1.51  ===================================================================
    1.52  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.53 -+++ a/libc/elf/static-stubs.c	2012-08-14 20:16:10.197093639 -0700
    1.54 ++++ a/elf/static-stubs.c	2012-08-14 20:16:10.197093639 -0700
    1.55  @@ -0,0 +1,46 @@
    1.56  +/* Stub implementations of functions to link into statically linked
    1.57  +   programs without needing libgcc_eh.
    1.58 @@ -320,24 +320,3 @@
    1.59  +{
    1.60  +  abort ();
    1.61  +}
    1.62 -Index: a/ports/sysdeps/arm/Makefile
    1.63 -===================================================================
    1.64 ---- a/ports/sysdeps/arm/Makefile	2012-07-04 18:25:41.000000000 -0700
    1.65 -+++ b/ports/sysdeps/arm/Makefile	2012-08-14 20:16:10.201093638 -0700
    1.66 -@@ -1,8 +1,16 @@
    1.67 -+gnulib-arch = $(elfobjdir)/libgcc-stubs.a
    1.68 -+static-gnulib-arch = $(elfobjdir)/libgcc-stubs.a
    1.69 -+
    1.70 - ifeq ($(subdir),elf)
    1.71 - sysdep-dl-routines += tlsdesc dl-tlsdesc
    1.72 - sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
    1.73 - sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
    1.74 - shared-only-routines += aeabi_unwind_cpp_pr1
    1.75 -+
    1.76 -+$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
    1.77 -+	$(build-extra-lib)
    1.78 -+
    1.79 -+lib-noranlib: $(objpfx)libgcc-stubs.a
    1.80 - endif
    1.81 - 
    1.82 - ifeq ($(subdir),csu)