Fix three tests for targets using _USER_LABEL_PREFIX_

2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>

	Backport from mainline
	2018-08-22  Iain Sandoe  <iain@sandoe.co.uk>

	* gcc.dg/lto/pr85248_0.c (test_alias):
	Stringify __USER_LABEL_PREFIX__.
	(test_noreturn): Likewise.

	2018-08-16  Iain Sandoe <iain@sandoe.co.uk>

	* gcc.dg/memcmp-1.c (lib_memcmp): Apply __USER_LABEL_PREFIX__.
	(lib_strncmp): Likewise.

	2018-08-16  Iain Sandoe  <iain@sandoe.co.uk>

	* gcc.dg/asan/pr81923.c: Stringify __USER_LABEL_PREFIX__.

From-SVN: r267404

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e6398fcb7fad827a6fa4d1e69a9f4c15b4ac961f..4315ddecb26fd97fff5572dfc88f1b5c31b05f5c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline
+       2018-08-22  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * gcc.dg/lto/pr85248_0.c (test_alias):
+       Stringify __USER_LABEL_PREFIX__.
+       (test_noreturn): Likewise.
+
+       2018-08-16  Iain Sandoe <iain@sandoe.co.uk>
+ 
+       * gcc.dg/memcmp-1.c (lib_memcmp): Apply __USER_LABEL_PREFIX__.
+       (lib_strncmp): Likewise.
+
+       2018-08-16  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * gcc.dg/asan/pr81923.c: Stringify __USER_LABEL_PREFIX__.
+
 2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.dg/asan/pr81923.c b/gcc/testsuite/gcc.dg/asan/pr81923.c
index f81d512c96e382ad2aa14c210106d9aa81705b92..dd9db728ce9ec304524e8a5bb39a903afe5dd106 100644 (file)
--- a/gcc/testsuite/gcc.dg/asan/pr81923.c
+++ b/gcc/testsuite/gcc.dg/asan/pr81923.c
@@ -1,7 +1,10 @@
 /* PR sanitizer/81923 */
 /* { dg-do link } */
 
-int foobar __asm (__USER_LABEL_PREFIX__ "barbaz") = 34;
+#define STR1(X) #X
+#define STR2(X) STR1(X)
+
+int foobar __asm (STR2(__USER_LABEL_PREFIX__) "barbaz") = 34;
 
 int
 main ()

diff --git a/gcc/testsuite/gcc.dg/lto/pr85248_0.c b/gcc/testsuite/gcc.dg/lto/pr85248_0.c
index df61ac976a554c8b8f10f470fbd7ecc91cec7125..902f4b6620c95967c105ecacc8c96ca99228b69f 100644 (file)
--- a/gcc/testsuite/gcc.dg/lto/pr85248_0.c
+++ b/gcc/testsuite/gcc.dg/lto/pr85248_0.c
@@ -2,8 +2,13 @@
 /* { dg-lto-do run } */
 /* { dg-lto-options { { -flto -O2 } } } */
 
-extern void test_alias (int s, int e) __asm__ (__USER_LABEL_PREFIX__ "test");
-extern void test_noreturn (int s, int e) __asm__ (__USER_LABEL_PREFIX__ "test")
+#define STR1(X) #X
+#define STR2(X) STR1(X)
+
+extern void test_alias (int s, int e) 
+  __asm__ (STR2(__USER_LABEL_PREFIX__) "test");
+extern void test_noreturn (int s, int e)
+  __asm__ (STR2(__USER_LABEL_PREFIX__)  "test")
   __attribute__ ((__noreturn__));
 
 extern inline __attribute__ ((__always_inline__, __gnu_inline__)) void

diff --git a/gcc/testsuite/gcc.dg/memcmp-1.c b/gcc/testsuite/gcc.dg/memcmp-1.c
index 828a0caf1350ed5b5b02154035b2d23151560f11..549fc838d04728d4de04a0c311c189919e31be95 100644 (file)
--- a/gcc/testsuite/gcc.dg/memcmp-1.c
+++ b/gcc/testsuite/gcc.dg/memcmp-1.c
@@ -8,8 +8,13 @@
 #include <string.h>
 #include <stdint.h>
 
-int lib_memcmp(const void *a, const void *b, size_t n) asm("memcmp");
-int lib_strncmp(const char *a, const char *b, size_t n) asm("strncmp");
+#define STR1(X) #X
+#define STR2(X) STR1(X)
+
+int lib_memcmp(const void *a, const void *b, size_t n)
+ asm(STR2(__USER_LABEL_PREFIX__) "memcmp");
+int lib_strncmp(const char *a, const char *b, size_t n)
+ asm(STR2(__USER_LABEL_PREFIX__) "strncmp");
 
 #ifndef NRAND
 #define NRAND 10000