[ARM/FDPIC,v5,19/21,ARM,testsuite] FDPIC: Adjust pr43698.c to avoid clash with uclibc.

Message ID 20190515124006.25840-20-christophe.lyon@st.com
State Superseded
Headers show
Series
  • FDPIC ABI for ARM
Related show

Commit Message

Christophe Lyon May 15, 2019, 12:39 p.m.
uclibc defines bswap_32, so use a different name in this test.

2019-XX-XX  Christophe Lyon  <christophe.lyon@st.com>

	gcc/testsuite/
	* gcc.target/arm/pr43698.c (bswap_32): Rename as my_bswap_32.

Change-Id: I2591bd911030814331cabf97ee5cf6cf8124b4f3

-- 
2.6.3

Comments

Kyrill Tkachov July 19, 2019, 8:59 a.m. | #1
On 5/15/19 1:39 PM, Christophe Lyon wrote:
> uclibc defines bswap_32, so use a different name in this test.

>

> 2019-XX-XX  Christophe Lyon  <christophe.lyon@st.com>

>

>         gcc/testsuite/

>         * gcc.target/arm/pr43698.c (bswap_32): Rename as my_bswap_32.

>

Ok.

This can go in independently of the others.

Thanks,

Kyrill



> Change-Id: I2591bd911030814331cabf97ee5cf6cf8124b4f3

>

> diff --git a/gcc/testsuite/gcc.target/arm/pr43698.c 

> b/gcc/testsuite/gcc.target/arm/pr43698.c

> index 1fc497c..3b5dad0 100644

> --- a/gcc/testsuite/gcc.target/arm/pr43698.c

> +++ b/gcc/testsuite/gcc.target/arm/pr43698.c

> @@ -6,7 +6,7 @@

>

>  char do_reverse_endian = 0;

>

> -#  define bswap_32(x) \

> +#  define my_bswap_32(x) \

>    ((((x) & 0xff000000) >> 24) | \

>     (((x) & 0x00ff0000) >>  8) | \

>     (((x) & 0x0000ff00) <<  8) | \

> @@ -16,7 +16,7 @@ char do_reverse_endian = 0;

>    (__extension__ ({ \

>        uint64_t __res; \

>        if (!do_reverse_endian) {    __res = (X); \

> -      } else if (sizeof(X) == 4) { __res = bswap_32((X)); \

> +      } else if (sizeof(X) == 4) { __res = my_bswap_32((X)); \

>        } \

>        __res; \

>      }))

> -- 

> 2.6.3

>

Patch

diff --git a/gcc/testsuite/gcc.target/arm/pr43698.c b/gcc/testsuite/gcc.target/arm/pr43698.c
index 1fc497c..3b5dad0 100644
--- a/gcc/testsuite/gcc.target/arm/pr43698.c
+++ b/gcc/testsuite/gcc.target/arm/pr43698.c
@@ -6,7 +6,7 @@ 
 
 char do_reverse_endian = 0;
 
-#  define bswap_32(x) \
+#  define my_bswap_32(x) \
   ((((x) & 0xff000000) >> 24) | \
    (((x) & 0x00ff0000) >>  8) | \
    (((x) & 0x0000ff00) <<  8) | \
@@ -16,7 +16,7 @@  char do_reverse_endian = 0;
   (__extension__ ({ \
       uint64_t __res; \
       if (!do_reverse_endian) {    __res = (X); \
-      } else if (sizeof(X) == 4) { __res = bswap_32((X)); \
+      } else if (sizeof(X) == 4) { __res = my_bswap_32((X)); \
       } \
       __res; \
     }))