diff options
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 | ||||
| -rw-r--r-- | core/dumpvar.mk | 4 | ||||
| -rw-r--r-- | core/llvm_config.mk | 4 | ||||
| -rw-r--r-- | envsetup.sh | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 159fbe1..7506787 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -42,8 +42,8 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) -TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION) -TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-linux-android- +TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION) +TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/x86_64-linux-android- endif TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 92bf6af..2612e06 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -22,9 +22,9 @@ ifeq ($(TARGET_ARCH),arm) else ifeq ($(TARGET_ARCH),x86) # Add the x86 toolchain bin dir if it actually exists - ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)/bin),) + ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)/bin),) # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)/bin + ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)/bin endif endif diff --git a/core/llvm_config.mk b/core/llvm_config.mk index 0fe9f93..c679e42 100644 --- a/core/llvm_config.mk +++ b/core/llvm_config.mk @@ -72,11 +72,11 @@ ifeq ($(TARGET_ARCH),x86) CLANG_CONFIG_EXTRA_ASFLAGS += \ -target i686-linux-android \ -nostdlibinc \ - -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin + -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin CLANG_CONFIG_EXTRA_CFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS) CLANG_CONFIG_EXTRA_LDFLAGS += \ -target i686-linux-android \ - -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin + -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin CLANG_CONFIG_UNKNOWN_CFLAGS += \ -finline-limit=300 \ -fno-inline-functions-called-once \ diff --git a/envsetup.sh b/envsetup.sh index 429ca4a..da28996 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -126,7 +126,7 @@ function setpaths() export ANDROID_EABI_TOOLCHAIN= local ARCH=$(get_build_var TARGET_ARCH) case $ARCH in - x86) toolchaindir=x86/i686-linux-android-$targetgccversion/bin + x86) toolchaindir=x86/x86_64-linux-android-$targetgccversion/bin ;; arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin ;; @@ -861,7 +861,7 @@ function gdbclient() local ARCH=$(get_build_var TARGET_ARCH) local GDB case "$ARCH" in - x86) GDB=i686-linux-android-gdb;; + x86) GDB=x86_64-linux-android-gdb;; arm) GDB=arm-linux-androideabi-gdb;; mips) GDB=mipsel-linux-android-gdb;; *) echo "Unknown arch $ARCH"; return 1;; |