Skip to contentSkip to conversation

armv8: Use __aarch64__ rather than CONFIG_ARM64 in some cases

PATCH New Tom Rini 2 participants 2 messages Jan 9, 2014 – Jan 10, 2014 Arm (32-bit)

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 armv8: Use __aarch64__ rather than CONFIG_ARM64 in some cases

The toolchain sets __aarch64__ for both LE and BE. In the case of posix_types.h we cannot reliably use config.h as that will lead to problems. In the case of byteorder.h it's clearer to check the EB flag being set in either case instead.

Cc David Feng <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/include/asm/byteorder.h   |   14 +-------------
 arch/arm/include/asm/posix_types.h |    6 +++---
 2 files changed, 4 insertions(+), 16 deletions(-)
arch/arm/include/asm/byteorder.h +1 -13
index 71a9966..20cce76 100644
@@ -23,22 +23,10 @@
 #  define __SWAB_64_THRU_32__
 #endif
 
-#ifdef	CONFIG_ARM64
-
-#ifdef __AARCH64EB__
-#include <linux/byteorder/big_endian.h>
-#else
-#include <linux/byteorder/little_endian.h>
-#endif
-
-#else	/* CONFIG_ARM64 */
-
-#ifdef __ARMEB__
+#if defined(__ARMEB__) || defined(__AARCH64EB__)
 #include <linux/byteorder/big_endian.h>
 #else
 #include <linux/byteorder/little_endian.h>
 #endif
 
-#endif	/* CONFIG_ARM64 */
-
 #endif
arch/arm/include/asm/posix_types.h +3 -3
index 9ba9add..fe4483f 100644
@@ -31,15 +31,15 @@ typedef unsigned short		__kernel_ipc_pid_t;
 typedef unsigned short		__kernel_uid_t;
 typedef unsigned short		__kernel_gid_t;
 
-#ifdef	CONFIG_ARM64
+#ifdef	__aarch64__
 typedef unsigned long		__kernel_size_t;
 typedef long			__kernel_ssize_t;
 typedef long			__kernel_ptrdiff_t;
-#else	/* CONFIG_ARM64 */
+#else
 typedef unsigned int		__kernel_size_t;
 typedef int			__kernel_ssize_t;
 typedef int			__kernel_ptrdiff_t;
-#endif	/* CONFIG_ARM64 */
+#endif
 
 typedef long			__kernel_time_t;
 typedef long			__kernel_suseconds_t;
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 armv8: Use __aarch64__ rather than CONFIG_ARM64 in some cases

Hi Tom,

Quoted 4 lines · Tom Rini

The toolchain sets __aarch64__ for both LE and BE. In the case of posix_types.h we cannot reliably use config.h as that will lead to problems. In the case of byteorder.h it's clearer to check the EB flag being set in either case instead.

Amended according to Tom's instruction on IRC (actual removal of config.h include in posix_types.h) then applied on top of the arm64 serie v16.

Amicalement,

Signature · 1 line
Albert.