diff options
| author | David Cunado <david.cunado@arm.com> | 2017-01-19 10:26:16 +0000 |
|---|---|---|
| committer | David Cunado <david.cunado@arm.com> | 2017-01-26 13:47:37 +0000 |
| commit | 9edac0479d562a5cb62b57961ad6288d0537e9f1 (patch) | |
| tree | 22d7922f26fc9888d6dc6517edd4cbb22f585b12 /include/lib/utils.h | |
| parent | d7aa7b44d6c73f84a8913b010e850e0322063d91 (diff) | |
Resolve build errors flagged by GCC 6.2
With GCC 6.2 compiler, more C undefined behaviour is being flagged as
warnings, which result in build errors in ARM TF build.
The specific issue that this patch resolves is the use of (1 << 31),
which is predominantly used in case statements, where 1 is represented
as a signed int. When shifted to msb the behaviour is undefined.
The resolution is to specify 1 as an unsigned int using a convenience
macro ULL(). A duplicate macro MAKE_ULL() is replaced.
Fixes ARM-software/tf-issues#438
Change-Id: I08e3053bbcf4c022ee2be33a75bd0056da4073e1
Signed-off-by: David Cunado <david.cunado@arm.com>
Diffstat (limited to 'include/lib/utils.h')
| -rw-r--r-- | include/lib/utils.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/lib/utils.h b/include/lib/utils.h index f7af8f66..b6bc9af6 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -66,4 +66,18 @@ #define check_uptr_overflow(ptr, inc) \ (((ptr) > UINTPTR_MAX - (inc)) ? 1 : 0) +/* + * For those constants to be shared between C and other sources, apply a 'ull' + * suffix to the argument only in C, to avoid undefined or unintended behaviour. + * + * The GNU assembler and linker do not support the 'ull' suffix (it causes the + * build process to fail) therefore the suffix is omitted when used in linker + * scripts and assembler files. +*/ +#if defined(__LINKER__) || defined(__ASSEMBLY__) +# define ULL(_x) (_x) +#else +# define ULL(_x) (_x##ull) +#endif + #endif /* __UTILS_H__ */ |