aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Warta <[email protected]>2017-04-04 00:23:41 +0200
committerSimon Warta <[email protected]>2017-04-04 18:06:21 +0200
commitd15684a4f2c5572bfde4d2a6f94bbd797caaf188 (patch)
treea351ec9e787f175fc7fa26188ca8561d653617e8 /src
parent44f6c91df5783f4be08a876d3c2e0aff817a6c9b (diff)
configure: encode submodel prefix into single value
to reuse dictionary parsing
Diffstat (limited to 'src')
-rw-r--r--src/build-data/cc/gcc.txt20
-rw-r--r--src/build-data/cc/sunstudio.txt2
2 files changed, 11 insertions, 11 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 07c1d7d0a..5ace1931c 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -99,21 +99,21 @@ alpha-ev7 -> "-mcpu=ev67"
sh4 -> "-m4 -mieee"
# Default family options (SUBMODEL is substitued with the actual
-# submodel name). Anything after the quotes is what should be
-# *removed* from the submodel name before it's put into SUBMODEL.
+# submodel name). Anything after the pipe will be removed from the
+# submodel name before it's put into SUBMODEL.
-alpha -> "-mcpu=SUBMODEL" alpha-
+alpha -> "-mcpu=SUBMODEL|alpha-"
arm32 -> "-march=SUBMODEL"
arm64 -> "-march=SUBMODEL"
-superh -> "-mSUBMODEL" sh
-hppa -> "-march=SUBMODEL" hppa
+superh -> "-mSUBMODEL|sh"
+hppa -> "-march=SUBMODEL|hppa"
ia64 -> "-mtune=SUBMODEL"
m68k -> "-mSUBMODEL"
-mips32 -> "-mips1 -mcpu=SUBMODEL" mips32-
-mips64 -> "-mips3 -mcpu=SUBMODEL" mips64-
-ppc32 -> "-mcpu=SUBMODEL" ppc
-ppc64 -> "-mcpu=SUBMODEL" ppc
-sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32-
+mips32 -> "-mips1 -mcpu=SUBMODEL|mips32-"
+mips64 -> "-mips3 -mcpu=SUBMODEL|mips64-"
+ppc32 -> "-mcpu=SUBMODEL|ppc"
+ppc64 -> "-mcpu=SUBMODEL|ppc"
+sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus|sparc32-"
sparc64 -> "-mcpu=v9 -mtune=SUBMODEL"
x86_32 -> "-march=SUBMODEL"
x86_64 -> "-march=SUBMODEL"
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index 934b42099..c2fc97a01 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -43,7 +43,7 @@ ultrasparc3 -> "-xchip=ultra3"
niagra1 -> "-xchip=ultraT1"
niagra2 -> "-xchip=ultraT2"
-sparc32 -> "-xchip=ultra -xarch=SUBMODEL" sparc32-
+sparc32 -> "-xchip=ultra -xarch=SUBMODEL|sparc32-"
sparc64 -> "-xchip=generic"
</mach_opt>