diff options
Diffstat (limited to 'core/combo')
-rw-r--r-- | core/combo/TARGET_linux-arm.mk | 17 | ||||
-rw-r--r-- | core/combo/TARGET_linux-sh.mk | 2 | ||||
-rw-r--r-- | core/combo/javac.mk | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 6139b67..bc398c3 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -44,7 +44,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) TARGET_TOOLS_PREFIX := \ - prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi- endif TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) @@ -97,6 +97,7 @@ arch_include_dir := $(dir $(android_config_h)) TARGET_GLOBAL_CFLAGS += \ -msoft-float -fpic \ -ffunction-sections \ + -fdata-sections \ -funwind-tables \ -fstack-protector \ -Wa,--noexecstack \ @@ -118,6 +119,7 @@ TARGET_GLOBAL_CFLAGS += -Wno-psabi TARGET_GLOBAL_LDFLAGS += \ -Wl,-z,noexecstack \ + -Wl,--icf=safe \ $(arch_variant_ldflags) # We only need thumb interworking in cases where thumb support @@ -132,6 +134,11 @@ endif TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden +# More flags/options can be added here +ifeq ($(NEED_WORKAROUND_CORTEX_A9_745320),true) +TARGET_GLOBAL_CFLAGS += -DWORKAROUND_CORTEX_A9_745320 +endif + TARGET_RELEASE_CFLAGS := \ -DNDEBUG \ -g \ @@ -206,7 +213,7 @@ TARGET_C_INCLUDES := \ $(libstdc++_root)/include \ $(KERNEL_HEADERS) \ $(libm_root)/include \ - $(libm_root)/include/arch/arm \ + $(libm_root)/include/arm \ $(libthread_db_root)/include TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o @@ -276,8 +283,12 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ $(TARGET_GLOBAL_LDFLAGS) \ $(PRIVATE_LDFLAGS) \ $(PRIVATE_ALL_OBJECTS) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \ + -Wl,--start-group \ + $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ + $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ $(TARGET_FDO_LIB) \ $(TARGET_LIBGCC) \ + -Wl,--end-group \ $(TARGET_CRTEND_O) endef diff --git a/core/combo/TARGET_linux-sh.mk b/core/combo/TARGET_linux-sh.mk index cf945fe..2600b9e 100644 --- a/core/combo/TARGET_linux-sh.mk +++ b/core/combo/TARGET_linux-sh.mk @@ -99,7 +99,7 @@ TARGET_C_INCLUDES := \ $(libstdc++_root)/include \ $(KERNEL_HEADERS) \ $(libm_root)/include \ - $(libm_root)/include/arch/sh \ + $(libm_root)/include/sh \ $(libthread_db_root)/include TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o diff --git a/core/combo/javac.mk b/core/combo/javac.mk index d4c04e7..f8c99fb 100644 --- a/core/combo/javac.mk +++ b/core/combo/javac.mk @@ -8,7 +8,7 @@ # COMMON_JAVAC -- Java compiler command with common arguments # Whatever compiler is on this system. -ifeq ($(HOST_OS), windows) +ifeq ($(BUILD_OS), windows) COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \ -target 1.5 -Xmaxerrs 9999999 else |