diff options
| author | Dan Albert <danalbert@google.com> | 2015-12-07 18:41:19 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-12-07 18:41:19 -0800 |
| commit | 135b95f0c6d1c7dc3ce7183de3c5387c3562811b (patch) | |
| tree | 0da48e9fcbeed8fef97e2a83eb088e3da0baf9e4 /tests | |
| parent | 5f5c62c26f488b166a0b72776a5c4ee56bc8767d (diff) | |
| download | ndk-135b95f0c6d1c7dc3ce7183de3c5387c3562811b.tar.gz | |
Fix LTO tests for aarch64.
Clang LTO is only supported with gold. ARM64 still uses bfd by
default, so make sure this test uses gold when we're using clang.
Change-Id: Iac8080eff23e4fcdd5f7be4e2687d938472843d2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/build/flto/jni/Android.mk | 14 | ||||
| -rw-r--r-- | tests/build/issue36131-flto-c++11/jni/Android.mk | 13 |
2 files changed, 12 insertions, 15 deletions
diff --git a/tests/build/flto/jni/Android.mk b/tests/build/flto/jni/Android.mk index a9920c894..6c533fc8f 100644 --- a/tests/build/flto/jni/Android.mk +++ b/tests/build/flto/jni/Android.mk @@ -3,16 +3,14 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := flto LOCAL_SRC_FILES := flto.c +LOCAL_CFLAGS += -flto +LOCAL_LDFLAGS += -flto -FLTO_FLAG := -flto +# Clang LTO is only supported with gold. ARM64 still uses bfd by default, so +# make sure this test uses gold when we're using clang. ifneq ($(filter clang%,$(NDK_TOOLCHAIN_VERSION)),) -ifeq ($(TARGET_ARCH_ABI),mips) -# clang does LTO via gold plugin, but gold doesn't support MIPS yet -FLTO_FLAG := -endif +LOCAL_CFLAGS += -fuse-ld=gold +LOCAL_LDFLAGS += -fuse-ld=gold endif -LOCAL_CFLAGS += $(FLTO_FLAG) -LOCAL_LDFLAGS += $(FLTO_FLAG) include $(BUILD_EXECUTABLE) - diff --git a/tests/build/issue36131-flto-c++11/jni/Android.mk b/tests/build/issue36131-flto-c++11/jni/Android.mk index 6b0493ec3..3c3de7457 100644 --- a/tests/build/issue36131-flto-c++11/jni/Android.mk +++ b/tests/build/issue36131-flto-c++11/jni/Android.mk @@ -4,15 +4,14 @@ include $(CLEAR_VARS) LOCAL_MODULE := issue36131-flto-c++11 LOCAL_SRC_FILES := issue36131-flto-c++11.cxx LOCAL_CFLAGS += -g -std=c++11 +LOCAL_CFLAGS += -flto +LOCAL_LDFLAGS += -flto -FLTO_FLAG := -flto +# Clang LTO is only supported with gold. ARM64 still uses bfd by default, so +# make sure this test uses gold when we're using clang. ifneq ($(filter clang%,$(NDK_TOOLCHAIN_VERSION)),) -ifeq ($(TARGET_ARCH_ABI),mips) -# clang does LTO via gold plugin, but gold doesn't support MIPS yet -FLTO_FLAG := -endif +LOCAL_CFLAGS += -fuse-ld=gold +LOCAL_LDFLAGS += -fuse-ld=gold endif -LOCAL_CFLAGS += $(FLTO_FLAG) -LOCAL_LDFLAGS += $(FLTO_FLAG) include $(BUILD_EXECUTABLE) |