1 |
Author: wolf31o2 |
2 |
Date: 2008-02-06 23:36:22 +0000 (Wed, 06 Feb 2008) |
3 |
New Revision: 1280 |
4 |
|
5 |
Added: |
6 |
trunk/arch/powerpc.py |
7 |
Removed: |
8 |
trunk/arch/ppc.py |
9 |
trunk/arch/ppc64.py |
10 |
trunk/arch/sparc64.py |
11 |
Modified: |
12 |
trunk/ChangeLog |
13 |
trunk/arch/sparc.py |
14 |
Log: |
15 |
Merged ppc.py and ppc64.py into powerpc.py and merged sparc.py and sparc64.py into sparc.py, so we have a cleaner set of arch files. |
16 |
|
17 |
Modified: trunk/ChangeLog |
18 |
=================================================================== |
19 |
--- trunk/ChangeLog 2008-02-06 22:57:55 UTC (rev 1279) |
20 |
+++ trunk/ChangeLog 2008-02-06 23:36:22 UTC (rev 1280) |
21 |
@@ -1,6 +1,11 @@ |
22 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Id: $ |
24 |
|
25 |
+ 06 Feb 2008; Chris Gianelloni <wolf31o2@g.o> +arch/powerpc.py, |
26 |
+ -arch/ppc.py, -arch/ppc64.py, arch/sparc.py, -arch/sparc64.py: |
27 |
+ Merged ppc.py and ppc64.py into powerpc.py and merged sparc.py and |
28 |
+ sparc64.py into sparc.py, so we have a cleaner set of arch files. |
29 |
+ |
30 |
06 Feb 2008; Chris Gianelloni <wolf31o2@g.o> arch/amd64.py, |
31 |
arch/x86.py: |
32 |
Did a little cleanup on the x86.py to remove some redundant entries and |
33 |
|
34 |
Added: trunk/arch/powerpc.py |
35 |
=================================================================== |
36 |
--- trunk/arch/powerpc.py (rev 0) |
37 |
+++ trunk/arch/powerpc.py 2008-02-06 23:36:22 UTC (rev 1280) |
38 |
@@ -0,0 +1,125 @@ |
39 |
+ |
40 |
+import os,builder |
41 |
+from catalyst_support import * |
42 |
+ |
43 |
+class generic_ppc(builder.generic): |
44 |
+ "abstract base class for all 32-bit powerpc builders" |
45 |
+ def __init__(self,myspec): |
46 |
+ builder.generic.__init__(self,myspec) |
47 |
+ self.settings["CHOST"]="powerpc-unknown-linux-gnu" |
48 |
+ if self.settings["buildarch"]=="ppc64": |
49 |
+ if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): |
50 |
+ raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" |
51 |
+ self.settings["CHROOT"]="linux32 chroot" |
52 |
+ self.settings["crosscompile"] = False; |
53 |
+ else: |
54 |
+ self.settings["CHROOT"]="chroot" |
55 |
+ |
56 |
+class generic_ppc64(builder.generic): |
57 |
+ "abstract base class for all 64-bit powerpc builders" |
58 |
+ def __init__(self,myspec): |
59 |
+ builder.generic.__init__(self,myspec) |
60 |
+ self.settings["CHROOT"]="chroot" |
61 |
+ |
62 |
+class arch_970(arch_ppc64): |
63 |
+ "builder class for 970 aka G5 under ppc64" |
64 |
+ def __init__(self,myspec): |
65 |
+ arch_ppc64.__init__(self,myspec) |
66 |
+ self.settings["CFLAGS"]="-O2 -pipe -mcpu=970 -mtune=970" |
67 |
+ self.settings["HOSTUSE"]=["altivec"] |
68 |
+ |
69 |
+class arch_cell(arch_ppc64): |
70 |
+ "builder class for cell under ppc64" |
71 |
+ def __init__(self,myspec): |
72 |
+ arch_ppc64.__init__(self,myspec) |
73 |
+ self.settings["CFLAGS"]="-O2 -pipe -mcpu=cell -mtune=cell" |
74 |
+ self.settings["HOSTUSE"]=["altivec","ibm"] |
75 |
+ |
76 |
+class arch_g3(generic_ppc): |
77 |
+ def __init__(self,myspec): |
78 |
+ generic_ppc.__init__(self,myspec) |
79 |
+ self.settings["CFLAGS"]="-O2 -mcpu=G3 -mtune=G3 -fno-strict-aliasing -pipe" |
80 |
+ |
81 |
+class arch_g4(generic_ppc): |
82 |
+ def __init__(self,myspec): |
83 |
+ generic_ppc.__init__(self,myspec) |
84 |
+ self.settings["CFLAGS"]="-O2 -mcpu=G4 -mtune=G4 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" |
85 |
+ self.settings["HOSTUSE"]=["altivec"] |
86 |
+ |
87 |
+class arch_g5(generic_ppc): |
88 |
+ def __init__(self,myspec): |
89 |
+ generic_ppc.__init__(self,myspec) |
90 |
+ self.settings["CFLAGS"]="-O2 -mcpu=G5 -mtune=G5 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" |
91 |
+ self.settings["HOSTUSE"]=["altivec"] |
92 |
+ |
93 |
+class arch_power(generic_ppc): |
94 |
+ "builder class for generic power" |
95 |
+ def __init__(self,myspec): |
96 |
+ generic_ppc.__init__(self,myspec) |
97 |
+ self.settings["CFLAGS"]="-O2 -mcpu=power -mtune=power -fno-strict-aliasing -pipe" |
98 |
+ |
99 |
+class arch_power_ppc(generic_ppc): |
100 |
+ "builder class for generic powerpc/power" |
101 |
+ def __init__(self,myspec): |
102 |
+ generic_ppc.__init__(self,myspec) |
103 |
+ self.settings["CFLAGS"]="-O2 -mcpu=common -mtune=common -fno-strict-aliasing -pipe" |
104 |
+ |
105 |
+class arch_power3(arch_ppc64): |
106 |
+ "builder class for power3 under ppc64" |
107 |
+ def __init__(self,myspec): |
108 |
+ arch_ppc64.__init__(self,myspec) |
109 |
+ self.settings["CFLAGS"]="-O2 -pipe -mcpu=power3 -mtune=power3" |
110 |
+ self.settings["HOSTUSE"]=["ibm"] |
111 |
+ |
112 |
+class arch_power4(arch_ppc64): |
113 |
+ "builder class for power4 under ppc64" |
114 |
+ def __init__(self,myspec): |
115 |
+ arch_ppc64.__init__(self,myspec) |
116 |
+ self.settings["CFLAGS"]="-O2 -pipe -mcpu=power4 -mtune=power4" |
117 |
+ self.settings["HOSTUSE"]=["ibm"] |
118 |
+ |
119 |
+class arch_power5(arch_ppc64): |
120 |
+ "builder class for power5 under ppc64" |
121 |
+ def __init__(self,myspec): |
122 |
+ arch_ppc64.__init__(self,myspec) |
123 |
+ self.settings["CFLAGS"]="-O2 -pipe -mcpu=power5 -mtune=power5" |
124 |
+ self.settings["HOSTUSE"]=["ibm"] |
125 |
+ |
126 |
+class arch_power6(arch_ppc64): |
127 |
+ "builder class for power6 under ppc64" |
128 |
+ def __init__(self,myspec): |
129 |
+ arch_ppc64.__init__(self,myspec) |
130 |
+ self.settings["CFLAGS"]="-O2 -pipe -mcpu=power6 -mtune=power6" |
131 |
+ self.settings["HOSTUSE"]=["altivec","ibm"] |
132 |
+ |
133 |
+class arch_ppc(generic_ppc): |
134 |
+ "builder class for generic powerpc" |
135 |
+ def __init__(self,myspec): |
136 |
+ generic_ppc.__init__(self,myspec) |
137 |
+ self.settings["CFLAGS"]="-O2 -mcpu=powerpc -mtune=powerpc -fno-strict-aliasing -pipe" |
138 |
+ |
139 |
+class arch_ppc64(generic_ppc64): |
140 |
+ "builder class for generic ppc64" |
141 |
+ def __init__(self,myspec): |
142 |
+ generic_ppc64.__init__(self,myspec) |
143 |
+ self.settings["CFLAGS"]="-O2 -pipe" |
144 |
+ self.settings["CHOST"]="powerpc64-unknown-linux-gnu" |
145 |
+ |
146 |
+def register(): |
147 |
+ "Inform main catalyst program of the contents of this plugin." |
148 |
+ return ({ |
149 |
+ "970" : arch_970, |
150 |
+ "cell" : arch_cell, |
151 |
+ "g3" : arch_g3, |
152 |
+ "g4" : arch_g4, |
153 |
+ "g5" : arch_g5, |
154 |
+ "power" : arch_power, |
155 |
+ "power-ppc" : arch_power_ppc, |
156 |
+ "power3" : arch_power3, |
157 |
+ "power4" : arch_power4, |
158 |
+ "power5" : arch_power5, |
159 |
+ "power6" : arch_power6, |
160 |
+ "ppc" : arch_ppc, |
161 |
+ "ppc64" : arch_ppc64 |
162 |
+ }, ("ppc","ppc64","powerpc","powerpc64")) |
163 |
+ |
164 |
|
165 |
Deleted: trunk/arch/ppc.py |
166 |
=================================================================== |
167 |
--- trunk/arch/ppc.py 2008-02-06 22:57:55 UTC (rev 1279) |
168 |
+++ trunk/arch/ppc.py 2008-02-06 23:36:22 UTC (rev 1280) |
169 |
@@ -1,62 +0,0 @@ |
170 |
- |
171 |
-import os,builder |
172 |
-from catalyst_support import * |
173 |
- |
174 |
-# gcc-3.3.3 is required to do G5 optimizations |
175 |
-# install a 32bit kernel personality changer (that works) before building on a |
176 |
-# ppc64 host new gcc optimization feature requires -fno-strict-aliasing needed, |
177 |
-# otherwise code complains use the experimental thing for nptl builds |
178 |
- |
179 |
-class generic_ppc(builder.generic): |
180 |
- "abstract base class for all ppc builders" |
181 |
- def __init__(self,myspec): |
182 |
- builder.generic.__init__(self,myspec) |
183 |
- self.settings["CHOST"]="powerpc-unknown-linux-gnu" |
184 |
- if self.settings["buildarch"]=="ppc64": |
185 |
- if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): |
186 |
- raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" |
187 |
- self.settings["CHROOT"]="linux32 chroot" |
188 |
- self.settings["crosscompile"] = False; |
189 |
- else: |
190 |
- self.settings["CHROOT"]="chroot" |
191 |
- |
192 |
-class arch_power_ppc(generic_ppc): |
193 |
- "builder class for generic powerpc/power" |
194 |
- def __init__(self,myspec): |
195 |
- generic_ppc.__init__(self,myspec) |
196 |
- self.settings["CFLAGS"]="-O2 -mcpu=common -mtune=common -fno-strict-aliasing -pipe" |
197 |
- |
198 |
-class arch_ppc(generic_ppc): |
199 |
- "builder class for generic powerpc" |
200 |
- def __init__(self,myspec): |
201 |
- generic_ppc.__init__(self,myspec) |
202 |
- self.settings["CFLAGS"]="-O2 -mcpu=powerpc -mtune=powerpc -fno-strict-aliasing -pipe" |
203 |
- |
204 |
-class arch_power(generic_ppc): |
205 |
- "builder class for generic power" |
206 |
- def __init__(self,myspec): |
207 |
- generic_ppc.__init__(self,myspec) |
208 |
- self.settings["CFLAGS"]="-O2 -mcpu=power -mtune=power -fno-strict-aliasing -pipe" |
209 |
- |
210 |
-class arch_g3(generic_ppc): |
211 |
- def __init__(self,myspec): |
212 |
- generic_ppc.__init__(self,myspec) |
213 |
- self.settings["CFLAGS"]="-O2 -mcpu=G3 -mtune=G3 -fno-strict-aliasing -pipe" |
214 |
- |
215 |
-class arch_g4(generic_ppc): |
216 |
- def __init__(self,myspec): |
217 |
- generic_ppc.__init__(self,myspec) |
218 |
- self.settings["CFLAGS"]="-O2 -mcpu=G4 -mtune=G4 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" |
219 |
- self.settings["HOSTUSE"]=["altivec"] |
220 |
- |
221 |
-class arch_g5(generic_ppc): |
222 |
- def __init__(self,myspec): |
223 |
- generic_ppc.__init__(self,myspec) |
224 |
- self.settings["CFLAGS"]="-O2 -mcpu=G5 -mtune=G5 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" |
225 |
- self.settings["HOSTUSE"]=["altivec"] |
226 |
- |
227 |
-def register(): |
228 |
- "Inform main catalyst program of the contents of this plugin." |
229 |
- return ({"ppc":arch_ppc,"power":arch_power,"power-ppc":arch_power_ppc,"g3":arch_g3,"g4":arch_g4,"g5":arch_g5}, |
230 |
- ("ppc","powerpc")) |
231 |
- |
232 |
|
233 |
Deleted: trunk/arch/ppc64.py |
234 |
=================================================================== |
235 |
--- trunk/arch/ppc64.py 2008-02-06 22:57:55 UTC (rev 1279) |
236 |
+++ trunk/arch/ppc64.py 2008-02-06 23:36:22 UTC (rev 1280) |
237 |
@@ -1,68 +0,0 @@ |
238 |
- |
239 |
-import builder |
240 |
- |
241 |
-class generic_ppc64(builder.generic): |
242 |
- "abstract base class for all ppc64 builders" |
243 |
- def __init__(self,myspec): |
244 |
- builder.generic.__init__(self,myspec) |
245 |
- self.settings["CHROOT"]="chroot" |
246 |
- |
247 |
-class arch_ppc64(generic_ppc64): |
248 |
- "builder class for generic ppc64" |
249 |
- def __init__(self,myspec): |
250 |
- generic_ppc64.__init__(self,myspec) |
251 |
- self.settings["CFLAGS"]="-O2 -pipe" |
252 |
- self.settings["CHOST"]="powerpc64-unknown-linux-gnu" |
253 |
- |
254 |
-class arch_970(arch_ppc64): |
255 |
- "builder class for 970 aka G5 under ppc64" |
256 |
- def __init__(self,myspec): |
257 |
- arch_ppc64.__init__(self,myspec) |
258 |
- self.settings["CFLAGS"]="-O2 -pipe -mcpu=970 -mtune=970" |
259 |
- self.settings["HOSTUSE"]=["altivec"] |
260 |
- |
261 |
-class arch_cell(arch_ppc64): |
262 |
- "builder class for cell under ppc64" |
263 |
- def __init__(self,myspec): |
264 |
- arch_ppc64.__init__(self,myspec) |
265 |
- self.settings["CFLAGS"]="-O2 -pipe -mcpu=cell -mtune=cell" |
266 |
- self.settings["HOSTUSE"]=["altivec"] |
267 |
- |
268 |
-class arch_power3(arch_ppc64): |
269 |
- "builder class for power3 under ppc64" |
270 |
- def __init__(self,myspec): |
271 |
- arch_ppc64.__init__(self,myspec) |
272 |
- self.settings["CFLAGS"]="-O2 -pipe -mcpu=power3 -mtune=power3" |
273 |
- |
274 |
-class arch_power4(arch_ppc64): |
275 |
- "builder class for power4 under ppc64" |
276 |
- def __init__(self,myspec): |
277 |
- arch_ppc64.__init__(self,myspec) |
278 |
- self.settings["CFLAGS"]="-O2 -pipe -mcpu=power4 -mtune=power4" |
279 |
- |
280 |
-class arch_power5(arch_ppc64): |
281 |
- "builder class for power5 under ppc64" |
282 |
- def __init__(self,myspec): |
283 |
- arch_ppc64.__init__(self,myspec) |
284 |
- self.settings["CFLAGS"]="-O2 -pipe -mcpu=power5 -mtune=power5" |
285 |
- |
286 |
-class arch_power6(arch_ppc64): |
287 |
- "builder class for power6 under ppc64" |
288 |
- def __init__(self,myspec): |
289 |
- arch_ppc64.__init__(self,myspec) |
290 |
- self.settings["CFLAGS"]="-O2 -pipe -mcpu=power6 -mtune=power6" |
291 |
- self.settings["HOSTUSE"]=["altivec"] |
292 |
- |
293 |
-def register(): |
294 |
- "Inform main catalyst program of the contents of this plugin." |
295 |
- return ({ |
296 |
- "ppc64": arch_ppc64, |
297 |
- "970": arch_970, |
298 |
- "cell": arch_cell, |
299 |
- "power3": arch_power3, |
300 |
- "power4": arch_power4, |
301 |
- "power5": arch_power5, |
302 |
- "power6": arch_power6 |
303 |
- }, ("ppc64","powerpc64")) |
304 |
- |
305 |
- |
306 |
|
307 |
Modified: trunk/arch/sparc.py |
308 |
=================================================================== |
309 |
--- trunk/arch/sparc.py 2008-02-06 22:57:55 UTC (rev 1279) |
310 |
+++ trunk/arch/sparc.py 2008-02-06 23:36:22 UTC (rev 1280) |
311 |
@@ -14,14 +14,29 @@ |
312 |
else: |
313 |
self.settings["CHROOT"]="chroot" |
314 |
|
315 |
+class generic_sparc64(builder.generic): |
316 |
+ "abstract base class for all sparc64 builders" |
317 |
+ def __init__(self,myspec): |
318 |
+ builder.generic.__init__(self,myspec) |
319 |
+ self.settings["CHROOT"]="chroot" |
320 |
+ |
321 |
class arch_sparc(generic_sparc): |
322 |
"builder class for generic sparc (sun4cdm)" |
323 |
def __init__(self,myspec): |
324 |
generic_sparc.__init__(self,myspec) |
325 |
self.settings["CFLAGS"]="-O2 -pipe" |
326 |
- self.settings["CXXFLAGS"]="-O2 -pipe" |
327 |
self.settings["CHOST"]="sparc-unknown-linux-gnu" |
328 |
|
329 |
+class arch_sparc64(generic_sparc64): |
330 |
+ "builder class for generic sparc64 (sun4u)" |
331 |
+ def __init__(self,myspec): |
332 |
+ generic_sparc64.__init__(self,myspec) |
333 |
+ self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc -pipe" |
334 |
+ self.settings["CHOST"]="sparc-unknown-linux-gnu" |
335 |
+ |
336 |
def register(): |
337 |
"Inform main catalyst program of the contents of this plugin." |
338 |
- return ({"sparc":arch_sparc}, ("sparc", )) |
339 |
+ return ({ |
340 |
+ "sparc" : arch_sparc, |
341 |
+ "sparc64" : arch_sparc64 |
342 |
+ }, ("sparc","sparc64", )) |
343 |
|
344 |
Deleted: trunk/arch/sparc64.py |
345 |
=================================================================== |
346 |
--- trunk/arch/sparc64.py 2008-02-06 22:57:55 UTC (rev 1279) |
347 |
+++ trunk/arch/sparc64.py 2008-02-06 23:36:22 UTC (rev 1280) |
348 |
@@ -1,21 +0,0 @@ |
349 |
- |
350 |
-import builder,os |
351 |
-from catalyst_support import * |
352 |
- |
353 |
-class generic_sparc64(builder.generic): |
354 |
- "abstract base class for all sparc64 builders" |
355 |
- def __init__(self,myspec): |
356 |
- builder.generic.__init__(self,myspec) |
357 |
- self.settings["CHROOT"]="chroot" |
358 |
- |
359 |
-class arch_sparc64(generic_sparc64): |
360 |
- "builder class for generic sparc64 (sun4u)" |
361 |
- def __init__(self,myspec): |
362 |
- generic_sparc64.__init__(self,myspec) |
363 |
- self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc -pipe" |
364 |
- self.settings["CXXFLAGS"]="-O2 -mcpu=ultrasparc -pipe" |
365 |
- self.settings["CHOST"]="sparc-unknown-linux-gnu" |
366 |
- |
367 |
-def register(): |
368 |
- "Inform main catalyst program of the contents of this plugin." |
369 |
- return ({"sparc64":arch_sparc64}, ("sparc64", )) |
370 |
|
371 |
-- |
372 |
gentoo-commits@l.g.o mailing list |