about summary refs log tree commit diff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2022-04-13 14:36:09 +0200
committerStefan Liebler <stli@linux.ibm.com>2022-04-14 14:20:47 +0200
commit5eddc29c92612966cbf08d3f41b0132f79142eeb (patch)
tree7f47bb0118fb03ee9140b1fd94634589a4b86053 /elf/Makefile
parentc78ad8eb47a5a5a0f20cd5860fda6f7b32ae613b (diff)
downloadglibc-5eddc29c92612966cbf08d3f41b0132f79142eeb.tar.gz
glibc-5eddc29c92612966cbf08d3f41b0132f79142eeb.tar.xz
glibc-5eddc29c92612966cbf08d3f41b0132f79142eeb.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/Makefile')
-rw-r--r--elf/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 4fc3bd8239..37944c189c 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -349,6 +349,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		libmarkermod2-1 libmarkermod2-2 \
 		libmarkermod3-1 libmarkermod3-2 libmarkermod3-3 \
 		libmarkermod4-1 libmarkermod4-2 libmarkermod4-3 libmarkermod4-4 \
+		libmarkermod5-1 libmarkermod5-2 libmarkermod5-3 libmarkermod5-4 \
+		libmarkermod5-5 \
 		tst-dlmopen-dlerror-mod tst-dlmopen-gethostbyname-mod \
 
 # Most modules build with _ISOMAC defined, but those filtered out
@@ -1849,6 +1851,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 -, ,$*)) \
@@ -1861,6 +1864,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.