diff options
author | Alexey Neyman <stilor@att.net> | 2022-02-11 02:00:59 (GMT) |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2022-02-11 08:47:51 (GMT) |
commit | 86c2982568de1ad4d4cc12a65b19231331484405 (patch) | |
tree | 2e0b3fb78c30877c0c152d59d0e0fff817b73822 /packages/glibc/2.17/0061-glibc-ppc64le-39.patch | |
parent | 1210b0c2f45e32ef0867ca00e16b6aadb6a81bf9 (diff) |
Run patches thru `manage-packages -P`
This refreshes the line numbers, removes any fuzz (which would make any
future forward ports easier) and standardizes the patch/file headers
(which makes them easier to read).
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/glibc/2.17/0061-glibc-ppc64le-39.patch')
-rw-r--r-- | packages/glibc/2.17/0061-glibc-ppc64le-39.patch | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/packages/glibc/2.17/0061-glibc-ppc64le-39.patch b/packages/glibc/2.17/0061-glibc-ppc64le-39.patch index f837d99..f39f271 100644 --- a/packages/glibc/2.17/0061-glibc-ppc64le-39.patch +++ b/packages/glibc/2.17/0061-glibc-ppc64le-39.patch @@ -33,10 +33,20 @@ # The hack in VDSO_IFUNC_RET to "synthesize" a function descriptor # for vDSO routines is also no longer necessary for ELFv2. # -diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h ---- glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:58:25.000000000 -0500 -@@ -2263,6 +2263,12 @@ +--- +# elf/elf.h | 6 +# sysdeps/powerpc/powerpc64/crti.S | 2 +# sysdeps/powerpc/powerpc64/dl-irel.h | 4 +# sysdeps/powerpc/powerpc64/dl-machine.h | 99 ++++++++++++---- +# sysdeps/powerpc/powerpc64/setjmp-common.S | 21 +-- +# sysdeps/powerpc/powerpc64/sysdep.h | 54 ++++++++ +# sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h | 4 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S | 7 + +# 8 files changed, 162 insertions(+), 35 deletions(-) +# +--- a/elf/elf.h ++++ b/elf/elf.h +@@ -2260,6 +2260,12 @@ #define R_PPC64_REL16_HI 251 /* half16 (sym+add-.)@h */ #define R_PPC64_REL16_HA 252 /* half16 (sym+add-.)@ha */ @@ -49,9 +59,8 @@ diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h /* PowerPC64 specific values for the Dyn d_tag field. */ #define DT_PPC64_GLINK (DT_LOPROC + 0) #define DT_PPC64_OPD (DT_LOPROC + 1) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/crti.S ++++ b/sysdeps/powerpc/powerpc64/crti.S @@ -64,6 +64,7 @@ ENTRY_2(_init) .align ALIGNARG (2) @@ -68,9 +77,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a6 mflr 0 std 0, 16(r1) stdu r1, -112(r1) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-irel.h ++++ b/sysdeps/powerpc/powerpc64/dl-irel.h @@ -50,7 +50,11 @@ { Elf64_Addr *const reloc_addr = (void *) reloc->r_offset; @@ -83,9 +91,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h glibc-2.17-c75 } else __libc_fatal ("unexpected reloc type in static binary"); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 14:05:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-machine.h ++++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -31,6 +31,7 @@ in l_info array. */ #define DT_PPC64(x) (DT_PPC64_##x - DT_LOPROC + DT_NUM) @@ -311,9 +318,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17- return ((Elf64_Addr (*) (unsigned long int)) value) (GLRO(dl_hwcap)); } -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-29 14:00:27.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/setjmp-common.S ++++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -55,21 +55,22 @@ that saves r2 since the call won't go via a plt call stub. See bugz #269. __GI__setjmp is used in csu/libc-start.c when @@ -366,9 +372,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S glibc-2. #endif -END (BP_SYM (__sigsetjmp)) +END (__sigsetjmp) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/sysdep.h ++++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -74,6 +74,8 @@ #endif .endm @@ -463,9 +468,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758 +#endif /* _CALL_ELF */ #endif /* __ASSEMBLER__ */ -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h 2014-05-29 13:58:24.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h @@ -23,6 +23,8 @@ /* Now define our stuff. */ @@ -482,9 +486,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs +#endif + #endif /* ldsodefs.h */ -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-29 13:58:24.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S @@ -111,6 +111,7 @@ L(noparms): |