Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>

8 files changed, 55 insertions, 52 deletions

diff --git a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch
index 1f08ba1..2b56075 100644
--- a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch
@@ -17,12 +17,10 @@ Tested that this fixes the build for ARM.
 	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
 	Likewise.
 ---
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c       |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-index 6ccd9b4..660d148 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -22,7 +22,8 @@
@@ -35,8 +33,6 @@ index 6ccd9b4..660d148 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -20,7 +20,8 @@
@@ -49,6 +45,3 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  
--- 
-1.9.4
-
diff --git a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch b/packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch
index 932d917..a03b08d 100644
--- a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch
@@ -1,8 +1,11 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/m68k/sys/user.h |   87 ++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/m68k/sys/user.h
++++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
diff --git a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch b/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch
index 7612872..ca608bc 100644
--- a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch
@@ -5,9 +5,12 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
+---
+ sysdeps/unix/sysv/linux/alpha/dl-support.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/dl-support.c
++++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c
+@@ -1,2 +1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch
index 96f1646..0e1d592 100644
--- a/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch
@@ -13,13 +13,12 @@ make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error
 Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
 I cannot really think of anything better than
 
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
+ sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
+--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
++++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
+@@ -177,13 +177,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
  {
@@ -35,7 +34,7 @@ diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-
  }
  
  static inline void
-@@ -356,7 +356,7 @@
+@@ -355,7 +355,7 @@
    unsigned long int addr = dense_port_to_cpu_addr (port);
    unsigned char r;
  
@@ -44,7 +43,7 @@ diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-
    return r;
  }
  
-@@ -366,7 +366,7 @@
+@@ -365,7 +365,7 @@
    unsigned long int addr = dense_port_to_cpu_addr (port);
    unsigned short r;
  
diff --git a/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch
new file mode 100644
index 0000000..bc2ae45
--- /dev/null
+++ b/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch
@@ -0,0 +1,19 @@
+2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
+
+ sysdeps/alpha/Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/alpha/Makefile
++++ b/sysdeps/alpha/Makefile
+@@ -34,7 +34,8 @@
+ 
+ ifeq ($(subdir),elf)
+ # The ld.so startup code cannot use literals until it self-relocates.
+-CFLAGS-rtld.c = -mbuild-constants
++# It uses more than 64k for the small data area.
++CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
+ endif
+ 
+ ifeq ($(subdir),math)
diff --git a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch
index a1c6c7a..3899a0a 100644
--- a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch
@@ -9,10 +9,13 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
+---
+ sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
++++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+@@ -24,6 +24,7 @@
  #include <atomic.h>
  #include <sysdep.h>
  #include <kernel-features.h>
diff --git a/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch b/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch
index ef42c8f..87d56f5 100644
--- a/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch
@@ -1,9 +1,12 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-ports-2.16.0.orig/sysdeps/mips/fpu_control.h glibc-ports-2.16.0/sysdeps/mips/fpu_control.h
---- glibc-ports-2.16.0.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
+---
+ sysdeps/mips/fpu_control.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/mips/fpu_control.h
++++ b/sysdeps/mips/fpu_control.h
+@@ -85,7 +85,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
  
diff --git a/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index db9c890..0000000
--- a/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-ports-2.16.0.orig/sysdeps/alpha/Makefile glibc-ports-2.16.0/sysdeps/alpha/Makefile
---- glibc-ports-2.16.0.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;