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

Commit 582e5ecb authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Android Git Automerger
Browse files

am aabe27cc: am 9754735f: am db55f602: Merge "Switch to new host prebuilt... 

am aabe27cc: am 9754735f: am db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"

* commit 'aabe27cc':
  Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
parents 6e048afb aabe27cc

core/clang/x86_common.mk

+23 −20
Original line number Diff line number Diff line
@@ -4,14 +4,6 @@ endif 


ifeq ($(HOST_OS),linux)



ifneq ($(strip $(BUILD_HOST_64bit)),)

# Needs to be updated along with gcc

HOST_ARCH_DESCRIPTOR_FOR_CLANG := x86_64-linux

else

# Needs to be updated along with gcc

HOST_ARCH_DESCRIPTOR_FOR_CLANG := i686-linux

endif



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot
@@ -19,27 +11,38 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \ 
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \



ifneq ($(strip $(BUILD_HOST_64bit)),)

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS :=   \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG) \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google/backward \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/bin \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/4.6.x-google \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/4.6.x-google



ifneq ($(strip $(BUILD_HOST_64bit)),)

# need to add lib64 if building 64-bit, otherwise lib

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS += -L$(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/lib64/

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/

else

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS += -L$(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/lib/

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS :=   \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux/32 \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/

endif

endif

endif # linux



ifeq ($(HOST_OS),windows)

# nothing required here yet

core/combo/HOST_linux-x86.mk

+2 −7
Original line number Diff line number Diff line
@@ -22,10 +22,8 @@ define get-file-size 
stat --format "%s" "$(1)" | tr -d '\n'

endef



# Previously the prebiult host toolchain is used only for the sdk build,

# that's why we have "sdk" in the path name.

ifeq ($(strip $(HOST_TOOLCHAIN_PREFIX)),)

HOST_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk/

HOST_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux-

endif

# Don't do anything if the toolchain is not there

ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)gcc)))
@@ -34,6 +32,7 @@ HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)g++ 
HOST_AR  := $(HOST_TOOLCHAIN_PREFIX)ar

endif # $(HOST_TOOLCHAIN_PREFIX)gcc exists



HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/

ifneq ($(strip $(BUILD_HOST_64bit)),)

# By default we build everything in 32-bit, because it gives us

# more consistency between the host tools and the target.
@@ -41,14 +40,10 @@ ifneq ($(strip $(BUILD_HOST_64bit)),) 
# which can benefit from 64-bit host arch.

HOST_GLOBAL_CFLAGS += -m64 -Wa,--noexecstack

HOST_GLOBAL_LDFLAGS += -m64 -Wl,-z,noexecstack

# gcc location for clang; to be updated when clang is updated

HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6/

else

# We expect SSE3 floating point math.

HOST_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32 -Wa,--noexecstack

HOST_GLOBAL_LDFLAGS += -m32 -Wl,-z,noexecstack

# gcc location for clang; to be updated when clang is updated

HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6/

endif # BUILD_HOST_64bit



ifneq ($(strip $(BUILD_HOST_static)),)