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 --- libc/sysdeps/linux/arm/bits/arm_asm.h | 8 -------- libc/sysdeps/linux/arm/bits/arm_bx.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 libc/sysdeps/linux/arm/bits/arm_bx.h (limited to 'libc/sysdeps/linux/arm/bits') 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 */ -- cgit v1.2.3