summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Sindholt <opensource@zhasha.com>2015-08-27 16:25:05 +0200
committerJoakim Sindholt <opensource@zhasha.com>2015-08-27 16:25:05 +0200
commit6b827e29e2bd0ba498dc56dfaf2b201bef126c75 (patch)
treeb9e67bdfa18b739bd9872c942b88df891c40d4d7
parentcbee8e46123d28e5d96c6b7d97aea92cdb71da6e (diff)
switch arm target to hard-float ABI
-rw-r--r--bin/arch.sh2
-rw-r--r--bin/build-libc.sh2
-rw-r--r--src/clang_linux_builtin_arm.mk8
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/arch.sh b/bin/arch.sh
index 778c385..7550053 100644
--- a/bin/arch.sh
+++ b/bin/arch.sh
@@ -2,7 +2,7 @@
case "$objtype" in
spim) O=0; MARCH="mipsel" CLANGARCH="mipsel-none-gnu" ;;
- arm) O=5; MARCH="armv7a" CLANGARCH="armv7a-none-eabi" ;;
+ arm) O=5; MARCH="armv7a" CLANGARCH="armv7a-none-eabihf" ;;
amd64) O=6; MARCH="generic" CLANGARCH="x86_64-pc-gnu" ;;
386) O=8; MARCH="i686" CLANGARCH="i386-pc-gnu" ;;
power64) O=9; MARCH="ppc64" CLANGARCH="ppc64-none-gnu" ;;
diff --git a/bin/build-libc.sh b/bin/build-libc.sh
index b193690..c5d4358 100644
--- a/bin/build-libc.sh
+++ b/bin/build-libc.sh
@@ -22,7 +22,7 @@ Linux)
case "$objtype" in
spim) MUSLARCH="" ;;
- arm) MUSLARCH="arm" ;;
+ arm) MUSLARCH="armhf" ;;
amd64) MUSLARCH="x86_64" ;;
386) MUSLARCH="i386" ;;
power64) MUSLARCH="" ;;
diff --git a/src/clang_linux_builtin_arm.mk b/src/clang_linux_builtin_arm.mk
index c1e7a4d..50c980e 100644
--- a/src/clang_linux_builtin_arm.mk
+++ b/src/clang_linux_builtin_arm.mk
@@ -4,16 +4,16 @@ Description := Static runtime libraries for clang/Linux.
CC := clang
Arch := unknown
-Configs := builtins-arm
+Configs := builtins-armhf
CFLAGS := -Wall -Werror -O3 -fomit-frame-pointer -fPIE -ftls-model=local-exec \
-integrated-as --sysroot $(ProjSrcRoot) \
-isystem $(ProjSrcRoot)/../../arm/include \
-include $(ProjSrcRoot)/../visibility.h
-Arch.builtins-arm := armv7
-CFLAGS.builtins-arm := $(CFLAGS) -target armv7a-linux-eabi
-FUNCTIONS.builtins-arm := $(CommonFunctions) $(ArchFunctions.armv7)
+Arch.builtins-armhf := armv7
+CFLAGS.builtins-armhf := $(CFLAGS) -target armv7a-linux-eabihf
+FUNCTIONS.builtins-armhf := $(CommonFunctions) $(ArchFunctions.armv7)
# Always use optimized variants.
OPTIMIZED := 1