From 066d80a7cdfa5ab7b2dd66cb51e8abeed60227e5 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 3 Dec 2019 09:18:49 -0300 Subject: [PATCH] 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) --- scripts/build-many-glibcs.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 34c933acbc..0c7d8ecaa2 100755 --- 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',