Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1a5664e authored by Pavel Chupin's avatar Pavel Chupin
Browse files

Switch x86 default compiler to multilib version 

Switch from gcc-4.7 32-bit only to gcc-4.7 multilib (32/x32/64) compiler.
Tested x86 image build on Linux and Darwin.

This bionic patch is required:
https://android-review.googlesource.com/#/c/64183



Change-Id: Ifc2c6c5d6a4a1b71a00a87af072bb7f67b1c284d
Signed-off-by: default avatarPavel Chupin <pavel.v.chupin@intel.com>
parent 929b3a24

core/combo/TARGET_linux-x86.mk

+2 −2
Original line number Diff line number Diff line
@@ -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)

core/dumpvar.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

core/llvm_config.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 \

envsetup.sh

+2 −2
Original line number Diff line number Diff line
@@ -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

            ;;
@@ -842,7 +842,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;;