diff options
| author | Florian Weimer <fweimer@redhat.com> | 2025-11-06 11:14:53 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2025-11-13 14:57:54 +0100 |
| commit | e8b9a4bcc2bb1f6c71f58d29dad51252e6336091 (patch) | |
| tree | d30dadcde40aa8bdb6248b414f581899b79c41d7 | |
| parent | c0ae0450273c7346ec788bf6a933257d455ea820 (diff) | |
aarch64: Do not link conform tests with -Wl,-z,force-bti (bug 33601)
If the toolchain does not default to generate BTI markers in GCC,
the main program for conform runtime tests will not have the
BTI marker that -Wl,-z,force-bti requires. Without -Wl,-z,force-bti,
the link editor will not tell the dynamic linker to enable BTI,
and the missing BTI marker is harmless.
Reviewed-by: Yury Khrustalev <yury.khrustalev@arm.com>
(cherry picked from commit 75b6b263e928eaca01d836f6bb8b539346b6bb2d)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sysdeps/aarch64/Makefile | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -30,6 +30,7 @@ The following bugs are resolved with this release: [33185] Fix double-free after allocation failure in regcomp [33234] Use TLS initial-exec model for __libc_tsd_CTYPE_* thread variables [33361] nss: Group merge does not react to ERANGE during merge + [33601] aarch64: Do not link conform tests with -Wl,-z,force-bti Version 2.40 diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile index 141d7d9cc2..eb34f4541e 100644 --- a/sysdeps/aarch64/Makefile +++ b/sysdeps/aarch64/Makefile @@ -2,11 +2,15 @@ long-double-fcts = yes ifeq (yes,$(aarch64-bti)) # Mark linker output BTI compatible, it warns on non-BTI inputs. +# Do not do this for conform tests because they may not be compiled +# with the appropriate compiler flags. +ifneq ($(subdir),conform) sysdep-LDFLAGS += -Wl,-z,force-bti # Make warnings fatal outside the test system. LDFLAGS-lib.so += -Wl,--fatal-warnings LDFLAGS-rtld += -Wl,-z,force-bti,--fatal-warnings -endif +endif # $(subdir) != conform +endif # $(aarch64-bit) ifeq ($(subdir),elf) sysdep-dl-routines += dl-bti |