diff mbox series

Add crt1-2.0.o for glibc 2.0 compatibility tests

Message ID 20240430165712.295758-1-hjl.tools@gmail.com
State Committed
Commit 5f245f3bfbe61b2182964dafb94907e38284b806
Headers
Series Add crt1-2.0.o for glibc 2.0 compatibility tests |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

H.J. Lu April 30, 2024, 4:57 p.m. UTC 
  Starting from glibc 2.1, crt1.o contains _IO_stdin_used which is checked
by _IO_check_libio to provide binary compatibility for glibc 2.0.  Add
crt1-2.0.o for tests against glibc 2.0.  Define tests-2.0 for glibc 2.0
compatibility tests.  Add and update glibc 2.0 compatibility tests for
stderr, matherr and pthread_kill.
---
 Makeconfig                | 21 ++++++++++++++++
 Rules                     | 13 +++++++++-
 csu/Makefile              |  4 +++
 libio/Makefile            |  6 +++++
 libio/tst-stderr-compat.c | 52 +++++++++++++++++++++++++++++++++++++++
 math/Makefile             |  3 +++
 sysdeps/pthread/Makefile  |  4 +++
 7 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 libio/tst-stderr-compat.c

Comments

Carlos O'Donell May 6, 2024, 1:59 p.m. UTC | #1 
On 4/30/24 12:57, H.J. Lu wrote:
> Starting from glibc 2.1, crt1.o contains _IO_stdin_used which is checked
> by _IO_check_libio to provide binary compatibility for glibc 2.0.  Add
> crt1-2.0.o for tests against glibc 2.0.  Define tests-2.0 for glibc 2.0
> compatibility tests.  Add and update glibc 2.0 compatibility tests for
> stderr, matherr and pthread_kill.

This is a great addition to the testsuite to verify the older code paths.

Thank you for creating this.

LGTM.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>


> ---
>  Makeconfig                | 21 ++++++++++++++++
>  Rules                     | 13 +++++++++-
>  csu/Makefile              |  4 +++
>  libio/Makefile            |  6 +++++
>  libio/tst-stderr-compat.c | 52 +++++++++++++++++++++++++++++++++++++++
>  math/Makefile             |  3 +++
>  sysdeps/pthread/Makefile  |  4 +++
>  7 files changed, 102 insertions(+), 1 deletion(-)
>  create mode 100644 libio/tst-stderr-compat.c
> 
> diff --git a/Makeconfig b/Makeconfig
> index e583765712..61ff1d0d9b 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -360,6 +360,8 @@ whole-archive = -Wl,--whole-archive
>  # Installed name of the startup code.
>  # The ELF convention is that the startfile is called crt1.o
>  start-installed-name = crt1.o
> +# Similar to crt1.o, but without _IO_stdin_used.
> +start-name-2.0 = crt1-2.0.o

OK.

>  # On systems that do not need a special startfile for statically linked
>  # binaries, simply set it to the normal name.
>  ifndef static-start-installed-name
> @@ -537,6 +539,25 @@ else  # build-static
>  endif  # build-shared
>  endif  # +link
>  
> +# Command for linking test programs with crt1.o from glibc 2.0.
> ++link-2.0-before-inputs = -nostdlib -nostartfiles $(no-pie-ldflag) \
> +	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
> +	      $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
> +	      $(firstword $(CRT-$(@F)) $(csu-objpfx)$(start-name-2.0)) \
> +	      $(+preinit) $(+prector)
> ++link-2.0-before-libc = -o $@ $(+link-2.0-before-inputs) \
> +	      $(filter-out $(addprefix $(csu-objpfx),start.o \
> +						     $(start-name-2.0))\
> +			   $(+preinit) $(link-extra-libs) \
> +			   $(common-objpfx)libc% $(+postinit),$^) \
> +	      $(link-extra-libs)

OK. Agreed, we need to manually assembly these things with old startup. Should not impact
new startup link process.

> ++link-after-libc = $(+postctor) $(+postinit)
> +define +link-2.0-tests
> +$(CC) $(+link-2.0-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \
> +  $(+link-after-libc)
> +$(call after-link,$@)
> +endef

OK.

> +
>  # The pretty printer test programs need to be compiled without optimizations
>  # so they won't confuse gdb.  We could use either the 'GCC optimize' pragma
>  # or the 'optimize' function attribute to achieve this; however, at least on
> diff --git a/Rules b/Rules
> index c7db0a4869..9010c5d5b2 100644
> --- a/Rules
> +++ b/Rules
> @@ -188,6 +188,7 @@ binaries-all = $(binaries-all-notests) $(binaries-all-tests)
>  binaries-static-notests = $(others-static)
>  binaries-static-tests = $(tests-static) $(xtests-static)
>  binaries-static = $(binaries-static-notests) $(binaries-static-tests)
> +binaries-shared-2.0-tests = $(tests-2.0)

OK.

>  ifeq (yesyes,$(have-fpie)$(build-shared))
>  binaries-pie-tests = $(tests-pie) $(xtests-pie)
>  binaries-pie-notests = $(others-pie)
> @@ -215,7 +216,8 @@ binaries-malloc-hugetlb2-tests =
>  endif
>  
>  binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests)
> -binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static), \
> +binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static) \
> +				     $(binaries-shared-2.0-tests), \

OK. Remove the compat ones.

>  				     $(binaries-all-tests))
>  binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
>  				       $(binaries-all-notests))
> @@ -235,6 +237,15 @@ $(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \
>  	$(+link-tests)
>  endif
>  
> +# Linking test programs with crt1.o from glibc 2.0.
> +ifneq "$(strip $(binaries-shared-2.0-tests))" ""
> +$(addprefix $(objpfx),$(binaries-shared-2.0-tests)): %: %.o \
> +  $(link-extra-libs-tests) \
> +  $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
> +  $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
> +	$(+link-2.0-tests)
> +endif

OK.

> +
>  ifneq "$(strip $(binaries-mcheck-tests))" ""
>  $(addprefix $(objpfx),$(binaries-mcheck-tests)): %-mcheck: %.o \
>    $(link-extra-libs-tests) \
> diff --git a/csu/Makefile b/csu/Makefile
> index 946fd91031..777d6720a7 100644
> --- a/csu/Makefile
> +++ b/csu/Makefile
> @@ -42,6 +42,7 @@ csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o)
>  extra-objs = \
>    $(csu-dummies) \
>    $(start-installed-name) \
> +  $(start-name-2.0) \

OK.

>    S$(start-installed-name) \
>    g$(start-installed-name) \
>    start.o \
> @@ -182,6 +183,9 @@ ifndef start-installed-name-rule
>  $(objpfx)$(start-installed-name): $(objpfx)start.o $(objpfx)abi-note.o \
>  				  $(objpfx)init.o $(objpfx)static-reloc.o
>  	$(link-relocatable)
> +$(objpfx)$(start-name-2.0): $(objpfx)start.o $(objpfx)abi-note.o \
> +			    $(objpfx)static-reloc.o
> +	$(link-relocatable)

OK.

>  $(objpfx)r$(start-installed-name): $(objpfx)start.o $(objpfx)abi-note.o \
>  				  $(objpfx)init.o
>  	$(link-relocatable)
> diff --git a/libio/Makefile b/libio/Makefile
> index a4f4409b56..0c1f16ee3b 100644
> --- a/libio/Makefile
> +++ b/libio/Makefile
> @@ -266,6 +266,12 @@ aux	:= fileops genops stdfiles stdio strops
>  ifeq ($(build-shared),yes)
>  generated += tst-bz24228.mtrace tst-bz24228.check
>  aux	+= oldfileops oldstdfiles
> +tests += \
> +  tst-stderr-compat \
> +# tests
> +tests-2.0 += \
> +  tst-stderr-compat \
> +# tests-2.0

OK.

>  endif
>  
>  shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops	\
> diff --git a/libio/tst-stderr-compat.c b/libio/tst-stderr-compat.c
> new file mode 100644
> index 0000000000..8221415cd4
> --- /dev/null
> +++ b/libio/tst-stderr-compat.c
> @@ -0,0 +1,52 @@
> +/* Test that fclose works on stderr from glibc 2.0.
> +   Copyright (C) 2024 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 <shlib-compat.h>
> +
> +#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
> +# define _LIBC
> +# define _IO_USE_OLD_IO_FILE
> +# include <stdio.h>
> +# include <support/check.h>
> +
> +extern FILE _IO_stderr_;
> +compat_symbol_reference (libc, _IO_stderr_, _IO_stderr_, GLIBC_2_0);
> +compat_symbol_reference (libc, fclose, fclose, GLIBC_2_0);

OK. Reference the old versions.

> +
> +__attribute__ ((weak, noclone, noinline))
> +void
> +do_fclose (FILE *fp)
> +{
> +  TEST_VERIFY_EXIT (fclose (fp) == 0);
> +}
> +
> +static int
> +do_test (void)
> +{
> +  do_fclose (&_IO_stderr_);
> +  return 0;
> +}
> +#else
> +static int
> +do_test (void)
> +{
> +  return 0;
> +}
> +#endif
> +
> +#include <support/test-driver.c>
> diff --git a/math/Makefile b/math/Makefile
> index a9fef9e2db..435939aedb 100644
> --- a/math/Makefile
> +++ b/math/Makefile
> @@ -566,6 +566,9 @@ tests += \
>    test-matherr \
>    test-matherr-2 \
>    # tests
> +tests-2.0 += \
> +  test-matherr-2 \
> +  # tests-2.0

OK.

>  endif
>  
>  # These tests use internal (unexported) GMP functions and are linked
> diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
> index f9efb50764..04ea56559e 100644
> --- a/sysdeps/pthread/Makefile
> +++ b/sysdeps/pthread/Makefile
> @@ -282,6 +282,10 @@ tests += \
>    tst-vfork2x \
>    # tests
>  
> +tests-2.0 += \
> +  tst-pthread_kill-exited
> +  # tests-2.0

OK.

> +
>  tests-time64 += \
>    tst-abstime-time64 \
>    tst-cnd-timedwait-time64 \
diff mbox series

Patch

diff --git a/Makeconfig b/Makeconfig
index e583765712..61ff1d0d9b 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -360,6 +360,8 @@  whole-archive = -Wl,--whole-archive
 # Installed name of the startup code.
 # The ELF convention is that the startfile is called crt1.o
 start-installed-name = crt1.o
+# Similar to crt1.o, but without _IO_stdin_used.
+start-name-2.0 = crt1-2.0.o
 # On systems that do not need a special startfile for statically linked
 # binaries, simply set it to the normal name.
 ifndef static-start-installed-name
@@ -537,6 +539,25 @@  else  # build-static
 endif  # build-shared
 endif  # +link
 
+# Command for linking test programs with crt1.o from glibc 2.0.
++link-2.0-before-inputs = -nostdlib -nostartfiles $(no-pie-ldflag) \
+	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
+	      $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
+	      $(firstword $(CRT-$(@F)) $(csu-objpfx)$(start-name-2.0)) \
+	      $(+preinit) $(+prector)
++link-2.0-before-libc = -o $@ $(+link-2.0-before-inputs) \
+	      $(filter-out $(addprefix $(csu-objpfx),start.o \
+						     $(start-name-2.0))\
+			   $(+preinit) $(link-extra-libs) \
+			   $(common-objpfx)libc% $(+postinit),$^) \
+	      $(link-extra-libs)
++link-after-libc = $(+postctor) $(+postinit)
+define +link-2.0-tests
+$(CC) $(+link-2.0-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \
+  $(+link-after-libc)
+$(call after-link,$@)
+endef
+
 # The pretty printer test programs need to be compiled without optimizations
 # so they won't confuse gdb.  We could use either the 'GCC optimize' pragma
 # or the 'optimize' function attribute to achieve this; however, at least on
diff --git a/Rules b/Rules
index c7db0a4869..9010c5d5b2 100644
--- a/Rules
+++ b/Rules
@@ -188,6 +188,7 @@  binaries-all = $(binaries-all-notests) $(binaries-all-tests)
 binaries-static-notests = $(others-static)
 binaries-static-tests = $(tests-static) $(xtests-static)
 binaries-static = $(binaries-static-notests) $(binaries-static-tests)
+binaries-shared-2.0-tests = $(tests-2.0)
 ifeq (yesyes,$(have-fpie)$(build-shared))
 binaries-pie-tests = $(tests-pie) $(xtests-pie)
 binaries-pie-notests = $(others-pie)
@@ -215,7 +216,8 @@  binaries-malloc-hugetlb2-tests =
 endif
 
 binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests)
-binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static), \
+binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static) \
+				     $(binaries-shared-2.0-tests), \
 				     $(binaries-all-tests))
 binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
 				       $(binaries-all-notests))
@@ -235,6 +237,15 @@  $(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \
 	$(+link-tests)
 endif
 
+# Linking test programs with crt1.o from glibc 2.0.
+ifneq "$(strip $(binaries-shared-2.0-tests))" ""
+$(addprefix $(objpfx),$(binaries-shared-2.0-tests)): %: %.o \
+  $(link-extra-libs-tests) \
+  $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
+  $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
+	$(+link-2.0-tests)
+endif
+
 ifneq "$(strip $(binaries-mcheck-tests))" ""
 $(addprefix $(objpfx),$(binaries-mcheck-tests)): %-mcheck: %.o \
   $(link-extra-libs-tests) \
diff --git a/csu/Makefile b/csu/Makefile
index 946fd91031..777d6720a7 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -42,6 +42,7 @@  csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o)
 extra-objs = \
   $(csu-dummies) \
   $(start-installed-name) \
+  $(start-name-2.0) \
   S$(start-installed-name) \
   g$(start-installed-name) \
   start.o \
@@ -182,6 +183,9 @@  ifndef start-installed-name-rule
 $(objpfx)$(start-installed-name): $(objpfx)start.o $(objpfx)abi-note.o \
 				  $(objpfx)init.o $(objpfx)static-reloc.o
 	$(link-relocatable)
+$(objpfx)$(start-name-2.0): $(objpfx)start.o $(objpfx)abi-note.o \
+			    $(objpfx)static-reloc.o
+	$(link-relocatable)
 $(objpfx)r$(start-installed-name): $(objpfx)start.o $(objpfx)abi-note.o \
 				  $(objpfx)init.o
 	$(link-relocatable)
diff --git a/libio/Makefile b/libio/Makefile
index a4f4409b56..0c1f16ee3b 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -266,6 +266,12 @@  aux	:= fileops genops stdfiles stdio strops
 ifeq ($(build-shared),yes)
 generated += tst-bz24228.mtrace tst-bz24228.check
 aux	+= oldfileops oldstdfiles
+tests += \
+  tst-stderr-compat \
+# tests
+tests-2.0 += \
+  tst-stderr-compat \
+# tests-2.0
 endif
 
 shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops	\
diff --git a/libio/tst-stderr-compat.c b/libio/tst-stderr-compat.c
new file mode 100644
index 0000000000..8221415cd4
--- /dev/null
+++ b/libio/tst-stderr-compat.c
@@ -0,0 +1,52 @@ 
+/* Test that fclose works on stderr from glibc 2.0.
+   Copyright (C) 2024 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 <shlib-compat.h>
+
+#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+# define _LIBC
+# define _IO_USE_OLD_IO_FILE
+# include <stdio.h>
+# include <support/check.h>
+
+extern FILE _IO_stderr_;
+compat_symbol_reference (libc, _IO_stderr_, _IO_stderr_, GLIBC_2_0);
+compat_symbol_reference (libc, fclose, fclose, GLIBC_2_0);
+
+__attribute__ ((weak, noclone, noinline))
+void
+do_fclose (FILE *fp)
+{
+  TEST_VERIFY_EXIT (fclose (fp) == 0);
+}
+
+static int
+do_test (void)
+{
+  do_fclose (&_IO_stderr_);
+  return 0;
+}
+#else
+static int
+do_test (void)
+{
+  return 0;
+}
+#endif
+
+#include <support/test-driver.c>
diff --git a/math/Makefile b/math/Makefile
index a9fef9e2db..435939aedb 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -566,6 +566,9 @@  tests += \
   test-matherr \
   test-matherr-2 \
   # tests
+tests-2.0 += \
+  test-matherr-2 \
+  # tests-2.0
 endif
 
 # These tests use internal (unexported) GMP functions and are linked
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index f9efb50764..04ea56559e 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -282,6 +282,10 @@  tests += \
   tst-vfork2x \
   # tests
 
+tests-2.0 += \
+  tst-pthread_kill-exited
+  # tests-2.0
+
 tests-time64 += \
   tst-abstime-time64 \
   tst-cnd-timedwait-time64 \