From 8b8ad6ed0fb73ff5c331076ee82ff644d0b8cb07 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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 <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>
---
 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 +
 5 files changed, 5 insertions(+)

(limited to 'libc/string')

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
-- 
cgit v1.2.3