Merge "Add a 32-bit x86_64 arch variant"

am: 19b7692496

* commit '19b76924969de45f77334a5e7d86b22362a8d845':
  Add a 32-bit x86_64 arch variant

Change-Id: Ia2d708a0d2159d39cafbbf9589e2c4d296e3ffb1

core/combo/arch/x86/x86_64.mk

@@ -0,0 +1,18 @@
+# This file is used as the second (32-bit) architecture when building a generic
+# x86_64 64-bit platform image. (full_x86_64-eng / sdk_x86_64-eng)
+#
+# The generic 'x86' variant cannot be used, since it resets some flags used
+# by the 'x86_64' variant.
+
+ARCH_X86_HAVE_SSSE3 := true
+ARCH_X86_HAVE_MOVBE := false # Only supported on Atom.
+ARCH_X86_HAVE_POPCNT := true
+ARCH_X86_HAVE_SSE4 := true
+ARCH_X86_HAVE_SSE4_1 := true
+ARCH_X86_HAVE_SSE4_2 := true
+
+
+# Some intrinsic functions used by libcxx only exist for prescott or newer CPUs.
+arch_variant_cflags := \
+    -march=prescott \
+

target/board/generic_x86_64/BoardConfig.mk

@@ -13,7 +13,7 @@ TARGET_PRELINK_MODULE := false
 
 TARGET_2ND_CPU_ABI := x86
 TARGET_2ND_ARCH := x86
-TARGET_2ND_ARCH_VARIANT := x86
+TARGET_2ND_ARCH_VARIANT := x86_64
 
 TARGET_USES_64_BIT_BINDER := true