summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2017-12-10 07:36:20 +0800
committerBen Gamari <ben@smart-cactus.org>2019-06-24 18:35:12 -0400
commit3d0fa737b801f5d3e00c91a8783b6e5cec4d6a68 (patch)
tree01eefea3ed9a30c5b7c562766f9132c1cfed2e4e
parent5edcf9492a3af7663faf24b58a709a9a9eec86ad (diff)
downloadhaskell-3d0fa737b801f5d3e00c91a8783b6e5cec4d6a68.tar.gz
llvm-targets: Add x86_64 android layout
(cherry picked from commit e87b9f8731460a7d8c0b45507be2d83935683d56)
-rw-r--r--llvm-targets1
-rwxr-xr-xutils/llvm-targets/gen-data-layout.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/llvm-targets b/llvm-targets
index db35131493..d62e069cdf 100644
--- a/llvm-targets
+++ b/llvm-targets
@@ -14,6 +14,7 @@
,("i386-unknown-linux", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
,("x86_64-unknown-linux-gnu", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
,("x86_64-unknown-linux", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
+,("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"))
,("powerpc64le-unknown-linux", ("e-m:e-i64:64-n32:64", "ppc64le", ""))
diff --git a/utils/llvm-targets/gen-data-layout.sh b/utils/llvm-targets/gen-data-layout.sh
index b0b411cb13..60cee202f8 100755
--- a/utils/llvm-targets/gen-data-layout.sh
+++ b/utils/llvm-targets/gen-data-layout.sh
@@ -29,7 +29,7 @@ TARGETS=(
# Linux x86
"i386-unknown-linux-gnu" "i386-unknown-linux" "x86_64-unknown-linux-gnu" "x86_64-unknown-linux"
# Linux Android
- "armv7-unknown-linux-androideabi" "aarch64-unknown-linux-android"
+ "x86_64-unknown-linux-android" "armv7-unknown-linux-androideabi" "aarch64-unknown-linux-android"
# Linux ppc64le
"powerpc64le-unknown-linux"