diff options
| author | Goran Jakovljevic <goran.jakovljevic@imgtec.com> | 2015-03-10 17:11:39 +0100 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-03-10 10:01:50 -0700 |
| commit | 1156508265422f407c7072788ce6c32c35411941 (patch) | |
| tree | 8396de72d1b950b695df57fe39a679c9e37ff440 | |
| parent | a94cf791c1c9b93d49f5573716de93348757ae15 (diff) | |
| download | bionic-1156508265422f407c7072788ce6c32c35411941.zip bionic-1156508265422f407c7072788ce6c32c35411941.tar.gz bionic-1156508265422f407c7072788ce6c32c35411941.tar.bz2 | |
Generate gnu hash for arm only
Fixes build failure caused by:
https://android-review.googlesource.com/#/c/139660
As previously discussed [1], MIPS does not support GNU-style ELF hashes.
[1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk
Change-Id: I9a7966eebfd1ef0a587a20b71faefde38e84ab62
| -rw-r--r-- | libc/Android.mk | 4 | ||||
| -rw-r--r-- | libm/Android.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index d0ef772..293b70e 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1326,7 +1326,7 @@ LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS := -Wl,--hash-style=both +LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_SRC_FILES := \ @@ -1480,7 +1480,7 @@ LOCAL_CFLAGS := $(libc_common_cflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS := -Wl,--hash-style=both +LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_SRC_FILES := $(libstdcxx_common_src_files) LOCAL_MODULE:= libstdc++ diff --git a/libm/Android.mk b/libm/Android.mk index 092ebd5..2f30c82 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -439,7 +439,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS := -Wl,--hash-style=both +LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_MODULE := libm LOCAL_CLANG := $(libm_clang) |