[glibc] build-many-glibcs.py: Add s390 --disable-multi-arch / multi-arch configurations.

[glibc] build-many-glibcs.py: Add s390 --disable-multi-arch / multi-arch configurations.

[Stefan Liebler]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2938846accff13087d520cc29c17b857337ae927

commit 2938846accff13087d520cc29c17b857337ae927
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Wed Jan 31 13:02:57 2024 +0100

    build-many-glibcs.py: Add s390 --disable-multi-arch / multi-arch configurations.
    
    This patch adds some --disable-multi-arch variants for s390x.
    
    As the used IFUNC variants and __GI symbols depend on the used
    gcc -march=cpu-level, there are multiple new configurations.
    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

Diff:
---
 scripts/build-many-glibcs.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 84418e8de1..cc30dd5862 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -417,7 +417,22 @@ class Context(object):
                         glibcs=[{},
                                 {'arch': 's390', 'ccopts': '-m31'}],
                         extra_glibcs=[{'variant': 'O3',
-                                       'cflags': '-O3'}])
+                                       'cflags': '-O3'},
+                                      {'variant': 'zEC12',
+                                       'ccopts': '-march=zEC12'},
+                                      {'variant': 'z13',
+                                       'ccopts': '-march=z13'},
+                                      {'variant': 'z15',
+                                       'ccopts': '-march=z15'},
+                                      {'variant': 'zEC12-disable-multi-arch',
+                                       'ccopts': '-march=zEC12',
+                                       'cfg': ['--disable-multi-arch']},
+                                      {'variant': 'z13-disable-multi-arch',
+                                       'ccopts': '-march=z13',
+                                       'cfg': ['--disable-multi-arch']},
+                                      {'variant': 'z15-disable-multi-arch',
+                                       'ccopts': '-march=z15',
+                                       'cfg': ['--disable-multi-arch']}])
         self.add_config(arch='sh3',
                         os_name='linux-gnu')
         self.add_config(arch='sh3eb',