summaryrefslogtreecommitdiff
path: root/libc/string/arm
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 /libc/string/arm
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 'libc/string/arm')
-rw-r--r--libc/string/arm/_memcpy.S1
-rw-r--r--libc/string/arm/memcmp.S1
-rw-r--r--libc/string/arm/memset.S1
-rw-r--r--libc/string/arm/strcmp.S1
-rw-r--r--libc/string/arm/strlen.S1
5 files changed, 5 insertions, 0 deletions
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 <features.h>
#include <endian.h>
#include <bits/arm_asm.h>
+#include <bits/arm_bx.h>
#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 <features.h>
#include <bits/arm_asm.h>
+#include <bits/arm_bx.h>
.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 <features.h>
#include <sys/syscall.h>
#include <bits/arm_asm.h>
+#include <bits/arm_bx.h>
.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 <features.h>
#include <bits/arm_asm.h>
+#include <bits/arm_bx.h>
.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 <endian.h>
#include <sys/syscall.h>
#include <bits/arm_asm.h>
+#include <bits/arm_bx.h>
/* size_t strlen(const char *S)
* entry: r0 -> string