[commit: ghc] wip/angerman/llvmng: Adds x86_64 android layout (5f7ea11)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/angerman/llvmng
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f7ea110da8533b8d614c4cbba362e974b8ac923/ghc

>---------------------------------------------------------------

commit 5f7ea110da8533b8d614c4cbba362e974b8ac923
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sun Dec 10 07:36:20 2017 +0800

    Adds x86_64 android layout


>---------------------------------------------------------------

5f7ea110da8533b8d614c4cbba362e974b8ac923
 llvm-targets                          | 1 +
 utils/llvm-targets/gen-data-layout.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/llvm-targets b/llvm-targets
index 3c9da1e..6dd5a60 100644
--- a/llvm-targets
+++ b/llvm-targets
@@ -11,6 +11,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"))
 ,("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 6f2aafc..05ab085 100755
--- a/utils/llvm-targets/gen-data-layout.sh
+++ b/utils/llvm-targets/gen-data-layout.sh
@@ -20,7 +20,7 @@
 WINDOWS_x86="i386-unknown-windows i686-unknown-windows x86_64-unknown-windows"
 LINUX_ARM="arm-unknown-linux-gnueabihf armv6-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnu aarch64-unknown-linux armv7a-unknown-linux-gnueabi"
 LINUX_x86="i386-unknown-linux-gnu i386-unknown-linux x86_64-unknown-linux-gnu x86_64-unknown-linux"
-ANDROID="armv7-unknown-linux-androideabi aarch64-unknown-linux-android"
+ANDROID="x86_64-unknown-linux-android armv7-unknown-linux-androideabi aarch64-unknown-linux-android"
 QNX="arm-unknown-nto-qnx-eabi"
 MACOS="i386-apple-darwin x86_64-apple-darwin"
 IOS="armv7-apple-ios arm64-apple-ios i386-apple-ios x86_64-apple-ios"