| commit | 6750532978e56e7f6c9932bd813344e8fe800282 | [log] [tgz] |
|---|---|---|
| author | Ivan Lozano <ivanlozano@google.com> | Thu Nov 29 15:58:39 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Nov 29 15:58:39 2018 +0000 |
| tree | b65d8b5498041bc3f9e9e465c3b39d05a2259a44 | |
| parent | d5bb13addb4ea0548800478670b04fbe42e876c6 [diff] | |
| parent | f9f03e0119b21b2f3b46de24acd93f68b2b1dc7a [diff] |
Merge "Disable AArch64 XOM when not using lld."
diff --git a/core/binary.mk b/core/binary.mk index 8d2bb65..427f689 100644 --- a/core/binary.mk +++ b/core/binary.mk
@@ -91,7 +91,9 @@ ifeq ($(strip $(my_xom)),true) ifeq (arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) - my_ldflags += -Wl,-execute-only + ifeq ($(my_use_clang_lld),true) + my_ldflags += -Wl,-execute-only + endif endif endif endif