Skip to content

Commit bb23e71

Browse files
galaknashif
authored andcommitted
Update gcc-8.2 patch for arm_cmse.h c99 typeof fix
Pull in patch from upstream gcc that fixes use of typeof. Signed-off-by: Kumar Gala <[email protected]>
1 parent 40c62ee commit bb23e71

File tree

1 file changed

+50
-2
lines changed

1 file changed

+50
-2
lines changed

patches/0001-Add-GCC-8.2.patch

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c442ac67ecc81235d0a7c73470e081dff0b67797 Mon Sep 17 00:00:00 2001
1+
From 54abbdf31a9a78f4f19c17dc107373d41fe9516b Mon Sep 17 00:00:00 2001
22
From: Kumar Gala <[email protected]>
33
Date: Mon, 30 Jul 2018 17:04:28 -0500
44
Subject: [PATCH] Add GCC 8.2
@@ -25,9 +25,10 @@ Signed-off-by: Kumar Gala <[email protected]>
2525
packages/gcc/8.2.0/0017-crystax.patch | 34 ++
2626
...RC-Add-multilib-support-for-linux-targets.patch | 76 +++
2727
packages/gcc/8.2.0/0019-ARM-fix-cmse.patch | 69 +++
28+
.../0020-arm-Make-arm_cmse.h-C99-compatible.patch | 40 ++
2829
packages/gcc/8.2.0/chksum | 8 +
2930
packages/gcc/8.2.0/version.desc | 0
30-
22 files changed, 1520 insertions(+)
31+
23 files changed, 1560 insertions(+)
3132
create mode 100644 packages/gcc/8.2.0/0000-libtool-leave-framework-alone.patch
3233
create mode 100644 packages/gcc/8.2.0/0001-uclibc-conf.patch
3334
create mode 100644 packages/gcc/8.2.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -48,6 +49,7 @@ Signed-off-by: Kumar Gala <[email protected]>
4849
create mode 100644 packages/gcc/8.2.0/0017-crystax.patch
4950
create mode 100644 packages/gcc/8.2.0/0018-ARC-Add-multilib-support-for-linux-targets.patch
5051
create mode 100644 packages/gcc/8.2.0/0019-ARM-fix-cmse.patch
52+
create mode 100644 packages/gcc/8.2.0/0020-arm-Make-arm_cmse.h-C99-compatible.patch
5153
create mode 100644 packages/gcc/8.2.0/chksum
5254
create mode 100644 packages/gcc/8.2.0/version.desc
5355

@@ -1683,6 +1685,52 @@ index 00000000..4a501a27
16831685
+--
16841686
+2.14.4
16851687
+
1688+
diff --git a/packages/gcc/8.2.0/0020-arm-Make-arm_cmse.h-C99-compatible.patch b/packages/gcc/8.2.0/0020-arm-Make-arm_cmse.h-C99-compatible.patch
1689+
new file mode 100644
1690+
index 00000000..09899107
1691+
--- /dev/null
1692+
+++ b/packages/gcc/8.2.0/0020-arm-Make-arm_cmse.h-C99-compatible.patch
1693+
@@ -0,0 +1,40 @@
1694+
+From 02a72c22044c079becd5307c8b5c9552ba0c7f53 Mon Sep 17 00:00:00 2001
1695+
+From: avieira <avieira@138bc75d-0d04-0410-961f-82ee72b054a4>
1696+
+Date: Tue, 5 Jun 2018 15:07:09 +0000
1697+
+Subject: [PATCH] [arm] Make arm_cmse.h C99 compatible
1698+
+
1699+
+gcc/ChangeLog
1700+
+2018-06-05 Andre Vieira <[email protected]>
1701+
+
1702+
+ * config/arm/arm_cmse.h (cmse_nsfptr_create): Change typeof to
1703+
+ __typeof__.
1704+
+ (cmse_check_pointed_object): Likewise.
1705+
+
1706+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261204 138bc75d-0d04-0410-961f-82ee72b054a4
1707+
+---
1708+
+ gcc/config/arm/arm_cmse.h | 4 ++--
1709+
+ 4 files changed, 16 insertions(+), 2 deletions(-)
1710+
+ create mode 100644 gcc/testsuite/gcc.target/arm/cmse/cmse-1c99.c
1711+
+
1712+
+diff --git a/gcc/config/arm/arm_cmse.h b/gcc/config/arm/arm_cmse.h
1713+
+index f972e23659d..9b35537cd33 100644
1714+
+--- a/gcc/config/arm/arm_cmse.h
1715+
++++ b/gcc/config/arm/arm_cmse.h
1716+
+@@ -173,7 +173,7 @@ cmse_nonsecure_caller (void)
1717+
+ #define CMSE_MPU_NONSECURE 16
1718+
+ #define CMSE_NONSECURE 18
1719+
+
1720+
+-#define cmse_nsfptr_create(p) ((typeof ((p))) ((__INTPTR_TYPE__) (p) & ~1))
1721+
++#define cmse_nsfptr_create(p) ((__typeof__ ((p))) ((__INTPTR_TYPE__) (p) & ~1))
1722+
+
1723+
+ #define cmse_is_nsfptr(p) (!((__INTPTR_TYPE__) (p) & 1))
1724+
+
1725+
+@@ -187,7 +187,7 @@ __extension__ void *
1726+
+ cmse_check_address_range (void *, size_t, int);
1727+
+
1728+
+ #define cmse_check_pointed_object(p, f) \
1729+
+- ((typeof ((p))) cmse_check_address_range ((p), sizeof (*(p)), (f)))
1730+
++ ((__typeof__ ((p))) cmse_check_address_range ((p), sizeof (*(p)), (f)))
1731+
+
1732+
+ #endif /* __ARM_FEATURE_CMSE & 1 */
1733+
+
16861734
diff --git a/packages/gcc/8.2.0/chksum b/packages/gcc/8.2.0/chksum
16871735
new file mode 100644
16881736
index 00000000..c6c0eca0

0 commit comments

Comments
 (0)