diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-04-11 23:02:03 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2014-06-12 17:08:39 +0200 |
| commit | 8b8ad6ed0fb73ff5c331076ee82ff644d0b8cb07 (patch) | |
| tree | 886eef6ea0e50dcc15d8579463e23688e6951cee /libc/sysdeps/linux/arm/bits | |
| parent | 3b688f42f091e04d050ec5ab71e29847def273e9 (diff) | |
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 <will.newton@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Will Newton <will.newton@gmail.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/sysdeps/linux/arm/bits')
| -rw-r--r-- | libc/sysdeps/linux/arm/bits/arm_asm.h | 8 | ||||
| -rw-r--r-- | libc/sysdeps/linux/arm/bits/arm_bx.h | 34 |
2 files changed, 34 insertions, 8 deletions
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 <yann.morin.1998@free.fr> + * + * 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 + * <http://www.gnu.org/licenses/>. + */ + +#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 */ |