From aa31ceaf7568802590f73a740ffbc8b800096342 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 25 Sep 2019 11:25:25 -0400
Subject: [PATCH] Replace freebsd-gnueabihf with freebsd
FreeBSD does not support GNU libc, so it makes no sense to use this
triple. Most likely previous builds were just using the FreeBSD libc
instead of gnueabihf. To fix this, we should just use
armv6-unknown-freebsd and armv7-unknown-freebsd triples. Note that
both of these are actually "soft-float", not "hard-float". FreeBSD has
never officially released hard-float arm32:
https://wiki.freebsd.org/ARMTier1
---
aclocal.m4 | 4 ----
llvm-targets | 4 ++--
utils/llvm-targets/gen-data-layout.sh | 4 ++--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 1218203bfce9..fd115e46f8dc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1992,10 +1992,6 @@ case "$1" in
# converts the canonicalized target into someting llvm can understand
AC_DEFUN([GHC_LLVM_TARGET], [
case "$2-$3" in
- *-freebsd*-gnueabihf)
- llvm_target_vendor="unknown"
- llvm_target_os="freebsd-gnueabihf"
- ;;
hardfloat-*eabi)
llvm_target_vendor="unknown"
llvm_target_os="$3""hf"
diff --git a/llvm-targets b/llvm-targets
index 97414a383f62..8f5717d98bee 100644
--- a/llvm-targets
+++ b/llvm-targets
@@ -42,7 +42,7 @@
,("amd64-portbld-freebsd", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
,("x86_64-unknown-freebsd", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
,("aarch64-unknown-freebsd", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
-,("armv6-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
-,("armv7-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+strict-align"))
+,("armv6-unknown-freebsd", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
+,("armv7-unknown-freebsd", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+strict-align"))
,("arm-unknown-nto-qnx-eabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+strict-align"))
]
diff --git a/utils/llvm-targets/gen-data-layout.sh b/utils/llvm-targets/gen-data-layout.sh
index e55f6eccd995..a73da499f3c9 100755
--- a/utils/llvm-targets/gen-data-layout.sh
+++ b/utils/llvm-targets/gen-data-layout.sh
@@ -92,8 +92,8 @@ TARGETS=(
# FreeBSD ARM
"aarch64-unknown-freebsd"
- "armv6-unknown-freebsd-gnueabihf"
- "armv7-unknown-freebsd-gnueabihf"
+ "armv6-unknown-freebsd"
+ "armv7-unknown-freebsd"
#########################
# Other
--
GitLab