summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2013-04-11 23:02:03 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2014-06-12 17:08:39 +0200
commit8b8ad6ed0fb73ff5c331076ee82ff644d0b8cb07 (patch)
tree886eef6ea0e50dcc15d8579463e23688e6951cee /ldso
parent3b688f42f091e04d050ec5ab71e29847def273e9 (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 'ldso')
-rw-r--r--ldso/ldso/arm/dl-startup.h2
-rw-r--r--ldso/ldso/arm/resolve.S1
2 files changed, 2 insertions, 1 deletions
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 <features.h>
-#include <bits/arm_asm.h>
+#include <bits/arm_bx.h>
#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 <sys/syscall.h>
#include <bits/arm_asm.h>
+#include <bits/arm_bx.h>
#include <features.h>