diff options
author | Vladimir Marko <vmarko@google.com> | 2018-04-26 16:04:44 +0100 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2018-04-30 15:21:10 +0100 |
commit | 00bfaca0c3c923bd8f2db0992762a15b8b79e74f (patch) | |
tree | 7615a1f5a472735e70e9fada52685e5fd7aea234 | |
parent | ff087857dfab01b4a5e17ca2408e3cfb60f02b1c (diff) | |
download | vixl-pie-qpr2-release.tar.gz |
Fix CodeBuffer implementation mismatch.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
Test: Rely on TreeHugger.
Bug: 64359573
(cherry picked from commit 9b00771ae42e6ca9031ce5095ae08cc9a2feaa72)
Change-Id: Ic5f1e9548db625884350949cdfdbc44f222d4b95
-rw-r--r-- | Android.bp | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -72,6 +72,14 @@ cc_defaults { // Explicitly enable the write-strings warning. VIXL uses // const correctly when handling string constants. "-Wwrite-strings", + + // As we can load both libvixl-arm.so and libvixl-arm64.so in the + // same process, and some functions are emitted in both libraries, + // flags for selecting implementation details for these functions + // must be shared to emit identical code. Otherwise we can get + // undefined behavior, especially with link-time optimization. + // b/64359573 + "-DVIXL_CODE_BUFFER_MALLOC", ], local_include_dirs: ["src"], native_coverage: false, @@ -84,7 +92,6 @@ cc_defaults { name: "vixl-arm", defaults: ["vixl-common"], cppflags: [ - "-DVIXL_CODE_BUFFER_MALLOC", "-DVIXL_INCLUDE_TARGET_T32", ], srcs: ["src/aarch32/*.cc"], @@ -95,7 +102,6 @@ cc_defaults { defaults: ["vixl-common"], cppflags: [ "-DVIXL_INCLUDE_SIMULATOR_AARCH64", - "-DVIXL_CODE_BUFFER_MMAP", "-DVIXL_INCLUDE_TARGET_A64", ], srcs: ["src/aarch64/*.cc"], |