From 06827e81c976d16aa5861a40ac0d780b63a4d470 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 11 Apr 2013 23:02:03 +0200 Subject: [PATCH 8/8] 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: Thomas Petazzoni --- 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 | 2 +- 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(+), 11 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 f7d6052..8d6122b 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 08889d0..600d3af 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 b26080d..c59f5b8 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 65409f4..9f78415 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 66aa603..6f78128 100644 --- a/libc/string/arm/memset.S +++ b/libc/string/arm/memset.S @@ -20,6 +20,7 @@ #include #include #include +#include .text .global memset diff --git a/libc/string/arm/strcmp.S b/libc/string/arm/strcmp.S index 97363c1..8b77ab0 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 949e918..141f849 100644 --- a/libc/string/arm/strlen.S +++ b/libc/string/arm/strlen.S @@ -21,6 +21,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 5faf4ec..7418dc2 100644 --- a/libc/sysdeps/linux/arm/__longjmp.S +++ b/libc/sysdeps/linux/arm/__longjmp.S @@ -19,11 +19,11 @@ #include #include +#include #define _SETJMP_H #define _ASM #include - .global __longjmp .type __longjmp,%function .align 2 diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h index 921c9a3..ff8ea92 100644 --- a/libc/sysdeps/linux/arm/bits/arm_asm.h +++ b/libc/sysdeps/linux/arm/bits/arm_asm.h @@ -24,12 +24,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 0000000..321490e --- /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 1f7f09d..4d646be 100644 --- a/libc/sysdeps/linux/arm/clone.S +++ b/libc/sysdeps/linux/arm/clone.S @@ -25,6 +25,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 7071541..bd2cfb8 100644 --- a/libc/sysdeps/linux/arm/mmap64.S +++ b/libc/sysdeps/linux/arm/mmap64.S @@ -21,6 +21,7 @@ #include #include #include +#include #if defined __UCLIBC_HAS_LFS__ && defined __NR_mmap2 diff --git a/libc/sysdeps/linux/arm/syscall-eabi.S b/libc/sysdeps/linux/arm/syscall-eabi.S index b931882..019f701 100644 --- a/libc/sysdeps/linux/arm/syscall-eabi.S +++ b/libc/sysdeps/linux/arm/syscall-eabi.S @@ -18,6 +18,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 e498695..9c1dbca 100644 --- a/libc/sysdeps/linux/arm/sysdep.h +++ b/libc/sysdeps/linux/arm/sysdep.h @@ -21,7 +21,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 17d6a4d..6c55d71 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 -- 1.8.1.2