summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-06-12 14:24:23 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-06-13 02:48:13 -0400
commit5ffc266e9c5ec8ed6010835165a65bd1f6b56dd4 (patch)
treed66d72bc22651fde877aa8eb7684fd9d2bd4f93c
parent7b751ed89a97545e9ff9c9814a3d5440a8d42d64 (diff)
downloadhaskell-5ffc266e9c5ec8ed6010835165a65bd1f6b56dd4.tar.gz
Add a few missing llvm-targets
This should finally fix #14261. [skip ci]
-rw-r--r--llvm-targets10
-rwxr-xr-xutils/llvm-targets/gen-data-layout.sh66
2 files changed, 58 insertions, 18 deletions
diff --git a/llvm-targets b/llvm-targets
index d62e069cdf..b0fe913471 100644
--- a/llvm-targets
+++ b/llvm-targets
@@ -6,8 +6,9 @@
,("armv6l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
,("armv7-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
,("armv7a-unknown-linux-gnueabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-,("armv7l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
+,("armv7a-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
,("armv7l-unknown-linux-gnueabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
+,("armv7l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
,("aarch64-unknown-linux-gnu", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
,("aarch64-unknown-linux", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
,("i386-unknown-linux-gnu", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
@@ -17,17 +18,18 @@
,("x86_64-unknown-linux-android", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", "+sse4.2 +popcnt"))
,("armv7-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
,("aarch64-unknown-linux-android", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
+,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
,("powerpc64le-unknown-linux", ("e-m:e-i64:64-n32:64", "ppc64le", ""))
-,("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", ""))
-,("arm-unknown-nto-qnx-eabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+strict-align"))
,("i386-apple-darwin", ("e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128", "yonah", ""))
,("x86_64-apple-darwin", ("e-m:o-i64:64-f80:128-n8:16:32:64-S128", "core2", ""))
,("armv7-apple-ios", ("e-m:o-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32", "generic", ""))
,("aarch64-apple-ios", ("e-m:o-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
,("i386-apple-ios", ("e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128", "yonah", ""))
,("x86_64-apple-ios", ("e-m:o-i64:64-f80:128-n8:16:32:64-S128", "core2", ""))
+,("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"))
+,("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 60cee202f8..15fa113550 100755
--- a/utils/llvm-targets/gen-data-layout.sh
+++ b/utils/llvm-targets/gen-data-layout.sh
@@ -18,35 +18,73 @@
# Target sets for which to generate the llvm-targets file
TARGETS=(
+ #########################
+ # Windows
+ #########################
+
# Windows x86
- "i386-unknown-windows" "i686-unknown-windows" "x86_64-unknown-windows"
+ "i386-unknown-windows"
+ "i686-unknown-windows"
+ "x86_64-unknown-windows"
+
+ #########################
+ # Linux
+ #########################
# Linux ARM
- "arm-unknown-linux-gnueabihf" "armv6-unknown-linux-gnueabihf" "armv6l-unknown-linux-gnueabihf"
- "armv7-unknown-linux-gnueabihf" "armv7a-unknown-linux-gnueabi" "armv7l-unknown-linux-gnueabihf"
+ "arm-unknown-linux-gnueabihf"
+ "armv6-unknown-linux-gnueabihf"
+ "armv6l-unknown-linux-gnueabihf"
+ "armv7-unknown-linux-gnueabihf"
+ "armv7a-unknown-linux-gnueabi"
+ "armv7a-unknown-linux-gnueabihf"
"armv7l-unknown-linux-gnueabi"
- "aarch64-unknown-linux-gnu" "aarch64-unknown-linux"
+ "armv7l-unknown-linux-gnueabihf"
+ "aarch64-unknown-linux-gnu"
+ "aarch64-unknown-linux"
# Linux x86
- "i386-unknown-linux-gnu" "i386-unknown-linux" "x86_64-unknown-linux-gnu" "x86_64-unknown-linux"
+ "i386-unknown-linux-gnu"
+ "i386-unknown-linux"
+ "x86_64-unknown-linux-gnu"
+ "x86_64-unknown-linux"
# Linux Android
- "x86_64-unknown-linux-android" "armv7-unknown-linux-androideabi" "aarch64-unknown-linux-android"
+ "x86_64-unknown-linux-android"
+ "armv7-unknown-linux-androideabi"
+ "aarch64-unknown-linux-android"
+ "armv7a-unknown-linux-androideabi"
# Linux ppc64le
"powerpc64le-unknown-linux"
+ #########################
+ # Darwin
+ #########################
+
+ # macOS
+ "i386-apple-darwin"
+ "x86_64-apple-darwin"
+ # iOS
+ "armv7-apple-ios arm64-apple-ios"
+ "i386-apple-ios x86_64-apple-ios"
+
+ #########################
+ # FreeBSD
+ #########################
+
# FreeBSD amd64
"amd64-portbld-freebsd"
"x86_64-unknown-freebsd" # See #15718
- # QNX
- "arm-unknown-nto-qnx-eabi"
+ # FreeBSD ARM
+ "aarch64-unknown-freebsd"
+ "armv6-unknown-freebsd-gnueabihf"
+ "armv7-unknown-freebsd-gnueabihf"
- # macOS
- "i386-apple-darwin" "x86_64-apple-darwin"
- # iOS
- "armv7-apple-ios arm64-apple-ios" "i386-apple-ios x86_64-apple-ios"
+ #########################
+ # Other
+ #########################
- # FreeBSD ARM
- "aarch64-unknown-freebsd" "armv6-unknown-freebsd-gnueabihf" "armv7-unknown-freebsd-gnueabihf"
+ # QNX
+ "arm-unknown-nto-qnx-eabi"
)
# given the call to clang -c11 that clang --target -v generates,