3 files changed, 17 insertions, 4 deletions
diff --git a/elf/tst-tlsmod2.c b/elf/tst-tlsmod2.c
index 6aec8120c0..1a4c73b8a0 100644
--- a/elf/tst-tlsmod2.c
+++ b/elf/tst-tlsmod2.c
@@ -12,9 +12,13 @@ COMMON_INT_DEF(foo);
 int
 in_dso (int n, int *caller_foop)
 {
-  int *foop = TLS_GD (foo);
+  int *foop;
   int result = 0;
 
+  puts ("foo");			/* Make sure PLT is used before macros.  */
+
+  foop = TLS_GD (foo);
+
   if (caller_foop != NULL && foop != caller_foop)
     {
       printf ("callers address of foo differs: %p vs %p\n", caller_foop, foop);
diff --git a/elf/tst-tlsmod3.c b/elf/tst-tlsmod3.c
index 087c11b7a0..6b7fbccf4e 100644
--- a/elf/tst-tlsmod3.c
+++ b/elf/tst-tlsmod3.c
@@ -15,10 +15,15 @@ COMMON_INT_DEF(comm_n);
 int
 in_dso2 (void)
 {
-  int *foop = TLS_GD (foo);
+  int *foop;
   int result = 0;
   static int n;
-  int *np = TLS_GD (comm_n);
+  int *np;
+
+  puts ("foo");			/* Make sure PLT is used before macros.  */
+
+  foop = TLS_GD (foo);
+  np = TLS_GD (comm_n);
 
   if (n != *np)
     {
diff --git a/elf/tst-tlsmod4.c b/elf/tst-tlsmod4.c
index d40b3fdf61..c536303b47 100644
--- a/elf/tst-tlsmod4.c
+++ b/elf/tst-tlsmod4.c
@@ -12,9 +12,13 @@ COMMON_INT_DEF(baz);
 int
 in_dso (int n, int *caller_bazp)
 {
-  int *bazp = TLS_GD (baz);
+  int *bazp;
   int result = 0;
 
+  puts ("foo");			/* Make sure PLT is used before macros.  */
+
+  bazp = TLS_GD (baz);
+
   if (caller_bazp != NULL && bazp != caller_bazp)
     {
       printf ("callers address of baz differs: %p vs %p\n", caller_bazp, bazp);