summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorFred Hornsey <hornseyf@objectcomputing.com>2020-12-12 19:50:28 -0600
committerFred Hornsey <hornseyf@objectcomputing.com>2020-12-12 19:50:57 -0600
commite84d63955dc03dc336829e65c905102d2c5a50fc (patch)
tree658402716338e83908d4b8c7d9c17fe6bf3d6125 /ACE
parentd98d325cb16baa3a8d5acec7ddad513b1fb5610c (diff)
downloadATCD-e84d63955dc03dc336829e65c905102d2c5a50fc.tar.gz
platform_android.GNU: Remove --fix-cortex-a8 Flag
This flag isn't supported by LLD and appears to not be pased from r18 onwards: https://github.com/android/ndk/issues/766
Diffstat (limited to 'ACE')
-rw-r--r--ACE/include/makeinclude/platform_android.GNU5
1 files changed, 1 insertions, 4 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU
index ea9eac44979..09974e5596a 100644
--- a/ACE/include/makeinclude/platform_android.GNU
+++ b/ACE/include/makeinclude/platform_android.GNU
@@ -58,9 +58,6 @@ ifeq ($(android_abi),armeabi-v7a)
else
FLAGS_C_CC += -mfpu=vfpv3-d16
endif
- # NDK says -Wl,--fix-cortex-a8 is required for working around a CPU bug
- # in some Cortex-A8 implementations
- LDFLAGS += -Wl,--fix-cortex-a8
else ifeq ($(android_abi),arm64-v8a)
CROSS_COMPILE := aarch64-linux-android
@@ -122,9 +119,9 @@ LD_RPATH_FLAGS += -Wl,--enable-new-dtags
# for you): _SVID_SOURCE _BSD_SOURCE _POSIX_SOURCE _POSIX_C_SOURCE=199506L, ...
CPPFLAGS += -D_GNU_SOURCE
+# Use LLD, the LLVM linker as recommended by Google
android_set_lld ?= 1
ifeq ($(android_set_lld),1)
- # Use the LLVM linker as recommended by Google
# The other two arguments are explained by
# https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#additional-required-arguments
LDFLAGS += -fuse-ld=lld -Wl,--build-id=sha1 -Wl,--no-rosegment