diff options
| author | Jerome Lambourg <lambourg@adacore.com> | 2018-05-17 16:36:36 +0000 |
|---|---|---|
| committer | Olivier Hainque <hainque@gcc.gnu.org> | 2018-05-17 16:36:36 +0000 |
| commit | fcf4f8311e25eb0fde59e6f6a61b570c4c1068e3 (patch) | |
| tree | afcd5286a3dd380e8c530a839a72004cbf84d59b /libgcc | |
| parent | ca7584f79af7aa544f72a0d599020d72e06639e6 (diff) | |
| download | gcc-fcf4f8311e25eb0fde59e6f6a61b570c4c1068e3.zip gcc-fcf4f8311e25eb0fde59e6f6a61b570c4c1068e3.tar.gz gcc-fcf4f8311e25eb0fde59e6f6a61b570c4c1068e3.tar.bz2 | |
arm_cmse.h (cmse_nsfptr_create, [...]): Remove #include <stdint.h>.
2018-05-17 Jerome Lambourg <lambourg@adacore.com>
gcc/
* config/arm/arm_cmse.h (cmse_nsfptr_create, cmse_is_nsfptr): Remove
#include <stdint.h>. Replace intptr_t with __INTPTR_TYPE__.
libgcc/
* config/arm/cmse.c (cmse_check_address_range): Replace
UINTPTR_MAX with __UINTPTR_MAX__ and uintptr_t with __UINTPTR_TYPE__.
From-SVN: r260330
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/config/arm/cmse.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 55bae33..df3d21a 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2018-05-17 Jerome Lambourg <lambourg@adacore.com> + + * config/arm/cmse.c (cmse_check_address_range): Replace + UINTPTR_MAX with __UINTPTR_MAX__ and uintptr_t with __UINTPTR_TYPE__. + 2018-05-17 Olga Makhotina <olga.makhotina@intel.com> * config/i386/cpuinfo.h (processor_types): Add INTEL_GOLDMONT_PLUS. diff --git a/libgcc/config/arm/cmse.c b/libgcc/config/arm/cmse.c index 3ded385..2ad0af2 100644 --- a/libgcc/config/arm/cmse.c +++ b/libgcc/config/arm/cmse.c @@ -36,7 +36,7 @@ cmse_check_address_range (void *p, size_t size, int flags) char *pb = (char *) p, *pe; /* Check if the range wraps around. */ - if (UINTPTR_MAX - (uintptr_t) p < size) + if (__UINTPTR_MAX__ - (__UINTPTR_TYPE__) p < size) return NULL; /* Check if an unknown flag is present. */ @@ -51,7 +51,8 @@ cmse_check_address_range (void *p, size_t size, int flags) /* Execute the right variant of the TT instructions. */ pe = pb + size - 1; - const int singleCheck = (((uintptr_t) pb ^ (uintptr_t) pe) < 32); + const int singleCheck + = (((__UINTPTR_TYPE__) pb ^ (__UINTPTR_TYPE__) pe) < 32); switch (flags & known_secure_level) { case 0: |