backport: arm_cmse.h (cmse_nsfptr_create): Change typeof to __typeof__.

gcc/
2018-06-22  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	Backport from mainline
	2018-06-05  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* config/arm/arm_cmse.h (cmse_nsfptr_create): Change typeof to
	__typeof__.
	(cmse_check_pointed_object): Likewise.

gcc/testsuite/
2018-06-22  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	Backport from mainline
	2018-06-05  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* gcc.target/arm/cmse/cmse-1c99.c: New test.

From-SVN: r261900

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db11a3e6c16ecaa29a1232cc9452f49fd331ccdf..37d23da6c5e5c498d2aea57c9fa00e7707fc3bc9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-06-22  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       Backport from mainline
+       2018-06-05  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       * config/arm/arm_cmse.h (cmse_nsfptr_create): Change typeof to
+       __typeof__.
+       (cmse_check_pointed_object): Likewise.
+
 2018-06-22  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
        Backport from mainline

diff --git a/gcc/config/arm/arm_cmse.h b/gcc/config/arm/arm_cmse.h
index f8bd730e0279a48b0ef5cdea572e40a995665e7f..427647fb981750560c7270ddf2df63367586ab6c 100644 (file)
--- a/gcc/config/arm/arm_cmse.h
+++ b/gcc/config/arm/arm_cmse.h
@@ -173,7 +173,7 @@ cmse_nonsecure_caller (void)
 #define CMSE_MPU_NONSECURE     16
 #define CMSE_NONSECURE         18
 
-#define cmse_nsfptr_create(p) ((typeof ((p))) ((__INTPTR_TYPE__) (p) & ~1))
+#define cmse_nsfptr_create(p) ((__typeof__ ((p))) ((__INTPTR_TYPE__) (p) & ~1))
 
 #define cmse_is_nsfptr(p) (!((__INTPTR_TYPE__) (p) & 1))
 
@@ -187,7 +187,7 @@ __extension__ void *
 cmse_check_address_range (void *, size_t, int);
 
 #define cmse_check_pointed_object(p, f) \
-  ((typeof ((p))) cmse_check_address_range ((p), sizeof (*(p)), (f)))
+  ((__typeof__ ((p))) cmse_check_address_range ((p), sizeof (*(p)), (f)))
 
 #endif /* __ARM_FEATURE_CMSE & 1 */
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4a5dc418479423474f76f86e7c61df25e8e18d05..c0cc3694262dd61d8bf3a337e4540eeb0711cb1e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-22  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       Backport from mainline
+       2018-06-05  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       * gcc.target/arm/cmse/cmse-1c99.c: New test.
+
 2018-06-19  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/aggr24.adb: New test.

diff --git a/gcc/testsuite/gcc.target/arm/cmse/cmse-1c99.c b/gcc/testsuite/gcc.target/arm/cmse/cmse-1c99.c
new file mode 100644 (file)
index 0000000..0f99dd3
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/cmse/cmse-1c99.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+/* { dg-options "-Os -mcmse -std=c99" }  */
+/* This is a copy of cmse-1.c to test arm_mve.h ISO C compatibility.  */
+#include "cmse-1.c"