]>
Commit | Line | Data |
---|---|---|
74cdb5dd JB |
1 | --- gmp-5.1.2/configure.ac.orig 2013-05-20 16:59:56.000000000 +0200 |
2 | +++ gmp-5.1.2/configure.ac 2013-05-26 18:44:03.674054550 +0200 | |
3 | @@ -252,8 +252,12 @@ | |
cc591e0e JB |
4 | AC_MSG_ERROR([when doing a fat build, disabling assembly will not work]) |
5 | fi | |
79bf06f6 | 6 | |
cc591e0e JB |
7 | - |
8 | -tmp_host=`echo $host_cpu | sed 's/\./_/'` | |
79bf06f6 JB |
9 | +AC_ARG_WITH(cpu, |
10 | +AC_HELP_STRING([--with-cpu], | |
11 | + [specify CPU type [[default=host_cpu]]]), | |
12 | +[gmp_cpu=$withval], [gmp_cpu=$host_cpu]) | |
cc591e0e | 13 | + |
79bf06f6 JB |
14 | +tmp_host=`echo $gmp_cpu | sed 's/\./_/'` |
15 | AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_$tmp_host) | |
16 | GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')", POST) | |
17 | ||
74cdb5dd | 18 | @@ -436,7 +440,7 @@ |
79bf06f6 JB |
19 | |
20 | alpha*-*-*) | |
21 | AC_DEFINE(HAVE_HOST_CPU_FAMILY_alpha) | |
22 | - case $host_cpu in | |
23 | + case $gmp_cpu in | |
ddf782b3 | 24 | alphaev5* | alphapca5*) |
5e0f15ef | 25 | path="alpha/ev5 alpha" ;; |
79bf06f6 | 26 | alphaev67 | alphaev68 | alphaev7*) |
74cdb5dd | 27 | @@ -460,7 +464,7 @@ |
79bf06f6 JB |
28 | # compiler errors too easily and is rejected by GMP_PROG_CC_WORKS. Each |
29 | # -mcpu=ev6 below has a fallback to -mcpu=ev56 for this reason. | |
30 | # | |
31 | - case $host_cpu in | |
32 | + case $gmp_cpu in | |
33 | alpha) gcc_cflags_cpu="-mcpu=ev4" ;; | |
34 | alphaev5) gcc_cflags_cpu="-mcpu=ev5" ;; | |
35 | alphaev56) gcc_cflags_cpu="-mcpu=ev56" ;; | |
74cdb5dd | 36 | @@ -493,7 +497,7 @@ |
79bf06f6 JB |
37 | # Insns like ctlz which were never available as macros are always |
38 | # accepted and always generate their plain code. | |
39 | # | |
40 | - case $host_cpu in | |
41 | + case $gmp_cpu in | |
42 | alpha) gcc_cflags_asm="-Wa,-arch,ev4 -Wa,-mev4" ;; | |
43 | alphaev5) gcc_cflags_asm="-Wa,-arch,ev5 -Wa,-mev5" ;; | |
44 | alphaev56) gcc_cflags_asm="-Wa,-arch,ev56 -Wa,-mev56" ;; | |
74cdb5dd | 45 | @@ -528,7 +532,7 @@ |
79bf06f6 JB |
46 | # DEC C V5.9-005 knows ev4, ev5, ev56, pca56, ev6. |
47 | # Compaq C V6.3-029 adds ev67. | |
48 | # | |
49 | - case $host_cpu in | |
50 | + case $gmp_cpu in | |
51 | alpha) cc_cflags_cpu="-arch~ev4~-tune~ev4" ;; | |
52 | alphaev5) cc_cflags_cpu="-arch~ev5~-tune~ev5" ;; | |
53 | alphaev56) cc_cflags_cpu="-arch~ev56~-tune~ev56" ;; | |
74cdb5dd | 54 | @@ -649,7 +653,7 @@ |
79bf06f6 JB |
55 | # (Can't remember why this isn't done already, have to check what .asm |
56 | # files are available in each and how they run on a typical 2.0 cpu.) | |
57 | # | |
58 | - case $host_cpu in | |
59 | + case $gmp_cpu in | |
60 | hppa1.0*) path="pa32" ;; | |
61 | hppa7000*) path="pa32/hppa1_1 pa32" ;; | |
62 | hppa2.0* | hppa64) | |
74cdb5dd | 63 | @@ -667,13 +671,13 @@ |
79bf06f6 JB |
64 | # probably be safe, but let's not take the chance. In any case, a |
65 | # configuration like --host=hppa2.0 ABI=1.0 is far from optimal. | |
66 | # | |
67 | - case $host_cpu in | |
68 | + case $gmp_cpu in | |
69 | hppa1.0*) gcc_cflags_arch="-mpa-risc-1-0" ;; | |
70 | *) # default to 7100 | |
71 | gcc_cflags_arch="-mpa-risc-1-1" ;; | |
72 | esac | |
73 | ||
74 | - case $host_cpu in | |
75 | + case $gmp_cpu in | |
76 | hppa1.0*) cc_cflags="+O2" ;; | |
77 | *) # default to 7100 | |
78 | cc_cflags="+DA1.1 +O2" ;; | |
74cdb5dd | 79 | @@ -740,7 +744,7 @@ |
79bf06f6 | 80 | SPEED_CYCLECOUNTER_OBJ=ia64.lo |
cc591e0e | 81 | any_32_testlist="sizeof-long-4" |
79bf06f6 JB |
82 | |
83 | - case $host_cpu in | |
84 | + case $gmp_cpu in | |
85 | itanium) path="ia64/itanium ia64" ;; | |
86 | itanium2) path="ia64/itanium2 ia64" ;; | |
87 | *) path="ia64" ;; | |
74cdb5dd | 88 | @@ -750,7 +754,7 @@ |
79bf06f6 JB |
89 | gcc_32_cflags_optlist=$gcc_64_cflags_optlist |
90 | ||
91 | # gcc pre-release 3.4 adds -mtune itanium and itanium2 | |
92 | - case $host_cpu in | |
93 | + case $gmp_cpu in | |
94 | itanium) gcc_cflags_tune="-mtune=itanium" ;; | |
95 | itanium2) gcc_cflags_tune="-mtune=itanium2" ;; | |
96 | esac | |
74cdb5dd | 97 | @@ -812,7 +816,7 @@ |
79bf06f6 JB |
98 | # gcc 2.95 adds -mcpu32, -m68060. |
99 | # FIXME: Maybe "-m68020 -mnobitfield" would suit cpu32 on 2.7.2. | |
100 | # | |
101 | - case $host_cpu in | |
102 | + case $gmp_cpu in | |
103 | m68020) gcc_cflags_arch="-m68020" ;; | |
104 | m68030) gcc_cflags_arch="-m68030" ;; | |
105 | m68040) gcc_cflags_arch="-m68040" ;; | |
74cdb5dd | 106 | @@ -824,7 +828,7 @@ |
79bf06f6 JB |
107 | # FIXME: m68k/mc68020 looks like it's ok for cpu32, but this wants to be |
108 | # tested. Will need to introduce an m68k/cpu32 if m68k/mc68020 ever uses | |
109 | # the bitfield instructions. | |
110 | - case $host_cpu in | |
111 | + case $gmp_cpu in | |
112 | [m680[234]0 | m68360]) path="m68k/mc68020 m68k" ;; | |
113 | *) path="m68k" ;; | |
114 | esac | |
74cdb5dd | 115 | @@ -931,7 +935,7 @@ |
79bf06f6 JB |
116 | SPEED_CYCLECOUNTER_OBJ=powerpc.lo |
117 | cyclecounter_size=0 | |
118 | ||
119 | - case $host_cpu in | |
120 | + case $gmp_cpu in | |
121 | powerpc740 | powerpc750) | |
122 | path="powerpc32/750 powerpc32" ;; | |
123 | powerpc7400 | powerpc7410) | |
74cdb5dd | 124 | @@ -942,7 +946,7 @@ |
5e0f15ef JB |
125 | path="powerpc32" ;; |
126 | esac | |
127 | ||
79bf06f6 JB |
128 | - case $host_cpu in |
129 | + case $gmp_cpu in | |
130 | powerpc401) gcc_cflags_cpu="-mcpu=401" ;; | |
5e0f15ef JB |
131 | powerpc403) gcc_cflags_cpu="-mcpu=403" |
132 | xlc_cflags_arch="-qarch=403 -qarch=ppc" ;; | |
74cdb5dd | 133 | @@ -1260,7 +1264,7 @@ |
79bf06f6 JB |
134 | any_testlist="sizeof-long-4" |
135 | GMP_INCLUDE_MPN(sparc32/sparc-defs.m4) | |
136 | ||
137 | - case $host_cpu in | |
138 | + case $gmp_cpu in | |
139 | sparcv8 | microsparc | turbosparc) | |
140 | path="sparc32/v8 sparc32" ;; | |
141 | supersparc) | |
74cdb5dd | 142 | @@ -1287,7 +1291,7 @@ |
79bf06f6 JB |
143 | # latter would be used in the 64-bit ABI on systems like "*bsd" where |
144 | # abilist="64" only. | |
145 | # | |
146 | - case $host_cpu in | |
147 | + case $gmp_cpu in | |
74cdb5dd JB |
148 | [ultrasparct[345]]) |
149 | gcc_32_cflags="$gcc_cflags -Wa,-xarch=v8plusd" ;; | |
79bf06f6 | 150 | sparc64 | sparcv9* | ultrasparc*) |
74cdb5dd | 151 | @@ -1305,7 +1309,7 @@ |
79bf06f6 JB |
152 | # gcc 3.2 adds nothing. |
153 | # gcc 3.3 adds ultrasparc3. | |
154 | # | |
155 | - case $host_cpu in | |
156 | + case $gmp_cpu in | |
157 | supersparc) gcc_cflags_cpu="-mcpu=supersparc -msupersparc" ;; | |
158 | sparcv8 | microsparc | turbosparc) | |
159 | gcc_cflags_cpu="-mcpu=v8 -mv8" ;; | |
74cdb5dd | 160 | @@ -1327,7 +1331,7 @@ |
79bf06f6 JB |
161 | |
162 | # SunOS cc doesn't know -xarch, apparently always generating v7 | |
163 | # code, so make this optional | |
164 | - case $host_cpu in | |
165 | + case $gmp_cpu in | |
166 | sparcv8 | microsparc | supersparc | turbosparc) | |
167 | cc_cflags_arch="-xarch=v8" ;; | |
74cdb5dd JB |
168 | [ultrasparct[345]]) cc_cflags_arch="-xarch=v8plusd" ;; |
169 | @@ -1343,7 +1347,7 @@ | |
79bf06f6 JB |
170 | # FIXME: Which of ultra, ultra2 or ultra2i is the best fallback for |
171 | # ultrasparc3? | |
172 | # | |
173 | - case $host_cpu in | |
174 | + case $gmp_cpu in | |
175 | supersparc) cc_cflags_cpu="-xchip=super" ;; | |
176 | microsparc) cc_cflags_cpu="-xchip=micro" ;; | |
177 | turbosparc) cc_cflags_cpu="-xchip=micro2" ;; | |
74cdb5dd | 178 | @@ -1355,7 +1359,7 @@ |
79bf06f6 JB |
179 | esac |
180 | esac | |
181 | ||
182 | - case $host_cpu in | |
183 | + case $gmp_cpu in | |
184 | sparc64 | sparcv9* | ultrasparc*) | |
185 | case $host in | |
186 | # Solaris 6 and earlier cannot run ABI=64 since it doesn't save | |
74cdb5dd | 187 | @@ -1382,7 +1386,7 @@ |
ddf782b3 JB |
188 | *) abilist="64 32" ;; |
189 | esac | |
190 | ||
191 | - case $host_cpu in | |
192 | + case $gmp_cpu in | |
193 | ultrasparc | ultrasparc2 | ultrasparc2i) | |
cc591e0e | 194 | path_64="sparc64/ultrasparc1234 sparc64" ;; |
5e0f15ef | 195 | [ultrasparc[34]]) |
74cdb5dd | 196 | @@ -1517,7 +1521,7 @@ |
79bf06f6 JB |
197 | # duplicate anything. |
198 | # | |
199 | gcc_cflags_optlist="cpu arch" | |
200 | - case $host_cpu in | |
201 | + case $gmp_cpu in | |
202 | i386*) | |
5e0f15ef JB |
203 | gcc_cflags_cpu="-mtune=i386 -mcpu=i386 -m386" |
204 | gcc_cflags_arch="-march=i386" |