forked from pool/glibc
Andreas Schwab
3d1d35fa2b
- tst-tlsopt-powerpc.patch: fix tst-tlsopt-powerpc (bcn#1070419) - powerpc-hwcap-bits.patch: Update HWCAP for powerpc (bnc#1070420) - malloc-tcache-check-overflow.patch: Fix integer overflow in malloc when tcache is enabled (CVE-2017-17426, bnc#1071479, BZ #22375) OBS-URL: https://build.opensuse.org/request/show/556907 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=487
172 lines
5.2 KiB
Diff
172 lines
5.2 KiB
Diff
2017-08-03 Alan Modra <amodra@gmail.com>
|
|
|
|
* sysdeps/powerpc/mod-tlsopt-powerpc.c: Extract from
|
|
tst-tlsopt-powerpc.c with function name change and no test harness.
|
|
* sysdeps/powerpc/tst-tlsopt-powerpc.c: Remove body of test.
|
|
Call tls_get_addr_opt_test.
|
|
* sysdeps/powerpc/Makefile (LDFLAGS-tst-tlsopt-powerpc): Don't define.
|
|
(modules-names): Add mod-tlsopt-powerpc.
|
|
(mod-tlsopt-powerpc.so-no-z-defs): Define.
|
|
(tst-tlsopt-powerpc): Depend on .so.
|
|
* sysdeps/powerpc/powerpc64/tls-macros.h (__TLS_GET_ADDR): Don't
|
|
define. Expand use in TLS_GD and TLS_LD.
|
|
|
|
Index: glibc-2.26/sysdeps/powerpc/Makefile
|
|
===================================================================
|
|
--- glibc-2.26.orig/sysdeps/powerpc/Makefile
|
|
+++ glibc-2.26/sysdeps/powerpc/Makefile
|
|
@@ -8,9 +8,11 @@ sysdep-dl-routines += dl-machine hwcapin
|
|
sysdep_routines += dl-machine hwcapinfo
|
|
# extra shared linker files to link only into dl-allobjs.so
|
|
sysdep-rtld-routines += dl-machine hwcapinfo
|
|
-# Don't optimize GD tls sequence to LE.
|
|
-LDFLAGS-tst-tlsopt-powerpc += -Wl,--no-tls-optimize
|
|
+
|
|
+modules-names += mod-tlsopt-powerpc
|
|
+mod-tlsopt-powerpc.so-no-z-defs = yes
|
|
tests += tst-tlsopt-powerpc
|
|
+$(objpfx)tst-tlsopt-powerpc: $(objpfx)mod-tlsopt-powerpc.so
|
|
|
|
ifneq (no,$(multi-arch))
|
|
tests-static += tst-tlsifunc-static
|
|
Index: glibc-2.26/sysdeps/powerpc/mod-tlsopt-powerpc.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.26/sysdeps/powerpc/mod-tlsopt-powerpc.c
|
|
@@ -0,0 +1,49 @@
|
|
+/* shared library to test for __tls_get_addr optimization. */
|
|
+#include <stdio.h>
|
|
+
|
|
+#include "../../elf/tls-macros.h"
|
|
+#include "dl-tls.h"
|
|
+
|
|
+/* common 'int' variable in TLS. */
|
|
+COMMON_INT_DEF(foo);
|
|
+
|
|
+
|
|
+int
|
|
+tls_get_addr_opt_test (void)
|
|
+{
|
|
+ int result = 0;
|
|
+
|
|
+ /* Get variable using general dynamic model. */
|
|
+ int *ap = TLS_GD (foo);
|
|
+ if (*ap != 0)
|
|
+ {
|
|
+ printf ("foo = %d\n", *ap);
|
|
+ result = 1;
|
|
+ }
|
|
+
|
|
+ tls_index *tls_arg;
|
|
+#ifdef __powerpc64__
|
|
+ register unsigned long thread_pointer __asm__ ("r13");
|
|
+ asm ("addi %0,2,foo@got@tlsgd" : "=r" (tls_arg));
|
|
+#else
|
|
+ register unsigned long thread_pointer __asm__ ("r2");
|
|
+ asm ("bcl 20,31,1f\n1:\t"
|
|
+ "mflr %0\n\t"
|
|
+ "addis %0,%0,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t"
|
|
+ "addi %0,%0,_GLOBAL_OFFSET_TABLE_-1b@l\n\t"
|
|
+ "addi %0,%0,foo@got@tlsgd" : "=b" (tls_arg));
|
|
+#endif
|
|
+
|
|
+ if (tls_arg->ti_module != 0)
|
|
+ {
|
|
+ printf ("tls_index not optimized, binutils too old?\n");
|
|
+ result = 1;
|
|
+ }
|
|
+ else if (tls_arg->ti_offset + thread_pointer != (unsigned long) ap)
|
|
+ {
|
|
+ printf ("tls_index->ti_offset wrong value\n");
|
|
+ result = 1;
|
|
+ }
|
|
+
|
|
+ return result;
|
|
+}
|
|
Index: glibc-2.26/sysdeps/powerpc/powerpc64/tls-macros.h
|
|
===================================================================
|
|
--- glibc-2.26.orig/sysdeps/powerpc/powerpc64/tls-macros.h
|
|
+++ glibc-2.26/sysdeps/powerpc/powerpc64/tls-macros.h
|
|
@@ -18,13 +18,11 @@
|
|
__result; \
|
|
})
|
|
|
|
-#define __TLS_GET_ADDR "__tls_get_addr"
|
|
-
|
|
/* PowerPC64 Local Dynamic TLS access. */
|
|
#define TLS_LD(x) \
|
|
({ int * __result; \
|
|
asm ("addi 3,2," #x "@got@tlsld\n\t" \
|
|
- "bl " __TLS_GET_ADDR "\n\t" \
|
|
+ "bl __tls_get_addr\n\t" \
|
|
"nop \n\t" \
|
|
"addis %0,3," #x "@dtprel@ha\n\t" \
|
|
"addi %0,%0," #x "@dtprel@l" \
|
|
@@ -36,7 +34,7 @@
|
|
#define TLS_GD(x) \
|
|
({ register int *__result __asm__ ("r3"); \
|
|
asm ("addi 3,2," #x "@got@tlsgd\n\t" \
|
|
- "bl " __TLS_GET_ADDR "\n\t" \
|
|
+ "bl __tls_get_addr\n\t" \
|
|
"nop " \
|
|
: "=r" (__result) : \
|
|
: __TLS_CALL_CLOBBERS); \
|
|
Index: glibc-2.26/sysdeps/powerpc/tst-tlsopt-powerpc.c
|
|
===================================================================
|
|
--- glibc-2.26.orig/sysdeps/powerpc/tst-tlsopt-powerpc.c
|
|
+++ glibc-2.26/sysdeps/powerpc/tst-tlsopt-powerpc.c
|
|
@@ -1,51 +1,11 @@
|
|
/* glibc test for __tls_get_addr optimization. */
|
|
-#include <stdio.h>
|
|
-
|
|
-#include "../../elf/tls-macros.h"
|
|
-#include "dl-tls.h"
|
|
-
|
|
-/* common 'int' variable in TLS. */
|
|
-COMMON_INT_DEF(foo);
|
|
-
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
- int result = 0;
|
|
-
|
|
- /* Get variable using general dynamic model. */
|
|
- int *ap = TLS_GD (foo);
|
|
- if (*ap != 0)
|
|
- {
|
|
- printf ("foo = %d\n", *ap);
|
|
- result = 1;
|
|
- }
|
|
-
|
|
- tls_index *tls_arg;
|
|
-#ifdef __powerpc64__
|
|
- register unsigned long thread_pointer __asm__ ("r13");
|
|
- asm ("addi %0,2,foo@got@tlsgd" : "=r" (tls_arg));
|
|
-#else
|
|
- register unsigned long thread_pointer __asm__ ("r2");
|
|
- asm ("bcl 20,31,1f\n1:\t"
|
|
- "mflr %0\n\t"
|
|
- "addis %0,%0,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t"
|
|
- "addi %0,%0,_GLOBAL_OFFSET_TABLE_-1b@l\n\t"
|
|
- "addi %0,%0,foo@got@tlsgd" : "=b" (tls_arg));
|
|
-#endif
|
|
-
|
|
- if (tls_arg->ti_module != 0)
|
|
- {
|
|
- printf ("tls_index not optimized, binutils too old?\n");
|
|
- result = 1;
|
|
- }
|
|
- else if (tls_arg->ti_offset + thread_pointer != (unsigned long) ap)
|
|
- {
|
|
- printf ("tls_index->ti_offset wrong value\n");
|
|
- result = 1;
|
|
- }
|
|
+ extern int tls_get_addr_opt_test (void);
|
|
|
|
- return result;
|
|
+ return tls_get_addr_opt_test ();
|
|
}
|
|
|
|
#include <support/test-driver.c>
|