diff options
author | Stefan Liebler <stli@linux.ibm.com> | 2022-04-13 14:36:09 +0200 |
---|---|---|
committer | Stefan Liebler <stli@linux.ibm.com> | 2022-04-14 14:21:57 +0200 |
commit | 0c03cb54c808173d8e7ba96f6152dfcf627ac496 (patch) | |
tree | eed3d66d1574edba45b6a9dd100e0126c3ac0de2 /elf | |
parent | ceed89d0892a8940d9de7cff6654d5f2951714ea (diff) | |
download | glibc-0c03cb54c808173d8e7ba96f6152dfcf627ac496.tar.gz glibc-0c03cb54c808173d8e7ba96f6152dfcf627ac496.tar.xz glibc-0c03cb54c808173d8e7ba96f6152dfcf627ac496.zip |
S390: Add new s390 platform z16.
The new IBM z16 is added to platform string array. The macro _DL_PLATFORMS_COUNT is incremented. _dl_hwcaps_subdir is extended by "z16" if HWCAP_S390_VXRS_PDE2 is set. HWCAP_S390_NNPA is not tested in _dl_hwcaps_subdirs_active as those instructions may be replaced or removed in future. tst-glibc-hwcaps.c is extended in order to test z16 via new marker5. A fatal glibc error is dumped if glibc was build with architecture level set for z16, but run on an older machine. (See dl-hwcap-check.h) (cherry picked from commit 2376944b9e5c0364b9fb473e4d8dabca31b57167)
Diffstat (limited to 'elf')
-rw-r--r-- | elf/Makefile | 8 | ||||
-rw-r--r-- | elf/tst-glibc-hwcaps-cache.script | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index fe954374c9..3ce0b7298f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -555,6 +555,11 @@ modules-names = \ libmarkermod4-2 \ libmarkermod4-3 \ libmarkermod4-4 \ + libmarkermod5-1 \ + libmarkermod5-2 \ + libmarkermod5-3 \ + libmarkermod5-4 \ + libmarkermod5-5 \ ltglobmod1 \ ltglobmod2 \ neededobj1 \ @@ -2368,6 +2373,7 @@ LDFLAGS-libmarkermod1-1.so += -Wl,-soname,libmarkermod1.so LDFLAGS-libmarkermod2-1.so += -Wl,-soname,libmarkermod2.so LDFLAGS-libmarkermod3-1.so += -Wl,-soname,libmarkermod3.so LDFLAGS-libmarkermod4-1.so += -Wl,-soname,libmarkermod4.so +LDFLAGS-libmarkermod5-1.so += -Wl,-soname,libmarkermod5.so $(objpfx)libmarkermod%.os : markermodMARKER-VALUE.c $(compile-command.c) \ -DMARKER=marker$(firstword $(subst -, ,$*)) \ @@ -2380,6 +2386,8 @@ $(objpfx)libmarkermod3.so: $(objpfx)libmarkermod3-1.so cp $< $@ $(objpfx)libmarkermod4.so: $(objpfx)libmarkermod4-1.so cp $< $@ +$(objpfx)libmarkermod5.so: $(objpfx)libmarkermod5-1.so + cp $< $@ # tst-glibc-hwcaps-prepend checks that --glibc-hwcaps-prepend is # preferred over auto-detected subdirectories. diff --git a/elf/tst-glibc-hwcaps-cache.script b/elf/tst-glibc-hwcaps-cache.script index c3271f61f9..d58fc8c5de 100644 --- a/elf/tst-glibc-hwcaps-cache.script +++ b/elf/tst-glibc-hwcaps-cache.script @@ -4,6 +4,7 @@ cp $B/elf/libmarkermod2-1.so $L/libmarkermod2.so cp $B/elf/libmarkermod3-1.so $L/libmarkermod3.so cp $B/elf/libmarkermod4-1.so $L/libmarkermod4.so +cp $B/elf/libmarkermod5-1.so $L/libmarkermod5.so mkdirp 0770 $L/glibc-hwcaps/power9 cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/power9/libmarkermod2.so @@ -20,6 +21,11 @@ mkdirp 0770 $L/glibc-hwcaps/z15 cp $B/elf/libmarkermod4-2.so $L/glibc-hwcaps/z13/libmarkermod4.so cp $B/elf/libmarkermod4-3.so $L/glibc-hwcaps/z14/libmarkermod4.so cp $B/elf/libmarkermod4-4.so $L/glibc-hwcaps/z15/libmarkermod4.so +mkdirp 0770 $L/glibc-hwcaps/z16 +cp $B/elf/libmarkermod5-2.so $L/glibc-hwcaps/z13/libmarkermod5.so +cp $B/elf/libmarkermod5-3.so $L/glibc-hwcaps/z14/libmarkermod5.so +cp $B/elf/libmarkermod5-4.so $L/glibc-hwcaps/z15/libmarkermod5.so +cp $B/elf/libmarkermod5-5.so $L/glibc-hwcaps/z16/libmarkermod5.so mkdirp 0770 $L/glibc-hwcaps/x86-64-v2 cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/x86-64-v2/libmarkermod2.so |