diff options
author | Alexey Neyman <stilor@att.net> | 2017-12-02 23:30:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-02 23:30:38 (GMT) |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/glibc-ports/2.13 | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'packages/glibc-ports/2.13')
-rw-r--r-- | packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch (renamed from packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch) | 20 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0001-m68k-sys-user.patch (renamed from packages/glibc-ports/2.13/330-m68k-sys-user.patch) | 9 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch (renamed from packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch) | 11 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0003-alpha-statfs.patch (renamed from packages/glibc-ports/2.13/420-alpha-statfs.patch) | 16 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0004-alpha-cache-shape.patch (renamed from packages/glibc-ports/2.13/440-alpha-cache-shape.patch) | 11 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch (renamed from packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch) | 11 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch (renamed from packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch) | 7 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch | 26 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch (renamed from packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch) | 7 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch (renamed from packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch) | 69 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch (renamed from packages/glibc-ports/2.13/580-nptl-lowlevellock.patch) | 9 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0011-fpu-cw-mips.patch (renamed from packages/glibc-ports/2.13/610-fpu-cw-mips.patch) | 9 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch | 25 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/470-alpha-feupdateenv.patch | 26 | ||||
-rw-r--r-- | packages/glibc-ports/2.13/670-support-hard-float-eabi.patch | 22 |
15 files changed, 149 insertions, 129 deletions
diff --git a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch index 259b285..af8d28a 100644 --- a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch +++ b/packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch @@ -17,14 +17,16 @@ 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/eabi/nptl/unwind-forcedunwind.c | 3 ++- + sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c | 3 ++- + sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | 3 ++- + sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c @@ -23,7 +23,8 @@ #include <pthreadP.h> - + static void *libgcc_s_handle; -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) @@ -32,15 +34,12 @@ Tested that this fixes the build for ARM. static _Unwind_Reason_Code (*libgcc_s_personality) (int, _Unwind_Action, _Unwind_Exception_Class, 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 @@ -21,7 +21,8 @@ #include <stdio.h> #include <unwind.h> - + -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) + __attribute_used__; @@ -51,7 +50,7 @@ index bff3e2b..1f1eb71 100644 +++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c @@ -23,7 +23,8 @@ #include <pthreadP.h> - + static void *libgcc_s_handle; -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) @@ -64,9 +63,10 @@ index bff3e2b..1f1eb71 100644 @@ -21,7 +21,8 @@ #include <stdio.h> #include <unwind.h> - + -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) + __attribute_used__; static _Unwind_Reason_Code (*libgcc_s_personality) (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); + diff --git a/packages/glibc-ports/2.13/330-m68k-sys-user.patch b/packages/glibc-ports/2.13/0001-m68k-sys-user.patch index a2b4528..a03b08d 100644 --- a/packages/glibc-ports/2.13/330-m68k-sys-user.patch +++ b/packages/glibc-ports/2.13/0001-m68k-sys-user.patch @@ -1,8 +1,11 @@ copied from kernel as it is sanitized now -diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h ---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/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.13/410-alpha-SETPIPE-GETPIPE.patch b/packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch index 580c16d..e806e95 100644 --- a/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch +++ b/packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch @@ -3,10 +3,12 @@ * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_SETPIPE_SZ, F_GETPIPE_SZ): Define. -diff --git glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h -index 860e9ac..e5e726b 100644 ---- glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h -+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h +--- + sysdeps/unix/sysv/linux/alpha/bits/fcntl.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h ++++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h @@ -97,6 +97,8 @@ # define F_SETLEASE 1024 /* Set a lease. */ # define F_GETLEASE 1025 /* Enquire what lease is active. */ @@ -16,4 +18,3 @@ index 860e9ac..e5e726b 100644 #endif #ifdef __USE_XOPEN2K8 # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with - diff --git a/packages/glibc-ports/2.13/420-alpha-statfs.patch b/packages/glibc-ports/2.13/0003-alpha-statfs.patch index accb5af..d9659eb 100644 --- a/packages/glibc-ports/2.13/420-alpha-statfs.patch +++ b/packages/glibc-ports/2.13/0003-alpha-statfs.patch @@ -3,11 +3,13 @@ * sysdeps/unix/sysv/linux/mips/bits/statfs.h (struct statfs, struct statfs64): Add f_flags field. -diff --git glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h -index d838e6b..157591d 100644 ---- glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h -+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h -@@ -42,7 +42,8 @@ struct statfs +--- + sysdeps/unix/sysv/linux/alpha/bits/statfs.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/sysdeps/unix/sysv/linux/alpha/bits/statfs.h ++++ b/sysdeps/unix/sysv/linux/alpha/bits/statfs.h +@@ -42,7 +42,8 @@ __fsid_t f_fsid; int f_namelen; int f_frsize; @@ -17,7 +19,7 @@ index d838e6b..157591d 100644 }; #ifdef __USE_LARGEFILE64 -@@ -58,7 +59,8 @@ struct statfs64 +@@ -58,7 +59,8 @@ __fsid_t f_fsid; int f_namelen; int f_frsize; @@ -26,4 +28,4 @@ index d838e6b..157591d 100644 + int f_spare[4]; }; #endif - + diff --git a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch b/packages/glibc-ports/2.13/0004-alpha-cache-shape.patch index 602c80d..ca608bc 100644 --- a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch +++ b/packages/glibc-ports/2.13/0004-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-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c ---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/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.13/450-alpha-DEFAULT_STACK_PERMS.patch b/packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch index 0d85ce5..a5a9615 100644 --- a/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch +++ b/packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch @@ -2,10 +2,12 @@ * sysdeps/alpha/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X. -diff --git glibc-ports-2.13/sysdeps/alpha/stackinfo.h glibc-ports-2.13/sysdeps/alpha/stackinfo.h -index 0a281bd..d9dbc35 100644 ---- glibc-ports-2.13/sysdeps/alpha/stackinfo.h -+++ glibc-ports-2.13/sysdeps/alpha/stackinfo.h +--- + sysdeps/alpha/stackinfo.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/sysdeps/alpha/stackinfo.h ++++ b/sysdeps/alpha/stackinfo.h @@ -22,7 +22,13 @@ #ifndef _STACKINFO_H #define _STACKINFO_H 1 @@ -20,4 +22,3 @@ index 0a281bd..d9dbc35 100644 +#define DEFAULT_STACK_PERMS (PF_R|PF_W|PF_X) + #endif /* stackinfo.h */ - diff --git a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch index d23ecf9..fef37a5 100644 --- a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch +++ b/packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch @@ -13,12 +13,11 @@ 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.13.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c ---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c 2009-11-13 00:50:57.000000000 +0100 +--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c ++++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c @@ -178,13 +178,13 @@ static inline void stb_mb(unsigned char val, unsigned long addr) diff --git a/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch new file mode 100644 index 0000000..164276f --- /dev/null +++ b/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch @@ -0,0 +1,26 @@ +2011-03-01 Aurelien Jarno <aurelien@aurel32.net> + + * sysdeps/alpha/fpu/feupdateenv.c (feupdateenv): Add + libm_hidden_def. + * sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise. + +--- + sysdeps/alpha/fpu/feupdateenv.c | 1 + + sysdeps/alpha/fpu/ftestexcept.c | 1 + + 2 files changed, 2 insertions(+) + +--- a/sysdeps/alpha/fpu/feupdateenv.c ++++ b/sysdeps/alpha/fpu/feupdateenv.c +@@ -46,4 +46,5 @@ + compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1); + #endif + ++libm_hidden_ver (__feupdateenv, feupdateenv) + versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2); +--- a/sysdeps/alpha/fpu/ftestexcept.c ++++ b/sysdeps/alpha/fpu/ftestexcept.c +@@ -30,3 +30,4 @@ + + return tmp & excepts & SWCR_STATUS_MASK; + } ++libm_hidden_def (fetestexcept) diff --git a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch index 38562b6..53a0992 100644 --- a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch +++ b/packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch @@ -2,12 +2,11 @@ * sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag). - ports/sysdeps/alpha/Makefile | 3 ++- + sysdeps/alpha/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff -durN glibc-ports-2.13.orig/sysdeps/alpha/Makefile glibc-ports-2.13/sysdeps/alpha/Makefile ---- glibc-ports-2.13.orig/sysdeps/alpha/Makefile 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/alpha/Makefile 2009-11-13 00:51:13.000000000 +0100 +--- a/sysdeps/alpha/Makefile ++++ b/sysdeps/alpha/Makefile @@ -35,7 +35,8 @@ ifeq ($(subdir),elf) diff --git a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch index b7d54ac..855dde2 100644 --- a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch +++ b/packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch @@ -1,9 +1,22 @@ http://yann.poupet.free.fr/ep93xx/ Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series -diff -durN glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h glibc-ports-2.13/sysdeps/arm/bits/endian.h ---- glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/bits/endian.h 2009-11-13 00:51:22.000000000 +0100 +--- + sysdeps/arm/bits/endian.h | 2 - + sysdeps/arm/fpu/__longjmp.S | 26 +++++++++++++ + sysdeps/arm/fpu/bits/fenv.h | 41 ++++++++++++++++++++ + sysdeps/arm/fpu/bits/setjmp.h | 4 ++ + sysdeps/arm/fpu/fegetround.c | 12 ++++++ + sysdeps/arm/fpu/fesetround.c | 16 ++++++++ + sysdeps/arm/fpu/fpu_control.h | 78 ++++++++++++++++++++++++++++++++++++++- + sysdeps/arm/fpu/jmpbuf-offsets.h | 4 ++ + sysdeps/arm/fpu/setjmp.S | 30 +++++++++++++++ + sysdeps/arm/gccframe.h | 4 ++ + sysdeps/arm/gmp-mparam.h | 2 - + 11 files changed, 216 insertions(+), 3 deletions(-) + +--- a/sysdeps/arm/bits/endian.h ++++ b/sysdeps/arm/bits/endian.h @@ -12,7 +12,7 @@ /* FPA floating point units are always big-endian, irrespective of the CPU endianness. VFP floating point units use the same endianness @@ -13,9 +26,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h glibc-ports-2.13/sysd #define __FLOAT_WORD_ORDER __BYTE_ORDER #else #define __FLOAT_WORD_ORDER __BIG_ENDIAN -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/__longjmp.S ++++ b/sysdeps/arm/fpu/__longjmp.S @@ -30,7 +30,33 @@ movs r0, r1 /* get the return value in place */ moveq r0, #1 /* can't let setjmp() return zero! */ @@ -50,9 +62,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.13/sy LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc}) END (__longjmp) -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/bits/fenv.h ++++ b/sysdeps/arm/fpu/bits/fenv.h @@ -20,6 +20,45 @@ # error "Never use <bits/fenv.h> directly; include <fenv.h> instead." #endif @@ -108,9 +119,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.13/sy /* Type representing exception flags. */ typedef unsigned long int fexcept_t; -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/bits/setjmp.h ++++ b/sysdeps/arm/fpu/bits/setjmp.h @@ -28,7 +28,11 @@ #ifndef _ASM /* Jump buffer contains v1-v6, sl, fp, sp and pc. Other registers are not @@ -123,9 +133,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.13/ +#endif #endif -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/fegetround.c ++++ b/sysdeps/arm/fpu/fegetround.c @@ -18,9 +18,21 @@ 02111-1307 USA. */ @@ -148,9 +157,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.13/s + +#endif } -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/fesetround.c ++++ b/sysdeps/arm/fpu/fesetround.c @@ -18,12 +18,28 @@ 02111-1307 USA. */ @@ -180,9 +188,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.13/s } libm_hidden_def (fesetround) -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/fpu_control.h ++++ b/sysdeps/arm/fpu/fpu_control.h @@ -1,5 +1,6 @@ /* FPU control word definitions. ARM version. - Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. @@ -278,9 +285,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.13/ +#endif + #endif /* _FPU_CONTROL_H */ -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/jmpbuf-offsets.h ++++ b/sysdeps/arm/fpu/jmpbuf-offsets.h @@ -17,4 +17,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -290,9 +296,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2. +#else #define __JMP_BUF_SP 20 +#endif -diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S ---- glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/fpu/setjmp.S ++++ b/sysdeps/arm/fpu/setjmp.S @@ -24,11 +24,41 @@ ENTRY (__sigsetjmp) @@ -335,9 +340,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.13/sysde /* Make a tail call to __sigjmp_save; it takes the same args. */ B PLTJMP(C_SYMBOL_NAME(__sigjmp_save)) -diff -durN glibc-ports-2.13.orig/sysdeps/arm/gccframe.h glibc-ports-2.13/sysdeps/arm/gccframe.h ---- glibc-ports-2.13.orig/sysdeps/arm/gccframe.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/gccframe.h 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/gccframe.h ++++ b/sysdeps/arm/gccframe.h @@ -17,6 +17,10 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,9 +353,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/gccframe.h glibc-ports-2.13/sysdeps +#endif #include <sysdeps/generic/gccframe.h> -diff -durN glibc-ports-2.13.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.13/sysdeps/arm/gmp-mparam.h ---- glibc-ports-2.13.orig/sysdeps/arm/gmp-mparam.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/arm/gmp-mparam.h 2009-11-13 00:51:22.000000000 +0100 +--- a/sysdeps/arm/gmp-mparam.h ++++ b/sysdeps/arm/gmp-mparam.h @@ -29,7 +29,7 @@ #if defined(__ARMEB__) # define IEEE_DOUBLE_MIXED_ENDIAN 0 diff --git a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch index 9f3fb76..55fc78f 100644 --- a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch +++ b/packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch @@ -9,9 +9,12 @@ 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.13.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h ---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2009-11-13 00:51:23.000000000 +0100 +--- + 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 @@ -25,6 +25,7 @@ #include <atomic.h> #include <sysdep.h> diff --git a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch b/packages/glibc-ports/2.13/0011-fpu-cw-mips.patch index c6345b3..5cb8d71 100644 --- a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch +++ b/packages/glibc-ports/2.13/0011-fpu-cw-mips.patch @@ -1,8 +1,11 @@ http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html -diff -durN glibc-ports-2.13.orig/sysdeps/mips/fpu_control.h glibc-ports-2.13/sysdeps/mips/fpu_control.h ---- glibc-ports-2.13.orig/sysdeps/mips/fpu_control.h 2009-05-16 10:36:20.000000000 +0200 -+++ glibc-ports-2.13/sysdeps/mips/fpu_control.h 2009-11-13 00:51:31.000000000 +0100 +--- + 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 @@ -86,7 +86,7 @@ #define _FPU_RC_UP 0x2 #define _FPU_RC_DOWN 0x3 diff --git a/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch new file mode 100644 index 0000000..9391e88 --- /dev/null +++ b/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch @@ -0,0 +1,25 @@ +--- + sysdeps/arm/preconfigure | 2 +- + sysdeps/arm/shlib-versions | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/sysdeps/arm/preconfigure ++++ b/sysdeps/arm/preconfigure +@@ -2,7 +2,7 @@ + arm*) + base_machine=arm + case $config_os in +- linux-gnueabi) ++ linux-gnueabi*) + machine=arm/eabi/$machine + if [ "${CFLAGS+set}" != "set" ]; then + CFLAGS="-g -O2" +--- a/sysdeps/arm/shlib-versions ++++ b/sysdeps/arm/shlib-versions +@@ -1,4 +1,4 @@ +-arm.*-.*-linux-gnueabi DEFAULT GLIBC_2.4 ++arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4 + +-arm.*-.*-linux-gnueabi ld=ld-linux.so.3 ++arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 + arm.*-.*-linux.* ld=ld-linux.so.2 diff --git a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch deleted file mode 100644 index ea1e056..0000000 --- a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch +++ /dev/null @@ -1,26 +0,0 @@ -2011-03-01 Aurelien Jarno <aurelien@aurel32.net> - - * sysdeps/alpha/fpu/feupdateenv.c (feupdateenv): Add - libm_hidden_def. - * sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise. - -diff --git glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c -index c798070..9abbf11 100644 ---- glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c -+++ glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c -@@ -46,4 +46,5 @@ strong_alias (__feupdateenv, __old_feupdateenv) - compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1); - #endif - -+libm_hidden_ver (__feupdateenv, feupdateenv) - versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2); -diff --git glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c -index a4b3081..34d8113 100644 ---- glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c -+++ glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c -@@ -30,3 +30,4 @@ fetestexcept (int excepts) - - return tmp & excepts & SWCR_STATUS_MASK; - } -+libm_hidden_def (fetestexcept) - diff --git a/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch deleted file mode 100644 index ec00405..0000000 --- a/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur glibc-2.13/sysdeps/arm/preconfigure glibc-2.13-patched/sysdeps/arm/preconfigure ---- glibc-2.13/sysdeps/arm/preconfigure 2011-01-25 14:00:16.000000000 -0700 -+++ glibc-2.13-patched/sysdeps/arm/preconfigure 2017-03-07 15:36:50.310454000 -0700 -@@ -2,7 +2,7 @@ - arm*) - base_machine=arm - case $config_os in -- linux-gnueabi) -+ linux-gnueabi*) - machine=arm/eabi/$machine - if [ "${CFLAGS+set}" != "set" ]; then - CFLAGS="-g -O2" -diff -ur glibc-2.13/sysdeps/arm/shlib-versions glibc-2.13-patched/sysdeps/arm/shlib-versions ---- glibc-2.13/sysdeps/arm/shlib-versions 2011-01-25 14:00:16.000000000 -0700 -+++ glibc-2.13-patched/sysdeps/arm/shlib-versions 2017-03-07 15:36:50.312457000 -0700 -@@ -1,4 +1,4 @@ --arm.*-.*-linux-gnueabi DEFAULT GLIBC_2.4 -+arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4 - --arm.*-.*-linux-gnueabi ld=ld-linux.so.3 -+arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 - arm.*-.*-linux.* ld=ld-linux.so.2 |