From 07e7fdfd429985f061630c46e91cb10579607233 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Tue, 16 Jun 2020 21:46:00 +0930
Subject: [PATCH] Use __asm__ rather than asm in ld testsuite

	* testsuite/ld-elf/pr23428.c: Define _DEFAULT_SOURCE.
	* testsuite/ld-elf/indirect1b.c: Replace asm with __asm__.
	* testsuite/ld-elf/indirect2.c: Likewise.
	* testsuite/ld-elf/indirect3b.c: Likewise.
	* testsuite/ld-elf/indirect4b.c: Likewise.
	* testsuite/ld-elf/pr14323-2.c: Likewise.
	* testsuite/ld-elf/pr18720b.c: Likewise.
	* testsuite/ld-elf/pr23428.c: Likewise.
	* testsuite/ld-elfvsb/common.c: Likewise.
	* testsuite/ld-elfvsb/main.c: Likewise.
	* testsuite/ld-elfvsb/sh1.c: Likewise.
	* testsuite/ld-elfvsb/test.c: Likewise.
	* testsuite/ld-pe/aligncomm-1.c: Likewise.
	* testsuite/ld-pe/aligncomm-2.c: Likewise.
	* testsuite/ld-pe/aligncomm-3.c: Likewise.
	* testsuite/ld-pe/aligncomm-4.c: Likewise.
	* testsuite/ld-plugin/pr23958.c: Likewise.
	* testsuite/ld-size/size-1b.c: Likewise.
	* testsuite/ld-size/size-2b.c: Likewise.
	* testsuite/ld-size/size-3a.c: Likewise.
	* testsuite/ld-size/size-3b.c: Likewise.
	* testsuite/ld-size/size-3c.c: Likewise.
	* testsuite/ld-size/size-4b.c: Likewise.
	* testsuite/ld-size/size-5b.c: Likewise.
	* testsuite/ld-size/size-6a.c: Likewise.
	* testsuite/ld-size/size-7a.c: Likewise.
	* testsuite/ld-size/size-8a.c: Likewise.
	* testsuite/ld-size/size-9b.c: Likewise.
	* testsuite/ld-size/size-10b.c: Likewise.
---
 ld/ChangeLog                     | 32 ++++++++++++++++++++++++++++++++
 ld/testsuite/ld-elf/indirect1b.c |  4 ++--
 ld/testsuite/ld-elf/indirect2.c  |  4 ++--
 ld/testsuite/ld-elf/indirect3b.c |  4 ++--
 ld/testsuite/ld-elf/indirect4b.c |  8 ++++----
 ld/testsuite/ld-elf/pr14323-2.c  |  2 +-
 ld/testsuite/ld-elf/pr18720b.c   | 14 +++++++-------
 ld/testsuite/ld-elf/pr23428.c    |  3 +++
 ld/testsuite/ld-elfvsb/common.c  |  2 +-
 ld/testsuite/ld-elfvsb/main.c    | 18 +++++++++---------
 ld/testsuite/ld-elfvsb/sh1.c     | 22 +++++++++++-----------
 ld/testsuite/ld-elfvsb/test.c    |  4 ++--
 ld/testsuite/ld-pe/aligncomm-1.c |  8 ++++----
 ld/testsuite/ld-pe/aligncomm-2.c |  8 ++++----
 ld/testsuite/ld-pe/aligncomm-3.c |  8 ++++----
 ld/testsuite/ld-pe/aligncomm-4.c |  8 ++++----
 ld/testsuite/ld-plugin/pr23958.c |  2 +-
 ld/testsuite/ld-size/size-10b.c  |  2 +-
 ld/testsuite/ld-size/size-1b.c   |  2 +-
 ld/testsuite/ld-size/size-2b.c   |  2 +-
 ld/testsuite/ld-size/size-3a.c   |  2 +-
 ld/testsuite/ld-size/size-3b.c   |  2 +-
 ld/testsuite/ld-size/size-3c.c   |  2 +-
 ld/testsuite/ld-size/size-4b.c   |  4 ++--
 ld/testsuite/ld-size/size-5b.c   |  4 ++--
 ld/testsuite/ld-size/size-6a.c   |  2 +-
 ld/testsuite/ld-size/size-7a.c   |  2 +-
 ld/testsuite/ld-size/size-8a.c   |  2 +-
 ld/testsuite/ld-size/size-9b.c   |  2 +-
 29 files changed, 107 insertions(+), 72 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7d19ced3b6..aa20f50580 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,35 @@
+2020-06-16  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/ld-elf/pr23428.c: Define _DEFAULT_SOURCE.
+	* testsuite/ld-elf/indirect1b.c: Replace asm with __asm__.
+	* testsuite/ld-elf/indirect2.c: Likewise.
+	* testsuite/ld-elf/indirect3b.c: Likewise.
+	* testsuite/ld-elf/indirect4b.c: Likewise.
+	* testsuite/ld-elf/pr14323-2.c: Likewise.
+	* testsuite/ld-elf/pr18720b.c: Likewise.
+	* testsuite/ld-elf/pr23428.c: Likewise.
+	* testsuite/ld-elfvsb/common.c: Likewise.
+	* testsuite/ld-elfvsb/main.c: Likewise.
+	* testsuite/ld-elfvsb/sh1.c: Likewise.
+	* testsuite/ld-elfvsb/test.c: Likewise.
+	* testsuite/ld-pe/aligncomm-1.c: Likewise.
+	* testsuite/ld-pe/aligncomm-2.c: Likewise.
+	* testsuite/ld-pe/aligncomm-3.c: Likewise.
+	* testsuite/ld-pe/aligncomm-4.c: Likewise.
+	* testsuite/ld-plugin/pr23958.c: Likewise.
+	* testsuite/ld-size/size-1b.c: Likewise.
+	* testsuite/ld-size/size-2b.c: Likewise.
+	* testsuite/ld-size/size-3a.c: Likewise.
+	* testsuite/ld-size/size-3b.c: Likewise.
+	* testsuite/ld-size/size-3c.c: Likewise.
+	* testsuite/ld-size/size-4b.c: Likewise.
+	* testsuite/ld-size/size-5b.c: Likewise.
+	* testsuite/ld-size/size-6a.c: Likewise.
+	* testsuite/ld-size/size-7a.c: Likewise.
+	* testsuite/ld-size/size-8a.c: Likewise.
+	* testsuite/ld-size/size-9b.c: Likewise.
+	* testsuite/ld-size/size-10b.c: Likewise.
+
 2020-06-16  Alan Modra  <amodra@gmail.com>
 
 	* emulparams/tic30aout.sh: Delete file.
diff --git a/ld/testsuite/ld-elf/indirect1b.c b/ld/testsuite/ld-elf/indirect1b.c
index 60f34527f4..6bb439caed 100644
--- a/ld/testsuite/ld-elf/indirect1b.c
+++ b/ld/testsuite/ld-elf/indirect1b.c
@@ -3,7 +3,7 @@ foo (void)
 {
 }
 
-asm (".symver foo,foo@FOO");
+__asm__ (".symver foo,foo@FOO");
 #if defined __powerpc64__ && defined _CALL_AIXDESC && !defined _CALL_LINUX
-asm (".symver .foo,.foo@FOO");
+__asm__ (".symver .foo,.foo@FOO");
 #endif
diff --git a/ld/testsuite/ld-elf/indirect2.c b/ld/testsuite/ld-elf/indirect2.c
index e36532d1e7..f16af0b594 100644
--- a/ld/testsuite/ld-elf/indirect2.c
+++ b/ld/testsuite/ld-elf/indirect2.c
@@ -1,8 +1,8 @@
 extern void foo (void);
 
-asm (".symver foo,foo@@@FOO");
+__asm__ (".symver foo,foo@@@FOO");
 #if defined __powerpc64__ && defined _CALL_AIXDESC && !defined _CALL_LINUX
-asm (".symver .foo,.foo@@@FOO");
+__asm__ (".symver .foo,.foo@@@FOO");
 #endif
 
 void
diff --git a/ld/testsuite/ld-elf/indirect3b.c b/ld/testsuite/ld-elf/indirect3b.c
index 74cc461f99..493d4dbc7c 100644
--- a/ld/testsuite/ld-elf/indirect3b.c
+++ b/ld/testsuite/ld-elf/indirect3b.c
@@ -6,7 +6,7 @@ foo (void)
   printf ("MAIN\n");
 }
 
-asm (".symver foo,foo@FOO");
+__asm__ (".symver foo,foo@FOO");
 #if defined __powerpc64__ && defined _CALL_AIXDESC && !defined _CALL_LINUX
-asm (".symver .foo,.foo@FOO");
+__asm__ (".symver .foo,.foo@FOO");
 #endif
diff --git a/ld/testsuite/ld-elf/indirect4b.c b/ld/testsuite/ld-elf/indirect4b.c
index 06739b55ea..d82d630aeb 100644
--- a/ld/testsuite/ld-elf/indirect4b.c
+++ b/ld/testsuite/ld-elf/indirect4b.c
@@ -6,9 +6,9 @@ foo2 (void)
   printf ("MAIN2\n");
 }
 
-asm (".symver foo2,foo@@FOO2");
+__asm__ (".symver foo2,foo@@FOO2");
 #if defined __powerpc64__ && defined _CALL_AIXDESC && !defined _CALL_LINUX
-asm (".symver .foo2,.foo@@FOO2");
+__asm__ (".symver .foo2,.foo@@FOO2");
 #endif
 
 void
@@ -17,7 +17,7 @@ foo1 (void)
   printf ("MAIN1\n");
 }
 
-asm (".symver foo1,foo@FOO1");
+__asm__ (".symver foo1,foo@FOO1");
 #if defined __powerpc64__ && defined _CALL_AIXDESC && !defined _CALL_LINUX
-asm (".symver .foo1,.foo@FOO1");
+__asm__ (".symver .foo1,.foo@FOO1");
 #endif
diff --git a/ld/testsuite/ld-elf/pr14323-2.c b/ld/testsuite/ld-elf/pr14323-2.c
index 34753d110e..b0371d62bb 100644
--- a/ld/testsuite/ld-elf/pr14323-2.c
+++ b/ld/testsuite/ld-elf/pr14323-2.c
@@ -1,7 +1,7 @@
 int foo __attribute__ ((section ("_data_foo"))) = 0;
 extern int foo_alias __attribute__ ((weak, alias ("foo")));
 extern char __start__data_foo;
-asm (".type __start__data_foo,%object");
+__asm__ (".type __start__data_foo,%object");
 int x1 = 1;
 int x2 = 2;
 
diff --git a/ld/testsuite/ld-elf/pr18720b.c b/ld/testsuite/ld-elf/pr18720b.c
index 3644e5dfc6..6b3222db86 100644
--- a/ld/testsuite/ld-elf/pr18720b.c
+++ b/ld/testsuite/ld-elf/pr18720b.c
@@ -6,15 +6,15 @@ foo (void)
   printf ("MAIN\n");
 }
 
-asm (".symver foo,foo@FOO");
+__asm__ (".symver foo,foo@FOO");
 #ifdef __alpha__
-asm ("foo_alias = foo");
+__asm__ ("foo_alias = foo");
 #else
-asm (".set foo_alias,foo");
+__asm__ (".set foo_alias,foo");
 #endif
-asm (".global foo_alias");
+__asm__ (".global foo_alias");
 #if defined __powerpc64__ && defined _CALL_AIXDESC && !defined _CALL_LINUX
-asm (".symver .foo,.foo@FOO");
-asm (".set .foo_alias,.foo");
-asm (".global .foo_alias");
+__asm__ (".symver .foo,.foo@FOO");
+__asm__ (".set .foo_alias,.foo");
+__asm__ (".global .foo_alias");
 #endif
diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c
index 3631ed7926..963b9e545d 100644
--- a/ld/testsuite/ld-elf/pr23428.c
+++ b/ld/testsuite/ld-elf/pr23428.c
@@ -1,3 +1,6 @@
+/* Ensure we get syscall declared.  */
+#define _DEFAULT_SOURCE
+
 #include <unistd.h>
 #include <link.h>
 #include <syscall.h>
diff --git a/ld/testsuite/ld-elfvsb/common.c b/ld/testsuite/ld-elfvsb/common.c
index 7d05eb7f8f..0432a07915 100644
--- a/ld/testsuite/ld-elfvsb/common.c
+++ b/ld/testsuite/ld-elfvsb/common.c
@@ -1,5 +1,5 @@
 int foo;
-asm (".hidden foo");
+__asm__ (".hidden foo");
 
 int
 _start (void)
diff --git a/ld/testsuite/ld-elfvsb/main.c b/ld/testsuite/ld-elfvsb/main.c
index 5419826f50..c2c9291134 100644
--- a/ld/testsuite/ld-elfvsb/main.c
+++ b/ld/testsuite/ld-elfvsb/main.c
@@ -96,7 +96,7 @@ main_visibility_checkvar (void)
 
 #ifndef PROTECTED_UNDEF_TEST
 int shared_data = 1;
-asm (".protected shared_data");
+__asm__ (".protected shared_data");
 
 int
 shared_func (void)
@@ -104,7 +104,7 @@ shared_func (void)
   return 1;
 }
 
-asm (".protected shared_func");
+__asm__ (".protected shared_func");
 
 extern int * shared_data_p ();
 typedef int (*func) ();
@@ -152,7 +152,7 @@ shlib_overriddencall2 (void)
 
 #ifdef HIDDEN_NORMAL_TEST
 int visibility_com;
-asm (".hidden visibility_com");
+__asm__ (".hidden visibility_com");
 
 int
 main_visibility_checkcom (void)
@@ -174,19 +174,19 @@ main_visibility_checkcom (void)
 
 #pragma weak visibility_undef_var_weak
 extern int visibility_undef_var_weak;
-asm (".hidden visibility_undef_var_weak");
+__asm__ (".hidden visibility_undef_var_weak");
 
 #pragma weak visibility_undef_func_weak
 extern int visibility_undef_func_weak ();
-asm (".hidden visibility_undef_func_weak");
+__asm__ (".hidden visibility_undef_func_weak");
 
 #pragma weak visibility_var_weak
 extern int visibility_var_weak;
-asm (".hidden visibility_var_weak");
+__asm__ (".hidden visibility_var_weak");
 
 #pragma weak visibility_func_weak
 extern int visibility_func_weak ();
-asm (".hidden visibility_func_weak");
+__asm__ (".hidden visibility_func_weak");
 
 int
 main_visibility_checkweak ()
@@ -198,9 +198,9 @@ main_visibility_checkweak ()
 }
 #elif defined (HIDDEN_UNDEF_TEST)
 extern int visibility_def;
-asm (".hidden visibility_def");
+__asm__ (".hidden visibility_def");
 extern int visibility_func ();
-asm (".hidden visibility_func");
+__asm__ (".hidden visibility_func");
 
 int
 main_visibility_checkcom (void)
diff --git a/ld/testsuite/ld-elfvsb/sh1.c b/ld/testsuite/ld-elfvsb/sh1.c
index b2754249af..1aba63c754 100644
--- a/ld/testsuite/ld-elfvsb/sh1.c
+++ b/ld/testsuite/ld-elfvsb/sh1.c
@@ -203,7 +203,7 @@ visibility ()
 #endif
 
 #ifdef HIDDEN_NORMAL_TEST
-asm (".hidden visibility_normal");
+__asm__ (".hidden visibility_normal");
 
 int
 visibility_normal ()
@@ -265,7 +265,7 @@ int visibility_var = 2;
 #endif
 
 #ifdef HIDDEN_NORMAL_TEST
-asm (".hidden visibility_var_normal");
+__asm__ (".hidden visibility_var_normal");
 
 int visibility_var_normal = 2;
 #endif
@@ -325,18 +325,18 @@ visibility_varval ()
 }
 
 #if defined (HIDDEN_TEST) || defined (HIDDEN_UNDEF_TEST)
-asm (".hidden visibility");
-asm (".hidden visibility_var");
+__asm__ (".hidden visibility");
+__asm__ (".hidden visibility_var");
 #else
 #if defined (PROTECTED_TEST) || defined (PROTECTED_UNDEF_TEST) || defined (PROTECTED_WEAK_TEST)
-asm (".protected visibility");
-asm (".protected visibility_var");
+__asm__ (".protected visibility");
+__asm__ (".protected visibility_var");
 #endif
 #endif
 
 #ifdef HIDDEN_NORMAL_TEST
 int shlib_visibility_com;
-asm (".hidden shlib_visibility_com");
+__asm__ (".hidden shlib_visibility_com");
 
 int
 shlib_visibility_checkcom ()
@@ -352,19 +352,19 @@ shlib_visibility_checkweak ()
 #elif defined (HIDDEN_WEAK_TEST)
 #pragma weak shlib_visibility_undef_var_weak
 extern int shlib_visibility_undef_var_weak;
-asm (".hidden shlib_visibility_undef_var_weak");
+__asm__ (".hidden shlib_visibility_undef_var_weak");
 
 #pragma weak shlib_visibility_undef_func_weak
 extern int shlib_visibility_undef_func_weak ();
-asm (".hidden shlib_visibility_undef_func_weak");
+__asm__ (".hidden shlib_visibility_undef_func_weak");
 
 #pragma weak shlib_visibility_var_weak
 extern int shlib_visibility_var_weak;
-asm (".hidden shlib_visibility_var_weak");
+__asm__ (".hidden shlib_visibility_var_weak");
 
 #pragma weak shlib_visibility_func_weak
 extern int shlib_visibility_func_weak ();
-asm (".hidden shlib_visibility_func_weak");
+__asm__ (".hidden shlib_visibility_func_weak");
 
 int
 shlib_visibility_checkcom ()
diff --git a/ld/testsuite/ld-elfvsb/test.c b/ld/testsuite/ld-elfvsb/test.c
index ca23d38b1e..d2210accc6 100644
--- a/ld/testsuite/ld-elfvsb/test.c
+++ b/ld/testsuite/ld-elfvsb/test.c
@@ -1,10 +1,10 @@
 #pragma weak main_hidden_data
 extern int main_hidden_data;
-asm (".hidden main_hidden_data");
+__asm__ (".hidden main_hidden_data");
  
 #pragma weak main_hidden_func
 extern int main_hidden_func ();
-asm (".hidden main_hidden_func");
+__asm__ (".hidden main_hidden_func");
 
 int
 _start (void)
diff --git a/ld/testsuite/ld-pe/aligncomm-1.c b/ld/testsuite/ld-pe/aligncomm-1.c
index fc6cb034e3..0c031540f3 100644
--- a/ld/testsuite/ld-pe/aligncomm-1.c
+++ b/ld/testsuite/ld-pe/aligncomm-1.c
@@ -13,10 +13,10 @@ int main (int argc, const char **argv)
 
 void __main (void)
 {
-  asm (".section .drectve\n"
-	"  .ascii \" -aligncomm:_r,4\"\n"
-	"  .ascii \" -aligncomm:r,4\"\n"
-	"  .text");
+  __asm__ (".section .drectve\n"
+	   "  .ascii \" -aligncomm:_r,4\"\n"
+	   "  .ascii \" -aligncomm:r,4\"\n"
+	   "  .text");
 }
 
 #if defined (__CYGWIN__) || defined (__MINGW32__)
diff --git a/ld/testsuite/ld-pe/aligncomm-2.c b/ld/testsuite/ld-pe/aligncomm-2.c
index 5e042b8df4..dc29bba51c 100644
--- a/ld/testsuite/ld-pe/aligncomm-2.c
+++ b/ld/testsuite/ld-pe/aligncomm-2.c
@@ -14,10 +14,10 @@ int main (int argc, const char **argv)
 
 void __main (void)
 {
-  asm (".section .drectve\n"
-	"  .ascii \" -aligncomm:_r,4\"\n"
-	"  .ascii \" -aligncomm:r,4\"\n"
-	"  .text");
+  __asm__ (".section .drectve\n"
+	   "  .ascii \" -aligncomm:_r,4\"\n"
+	   "  .ascii \" -aligncomm:r,4\"\n"
+	   "  .text");
 }
 
 #if defined (__CYGWIN__) || defined (__MINGW32__)
diff --git a/ld/testsuite/ld-pe/aligncomm-3.c b/ld/testsuite/ld-pe/aligncomm-3.c
index 69184f9ab3..8fc73cd929 100644
--- a/ld/testsuite/ld-pe/aligncomm-3.c
+++ b/ld/testsuite/ld-pe/aligncomm-3.c
@@ -15,10 +15,10 @@ int main (int argc, const char **argv)
 
 void __main (void)
 {
-  asm (".section .drectve\n"
-	"  .ascii \" -aligncomm:_r,4\"\n"
-	"  .ascii \" -aligncomm:r,4\"\n"
-	"  .text");
+  __asm__ (".section .drectve\n"
+	   "  .ascii \" -aligncomm:_r,4\"\n"
+	   "  .ascii \" -aligncomm:r,4\"\n"
+	   "  .text");
 }
 
 #if defined (__CYGWIN__) || defined (__MINGW32__)
diff --git a/ld/testsuite/ld-pe/aligncomm-4.c b/ld/testsuite/ld-pe/aligncomm-4.c
index 085335a5e4..c82f609f4c 100644
--- a/ld/testsuite/ld-pe/aligncomm-4.c
+++ b/ld/testsuite/ld-pe/aligncomm-4.c
@@ -16,10 +16,10 @@ int main (int argc, const char **argv)
 
 void __main (void)
 {
-  asm (".section .drectve\n"
-	"  .ascii \" -aligncomm:_r,4\"\n"
-	"  .ascii \" -aligncomm:r,4\"\n"
-	"  .text");
+  __asm__ (".section .drectve\n"
+	   "  .ascii \" -aligncomm:_r,4\"\n"
+	   "  .ascii \" -aligncomm:r,4\"\n"
+	   "  .text");
 }
 
 #if defined (__CYGWIN__) || defined (__MINGW32__)
diff --git a/ld/testsuite/ld-plugin/pr23958.c b/ld/testsuite/ld-plugin/pr23958.c
index 656dc31706..ba83ec9f6b 100644
--- a/ld/testsuite/ld-plugin/pr23958.c
+++ b/ld/testsuite/ld-plugin/pr23958.c
@@ -3,4 +3,4 @@ dwarf_bytesize (void)
 {
 }
 
-asm (".symver dwarf_bytesize,dwarf_bytesize@@@ELFUTILS_0.143");
+__asm__ (".symver dwarf_bytesize,dwarf_bytesize@@@ELFUTILS_0.143");
diff --git a/ld/testsuite/ld-size/size-10b.c b/ld/testsuite/ld-size/size-10b.c
index d043371b11..b55ecdf18f 100644
--- a/ld/testsuite/ld-size/size-10b.c
+++ b/ld/testsuite/ld-size/size-10b.c
@@ -1,5 +1,5 @@
 __thread char bar[10];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 char *bar_size = &size_of_bar;
 
 char *
diff --git a/ld/testsuite/ld-size/size-1b.c b/ld/testsuite/ld-size/size-1b.c
index 723c60a84c..da937225f8 100644
--- a/ld/testsuite/ld-size/size-1b.c
+++ b/ld/testsuite/ld-size/size-1b.c
@@ -1,3 +1,3 @@
 extern char bar[];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 char *bar_size = &size_of_bar;
diff --git a/ld/testsuite/ld-size/size-2b.c b/ld/testsuite/ld-size/size-2b.c
index 0f02c94027..9442fce8e0 100644
--- a/ld/testsuite/ld-size/size-2b.c
+++ b/ld/testsuite/ld-size/size-2b.c
@@ -1,5 +1,5 @@
 extern __thread char bar[];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 char *bar_size = &size_of_bar;
 
 char *
diff --git a/ld/testsuite/ld-size/size-3a.c b/ld/testsuite/ld-size/size-3a.c
index b321559df6..c05e7f84be 100644
--- a/ld/testsuite/ld-size/size-3a.c
+++ b/ld/testsuite/ld-size/size-3a.c
@@ -1,3 +1,3 @@
 char bar[10] __attribute__ ((visibility("hidden")));
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 char *bar_size = &size_of_bar;
diff --git a/ld/testsuite/ld-size/size-3b.c b/ld/testsuite/ld-size/size-3b.c
index fc379df0a5..ef1f0b9f6d 100644
--- a/ld/testsuite/ld-size/size-3b.c
+++ b/ld/testsuite/ld-size/size-3b.c
@@ -1,4 +1,4 @@
 static char bar[10];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 char *bar_size = &size_of_bar;
 char *bar_p = bar;
diff --git a/ld/testsuite/ld-size/size-3c.c b/ld/testsuite/ld-size/size-3c.c
index d94ceef922..f78c9e863b 100644
--- a/ld/testsuite/ld-size/size-3c.c
+++ b/ld/testsuite/ld-size/size-3c.c
@@ -1,3 +1,3 @@
 __thread char bar[10] __attribute__ ((visibility("hidden")));
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 char *bar_size = &size_of_bar;
diff --git a/ld/testsuite/ld-size/size-4b.c b/ld/testsuite/ld-size/size-4b.c
index c618be0bce..8112771fd9 100644
--- a/ld/testsuite/ld-size/size-4b.c
+++ b/ld/testsuite/ld-size/size-4b.c
@@ -1,5 +1,5 @@
 extern char bar[];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 
 char *bar_size_1 = &size_of_bar;
 static char *bar_size_2 = &size_of_bar;
@@ -17,7 +17,7 @@ bar_size2 (void)
 }
 
 extern char foo[];
-extern char size_of_foo asm ("foo@SIZE");
+extern char size_of_foo __asm__ ("foo@SIZE");
 
 char *foo_size_1 = &size_of_foo;
 static char *foo_size_2 = &size_of_foo;
diff --git a/ld/testsuite/ld-size/size-5b.c b/ld/testsuite/ld-size/size-5b.c
index a9450a5c86..097de85964 100644
--- a/ld/testsuite/ld-size/size-5b.c
+++ b/ld/testsuite/ld-size/size-5b.c
@@ -1,5 +1,5 @@
 extern __thread char bar[];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 
 char *bar_size_1 = &size_of_bar;
 static char *bar_size_2 = &size_of_bar;
@@ -18,7 +18,7 @@ bar_size2 (void)
 }
 
 extern __thread char foo[];
-extern char size_of_foo asm ("foo@SIZE");
+extern char size_of_foo __asm__ ("foo@SIZE");
 
 char *foo_size_1 = &size_of_foo;
 static char *foo_size_2 = &size_of_foo;
diff --git a/ld/testsuite/ld-size/size-6a.c b/ld/testsuite/ld-size/size-6a.c
index 3946fb17cf..512e5d044b 100644
--- a/ld/testsuite/ld-size/size-6a.c
+++ b/ld/testsuite/ld-size/size-6a.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 extern char bar[];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 extern void set_bar (int, int);
 
 int
diff --git a/ld/testsuite/ld-size/size-7a.c b/ld/testsuite/ld-size/size-7a.c
index c415180d28..396f30abba 100644
--- a/ld/testsuite/ld-size/size-7a.c
+++ b/ld/testsuite/ld-size/size-7a.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 
 int
 main ()
diff --git a/ld/testsuite/ld-size/size-8a.c b/ld/testsuite/ld-size/size-8a.c
index 78c5732349..73fe95e000 100644
--- a/ld/testsuite/ld-size/size-8a.c
+++ b/ld/testsuite/ld-size/size-8a.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 extern __thread char bar[];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 extern void set_bar (int, int);
 
 int
diff --git a/ld/testsuite/ld-size/size-9b.c b/ld/testsuite/ld-size/size-9b.c
index 16890d15fa..a2a5a0d97a 100644
--- a/ld/testsuite/ld-size/size-9b.c
+++ b/ld/testsuite/ld-size/size-9b.c
@@ -1,3 +1,3 @@
 char bar[10];
-extern char size_of_bar asm ("bar@SIZE");
+extern char size_of_bar __asm__ ("bar@SIZE");
 char *bar_size = &size_of_bar;
-- 
2.34.1