8e6a1ec6a4
Syncs with glibc-2.34-16.fc35. * Tue Dec 14 2021 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.34-16 - Enable PIE by default on all architectures (#1988382) * Tue Dec 14 2021 Florian Weimer <fweimer@redhat.com> - 2.34-15 - Sync with upstream branch release/2.34/master, commit 06865865151579d1aa17d38110060a68b85c5d90: - pthread/tst-cancel28: Fix barrier re-init race condition - Use $(pie-default) with conformtest - Run conform/ tests using newly built libc - nptl: Add one more barrier to nptl/tst-create1 Resolves: #1988382
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
commit 1fe4b8d6937139faa47410552d4e21b356810d67
|
|
Author: Joseph Myers <joseph@codesourcery.com>
|
|
Date: Fri Sep 17 19:24:14 2021 +0000
|
|
|
|
Use $(pie-default) with conformtest
|
|
|
|
My glibc bot showed that my conformtest changes fail the build of the
|
|
conformtest execution tests for x86_64-linux-gnu-static-pie, because
|
|
linking the newly built object with the newly built libc and the
|
|
associated options normally used for linking requires it to be built
|
|
as PIE. Add $(pie-default) to the compiler command used so that PIE
|
|
options are used when required.
|
|
|
|
There's a case for using the whole of $(CFLAGS-.o) (which includes
|
|
$(pie-default)), but that raises questions of any impact from using
|
|
optimization flags from CFLAGS in these tests. So for now just use
|
|
$(pie-default) as the key part of $(CFLAGS-.o) that's definitely
|
|
needed.
|
|
|
|
Tested with build-many-glibcs.py for x86_64-linux-gnu-static-pie.
|
|
|
|
(cherry picked from commit 885762aa31d75de8b9fea4c0e2e372b582d4c548)
|
|
|
|
diff --git a/conform/Makefile b/conform/Makefile
|
|
index 296db818f0a72253..27ad98caf866879f 100644
|
|
--- a/conform/Makefile
|
|
+++ b/conform/Makefile
|
|
@@ -175,7 +175,8 @@ $(conformtest-header-tests): $(objpfx)%/conform.out: \
|
|
conformtest.py $(conformtest-headers-data)
|
|
(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
|
|
mkdir -p $(@D); \
|
|
- $(PYTHON) $< --cc='$(CC)' --flags='$(conformtest-cc-flags)' \
|
|
+ $(PYTHON) $< --cc='$(CC) $(pie-default)' \
|
|
+ --flags='$(conformtest-cc-flags)' \
|
|
--ldflags='$(+link-tests-before-inputs)' \
|
|
--libs='$(+link-tests-after-inputs)' \
|
|
--run-program-prefix='$(run-program-prefix)' \
|