summaryrefslogtreecommitdiff
path: root/libc/elf/tst-tls10.c
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-10-25 00:37:10 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-10-25 00:37:10 +0000
commit4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch)
treecd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/elf/tst-tls10.c
parent91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff)
downloadeglibc2-4bbe4e2185c5484328182720ff7b3bb4f9593bff.tar.gz
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/elf/tst-tls10.c')
-rw-r--r--libc/elf/tst-tls10.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libc/elf/tst-tls10.c b/libc/elf/tst-tls10.c
index dbcc69727..347243f66 100644
--- a/libc/elf/tst-tls10.c
+++ b/libc/elf/tst-tls10.c
@@ -1,9 +1,7 @@
#include "tst-tls10.h"
-#ifdef USE_TLS__THREAD
__thread int dummy __attribute__((visibility ("hidden"))) = 12;
__thread struct A local = { 1, 2, 3 };
-#endif
#define CHECK(N, S) \
p = f##N##a (); \
@@ -13,7 +11,6 @@ __thread struct A local = { 1, 2, 3 };
int
main (void)
{
-#ifdef USE_TLS__THREAD
struct A *p;
if (local.a != 1 || local.b != 2 || local.c != 3)
abort ();
@@ -35,6 +32,6 @@ main (void)
abort ();
CHECK (9, 28);
CHECK (10, 31);
-#endif
+
exit (0);
}