build-many-glibcs.py: Move sparcv8 to extra_glibcs

It also fixes the sparcv9-linux-gnu-disable-multi-arch configuration.
The resulting sparc possible build permutations are:

  - sparc64-linux-gnu
  - sparcv9-linux-gnu
  - sparcv8-linux-gnu-leon3 (from extra_glibcs)
  - sparc64-linux-gnu-disable-multi-arch (from extra_glibcs)
  - sparcv9-linux-gnu-disable-multi-arch (from extra_glibcs)

diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 34c933acbc41e86500a576b0cdebbbd68f80d483..0c7d8ecaa2de0cb0972a30e29706b2b7ad3a985e 100755 (executable)
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -358,15 +358,16 @@ class Context(object):
         self.add_config(arch='sparc64',
                         os_name='linux-gnu',
                         glibcs=[{},
-                                {'arch': 'sparcv8',
-                                 'ccopts': '-m32 -mlong-double-128 -mcpu=leon3'},
                                 {'arch': 'sparcv9',
                                  'ccopts': '-m32 -mlong-double-128 -mcpu=v9'}],
-                        extra_glibcs=[{'variant': 'disable-multi-arch',
+                        extra_glibcs=[{'variant': 'leon3',
+                                       'arch' : 'sparcv8',
+                                       'ccopts' : '-m32 -mlong-double-128 -mcpu=leon3'},
+                                      {'variant': 'disable-multi-arch',
                                        'cfg': ['--disable-multi-arch']},
                                       {'variant': 'disable-multi-arch',
                                        'arch': 'sparcv9',
-                                       'ccopts': '-m32 -mlong-double-128',
+                                       'ccopts': '-m32 -mlong-double-128 -mcpu=v9',
                                        'cfg': ['--disable-multi-arch']}])
         self.add_config(arch='x86_64',
                         os_name='linux-gnu',