diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-27 11:49:57 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-29 03:50:06 -0400 |
| commit | 72f7ac9ad66b886f4ea9569446e20aa4f97890e4 (patch) | |
| tree | ce2ff38b1d613748f9016eef37f2c51faad2435f | |
| parent | 639773984180bf3e1a9855b1bdbde469cab2cf27 (diff) | |
| download | haskell-72f7ac9ad66b886f4ea9569446e20aa4f97890e4.tar.gz | |
Revert "Replace freebsd-gnueabihf with freebsd"
This reverts commit aa31ceaf7568802590f73a740ffbc8b800096342 as
suggested in #17392.
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | llvm-targets | 4 | ||||
| -rwxr-xr-x | utils/llvm-targets/gen-data-layout.sh | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index f5e7050a69..54b1672548 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1992,6 +1992,10 @@ 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 9cf969822c..e11ab1bb9f 100644 --- a/llvm-targets +++ b/llvm-targets @@ -43,7 +43,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", ("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")) +,("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")) ,("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 4f4a1ef079..aba2d07ae0 100755 --- a/utils/llvm-targets/gen-data-layout.sh +++ b/utils/llvm-targets/gen-data-layout.sh @@ -94,8 +94,8 @@ TARGETS=( # FreeBSD ARM "aarch64-unknown-freebsd" - "armv6-unknown-freebsd" - "armv7-unknown-freebsd" + "armv6-unknown-freebsd-gnueabihf" + "armv7-unknown-freebsd-gnueabihf" ######################### # Other |