Merge "Add a 32-bit x86_64 arch variant" am: 19b7692496

am: f51e73d8bf

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

Change-Id: Ib5f51ddcdec6f38a9cfc8f6182b6919c4f24aee6
This commit is contained in:
Dan Willemsen 2016-05-11 00:49:22 +00:00 committed by android-build-merger
commit 56242e5ca5
2 changed files with 19 additions and 1 deletions

View file

@ -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 \

View file

@ -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