libc/eglibc: Split changeset 3052:06b663f297 into eglibc/libc and eglibc/ports patches

crosstool-ng's glibc patche is made against glibc/libc sub-dir.
changeset 3052:06b663f297 is against glibc top-dir. it needs to split.

Signed-off-by: "Jang, Bongseo" <graycells@gmail.com>
[yann.morin.1998@free.fr: fix the ports patches depth]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-ID: <5040c8e83e35618361dc.1348370890@localhost.localdomain>
PatchWork-ID: 186177

4 files changed, 52 insertions, 33 deletions

diff --git a/patches/eglibc/2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch b/patches/eglibc/2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
index e1444aae..5dd69416 100644
--- a/patches/eglibc/2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
+++ b/patches/eglibc/2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
@@ -17,10 +17,10 @@ Subject: [PATCH] Avoid use of libgcc_s and libgcc_eh when building glibc.
  7 files changed, 206 insertions(+), 21 deletions(-)
  create mode 100644 elf/static-stubs.c
 
-Index: a/libc/Makeconfig
+Index: a/Makeconfig
 ===================================================================
---- a/libc/Makeconfig	2012-07-04 18:26:22.000000000 -0700
-+++ b/libc/Makeconfig	2012-08-14 20:16:10.197093639 -0700
+--- a/Makeconfig	2012-07-04 18:26:22.000000000 -0700
++++ b/Makeconfig	2012-08-14 20:16:10.197093639 -0700
 @@ -415,9 +415,9 @@
  LDFLAGS-rtld += $(hashstyle-LDFLAGS)
  endif
@@ -150,10 +150,10 @@ Index: a/libc/Makeconfig
  libc.so-gnulib := -lgcc
  endif
  +preinit = $(addprefix $(csu-objpfx),crti.o)
-Index: a/libc/Rules
+Index: a/Rules
 ===================================================================
---- a/libc/Rules	2012-07-04 18:25:47.000000000 -0700
-+++ b/libc/Rules	2012-08-14 20:16:10.197093639 -0700
+--- a/Rules	2012-07-04 18:25:47.000000000 -0700
++++ b/Rules	2012-08-14 20:16:10.197093639 -0700
 @@ -1,5 +1,4 @@
 -# Copyright (C) 1991-2000,2002,2003,2004,2005,2006,2011
 -#	Free Software Foundation, Inc.
@@ -238,10 +238,10 @@ Index: a/libc/Rules
  ifeq ($(build-bounded),yes)
  binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs))
  $(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \
-Index: a/libc/elf/Makefile
+Index: a/elf/Makefile
 ===================================================================
---- a/libc/elf/Makefile	2012-07-04 18:26:34.000000000 -0700
-+++ b/libc/elf/Makefile	2012-08-14 20:16:10.197093639 -0700
+--- a/elf/Makefile	2012-07-04 18:26:34.000000000 -0700
++++ b/elf/Makefile	2012-08-14 20:16:10.197093639 -0700
 @@ -71,6 +71,8 @@
  install-bin	= sprof pldd
  others-static   = sln
@@ -269,10 +269,10 @@ Index: a/libc/elf/Makefile
  $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
  
  $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o)
-Index: a/libc/elf/static-stubs.c
+Index: a/elf/static-stubs.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ a/libc/elf/static-stubs.c	2012-08-14 20:16:10.197093639 -0700
++++ a/elf/static-stubs.c	2012-08-14 20:16:10.197093639 -0700
 @@ -0,0 +1,46 @@
 +/* Stub implementations of functions to link into statically linked
 +   programs without needing libgcc_eh.
@@ -320,24 +320,3 @@ Index: a/libc/elf/static-stubs.c
 +{
 +  abort ();
 +}
-Index: a/ports/sysdeps/arm/Makefile
-===================================================================
---- a/ports/sysdeps/arm/Makefile	2012-07-04 18:25:41.000000000 -0700
-+++ b/ports/sysdeps/arm/Makefile	2012-08-14 20:16:10.201093638 -0700
-@@ -1,8 +1,16 @@
-+gnulib-arch = $(elfobjdir)/libgcc-stubs.a
-+static-gnulib-arch = $(elfobjdir)/libgcc-stubs.a
-+
- ifeq ($(subdir),elf)
- sysdep-dl-routines += tlsdesc dl-tlsdesc
- sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
- sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
- shared-only-routines += aeabi_unwind_cpp_pr1
-+
-+$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
-+	$(build-extra-lib)
-+
-+lib-noranlib: $(objpfx)libgcc-stubs.a
- endif
- 
- ifeq ($(subdir),csu)
diff --git a/patches/eglibc/ports-2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch b/patches/eglibc/ports-2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
new file mode 100644
index 00000000..0e58a765
--- /dev/null
+++ b/patches/eglibc/ports-2_16/001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
@@ -0,0 +1,40 @@
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+From 95f5a9a866695da4e038aa4e6ccbbfd5d9cf63b7 Mon Sep 17 00:00:00 2001
+From: Joseph Myers <joseph@codesourcery.com>
+Date: Tue, 3 Jul 2012 19:14:59 +0000
+Subject: [PATCH] Avoid use of libgcc_s and libgcc_eh when building glibc.
+
+---
+ ChangeLog                  |   47 ++++++++++++++++++++++++++++++
+ Makeconfig                 |   68 ++++++++++++++++++++++++++++++++++++++------
+ Rules                      |   45 ++++++++++++++++++++++-------
+ elf/Makefile               |    6 +++-
+ elf/static-stubs.c         |   46 ++++++++++++++++++++++++++++++
+ ports/ChangeLog.arm        |    7 +++++
+ ports/sysdeps/arm/Makefile |    8 ++++++
+ 7 files changed, 206 insertions(+), 21 deletions(-)
+ create mode 100644 elf/static-stubs.c
+
+-Index: a/ports/sysdeps/arm/Makefile
+===================================================================
+--- a/ports/sysdeps/arm/Makefile       2012-07-04 18:25:41.000000000 -0700
++++ b/ports/sysdeps/arm/Makefile       2012-08-14 20:16:10.201093638 -0700
+@@ -1,8 +1,16 @@
++gnulib-arch = $(elfobjdir)/libgcc-stubs.a
++static-gnulib-arch = $(elfobjdir)/libgcc-stubs.a
++
+ ifeq ($(subdir),elf)
+ sysdep-dl-routines += tlsdesc dl-tlsdesc
+ sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
+ sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
+ shared-only-routines += aeabi_unwind_cpp_pr1
++
++$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
++	$(build-extra-lib)
++
++lib-noranlib: $(objpfx)libgcc-stubs.a
+ endif
+
+ ifeq ($(subdir),csu)
diff --git a/patches/eglibc/2_16/002-Add-ARM-specific-static-stubs.c.patch b/patches/eglibc/ports-2_16/002-Add-ARM-specific-static-stubs.c.patch
index 3a306210..3a306210 100644
--- a/patches/eglibc/2_16/002-Add-ARM-specific-static-stubs.c.patch
+++ b/patches/eglibc/ports-2_16/002-Add-ARM-specific-static-stubs.c.patch
diff --git a/patches/eglibc/2_16/003-mips-rld-map-check.patch b/patches/eglibc/ports-2_16/003-mips-rld-map-check.patch
index 9b646fea..19cb8384 100644
--- a/patches/eglibc/2_16/003-mips-rld-map-check.patch
+++ b/patches/eglibc/ports-2_16/003-mips-rld-map-check.patch
@@ -11,7 +11,7 @@ Upstream-Status: Pending
 
 
 ---
-diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
+diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/sysdeps/mips/dl-machine.h
 --- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h	2009-05-16 16:36:20.000000000 +0800
 +++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h	2010-09-19 09:11:53.000000000 +0800
 @@ -70,7 +70,8 @@