about summary refs log tree commit diff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-01-25 13:33:13 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-01-26 08:57:47 -0300
commite4ba8fee1a8feea62f9f06099a116163848338db (patch)
tree3190fab7d82a66e03feabd0a7671acb907fb6182 /elf/Makefile
parent4f20a1dc5242fb4bb8763e0451df898fa48e740c (diff)
downloadglibc-e4ba8fee1a8feea62f9f06099a116163848338db.tar.gz
glibc-e4ba8fee1a8feea62f9f06099a116163848338db.tar.xz
glibc-e4ba8fee1a8feea62f9f06099a116163848338db.zip
elf: Replace tst-p_alignmod1-editX with a python script
This avoid the cross-compiling breakage when the test should not run
($(run-built-tests) equal to no).

Checked on x86_64-linux-gnu and i686-linux-gnu as well with a cross
compile to aarch64-linux-gnu and powerpc64-linux-gnu.
Diffstat (limited to 'elf/Makefile')
-rw-r--r--elf/Makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 41e0f2e8c4..daafb5cf12 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -413,8 +413,6 @@ tests += \
   tst-nodelete-opened \
   tst-noload \
   tst-null-argv \
-  tst-p_alignmod1-edit \
-  tst-p_alignmod2-edit \
   tst-p_align1 \
   tst-p_align2 \
   tst-p_align3 \
@@ -2607,23 +2605,19 @@ $(objpfx)tst-p_align1: $(objpfx)tst-p_alignmod1.so
 
 # Make a copy of tst-p_alignmod-base.so and lower p_align of the first
 # PT_LOAD segment.
-$(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod1-edit \
-			     $(objpfx)tst-p_alignmod-base.so
+$(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod-base.so
 	rm -f $@
 	cp $(objpfx)tst-p_alignmod-base.so $@
-	$(test-wrapper-env) $(run-program-env) $(rtld-prefix) \
-	  $(objpfx)tst-p_alignmod1-edit $@
+	$(PYTHON) $(..)scripts/tst-elf-edit.py -a half $@
 
 $(objpfx)tst-p_align2: $(objpfx)tst-p_alignmod2.so
 
 # Make a copy of tst-p_alignmod-base.so and update p_align of the first
 # PT_LOAD segment.
-$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \
-			     $(objpfx)tst-p_alignmod-base.so
+$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod-base.so
 	rm -f $@
 	cp $(objpfx)tst-p_alignmod-base.so $@
-	$(test-wrapper-env) $(run-program-env) $(rtld-prefix) \
-	  $(objpfx)tst-p_alignmod2-edit $@
+	$(PYTHON) $(..)scripts/tst-elf-edit.py -a 1 $@
 
 LDFLAGS-tst-p_alignmod3.so += -Wl,-z,max-page-size=0x100,-z,common-page-size=0x100