From 8b8ad6ed0fb73ff5c331076ee82ff644d0b8cb07 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 11 Apr 2013 23:02:03 +0200 Subject: arm: move check for BX to its own header As Will noticed, the header this check is currently done in is asm-only, and is not meant to be included from C code. This breaks compilation when compiled for a Thumb2-aware CPU. Move the BX check to its own header, and revert 7a246fd. Reported-by: Will Newton Signed-off-by: Yann E. MORIN Cc: Will Newton Signed-off-by: Bernhard Reutner-Fischer --- ldso/ldso/arm/dl-startup.h | 2 +- ldso/ldso/arm/resolve.S | 1 + libc/string/arm/_memcpy.S | 1 + libc/string/arm/memcmp.S | 1 + libc/string/arm/memset.S | 1 + libc/string/arm/strcmp.S | 1 + libc/string/arm/strlen.S | 1 + libc/sysdeps/linux/arm/__longjmp.S | 1 + libc/sysdeps/linux/arm/bits/arm_asm.h | 8 -------- libc/sysdeps/linux/arm/bits/arm_bx.h | 34 ++++++++++++++++++++++++++++++++++ libc/sysdeps/linux/arm/clone.S | 1 + libc/sysdeps/linux/arm/mmap64.S | 1 + libc/sysdeps/linux/arm/syscall-eabi.S | 1 + libc/sysdeps/linux/arm/sysdep.h | 2 +- libc/sysdeps/linux/arm/vfork.S | 1 + 15 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 libc/sysdeps/linux/arm/bits/arm_bx.h diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h index 0723d29e9..df2c82469 100644 --- a/ldso/ldso/arm/dl-startup.h +++ b/ldso/ldso/arm/dl-startup.h @@ -7,7 +7,7 @@ */ #include -#include +#include #if !defined(__thumb__) __asm__( diff --git a/ldso/ldso/arm/resolve.S b/ldso/ldso/arm/resolve.S index b0907f774..c1caf9a14 100644 --- a/ldso/ldso/arm/resolve.S +++ b/ldso/ldso/arm/resolve.S @@ -92,6 +92,7 @@ #include #include +#include #include diff --git a/libc/string/arm/_memcpy.S b/libc/string/arm/_memcpy.S index b26080d02..c59f5b808 100644 --- a/libc/string/arm/_memcpy.S +++ b/libc/string/arm/_memcpy.S @@ -40,6 +40,7 @@ #include #include #include +#include #if !defined(THUMB1_ONLY) /* diff --git a/libc/string/arm/memcmp.S b/libc/string/arm/memcmp.S index 65409f43a..9f7841559 100644 --- a/libc/string/arm/memcmp.S +++ b/libc/string/arm/memcmp.S @@ -31,6 +31,7 @@ #include #include +#include .text .global memcmp diff --git a/libc/string/arm/memset.S b/libc/string/arm/memset.S index c66b5994e..8ddc47eb1 100644 --- a/libc/string/arm/memset.S +++ b/libc/string/arm/memset.S @@ -19,6 +19,7 @@ #include #include #include +#include .text .global memset diff --git a/libc/string/arm/strcmp.S b/libc/string/arm/strcmp.S index 97363c1c2..8b77ab0f1 100644 --- a/libc/string/arm/strcmp.S +++ b/libc/string/arm/strcmp.S @@ -31,6 +31,7 @@ #include #include +#include .text .global strcmp diff --git a/libc/string/arm/strlen.S b/libc/string/arm/strlen.S index cfe041ab4..0e7737e23 100644 --- a/libc/string/arm/strlen.S +++ b/libc/string/arm/strlen.S @@ -20,6 +20,7 @@ #include #include #include +#include /* size_t strlen(const char *S) * entry: r0 -> string diff --git a/libc/sysdeps/linux/arm/__longjmp.S b/libc/sysdeps/linux/arm/__longjmp.S index b6e4961b3..853b906f8 100644 --- a/libc/sysdeps/linux/arm/__longjmp.S +++ b/libc/sysdeps/linux/arm/__longjmp.S @@ -18,6 +18,7 @@ #include #include +#include .global __longjmp .type __longjmp,%function diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h index 14d26341f..04664b376 100644 --- a/libc/sysdeps/linux/arm/bits/arm_asm.h +++ b/libc/sysdeps/linux/arm/bits/arm_asm.h @@ -26,12 +26,4 @@ #define THUMB1_ONLY 1 #endif -#if defined(__USE_BX__) -# if ( defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \ - || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \ - ) -# error Use of BX was requested, but is not available on the target processor. -# endif /* ARCH level */ -#endif /* __USE_BX__ */ - #endif /* _ARM_ASM_H */ diff --git a/libc/sysdeps/linux/arm/bits/arm_bx.h b/libc/sysdeps/linux/arm/bits/arm_bx.h new file mode 100644 index 000000000..321490e55 --- /dev/null +++ b/libc/sysdeps/linux/arm/bits/arm_bx.h @@ -0,0 +1,34 @@ +/* Copyright (C) 2013 Yann E. MORIN + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the GNU C Library; if not, see + * . + */ + +#ifndef _ARM_BX_H +#define _ARM_BX_H + +/* We need features.h first */ +#if !defined _FEATURES_H +#error Please include features.h first +#endif /* features.h not yet included */ + +#if defined(__USE_BX__) +# if ( defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \ + || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \ + ) +# error Use of BX was requested, but is not available on the target processor. +# endif /* ARCH level */ +#endif /* __USE_BX__ */ + +#endif /* _ARM_BX_H */ diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S index e73ddb6a4..03cd10e62 100644 --- a/libc/sysdeps/linux/arm/clone.S +++ b/libc/sysdeps/linux/arm/clone.S @@ -24,6 +24,7 @@ #include #include #include +#include #if defined(__NR_clone) /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */ diff --git a/libc/sysdeps/linux/arm/mmap64.S b/libc/sysdeps/linux/arm/mmap64.S index 3b66ef31a..f4c491aac 100644 --- a/libc/sysdeps/linux/arm/mmap64.S +++ b/libc/sysdeps/linux/arm/mmap64.S @@ -20,6 +20,7 @@ #include #include #include +#include #ifdef __NR_mmap2 diff --git a/libc/sysdeps/linux/arm/syscall-eabi.S b/libc/sysdeps/linux/arm/syscall-eabi.S index 56439044f..005cfe357 100644 --- a/libc/sysdeps/linux/arm/syscall-eabi.S +++ b/libc/sysdeps/linux/arm/syscall-eabi.S @@ -17,6 +17,7 @@ #include #include +#include /* In the EABI syscall interface, we don't need a special syscall to implement syscall(). It won't work reliably with 64-bit arguments diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h index 5c751f544..64f40407e 100644 --- a/libc/sysdeps/linux/arm/sysdep.h +++ b/libc/sysdeps/linux/arm/sysdep.h @@ -20,7 +20,7 @@ #define _LINUX_ARM_SYSDEP_H 1 #include -#include +#include #include /* For Linux we can use the system call table in the header file diff --git a/libc/sysdeps/linux/arm/vfork.S b/libc/sysdeps/linux/arm/vfork.S index 6a1c65e09..99fb6cb1f 100644 --- a/libc/sysdeps/linux/arm/vfork.S +++ b/libc/sysdeps/linux/arm/vfork.S @@ -7,6 +7,7 @@ #include #include +#include #define _ERRNO_H #include -- cgit v1.2.3