commit | fdcb85d1e5cadd2e0b89d9dc74a55897ef5b5983 | [log] [tgz] |
---|---|---|
author | Juan Yescas <jyescas@google.com> | Fri Oct 04 16:20:16 2024 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Oct 04 16:20:16 2024 +0000 |
tree | cac6f78e2b7e95861dd185e8f47a4971cafcf92b | |
parent | 79cb4b9681baf446e167f818e188e708013f36fe [diff] | |
parent | 0225a380fb2d165b259f4de43eab10ab03d3a238 [diff] |
Merge "16kb: bionic: Re-align libtest_invalid-local-tls.so to 16kb" into main
diff --git a/tests/prebuilt-elf-files/arm64/libtest_invalid-local-tls.so b/tests/prebuilt-elf-files/arm64/libtest_invalid-local-tls.so index 20c5765..c902bbe 100755 --- a/tests/prebuilt-elf-files/arm64/libtest_invalid-local-tls.so +++ b/tests/prebuilt-elf-files/arm64/libtest_invalid-local-tls.so Binary files differ
diff --git a/tests/prebuilt-elf-files/gen-libtest_invalid-local-tls.sh b/tests/prebuilt-elf-files/gen-libtest_invalid-local-tls.sh index 0f3e736..98a2b00 100755 --- a/tests/prebuilt-elf-files/gen-libtest_invalid-local-tls.sh +++ b/tests/prebuilt-elf-files/gen-libtest_invalid-local-tls.sh
@@ -19,12 +19,18 @@ build() { arch=$1 target=$2 + + if [[ "$arch" == "arm64" || "$arch" == "x86_64" ]]; then + alignment="-Wl,-z,max-page-size=16384" + fi + $NDK21E/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -O2 --target=$target \ -fpic -shared -o $arch/libtest_invalid-local-tls.so -fno-emulated-tls \ - -fuse-ld=gold test.c test2.c + $alignment -fuse-ld=gold test.c test2.c } build arm armv7a-linux-androideabi29 build arm64 aarch64-linux-android29 build x86 i686-linux-android29 build x86_64 x86_64-linux-android29 +
diff --git a/tests/prebuilt-elf-files/x86_64/libtest_invalid-local-tls.so b/tests/prebuilt-elf-files/x86_64/libtest_invalid-local-tls.so index 5b689ba..31d2b37 100755 --- a/tests/prebuilt-elf-files/x86_64/libtest_invalid-local-tls.so +++ b/tests/prebuilt-elf-files/x86_64/libtest_invalid-local-tls.so Binary files differ