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.

4 files changed, 4 insertions, 190 deletions

diff --git a/elf/Makefile b/elf/Makefile
index 41e0f2e..daafb5c 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
 
diff --git a/elf/tst-elf-edit.h b/elf/tst-elf-edit.h
deleted file mode 100644
index b764e78..0000000
--- a/elf/tst-elf-edit.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Update p_align of the first PT_LOAD segment.
-   Copyright (C) 2022 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <link.h>
-#include <error.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-const char *file_name;
-
-static size_t update_p_align (size_t);
-
-int
-main (int argc, char ** argv)
-{
-  if (argc != 2)
-    {
-      printf ("Usage: %s: file\n", argv[0]);
-      return 0;
-    }
-
-  file_name = argv[1];
-  struct stat statbuf;
-  int errno_saved;
-
-  if (stat (file_name, &statbuf) < 0)
-    error (1, errno, "%s: not exist", file_name);
-
-  ElfW(Ehdr) *ehdr;
-
-  if (statbuf.st_size < sizeof (*ehdr))
-    error (1, 0, "%s: too small", file_name);
-
-  int fd = open (file_name, O_RDWR);
-  if (fd < 0)
-    error (1, errno, "%s: can't open", file_name);
-
-  /* Map in the whole file.  */
-  void *base = mmap (NULL, statbuf.st_size, PROT_READ | PROT_WRITE,
-		     MAP_SHARED, fd, 0);
-  if (base == MAP_FAILED)
-    {
-      errno_saved = errno;
-      close (fd);
-      error (1, errno_saved, "%s: failed to map", file_name);
-    }
-
-  ehdr = (ElfW(Ehdr) *) base;
-  if (ehdr->e_ident[EI_MAG0] != ELFMAG0
-      || ehdr->e_ident[EI_MAG1] != ELFMAG1
-      || ehdr->e_ident[EI_MAG2] != ELFMAG2
-      || ehdr->e_ident[EI_MAG3] != ELFMAG3)
-    {
-      close (fd);
-      error (1, 0, "%s: bad ELF header", file_name);
-    }
-
-  if (ehdr->e_type != ET_DYN)
-    {
-      close (fd);
-      error (1, 0, "%s: not shared library", file_name);
-    }
-
-  bool unsupported_class = true;
-  switch (ehdr->e_ident[EI_CLASS])
-    {
-    default:
-      break;
-
-    case ELFCLASS32:
-      unsupported_class = __ELF_NATIVE_CLASS != 32;
-      break;
-
-    case ELFCLASS64:
-      unsupported_class = __ELF_NATIVE_CLASS != 64;
-      break;
-    }
-
-  if (unsupported_class)
-    {
-      close (fd);
-      error (1, 0, "%s: unsupported ELF class: %d",
-	     file_name, ehdr->e_ident[EI_CLASS]);
-    }
-
-  size_t phdr_size = sizeof (ElfW(Phdr)) * ehdr->e_phentsize;
-  if (statbuf.st_size < (ehdr->e_phoff + phdr_size))
-    {
-      close (fd);
-      error (1, 0, "%s: too small", file_name);
-    }
-
-  ElfW(Phdr) *phdr = (ElfW(Phdr) *) (base + ehdr->e_phoff);
-  for (int i = 0; i < ehdr->e_phnum; i++, phdr++)
-    if (phdr->p_type == PT_LOAD)
-      {
-	/* Update p_align of the first PT_LOAD segment.  */
-	phdr->p_align = update_p_align (phdr->p_align);
-	break;
-      }
-
-  munmap (base, statbuf.st_size);
-  close (fd);
-
-  return 0;
-}
diff --git a/elf/tst-p_alignmod1-edit.c b/elf/tst-p_alignmod1-edit.c
deleted file mode 100644
index 06d9c63..0000000
--- a/elf/tst-p_alignmod1-edit.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Reduce p_align of the first PT_LOAD segment by half.
-   Copyright (C) 2022 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include "tst-elf-edit.h"
-
-/* Reduce p_align by half.  */
-
-static size_t
-update_p_align (size_t p_align)
-{
-  return p_align >> 1;
-}
diff --git a/elf/tst-p_alignmod2-edit.c b/elf/tst-p_alignmod2-edit.c
deleted file mode 100644
index 4c2ae65..0000000
--- a/elf/tst-p_alignmod2-edit.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Set p_align of the first PT_LOAD segment to 1.
-   Copyright (C) 2022 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include "tst-elf-edit.h"
-
-/* Set p_align to 1.  */
-
-static size_t
-update_p_align (size_t p_align __attribute__ ((unused)))
-{
-  return 1;
-}