?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
updated on Sun Jan 15 04:04:02 UTC 2012
[aur-mirror.git] / pcsx-df / patch01.patch
blob460eb086549b1e0734fb596ea56efaa1d99102b9
1 diff -rupN original/ABOUT-NLS new/ABOUT-NLS
2 --- original/ABOUT-NLS 2009-03-28 22:33:59.000000000 -0430
3 +++ new/ABOUT-NLS 2007-10-08 17:13:27.000000000 -0400
4 @@ -1,625 +1,2 @@
5 -Notes on the Free Translation Project
6 -*************************************
7 -
8 - Free software is going international! The Free Translation Project
9 -is a way to get maintainers of free software, translators, and users all
10 -together, so that will gradually become able to speak many languages.
11 -A few packages already provide translations for their messages.
12 -
13 - If you found this `ABOUT-NLS' file inside a distribution, you may
14 -assume that the distributed package does use GNU `gettext' internally,
15 -itself available at your nearest GNU archive site. But you do _not_
16 -need to install GNU `gettext' prior to configuring, installing or using
17 -this package with messages translated.
18 -
19 - Installers will find here some useful hints. These notes also
20 -explain how users should proceed for getting the programs to use the
21 -available translations. They tell how people wanting to contribute and
22 -work at translations should contact the appropriate team.
23 -
24 - When reporting bugs in the `intl/' directory or bugs which may be
25 -related to internationalization, you should tell about the version of
26 -`gettext' which is used. The information can be found in the
27 -`intl/VERSION' file, in internationalized packages.
28 -
29 -Quick configuration advice
30 -==========================
31 -
32 - If you want to exploit the full power of internationalization, you
33 -should configure it using
34 -
35 - ./configure --with-included-gettext
36 -
37 -to force usage of internationalizing routines provided within this
38 -package, despite the existence of internationalizing capabilities in the
39 -operating system where this package is being installed. So far, only
40 -the `gettext' implementation in the GNU C library version 2 provides as
41 -many features (such as locale alias, message inheritance, automatic
42 -charset conversion or plural form handling) as the implementation here.
43 -It is also not possible to offer this additional functionality on top
44 -of a `catgets' implementation. Future versions of GNU `gettext' will
45 -very likely convey even more functionality. So it might be a good idea
46 -to change to GNU `gettext' as soon as possible.
47 -
48 - So you need _not_ provide this option if you are using GNU libc 2 or
49 -you have installed a recent copy of the GNU gettext package with the
50 -included `libintl'.
51 -
52 -INSTALL Matters
53 -===============
54 -
55 - Some packages are "localizable" when properly installed; the
56 -programs they contain can be made to speak your own native language.
57 -Most such packages use GNU `gettext'. Other packages have their own
58 -ways to internationalization, predating GNU `gettext'.
59 -
60 - By default, this package will be installed to allow translation of
61 -messages. It will automatically detect whether the system already
62 -provides the GNU `gettext' functions. If not, the GNU `gettext' own
63 -library will be used. This library is wholly contained within this
64 -package, usually in the `intl/' subdirectory, so prior installation of
65 -the GNU `gettext' package is _not_ required. Installers may use
66 -special options at configuration time for changing the default
67 -behaviour. The commands:
68 -
69 - ./configure --with-included-gettext
70 - ./configure --disable-nls
71 -
72 -will respectively bypass any pre-existing `gettext' to use the
73 -internationalizing routines provided within this package, or else,
74 -_totally_ disable translation of messages.
75 -
76 - When you already have GNU `gettext' installed on your system and run
77 -configure without an option for your new package, `configure' will
78 -probably detect the previously built and installed `libintl.a' file and
79 -will decide to use this. This might be not what is desirable. You
80 -should use the more recent version of the GNU `gettext' library. I.e.
81 -if the file `intl/VERSION' shows that the library which comes with this
82 -package is more recent, you should use
83 -
84 - ./configure --with-included-gettext
85 -
86 -to prevent auto-detection.
87 -
88 - The configuration process will not test for the `catgets' function
89 -and therefore it will not be used. The reason is that even an
90 -emulation of `gettext' on top of `catgets' could not provide all the
91 -extensions of the GNU `gettext' library.
92 -
93 - Internationalized packages have usually many `po/LL.po' files, where
94 -LL gives an ISO 639 two-letter code identifying the language. Unless
95 -translations have been forbidden at `configure' time by using the
96 -`--disable-nls' switch, all available translations are installed
97 -together with the package. However, the environment variable `LINGUAS'
98 -may be set, prior to configuration, to limit the installed set.
99 -`LINGUAS' should then contain a space separated list of two-letter
100 -codes, stating which languages are allowed.
101 -
102 -Using This Package
103 -==================
104 -
105 - As a user, if your language has been installed for this package, you
106 -only have to set the `LANG' environment variable to the appropriate
107 -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
108 -and `CC' is an ISO 3166 two-letter country code. For example, let's
109 -suppose that you speak German and live in Germany. At the shell
110 -prompt, merely execute `setenv LANG de_DE' (in `csh'),
111 -`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
112 -This can be done from your `.login' or `.profile' file, once and for
113 -all.
114 -
115 - You might think that the country code specification is redundant.
116 -But in fact, some languages have dialects in different countries. For
117 -example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
118 -country code serves to distinguish the dialects.
119 -
120 - The locale naming convention of `LL_CC', with `LL' denoting the
121 -language and `CC' denoting the country, is the one use on systems based
122 -on GNU libc. On other systems, some variations of this scheme are
123 -used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
124 -locales supported by your system for your country by running the command
125 -`locale -a | grep '^LL''.
126 -
127 - Not all programs have translations for all languages. By default, an
128 -English message is shown in place of a nonexistent translation. If you
129 -understand other languages, you can set up a priority list of languages.
130 -This is done through a different environment variable, called
131 -`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
132 -for the purpose of message handling, but you still need to have `LANG'
133 -set to the primary language; this is required by other parts of the
134 -system libraries. For example, some Swedish users who would rather
135 -read translations in German than English for when Swedish is not
136 -available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
137 -
138 - In the `LANGUAGE' environment variable, but not in the `LANG'
139 -environment variable, `LL_CC' combinations can be abbreviated as `LL'
140 -to denote the language's main dialect. For example, `de' is equivalent
141 -to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
142 -(Portuguese as spoken in Portugal) in this context.
143 -
144 -Translating Teams
145 -=================
146 -
147 - For the Free Translation Project to be a success, we need interested
148 -people who like their own language and write it well, and who are also
149 -able to synergize with other translators speaking the same language.
150 -Each translation team has its own mailing list. The up-to-date list of
151 -teams can be found at the Free Translation Project's homepage,
152 -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
153 -area.
154 -
155 - If you'd like to volunteer to _work_ at translating messages, you
156 -should become a member of the translating team for your own language.
157 -The subscribing address is _not_ the same as the list itself, it has
158 -`-request' appended. For example, speakers of Swedish can send a
159 -message to `sv-request@li.org', having this message body:
160 -
161 - subscribe
162 -
163 - Keep in mind that team members are expected to participate
164 -_actively_ in translations, or at solving translational difficulties,
165 -rather than merely lurking around. If your team does not exist yet and
166 -you want to start one, or if you are unsure about what to do or how to
167 -get started, please write to `translation@iro.umontreal.ca' to reach the
168 -coordinator for all translator teams.
169 -
170 - The English team is special. It works at improving and uniformizing
171 -the terminology in use. Proven linguistic skill are praised more than
172 -programming skill, here.
173 -
174 -Available Packages
175 -==================
176 -
177 - Languages are not equally supported in all packages. The following
178 -matrix shows the current state of internationalization, as of May 2003.
179 -The matrix shows, in regard of each package, for which languages PO
180 -files have been submitted to translation coordination, with a
181 -translation percentage of at least 50%.
182 -
183 - Ready PO files am az be bg ca cs da de el en en_GB eo es
184 - +-------------------------------------------+
185 - a2ps | [] [] [] [] |
186 - aegis | () |
187 - anubis | |
188 - ap-utils | |
189 - bash | [] [] [] |
190 - batchelor | |
191 - bfd | [] [] |
192 - binutils | [] [] |
193 - bison | [] [] [] |
194 - bluez-pin | [] [] |
195 - clisp | |
196 - clisp | [] [] [] |
197 - coreutils | [] [] [] [] |
198 - cpio | [] [] [] |
199 - darkstat | () [] |
200 - diffutils | [] [] [] [] [] [] [] |
201 - e2fsprogs | [] [] |
202 - enscript | [] [] [] [] |
203 - error | [] [] [] [] [] |
204 - fetchmail | [] () [] [] [] [] |
205 - fileutils | [] [] [] |
206 - findutils | [] [] [] [] [] [] |
207 - flex | [] [] [] [] |
208 - gas | [] |
209 - gawk | [] [] [] [] |
210 - gcal | [] |
211 - gcc | [] [] |
212 - gettext | [] [] [] [] [] |
213 - gettext-runtime | [] [] [] [] [] |
214 - gettext-tools | [] [] |
215 - gimp-print | [] [] [] [] [] |
216 - gliv | |
217 - glunarclock | [] [] [] |
218 - gnucash | () [] |
219 - gnucash-glossary | [] () [] |
220 - gnupg | [] () [] [] [] [] |
221 - gpe-calendar | [] |
222 - gpe-conf | [] |
223 - gpe-contacts | [] |
224 - gpe-edit | |
225 - gpe-login | [] |
226 - gpe-ownerinfo | [] |
227 - gpe-sketchbook | [] |
228 - gpe-timesheet | |
229 - gpe-today | [] |
230 - gpe-todo | [] |
231 - gphoto2 | [] [] [] [] |
232 - gprof | [] [] |
233 - gpsdrive | () () () |
234 - grep | [] [] [] [] [] |
235 - gretl | [] |
236 - hello | [] [] [] [] [] [] |
237 - id-utils | [] [] |
238 - indent | [] [] [] [] |
239 - jpilot | [] [] [] [] |
240 - jwhois | [] |
241 - kbd | [] [] [] [] [] |
242 - ld | [] [] |
243 - libc | [] [] [] [] [] [] |
244 - libgpewidget | [] |
245 - libiconv | [] [] [] [] [] |
246 - lifelines | [] () |
247 - lilypond | [] |
248 - lingoteach | |
249 - lingoteach_lessons | () () |
250 - lynx | [] [] [] [] |
251 - m4 | [] [] [] [] |
252 - mailutils | [] [] |
253 - make | [] [] [] |
254 - man-db | [] () [] [] () |
255 - mysecretdiary | [] [] [] |
256 - nano | [] () [] [] [] |
257 - nano_1_0 | [] () [] [] [] |
258 - opcodes | [] [] |
259 - parted | [] [] [] [] [] |
260 - ptx | [] [] [] [] [] |
261 - python | |
262 - radius | |
263 - recode | [] [] [] [] [] [] |
264 - screem | |
265 - sed | [] [] [] [] [] |
266 - sh-utils | [] [] [] |
267 - sharutils | [] [] [] [] [] [] |
268 - sketch | [] () [] |
269 - soundtracker | [] [] [] |
270 - sp | [] |
271 - tar | [] [] [] [] |
272 - texinfo | [] [] [] [] |
273 - textutils | [] [] [] [] |
274 - tin | () () |
275 - util-linux | [] [] [] [] [] |
276 - vorbis-tools | [] [] [] |
277 - wastesedge | () |
278 - wdiff | [] [] [] [] |
279 - wget | [] [] [] [] [] [] [] |
280 - xchat | [] [] [] |
281 - xpad | |
282 - +-------------------------------------------+
283 - am az be bg ca cs da de el en en_GB eo es
284 - 0 1 4 2 31 17 54 60 14 1 4 12 56
285 -
286 - et fa fi fr ga gl he hr hu id it ja ko
287 - +----------------------------------------+
288 - a2ps | [] [] [] () () |
289 - aegis | |
290 - anubis | [] |
291 - ap-utils | [] |
292 - bash | [] [] |
293 - batchelor | [] |
294 - bfd | [] [] |
295 - binutils | [] [] |
296 - bison | [] [] [] [] |
297 - bluez-pin | [] [] [] [] |
298 - clisp | |
299 - clisp | [] |
300 - coreutils | [] [] [] [] |
301 - cpio | [] [] [] [] |
302 - darkstat | () [] [] [] |
303 - diffutils | [] [] [] [] [] [] [] |
304 - e2fsprogs | |
305 - enscript | [] [] |
306 - error | [] [] [] [] |
307 - fetchmail | [] |
308 - fileutils | [] [] [] [] [] |
309 - findutils | [] [] [] [] [] [] [] [] [] [] [] |
310 - flex | [] [] |
311 - gas | [] |
312 - gawk | [] [] |
313 - gcal | [] |
314 - gcc | [] |
315 - gettext | [] [] [] |
316 - gettext-runtime | [] [] [] [] |
317 - gettext-tools | [] |
318 - gimp-print | [] [] |
319 - gliv | () |
320 - glunarclock | [] [] [] [] |
321 - gnucash | [] |
322 - gnucash-glossary | [] |
323 - gnupg | [] [] [] [] [] [] [] |
324 - gpe-calendar | [] |
325 - gpe-conf | |
326 - gpe-contacts | [] |
327 - gpe-edit | [] [] |
328 - gpe-login | [] |
329 - gpe-ownerinfo | [] [] [] |
330 - gpe-sketchbook | [] |
331 - gpe-timesheet | [] [] [] |
332 - gpe-today | [] [] |
333 - gpe-todo | [] [] |
334 - gphoto2 | [] [] [] |
335 - gprof | [] [] |
336 - gpsdrive | () [] () () |
337 - grep | [] [] [] [] [] [] [] [] [] [] [] |
338 - gretl | [] |
339 - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
340 - id-utils | [] [] [] |
341 - indent | [] [] [] [] [] [] [] [] |
342 - jpilot | [] () |
343 - jwhois | [] [] [] [] |
344 - kbd | [] |
345 - ld | [] |
346 - libc | [] [] [] [] [] [] |
347 - libgpewidget | [] [] [] |
348 - libiconv | [] [] [] [] [] [] [] [] |
349 - lifelines | () |
350 - lilypond | [] |
351 - lingoteach | [] [] |
352 - lingoteach_lessons | |
353 - lynx | [] [] [] [] |
354 - m4 | [] [] [] [] |
355 - mailutils | |
356 - make | [] [] [] [] [] [] |
357 - man-db | [] () () |
358 - mysecretdiary | [] [] |
359 - nano | [] [] [] [] |
360 - nano_1_0 | [] [] [] [] |
361 - opcodes | [] [] |
362 - parted | [] [] [] |
363 - ptx | [] [] [] [] [] [] [] |
364 - python | |
365 - radius | |
366 - recode | [] [] [] [] [] [] |
367 - screem | |
368 - sed | [] [] [] [] [] [] [] [] |
369 - sh-utils | [] [] [] [] [] [] |
370 - sharutils | [] [] [] [] [] |
371 - sketch | [] |
372 - soundtracker | [] [] [] |
373 - sp | [] () |
374 - tar | [] [] [] [] [] [] [] [] [] |
375 - texinfo | [] [] [] [] |
376 - textutils | [] [] [] [] [] |
377 - tin | [] () |
378 - util-linux | [] [] [] [] () [] |
379 - vorbis-tools | [] |
380 - wastesedge | () |
381 - wdiff | [] [] [] [] [] |
382 - wget | [] [] [] [] [] [] [] [] |
383 - xchat | [] [] [] |
384 - xpad | |
385 - +----------------------------------------+
386 - et fa fi fr ga gl he hr hu id it ja ko
387 - 20 1 15 73 14 24 8 10 30 31 19 31 9
388 -
389 - lg lt lv ms nb nl nn no pl pt pt_BR ro
390 - +----------------------------------------+
391 - a2ps | [] [] () () () [] [] |
392 - aegis | () |
393 - anubis | [] [] |
394 - ap-utils | () |
395 - bash | [] |
396 - batchelor | |
397 - bfd | |
398 - binutils | |
399 - bison | [] [] [] [] |
400 - bluez-pin | [] |
401 - clisp | |
402 - clisp | [] |
403 - coreutils | [] |
404 - cpio | [] [] [] |
405 - darkstat | [] [] [] [] |
406 - diffutils | [] [] [] |
407 - e2fsprogs | |
408 - enscript | [] [] |
409 - error | [] [] |
410 - fetchmail | () () |
411 - fileutils | [] |
412 - findutils | [] [] [] [] |
413 - flex | [] |
414 - gas | |
415 - gawk | [] |
416 - gcal | |
417 - gcc | |
418 - gettext | [] |
419 - gettext-runtime | [] |
420 - gettext-tools | |
421 - gimp-print | [] |
422 - gliv | [] |
423 - glunarclock | [] |
424 - gnucash | |
425 - gnucash-glossary | [] [] |
426 - gnupg | |
427 - gpe-calendar | [] [] |
428 - gpe-conf | [] [] |
429 - gpe-contacts | [] |
430 - gpe-edit | [] [] |
431 - gpe-login | [] [] |
432 - gpe-ownerinfo | [] [] |
433 - gpe-sketchbook | [] [] |
434 - gpe-timesheet | [] [] |
435 - gpe-today | [] [] |
436 - gpe-todo | [] [] |
437 - gphoto2 | |
438 - gprof | [] |
439 - gpsdrive | () () () |
440 - grep | [] [] [] [] |
441 - gretl | |
442 - hello | [] [] [] [] [] [] [] [] [] |
443 - id-utils | [] [] [] |
444 - indent | [] [] [] |
445 - jpilot | () () |
446 - jwhois | [] [] [] |
447 - kbd | |
448 - ld | |
449 - libc | [] [] [] [] |
450 - libgpewidget | [] [] |
451 - libiconv | [] [] |
452 - lifelines | |
453 - lilypond | [] |
454 - lingoteach | |
455 - lingoteach_lessons | |
456 - lynx | [] [] |
457 - m4 | [] [] [] [] |
458 - mailutils | |
459 - make | [] [] |
460 - man-db | [] |
461 - mysecretdiary | [] |
462 - nano | [] [] [] [] |
463 - nano_1_0 | [] [] [] [] |
464 - opcodes | [] [] [] |
465 - parted | [] [] [] |
466 - ptx | [] [] [] [] [] [] [] |
467 - python | |
468 - radius | |
469 - recode | [] [] [] |
470 - screem | |
471 - sed | [] [] |
472 - sh-utils | [] |
473 - sharutils | [] |
474 - sketch | [] |
475 - soundtracker | |
476 - sp | |
477 - tar | [] [] [] [] [] [] |
478 - texinfo | [] |
479 - textutils | [] |
480 - tin | |
481 - util-linux | [] [] |
482 - vorbis-tools | [] [] |
483 - wastesedge | |
484 - wdiff | [] [] [] [] |
485 - wget | [] [] [] |
486 - xchat | [] [] |
487 - xpad | [] |
488 - +----------------------------------------+
489 - lg lt lv ms nb nl nn no pl pt pt_BR ro
490 - 0 0 2 11 7 26 3 4 18 15 34 34
491 -
492 - ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
493 - +-------------------------------------------+
494 - a2ps | [] [] [] [] [] | 16
495 - aegis | () | 0
496 - anubis | [] [] | 5
497 - ap-utils | () | 1
498 - bash | [] | 7
499 - batchelor | | 1
500 - bfd | [] [] [] | 7
501 - binutils | [] [] [] | 7
502 - bison | [] [] | 13
503 - bluez-pin | | 7
504 - clisp | | 0
505 - clisp | | 5
506 - coreutils | [] [] [] [] [] | 14
507 - cpio | [] [] [] | 13
508 - darkstat | [] () () | 9
509 - diffutils | [] [] [] [] | 21
510 - e2fsprogs | [] | 3
511 - enscript | [] [] [] | 11
512 - error | [] [] [] | 14
513 - fetchmail | [] | 7
514 - fileutils | [] [] [] [] [] [] | 15
515 - findutils | [] [] [] [] [] [] | 27
516 - flex | [] [] [] | 10
517 - gas | [] | 3
518 - gawk | [] [] | 9
519 - gcal | [] [] | 4
520 - gcc | [] | 4
521 - gettext | [] [] [] [] [] [] | 15
522 - gettext-runtime | [] [] [] [] [] [] | 16
523 - gettext-tools | [] [] | 5
524 - gimp-print | [] [] | 10
525 - gliv | | 1
526 - glunarclock | [] [] [] | 11
527 - gnucash | [] [] | 4
528 - gnucash-glossary | [] [] [] | 8
529 - gnupg | [] [] [] [] | 16
530 - gpe-calendar | [] | 5
531 - gpe-conf | | 3
532 - gpe-contacts | [] | 4
533 - gpe-edit | [] | 5
534 - gpe-login | [] | 5
535 - gpe-ownerinfo | [] | 7
536 - gpe-sketchbook | [] | 5
537 - gpe-timesheet | [] | 6
538 - gpe-today | [] | 6
539 - gpe-todo | [] | 6
540 - gphoto2 | [] [] | 9
541 - gprof | [] [] | 7
542 - gpsdrive | [] [] | 3
543 - grep | [] [] [] [] | 24
544 - gretl | | 2
545 - hello | [] [] [] [] [] | 33
546 - id-utils | [] [] [] | 11
547 - indent | [] [] [] [] | 19
548 - jpilot | [] [] [] [] [] | 10
549 - jwhois | () () [] [] | 10
550 - kbd | [] [] | 8
551 - ld | [] [] | 5
552 - libc | [] [] [] [] | 20
553 - libgpewidget | | 6
554 - libiconv | [] [] [] [] [] [] | 21
555 - lifelines | [] | 2
556 - lilypond | [] | 4
557 - lingoteach | | 2
558 - lingoteach_lessons | () | 0
559 - lynx | [] [] [] [] | 14
560 - m4 | [] [] [] | 15
561 - mailutils | | 2
562 - make | [] [] [] [] | 15
563 - man-db | [] | 6
564 - mysecretdiary | [] [] | 8
565 - nano | [] [] [] | 15
566 - nano_1_0 | [] [] [] | 15
567 - opcodes | [] [] | 9
568 - parted | [] [] | 13
569 - ptx | [] [] [] | 22
570 - python | | 0
571 - radius | | 0
572 - recode | [] [] [] [] | 19
573 - screem | [] | 1
574 - sed | [] [] [] [] [] | 20
575 - sh-utils | [] [] [] | 13
576 - sharutils | [] [] [] [] | 16
577 - sketch | [] | 5
578 - soundtracker | [] | 7
579 - sp | [] | 3
580 - tar | [] [] [] [] [] | 24
581 - texinfo | [] [] [] [] | 13
582 - textutils | [] [] [] [] [] | 15
583 - tin | | 1
584 - util-linux | [] [] | 14
585 - vorbis-tools | [] | 7
586 - wastesedge | | 0
587 - wdiff | [] [] [] [] | 17
588 - wget | [] [] [] [] [] [] [] | 25
589 - xchat | [] [] [] | 11
590 - xpad | | 1
591 - +-------------------------------------------+
592 - 50 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
593 - 97 domains 32 19 16 0 56 0 48 10 1 1 12 23 913
594 -
595 - Some counters in the preceding matrix are higher than the number of
596 -visible blocks let us expect. This is because a few extra PO files are
597 -used for implementing regional variants of languages, or language
598 -dialects.
599 -
600 - For a PO file in the matrix above to be effective, the package to
601 -which it applies should also have been internationalized and
602 -distributed as such by its maintainer. There might be an observable
603 -lag between the mere existence a PO file and its wide availability in a
604 -distribution.
605 -
606 - If May 2003 seems to be old, you may fetch a more recent copy of
607 -this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
608 -matrix with full percentage details can be found at
609 -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
610 -
611 -Using `gettext' in new packages
612 -===============================
613 -
614 - If you are writing a freely available program and want to
615 -internationalize it you are welcome to use GNU `gettext' in your
616 -package. Of course you have to respect the GNU Library General Public
617 -License which covers the use of the GNU `gettext' library. This means
618 -in particular that even non-free programs can use `libintl' as a shared
619 -library, whereas only free software can use `libintl' as a static
620 -library or use modified versions of `libintl'.
621 -
622 - Once the sources are changed appropriately and the setup can handle
623 -the use of `gettext' the only thing missing are the translations. The
624 -Free Translation Project is also available for packages which are not
625 -developed inside the GNU project. Therefore the information given above
626 -applies also for every other Free Software Project. Contact
627 -`translation@iro.umontreal.ca' to make the `.pot' files available to
628 -the translation teams.
629 -
630 +PCSX-df uses gettext internally, but can be configured without it.
631 +The gettext library is not included with PCSX-df.
632 diff -rupN original/ChangeLog new/ChangeLog
633 --- original/ChangeLog 2009-03-29 01:15:59.000000000 -0430
634 +++ new/ChangeLog 2009-04-01 04:21:42.000000000 -0430
635 @@ -1,3 +1,8 @@
636 +2009-04-01 19:50 adburton
637 +
638 + * data/: pcsx-df.desktop.in, Makefile.am: Add support for
639 + desktop file to be translatable
640 +
641 2009-03-29 16:45 adburton
642
643 * configure.ac: Set version 1.10 for release
644 diff -rupN original/Makefile.in new/Makefile.in
645 --- original/Makefile.in 2009-03-29 01:17:42.000000000 -0430
646 +++ new/Makefile.in 1969-12-31 20:00:00.000000000 -0400
647 @@ -1,709 +0,0 @@
648 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
649 -# @configure_input@
650 -
651 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
652 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
653 -# This Makefile.in is free software; the Free Software Foundation
654 -# gives unlimited permission to copy and/or distribute it,
655 -# with or without modifications, as long as this notice is preserved.
656 -
657 -# This program is distributed in the hope that it will be useful,
658 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
659 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
660 -# PARTICULAR PURPOSE.
661 -
662 -@SET_MAKE@
663 -VPATH = @srcdir@
664 -pkgdatadir = $(datadir)/@PACKAGE@
665 -pkglibdir = $(libdir)/@PACKAGE@
666 -pkgincludedir = $(includedir)/@PACKAGE@
667 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
668 -install_sh_DATA = $(install_sh) -c -m 644
669 -install_sh_PROGRAM = $(install_sh) -c
670 -install_sh_SCRIPT = $(install_sh) -c
671 -INSTALL_HEADER = $(INSTALL_DATA)
672 -transform = $(program_transform_name)
673 -NORMAL_INSTALL = :
674 -PRE_INSTALL = :
675 -POST_INSTALL = :
676 -NORMAL_UNINSTALL = :
677 -PRE_UNINSTALL = :
678 -POST_UNINSTALL = :
679 -build_triplet = @build@
680 -host_triplet = @host@
681 -target_triplet = @target@
682 -subdir = .
683 -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
684 - $(srcdir)/Makefile.in $(top_srcdir)/configure \
685 - $(top_srcdir)/include/config.h.in \
686 - $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
687 - ChangeLog INSTALL NEWS compile config.guess config.rpath \
688 - config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
689 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
690 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
691 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
692 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
693 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
694 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
695 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
696 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
697 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
698 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
699 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
700 - $(top_srcdir)/configure.ac
701 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
702 - $(ACLOCAL_M4)
703 -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
704 - configure.lineno config.status.lineno
705 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
706 -CONFIG_HEADER = $(top_builddir)/include/config.h
707 -CONFIG_CLEAN_FILES = intl/Makefile
708 -SOURCES =
709 -DIST_SOURCES =
710 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
711 - html-recursive info-recursive install-data-recursive \
712 - install-dvi-recursive install-exec-recursive \
713 - install-html-recursive install-info-recursive \
714 - install-pdf-recursive install-ps-recursive install-recursive \
715 - installcheck-recursive installdirs-recursive pdf-recursive \
716 - ps-recursive uninstall-recursive
717 -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
718 - distclean-recursive maintainer-clean-recursive
719 -ETAGS = etags
720 -CTAGS = ctags
721 -DIST_SUBDIRS = $(SUBDIRS)
722 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
723 -distdir = $(PACKAGE)-$(VERSION)
724 -top_distdir = $(distdir)
725 -am__remove_distdir = \
726 - { test ! -d $(distdir) \
727 - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
728 - && rm -fr $(distdir); }; }
729 -DIST_ARCHIVES = $(distdir).tar.gz
730 -GZIP_ENV = --best
731 -distuninstallcheck_listfiles = find . -type f -print
732 -distcleancheck_listfiles = find . -type f -print
733 -ACLOCAL = @ACLOCAL@
734 -ALLOCA = @ALLOCA@
735 -ALL_LINGUAS = @ALL_LINGUAS@
736 -ALSA_LIBS = @ALSA_LIBS@
737 -AMTAR = @AMTAR@
738 -AR = @AR@
739 -AUTOCONF = @AUTOCONF@
740 -AUTOHEADER = @AUTOHEADER@
741 -AUTOMAKE = @AUTOMAKE@
742 -AWK = @AWK@
743 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
744 -BURN_CFLAGS = @BURN_CFLAGS@
745 -BURN_LIBS = @BURN_LIBS@
746 -CATOBJEXT = @CATOBJEXT@
747 -CC = @CC@
748 -CCAS = @CCAS@
749 -CCASDEPMODE = @CCASDEPMODE@
750 -CCASFLAGS = @CCASFLAGS@
751 -CCDEPMODE = @CCDEPMODE@
752 -CFLAGS = @CFLAGS@
753 -CPP = @CPP@
754 -CPPFLAGS = @CPPFLAGS@
755 -CXX = @CXX@
756 -CXXCPP = @CXXCPP@
757 -CXXDEPMODE = @CXXDEPMODE@
758 -CXXFLAGS = @CXXFLAGS@
759 -CYGPATH_W = @CYGPATH_W@
760 -DATADIRNAME = @DATADIRNAME@
761 -DEFS = @DEFS@
762 -DEPDIR = @DEPDIR@
763 -DFBINIMAGE = @DFBINIMAGE@
764 -DSYMUTIL = @DSYMUTIL@
765 -ECHO = @ECHO@
766 -ECHO_C = @ECHO_C@
767 -ECHO_N = @ECHO_N@
768 -ECHO_T = @ECHO_T@
769 -EGREP = @EGREP@
770 -EXEEXT = @EXEEXT@
771 -F77 = @F77@
772 -FFLAGS = @FFLAGS@
773 -FLTKCONFIG = @FLTKCONFIG@
774 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
775 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
776 -GENCAT = @GENCAT@
777 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
778 -GIO2_CFLAGS = @GIO2_CFLAGS@
779 -GIO2_LIBS = @GIO2_LIBS@
780 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
781 -GLADE2_LIBS = @GLADE2_LIBS@
782 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
783 -GLIB2_LIBS = @GLIB2_LIBS@
784 -GLIBC21 = @GLIBC21@
785 -GMSGFMT = @GMSGFMT@
786 -GREP = @GREP@
787 -GTK2_CFLAGS = @GTK2_CFLAGS@
788 -GTK2_LIBS = @GTK2_LIBS@
789 -INSTALL = @INSTALL@
790 -INSTALL_DATA = @INSTALL_DATA@
791 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
792 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
793 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
794 -INSTOBJEXT = @INSTOBJEXT@
795 -INTLBISON = @INTLBISON@
796 -INTLLIBS = @INTLLIBS@
797 -INTLOBJS = @INTLOBJS@
798 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
799 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
800 -INTLTOOL_PERL = @INTLTOOL_PERL@
801 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
802 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
803 -LDFLAGS = @LDFLAGS@
804 -LIBICONV = @LIBICONV@
805 -LIBINTL = @LIBINTL@
806 -LIBOBJS = @LIBOBJS@
807 -LIBS = @LIBS@
808 -LIBTOOL = @LIBTOOL@
809 -LN_S = @LN_S@
810 -LTLIBICONV = @LTLIBICONV@
811 -LTLIBINTL = @LTLIBINTL@
812 -LTLIBOBJS = @LTLIBOBJS@
813 -MAINT = @MAINT@
814 -MAKEINFO = @MAKEINFO@
815 -MKDIR_P = @MKDIR_P@
816 -MKINSTALLDIRS = @MKINSTALLDIRS@
817 -MSGFMT = @MSGFMT@
818 -MSGMERGE = @MSGMERGE@
819 -NASM = @NASM@
820 -NMEDIT = @NMEDIT@
821 -OBJEXT = @OBJEXT@
822 -PACKAGE = @PACKAGE@
823 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
824 -PACKAGE_NAME = @PACKAGE_NAME@
825 -PACKAGE_STRING = @PACKAGE_STRING@
826 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
827 -PACKAGE_VERSION = @PACKAGE_VERSION@
828 -PATH_SEPARATOR = @PATH_SEPARATOR@
829 -PKG_CONFIG = @PKG_CONFIG@
830 -POSUB = @POSUB@
831 -RANLIB = @RANLIB@
832 -SED = @SED@
833 -SET_MAKE = @SET_MAKE@
834 -SHELL = @SHELL@
835 -STRIP = @STRIP@
836 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
837 -USE_NLS = @USE_NLS@
838 -VERSION = @VERSION@
839 -XGETTEXT = @XGETTEXT@
840 -abs_builddir = @abs_builddir@
841 -abs_srcdir = @abs_srcdir@
842 -abs_top_builddir = @abs_top_builddir@
843 -abs_top_srcdir = @abs_top_srcdir@
844 -ac_ct_CC = @ac_ct_CC@
845 -ac_ct_CXX = @ac_ct_CXX@
846 -ac_ct_F77 = @ac_ct_F77@
847 -am__include = @am__include@
848 -am__leading_dot = @am__leading_dot@
849 -am__quote = @am__quote@
850 -am__tar = @am__tar@
851 -am__untar = @am__untar@
852 -bindir = @bindir@
853 -build = @build@
854 -build_alias = @build_alias@
855 -build_cpu = @build_cpu@
856 -build_os = @build_os@
857 -build_vendor = @build_vendor@
858 -builddir = @builddir@
859 -datadir = @datadir@
860 -datarootdir = @datarootdir@
861 -docdir = @docdir@
862 -dvidir = @dvidir@
863 -exec_prefix = @exec_prefix@
864 -host = @host@
865 -host_alias = @host_alias@
866 -host_cpu = @host_cpu@
867 -host_os = @host_os@
868 -host_vendor = @host_vendor@
869 -htmldir = @htmldir@
870 -includedir = @includedir@
871 -infodir = @infodir@
872 -install_sh = @install_sh@
873 -libdir = @libdir@
874 -libexecdir = @libexecdir@
875 -localedir = @localedir@
876 -localstatedir = @localstatedir@
877 -mandir = @mandir@
878 -mkdir_p = @mkdir_p@
879 -oldincludedir = @oldincludedir@
880 -pdfdir = @pdfdir@
881 -prefix = @prefix@
882 -program_transform_name = @program_transform_name@
883 -psdir = @psdir@
884 -sbindir = @sbindir@
885 -sharedstatedir = @sharedstatedir@
886 -srcdir = @srcdir@
887 -sysconfdir = @sysconfdir@
888 -target = @target@
889 -target_alias = @target_alias@
890 -target_cpu = @target_cpu@
891 -target_os = @target_os@
892 -target_vendor = @target_vendor@
893 -top_build_prefix = @top_build_prefix@
894 -top_builddir = @top_builddir@
895 -top_srcdir = @top_srcdir@
896 -SUBDIRS = data doc po intl libpcsxcore gui pixmaps plugins/dfinput \
897 - plugins/dfsound plugins/dfxvideo plugins/dfcdrom plugins/dfiso \
898 - plugins/dfOpenGL plugins/dfbinimage2 $(DFBINIMAGE)
899 -EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog \
900 - autogen.sh \
901 - setup-gettext \
902 - strip_fPIC.sh
903 -
904 -all: all-recursive
905 -
906 -.SUFFIXES:
907 -am--refresh:
908 - @:
909 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
910 - @for dep in $?; do \
911 - case '$(am__configure_deps)' in \
912 - *$$dep*) \
913 - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
914 - cd $(srcdir) && $(AUTOMAKE) --gnu \
915 - && exit 0; \
916 - exit 1;; \
917 - esac; \
918 - done; \
919 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
920 - cd $(top_srcdir) && \
921 - $(AUTOMAKE) --gnu Makefile
922 -.PRECIOUS: Makefile
923 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
924 - @case '$?' in \
925 - *config.status*) \
926 - echo ' $(SHELL) ./config.status'; \
927 - $(SHELL) ./config.status;; \
928 - *) \
929 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
930 - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
931 - esac;
932 -
933 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
934 - $(SHELL) ./config.status --recheck
935 -
936 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
937 - cd $(srcdir) && $(AUTOCONF)
938 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
939 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
940 -
941 -include/config.h: include/stamp-h1
942 - @if test ! -f $@; then \
943 - rm -f include/stamp-h1; \
944 - $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; \
945 - else :; fi
946 -
947 -include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
948 - @rm -f include/stamp-h1
949 - cd $(top_builddir) && $(SHELL) ./config.status include/config.h
950 -$(top_srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
951 - cd $(top_srcdir) && $(AUTOHEADER)
952 - rm -f include/stamp-h1
953 - touch $@
954 -
955 -distclean-hdr:
956 - -rm -f include/config.h include/stamp-h1
957 -intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
958 - cd $(top_builddir) && $(SHELL) ./config.status $@
959 -
960 -mostlyclean-libtool:
961 - -rm -f *.lo
962 -
963 -clean-libtool:
964 - -rm -rf .libs _libs
965 -
966 -distclean-libtool:
967 - -rm -f libtool
968 -
969 -# This directory's subdirectories are mostly independent; you can cd
970 -# into them and run `make' without going through this Makefile.
971 -# To change the values of `make' variables: instead of editing Makefiles,
972 -# (1) if the variable is set in `config.status', edit `config.status'
973 -# (which will cause the Makefiles to be regenerated when you run `make');
974 -# (2) otherwise, pass the desired values on the `make' command line.
975 -$(RECURSIVE_TARGETS):
976 - @failcom='exit 1'; \
977 - for f in x $$MAKEFLAGS; do \
978 - case $$f in \
979 - *=* | --[!k]*);; \
980 - *k*) failcom='fail=yes';; \
981 - esac; \
982 - done; \
983 - dot_seen=no; \
984 - target=`echo $@ | sed s/-recursive//`; \
985 - list='$(SUBDIRS)'; for subdir in $$list; do \
986 - echo "Making $$target in $$subdir"; \
987 - if test "$$subdir" = "."; then \
988 - dot_seen=yes; \
989 - local_target="$$target-am"; \
990 - else \
991 - local_target="$$target"; \
992 - fi; \
993 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
994 - || eval $$failcom; \
995 - done; \
996 - if test "$$dot_seen" = "no"; then \
997 - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
998 - fi; test -z "$$fail"
999 -
1000 -$(RECURSIVE_CLEAN_TARGETS):
1001 - @failcom='exit 1'; \
1002 - for f in x $$MAKEFLAGS; do \
1003 - case $$f in \
1004 - *=* | --[!k]*);; \
1005 - *k*) failcom='fail=yes';; \
1006 - esac; \
1007 - done; \
1008 - dot_seen=no; \
1009 - case "$@" in \
1010 - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1011 - *) list='$(SUBDIRS)' ;; \
1012 - esac; \
1013 - rev=''; for subdir in $$list; do \
1014 - if test "$$subdir" = "."; then :; else \
1015 - rev="$$subdir $$rev"; \
1016 - fi; \
1017 - done; \
1018 - rev="$$rev ."; \
1019 - target=`echo $@ | sed s/-recursive//`; \
1020 - for subdir in $$rev; do \
1021 - echo "Making $$target in $$subdir"; \
1022 - if test "$$subdir" = "."; then \
1023 - local_target="$$target-am"; \
1024 - else \
1025 - local_target="$$target"; \
1026 - fi; \
1027 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1028 - || eval $$failcom; \
1029 - done && test -z "$$fail"
1030 -tags-recursive:
1031 - list='$(SUBDIRS)'; for subdir in $$list; do \
1032 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1033 - done
1034 -ctags-recursive:
1035 - list='$(SUBDIRS)'; for subdir in $$list; do \
1036 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1037 - done
1038 -
1039 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1040 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1041 - unique=`for i in $$list; do \
1042 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1043 - done | \
1044 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
1045 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1046 - mkid -fID $$unique
1047 -tags: TAGS
1048 -
1049 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1050 - $(TAGS_FILES) $(LISP)
1051 - tags=; \
1052 - here=`pwd`; \
1053 - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1054 - include_option=--etags-include; \
1055 - empty_fix=.; \
1056 - else \
1057 - include_option=--include; \
1058 - empty_fix=; \
1059 - fi; \
1060 - list='$(SUBDIRS)'; for subdir in $$list; do \
1061 - if test "$$subdir" = .; then :; else \
1062 - test ! -f $$subdir/TAGS || \
1063 - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
1064 - fi; \
1065 - done; \
1066 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1067 - unique=`for i in $$list; do \
1068 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1069 - done | \
1070 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1071 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1072 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1073 - test -n "$$unique" || unique=$$empty_fix; \
1074 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1075 - $$tags $$unique; \
1076 - fi
1077 -ctags: CTAGS
1078 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1079 - $(TAGS_FILES) $(LISP)
1080 - tags=; \
1081 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1082 - unique=`for i in $$list; do \
1083 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1084 - done | \
1085 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1086 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1087 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
1088 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1089 - $$tags $$unique
1090 -
1091 -GTAGS:
1092 - here=`$(am__cd) $(top_builddir) && pwd` \
1093 - && cd $(top_srcdir) \
1094 - && gtags -i $(GTAGS_ARGS) $$here
1095 -
1096 -distclean-tags:
1097 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1098 -
1099 -distdir: $(DISTFILES)
1100 - $(am__remove_distdir)
1101 - test -d $(distdir) || mkdir $(distdir)
1102 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1103 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1104 - list='$(DISTFILES)'; \
1105 - dist_files=`for file in $$list; do echo $$file; done | \
1106 - sed -e "s|^$$srcdirstrip/||;t" \
1107 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
1108 - case $$dist_files in \
1109 - */*) $(MKDIR_P) `echo "$$dist_files" | \
1110 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1111 - sort -u` ;; \
1112 - esac; \
1113 - for file in $$dist_files; do \
1114 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1115 - if test -d $$d/$$file; then \
1116 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1117 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1118 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1119 - fi; \
1120 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1121 - else \
1122 - test -f $(distdir)/$$file \
1123 - || cp -p $$d/$$file $(distdir)/$$file \
1124 - || exit 1; \
1125 - fi; \
1126 - done
1127 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1128 - if test "$$subdir" = .; then :; else \
1129 - test -d "$(distdir)/$$subdir" \
1130 - || $(MKDIR_P) "$(distdir)/$$subdir" \
1131 - || exit 1; \
1132 - distdir=`$(am__cd) $(distdir) && pwd`; \
1133 - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
1134 - (cd $$subdir && \
1135 - $(MAKE) $(AM_MAKEFLAGS) \
1136 - top_distdir="$$top_distdir" \
1137 - distdir="$$distdir/$$subdir" \
1138 - am__remove_distdir=: \
1139 - am__skip_length_check=: \
1140 - distdir) \
1141 - || exit 1; \
1142 - fi; \
1143 - done
1144 - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
1145 - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
1146 - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
1147 - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1148 - || chmod -R a+r $(distdir)
1149 -dist-gzip: distdir
1150 - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1151 - $(am__remove_distdir)
1152 -
1153 -dist-bzip2: distdir
1154 - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
1155 - $(am__remove_distdir)
1156 -
1157 -dist-lzma: distdir
1158 - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
1159 - $(am__remove_distdir)
1160 -
1161 -dist-tarZ: distdir
1162 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
1163 - $(am__remove_distdir)
1164 -
1165 -dist-shar: distdir
1166 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
1167 - $(am__remove_distdir)
1168 -
1169 -dist-zip: distdir
1170 - -rm -f $(distdir).zip
1171 - zip -rq $(distdir).zip $(distdir)
1172 - $(am__remove_distdir)
1173 -
1174 -dist dist-all: distdir
1175 - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1176 - $(am__remove_distdir)
1177 -
1178 -# This target untars the dist file and tries a VPATH configuration. Then
1179 -# it guarantees that the distribution is self-contained by making another
1180 -# tarfile.
1181 -distcheck: dist
1182 - case '$(DIST_ARCHIVES)' in \
1183 - *.tar.gz*) \
1184 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
1185 - *.tar.bz2*) \
1186 - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
1187 - *.tar.lzma*) \
1188 - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
1189 - *.tar.Z*) \
1190 - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1191 - *.shar.gz*) \
1192 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
1193 - *.zip*) \
1194 - unzip $(distdir).zip ;;\
1195 - esac
1196 - chmod -R a-w $(distdir); chmod a+w $(distdir)
1197 - mkdir $(distdir)/_build
1198 - mkdir $(distdir)/_inst
1199 - chmod a-w $(distdir)
1200 - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
1201 - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
1202 - && cd $(distdir)/_build \
1203 - && ../configure --srcdir=.. --prefix="$$dc_install_base" \
1204 - --with-included-gettext \
1205 - $(DISTCHECK_CONFIGURE_FLAGS) \
1206 - && $(MAKE) $(AM_MAKEFLAGS) \
1207 - && $(MAKE) $(AM_MAKEFLAGS) dvi \
1208 - && $(MAKE) $(AM_MAKEFLAGS) check \
1209 - && $(MAKE) $(AM_MAKEFLAGS) install \
1210 - && $(MAKE) $(AM_MAKEFLAGS) installcheck \
1211 - && $(MAKE) $(AM_MAKEFLAGS) uninstall \
1212 - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
1213 - distuninstallcheck \
1214 - && chmod -R a-w "$$dc_install_base" \
1215 - && ({ \
1216 - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
1217 - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
1218 - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
1219 - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
1220 - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
1221 - } || { rm -rf "$$dc_destdir"; exit 1; }) \
1222 - && rm -rf "$$dc_destdir" \
1223 - && $(MAKE) $(AM_MAKEFLAGS) dist \
1224 - && rm -rf $(DIST_ARCHIVES) \
1225 - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
1226 - $(am__remove_distdir)
1227 - @(echo "$(distdir) archives ready for distribution: "; \
1228 - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
1229 - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
1230 -distuninstallcheck:
1231 - @cd $(distuninstallcheck_dir) \
1232 - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
1233 - || { echo "ERROR: files left after uninstall:" ; \
1234 - if test -n "$(DESTDIR)"; then \
1235 - echo " (check DESTDIR support)"; \
1236 - fi ; \
1237 - $(distuninstallcheck_listfiles) ; \
1238 - exit 1; } >&2
1239 -distcleancheck: distclean
1240 - @if test '$(srcdir)' = . ; then \
1241 - echo "ERROR: distcleancheck can only run from a VPATH build" ; \
1242 - exit 1 ; \
1243 - fi
1244 - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
1245 - || { echo "ERROR: files left in build directory after distclean:" ; \
1246 - $(distcleancheck_listfiles) ; \
1247 - exit 1; } >&2
1248 -check-am: all-am
1249 -check: check-recursive
1250 -all-am: Makefile
1251 -installdirs: installdirs-recursive
1252 -installdirs-am:
1253 -install: install-recursive
1254 -install-exec: install-exec-recursive
1255 -install-data: install-data-recursive
1256 -uninstall: uninstall-recursive
1257 -
1258 -install-am: all-am
1259 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
1260 -
1261 -installcheck: installcheck-recursive
1262 -install-strip:
1263 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1264 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1265 - `test -z '$(STRIP)' || \
1266 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1267 -mostlyclean-generic:
1268 -
1269 -clean-generic:
1270 -
1271 -distclean-generic:
1272 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1273 -
1274 -maintainer-clean-generic:
1275 - @echo "This command is intended for maintainers to use"
1276 - @echo "it deletes files that may require special tools to rebuild."
1277 -clean: clean-recursive
1278 -
1279 -clean-am: clean-generic clean-libtool mostlyclean-am
1280 -
1281 -distclean: distclean-recursive
1282 - -rm -f $(am__CONFIG_DISTCLEAN_FILES)
1283 - -rm -f Makefile
1284 -distclean-am: clean-am distclean-generic distclean-hdr \
1285 - distclean-libtool distclean-tags
1286 -
1287 -dvi: dvi-recursive
1288 -
1289 -dvi-am:
1290 -
1291 -html: html-recursive
1292 -
1293 -info: info-recursive
1294 -
1295 -info-am:
1296 -
1297 -install-data-am:
1298 -
1299 -install-dvi: install-dvi-recursive
1300 -
1301 -install-exec-am:
1302 -
1303 -install-html: install-html-recursive
1304 -
1305 -install-info: install-info-recursive
1306 -
1307 -install-man:
1308 -
1309 -install-pdf: install-pdf-recursive
1310 -
1311 -install-ps: install-ps-recursive
1312 -
1313 -installcheck-am:
1314 -
1315 -maintainer-clean: maintainer-clean-recursive
1316 - -rm -f $(am__CONFIG_DISTCLEAN_FILES)
1317 - -rm -rf $(top_srcdir)/autom4te.cache
1318 - -rm -f Makefile
1319 -maintainer-clean-am: distclean-am maintainer-clean-generic
1320 -
1321 -mostlyclean: mostlyclean-recursive
1322 -
1323 -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
1324 -
1325 -pdf: pdf-recursive
1326 -
1327 -pdf-am:
1328 -
1329 -ps: ps-recursive
1330 -
1331 -ps-am:
1332 -
1333 -uninstall-am:
1334 -
1335 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
1336 - install-strip
1337 -
1338 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1339 - all all-am am--refresh check check-am clean clean-generic \
1340 - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1341 - dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
1342 - distclean distclean-generic distclean-hdr distclean-libtool \
1343 - distclean-tags distcleancheck distdir distuninstallcheck dvi \
1344 - dvi-am html html-am info info-am install install-am \
1345 - install-data install-data-am install-dvi install-dvi-am \
1346 - install-exec install-exec-am install-html install-html-am \
1347 - install-info install-info-am install-man install-pdf \
1348 - install-pdf-am install-ps install-ps-am install-strip \
1349 - installcheck installcheck-am installdirs installdirs-am \
1350 - maintainer-clean maintainer-clean-generic mostlyclean \
1351 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1352 - tags tags-recursive uninstall uninstall-am
1353 -
1354 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
1355 -# Otherwise a system limit (for SysV at least) may be exceeded.
1356 -.NOEXPORT:
1357 diff -rupN original/README new/README
1358 --- original/README 2009-03-29 00:59:54.000000000 -0430
1359 +++ new/README 2008-07-05 11:07:08.000000000 -0430
1360 @@ -18,27 +18,3 @@ especially with certain games and with t
1361
1362 See the doc/ folder in the source, or /usr/share/doc/pcsx/ on Debian systems,
1363 for more detailed information on PCSX-df. A UNIX manpage is also available.
1364 -
1365 -About The Plugins
1366 --------------------------------
1367 -
1368 -PCSX-df comes with a number of plugins that allows users to start immediately. These plugins
1369 -are placed in /usr/lib/games/psemu, which is where PCSX searches by default.
1370 -
1371 -GPU
1372 -- dfxvideo - based on PEOpS 1.17 by pbernert
1373 -- dfOpenGL - OpenGL plugin (added by schao of PCSX-df team, based on gpuZenOpenGL by CitiZen X)
1374 -
1375 -SPU
1376 -- dfsound
1377 -
1378 -Joypad/Input
1379 -- dfinput - based on padjoy 0.8.2 by ammoq
1380 -
1381 -CDR
1382 -- dfbinimage - based on cdrmooby plugin, originally by mooby
1383 -- dfbinimage2 - (added by micket of PCSX-df team, based on dfbinimage)
1384 -- dfiso - reads PSX CDs in ISO format (added by hdhoshy of PCSX-df team, based on cdriso by linuzappz)
1385 -- dfcdrom - reads real PSX CD in the CD drive (originally by linuzappz)
1386 -
1387 -Alternate plugins are available from the PEOpS project (http://sourceforge.net/projects/peops)
1388 diff -rupN original/aclocal.m4 new/aclocal.m4
1389 --- original/aclocal.m4 2009-03-29 01:17:33.000000000 -0430
1390 +++ new/aclocal.m4 1969-12-31 20:00:00.000000000 -0400
1391 @@ -1,7976 +0,0 @@
1392 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
1393 -
1394 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1395 -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1396 -# This file is free software; the Free Software Foundation
1397 -# gives unlimited permission to copy and/or distribute it,
1398 -# with or without modifications, as long as this notice is preserved.
1399 -
1400 -# This program is distributed in the hope that it will be useful,
1401 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
1402 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1403 -# PARTICULAR PURPOSE.
1404 -
1405 -m4_ifndef([AC_AUTOCONF_VERSION],
1406 - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1407 -m4_if(AC_AUTOCONF_VERSION, [2.63],,
1408 -[m4_warning([this file was generated for autoconf 2.63.
1409 -You have another version of autoconf. It may work, but is not guaranteed to.
1410 -If you have problems, you may need to regenerate the build system entirely.
1411 -To do so, use the procedure documented by the package, typically `autoreconf'.])])
1412 -
1413 -
1414 -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
1415 -# serial 40 IT_PROG_INTLTOOL
1416 -AC_DEFUN([IT_PROG_INTLTOOL], [
1417 -AC_PREREQ([2.50])dnl
1418 -AC_REQUIRE([AM_NLS])dnl
1419 -
1420 -case "$am__api_version" in
1421 - 1.[01234])
1422 - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
1423 - ;;
1424 - *)
1425 - ;;
1426 -esac
1427 -
1428 -if test -n "$1"; then
1429 - AC_MSG_CHECKING([for intltool >= $1])
1430 -
1431 - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
1432 - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
1433 - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
1434 - ]
1435 - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
1436 - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
1437 - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
1438 -fi
1439 -
1440 -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
1441 -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
1442 -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
1443 -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
1444 - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
1445 -fi
1446 -
1447 - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1448 -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1449 - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1450 - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1451 - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
1452 - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1453 - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1454 - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1455 -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1456 - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1457 - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1458 - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
1459 - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1460 - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1461 - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1462 - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1463 - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1464 - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1465 - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1466 -
1467 -_IT_SUBST(INTLTOOL_DESKTOP_RULE)
1468 -_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
1469 -_IT_SUBST(INTLTOOL_KEYS_RULE)
1470 -_IT_SUBST(INTLTOOL_PROP_RULE)
1471 -_IT_SUBST(INTLTOOL_OAF_RULE)
1472 -_IT_SUBST(INTLTOOL_PONG_RULE)
1473 -_IT_SUBST(INTLTOOL_SERVER_RULE)
1474 -_IT_SUBST(INTLTOOL_SHEET_RULE)
1475 -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
1476 -_IT_SUBST(INTLTOOL_UI_RULE)
1477 -_IT_SUBST(INTLTOOL_XAM_RULE)
1478 -_IT_SUBST(INTLTOOL_KBD_RULE)
1479 -_IT_SUBST(INTLTOOL_XML_RULE)
1480 -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
1481 -_IT_SUBST(INTLTOOL_CAVES_RULE)
1482 -_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
1483 -_IT_SUBST(INTLTOOL_THEME_RULE)
1484 -_IT_SUBST(INTLTOOL_SERVICE_RULE)
1485 -_IT_SUBST(INTLTOOL_POLICY_RULE)
1486 -
1487 -# Check the gettext tools to make sure they are GNU
1488 -AC_PATH_PROG(XGETTEXT, xgettext)
1489 -AC_PATH_PROG(MSGMERGE, msgmerge)
1490 -AC_PATH_PROG(MSGFMT, msgfmt)
1491 -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1492 -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
1493 - AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
1494 -fi
1495 -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
1496 -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
1497 -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
1498 -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
1499 - AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
1500 -fi
1501 -
1502 -AC_PATH_PROG(INTLTOOL_PERL, perl)
1503 -if test -z "$INTLTOOL_PERL"; then
1504 - AC_MSG_ERROR([perl not found])
1505 -fi
1506 -AC_MSG_CHECKING([for perl >= 5.8.1])
1507 -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
1508 -if test $? -ne 0; then
1509 - AC_MSG_ERROR([perl 5.8.1 is required for intltool])
1510 -else
1511 - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
1512 - AC_MSG_RESULT([$IT_PERL_VERSION])
1513 -fi
1514 -if test "x$2" != "xno-xml"; then
1515 - AC_MSG_CHECKING([for XML::Parser])
1516 - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
1517 - AC_MSG_RESULT([ok])
1518 - else
1519 - AC_MSG_ERROR([XML::Parser perl module is required for intltool])
1520 - fi
1521 -fi
1522 -
1523 -# Substitute ALL_LINGUAS so we can use it in po/Makefile
1524 -AC_SUBST(ALL_LINGUAS)
1525 -
1526 -# Set DATADIRNAME correctly if it is not set yet
1527 -# (copied from glib-gettext.m4)
1528 -if test -z "$DATADIRNAME"; then
1529 - AC_LINK_IFELSE(
1530 - [AC_LANG_PROGRAM([[]],
1531 - [[extern int _nl_msg_cat_cntr;
1532 - return _nl_msg_cat_cntr]])],
1533 - [DATADIRNAME=share],
1534 - [case $host in
1535 - *-*-solaris*)
1536 - dnl On Solaris, if bind_textdomain_codeset is in libc,
1537 - dnl GNU format message catalog is always supported,
1538 - dnl since both are added to the libc all together.
1539 - dnl Hence, we'd like to go with DATADIRNAME=share
1540 - dnl in this case.
1541 - AC_CHECK_FUNC(bind_textdomain_codeset,
1542 - [DATADIRNAME=share], [DATADIRNAME=lib])
1543 - ;;
1544 - *)
1545 - [DATADIRNAME=lib]
1546 - ;;
1547 - esac])
1548 -fi
1549 -AC_SUBST(DATADIRNAME)
1550 -
1551 -IT_PO_SUBDIR([po])
1552 -
1553 -])
1554 -
1555 -
1556 -# IT_PO_SUBDIR(DIRNAME)
1557 -# ---------------------
1558 -# All po subdirs have to be declared with this macro; the subdir "po" is
1559 -# declared by IT_PROG_INTLTOOL.
1560 -#
1561 -AC_DEFUN([IT_PO_SUBDIR],
1562 -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
1563 -dnl
1564 -dnl The following CONFIG_COMMANDS should be exetuted at the very end
1565 -dnl of config.status.
1566 -AC_CONFIG_COMMANDS_PRE([
1567 - AC_CONFIG_COMMANDS([$1/stamp-it], [
1568 - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
1569 - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
1570 - fi
1571 - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
1572 - >"$1/stamp-it.tmp"
1573 - [sed '/^#/d
1574 - s/^[[].*] *//
1575 - /^[ ]*$/d
1576 - '"s|^| $ac_top_srcdir/|" \
1577 - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
1578 - ]
1579 - [sed '/^POTFILES =/,/[^\\]$/ {
1580 - /^POTFILES =/!d
1581 - r $1/POTFILES
1582 - }
1583 - ' "$1/Makefile.in" >"$1/Makefile"]
1584 - rm -f "$1/Makefile.tmp"
1585 - mv "$1/stamp-it.tmp" "$1/stamp-it"
1586 - ])
1587 -])dnl
1588 -])
1589 -
1590 -# _IT_SUBST(VARIABLE)
1591 -# -------------------
1592 -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
1593 -#
1594 -AC_DEFUN([_IT_SUBST],
1595 -[
1596 -AC_SUBST([$1])
1597 -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
1598 -]
1599 -)
1600 -
1601 -# deprecated macros
1602 -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
1603 -# A hint is needed for aclocal from Automake <= 1.9.4:
1604 -# AC_DEFUN([AC_PROG_INTLTOOL], ...)
1605 -
1606 -
1607 -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1608 -
1609 -# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
1610 -
1611 -
1612 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
1613 -# -----------------------------------------------------------
1614 -# If this macro is not defined by Autoconf, define it here.
1615 -m4_ifdef([AC_PROVIDE_IFELSE],
1616 - [],
1617 - [m4_define([AC_PROVIDE_IFELSE],
1618 - [m4_ifdef([AC_PROVIDE_$1],
1619 - [$2], [$3])])])
1620 -
1621 -
1622 -# AC_PROG_LIBTOOL
1623 -# ---------------
1624 -AC_DEFUN([AC_PROG_LIBTOOL],
1625 -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
1626 -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
1627 -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
1628 - AC_PROVIDE_IFELSE([AC_PROG_CXX],
1629 - [AC_LIBTOOL_CXX],
1630 - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
1631 - ])])
1632 -dnl And a similar setup for Fortran 77 support
1633 - AC_PROVIDE_IFELSE([AC_PROG_F77],
1634 - [AC_LIBTOOL_F77],
1635 - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
1636 -])])
1637 -
1638 -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
1639 -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
1640 -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
1641 - AC_PROVIDE_IFELSE([AC_PROG_GCJ],
1642 - [AC_LIBTOOL_GCJ],
1643 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
1644 - [AC_LIBTOOL_GCJ],
1645 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
1646 - [AC_LIBTOOL_GCJ],
1647 - [ifdef([AC_PROG_GCJ],
1648 - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
1649 - ifdef([A][M_PROG_GCJ],
1650 - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
1651 - ifdef([LT_AC_PROG_GCJ],
1652 - [define([LT_AC_PROG_GCJ],
1653 - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
1654 -])])# AC_PROG_LIBTOOL
1655 -
1656 -
1657 -# _AC_PROG_LIBTOOL
1658 -# ----------------
1659 -AC_DEFUN([_AC_PROG_LIBTOOL],
1660 -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
1661 -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
1662 -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
1663 -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
1664 -
1665 -# This can be used to rebuild libtool when needed
1666 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
1667 -
1668 -# Always use our own libtool.
1669 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
1670 -AC_SUBST(LIBTOOL)dnl
1671 -
1672 -# Prevent multiple expansion
1673 -define([AC_PROG_LIBTOOL], [])
1674 -])# _AC_PROG_LIBTOOL
1675 -
1676 -
1677 -# AC_LIBTOOL_SETUP
1678 -# ----------------
1679 -AC_DEFUN([AC_LIBTOOL_SETUP],
1680 -[AC_PREREQ(2.50)dnl
1681 -AC_REQUIRE([AC_ENABLE_SHARED])dnl
1682 -AC_REQUIRE([AC_ENABLE_STATIC])dnl
1683 -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
1684 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
1685 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1686 -AC_REQUIRE([AC_PROG_CC])dnl
1687 -AC_REQUIRE([AC_PROG_LD])dnl
1688 -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
1689 -AC_REQUIRE([AC_PROG_NM])dnl
1690 -
1691 -AC_REQUIRE([AC_PROG_LN_S])dnl
1692 -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
1693 -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
1694 -AC_REQUIRE([AC_OBJEXT])dnl
1695 -AC_REQUIRE([AC_EXEEXT])dnl
1696 -dnl
1697 -AC_LIBTOOL_SYS_MAX_CMD_LEN
1698 -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
1699 -AC_LIBTOOL_OBJDIR
1700 -
1701 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
1702 -_LT_AC_PROG_ECHO_BACKSLASH
1703 -
1704 -case $host_os in
1705 -aix3*)
1706 - # AIX sometimes has problems with the GCC collect2 program. For some
1707 - # reason, if we set the COLLECT_NAMES environment variable, the problems
1708 - # vanish in a puff of smoke.
1709 - if test "X${COLLECT_NAMES+set}" != Xset; then
1710 - COLLECT_NAMES=
1711 - export COLLECT_NAMES
1712 - fi
1713 - ;;
1714 -esac
1715 -
1716 -# Sed substitution that helps us do robust quoting. It backslashifies
1717 -# metacharacters that are still active within double-quoted strings.
1718 -Xsed='sed -e 1s/^X//'
1719 -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
1720 -
1721 -# Same as above, but do not quote variable references.
1722 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
1723 -
1724 -# Sed substitution to delay expansion of an escaped shell variable in a
1725 -# double_quote_subst'ed string.
1726 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1727 -
1728 -# Sed substitution to avoid accidental globbing in evaled expressions
1729 -no_glob_subst='s/\*/\\\*/g'
1730 -
1731 -# Constants:
1732 -rm="rm -f"
1733 -
1734 -# Global variables:
1735 -default_ofile=libtool
1736 -can_build_shared=yes
1737 -
1738 -# All known linkers require a `.a' archive for static linking (except MSVC,
1739 -# which needs '.lib').
1740 -libext=a
1741 -ltmain="$ac_aux_dir/ltmain.sh"
1742 -ofile="$default_ofile"
1743 -with_gnu_ld="$lt_cv_prog_gnu_ld"
1744 -
1745 -AC_CHECK_TOOL(AR, ar, false)
1746 -AC_CHECK_TOOL(RANLIB, ranlib, :)
1747 -AC_CHECK_TOOL(STRIP, strip, :)
1748 -
1749 -old_CC="$CC"
1750 -old_CFLAGS="$CFLAGS"
1751 -
1752 -# Set sane defaults for various variables
1753 -test -z "$AR" && AR=ar
1754 -test -z "$AR_FLAGS" && AR_FLAGS=cru
1755 -test -z "$AS" && AS=as
1756 -test -z "$CC" && CC=cc
1757 -test -z "$LTCC" && LTCC=$CC
1758 -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
1759 -test -z "$DLLTOOL" && DLLTOOL=dlltool
1760 -test -z "$LD" && LD=ld
1761 -test -z "$LN_S" && LN_S="ln -s"
1762 -test -z "$MAGIC_CMD" && MAGIC_CMD=file
1763 -test -z "$NM" && NM=nm
1764 -test -z "$SED" && SED=sed
1765 -test -z "$OBJDUMP" && OBJDUMP=objdump
1766 -test -z "$RANLIB" && RANLIB=:
1767 -test -z "$STRIP" && STRIP=:
1768 -test -z "$ac_objext" && ac_objext=o
1769 -
1770 -# Determine commands to create old-style static archives.
1771 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
1772 -old_postinstall_cmds='chmod 644 $oldlib'
1773 -old_postuninstall_cmds=
1774 -
1775 -if test -n "$RANLIB"; then
1776 - case $host_os in
1777 - openbsd*)
1778 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1779 - ;;
1780 - *)
1781 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1782 - ;;
1783 - esac
1784 - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1785 -fi
1786 -
1787 -_LT_CC_BASENAME([$compiler])
1788 -
1789 -# Only perform the check for file, if the check method requires it
1790 -case $deplibs_check_method in
1791 -file_magic*)
1792 - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
1793 - AC_PATH_MAGIC
1794 - fi
1795 - ;;
1796 -esac
1797 -
1798 -_LT_REQUIRED_DARWIN_CHECKS
1799 -
1800 -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
1801 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
1802 -enable_win32_dll=yes, enable_win32_dll=no)
1803 -
1804 -AC_ARG_ENABLE([libtool-lock],
1805 - [AC_HELP_STRING([--disable-libtool-lock],
1806 - [avoid locking (might break parallel builds)])])
1807 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
1808 -
1809 -AC_ARG_WITH([pic],
1810 - [AC_HELP_STRING([--with-pic],
1811 - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
1812 - [pic_mode="$withval"],
1813 - [pic_mode=default])
1814 -test -z "$pic_mode" && pic_mode=default
1815 -
1816 -# Use C for the default configuration in the libtool script
1817 -tagname=
1818 -AC_LIBTOOL_LANG_C_CONFIG
1819 -_LT_AC_TAGCONFIG
1820 -])# AC_LIBTOOL_SETUP
1821 -
1822 -
1823 -# _LT_AC_SYS_COMPILER
1824 -# -------------------
1825 -AC_DEFUN([_LT_AC_SYS_COMPILER],
1826 -[AC_REQUIRE([AC_PROG_CC])dnl
1827 -
1828 -# If no C compiler was specified, use CC.
1829 -LTCC=${LTCC-"$CC"}
1830 -
1831 -# If no C compiler flags were specified, use CFLAGS.
1832 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
1833 -
1834 -# Allow CC to be a program name with arguments.
1835 -compiler=$CC
1836 -])# _LT_AC_SYS_COMPILER
1837 -
1838 -
1839 -# _LT_CC_BASENAME(CC)
1840 -# -------------------
1841 -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
1842 -AC_DEFUN([_LT_CC_BASENAME],
1843 -[for cc_temp in $1""; do
1844 - case $cc_temp in
1845 - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
1846 - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
1847 - \-*) ;;
1848 - *) break;;
1849 - esac
1850 -done
1851 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1852 -])
1853 -
1854 -
1855 -# _LT_COMPILER_BOILERPLATE
1856 -# ------------------------
1857 -# Check for compiler boilerplate output or warnings with
1858 -# the simple compiler test code.
1859 -AC_DEFUN([_LT_COMPILER_BOILERPLATE],
1860 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
1861 -ac_outfile=conftest.$ac_objext
1862 -echo "$lt_simple_compile_test_code" >conftest.$ac_ext
1863 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1864 -_lt_compiler_boilerplate=`cat conftest.err`
1865 -$rm conftest*
1866 -])# _LT_COMPILER_BOILERPLATE
1867 -
1868 -
1869 -# _LT_LINKER_BOILERPLATE
1870 -# ----------------------
1871 -# Check for linker boilerplate output or warnings with
1872 -# the simple link test code.
1873 -AC_DEFUN([_LT_LINKER_BOILERPLATE],
1874 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
1875 -ac_outfile=conftest.$ac_objext
1876 -echo "$lt_simple_link_test_code" >conftest.$ac_ext
1877 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1878 -_lt_linker_boilerplate=`cat conftest.err`
1879 -$rm -r conftest*
1880 -])# _LT_LINKER_BOILERPLATE
1881 -
1882 -# _LT_REQUIRED_DARWIN_CHECKS
1883 -# --------------------------
1884 -# Check for some things on darwin
1885 -AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
1886 - case $host_os in
1887 - rhapsody* | darwin*)
1888 - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
1889 - AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
1890 -
1891 - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
1892 - [lt_cv_apple_cc_single_mod=no
1893 - if test -z "${LT_MULTI_MODULE}"; then
1894 - # By default we will add the -single_module flag. You can override
1895 - # by either setting the environment variable LT_MULTI_MODULE
1896 - # non-empty at configure time, or by adding -multi_module to the
1897 - # link flags.
1898 - echo "int foo(void){return 1;}" > conftest.c
1899 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
1900 - -dynamiclib ${wl}-single_module conftest.c
1901 - if test -f libconftest.dylib; then
1902 - lt_cv_apple_cc_single_mod=yes
1903 - rm -rf libconftest.dylib*
1904 - fi
1905 - rm conftest.c
1906 - fi])
1907 - AC_CACHE_CHECK([for -exported_symbols_list linker flag],
1908 - [lt_cv_ld_exported_symbols_list],
1909 - [lt_cv_ld_exported_symbols_list=no
1910 - save_LDFLAGS=$LDFLAGS
1911 - echo "_main" > conftest.sym
1912 - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
1913 - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
1914 - [lt_cv_ld_exported_symbols_list=yes],
1915 - [lt_cv_ld_exported_symbols_list=no])
1916 - LDFLAGS="$save_LDFLAGS"
1917 - ])
1918 - case $host_os in
1919 - rhapsody* | darwin1.[[0123]])
1920 - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
1921 - darwin1.*)
1922 - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
1923 - darwin*)
1924 - # if running on 10.5 or later, the deployment target defaults
1925 - # to the OS version, if on x86, and 10.4, the deployment
1926 - # target defaults to 10.4. Don't you love it?
1927 - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
1928 - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
1929 - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
1930 - 10.[[012]]*)
1931 - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
1932 - 10.*)
1933 - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
1934 - esac
1935 - ;;
1936 - esac
1937 - if test "$lt_cv_apple_cc_single_mod" = "yes"; then
1938 - _lt_dar_single_mod='$single_module'
1939 - fi
1940 - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
1941 - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
1942 - else
1943 - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
1944 - fi
1945 - if test "$DSYMUTIL" != ":"; then
1946 - _lt_dsymutil="~$DSYMUTIL \$lib || :"
1947 - else
1948 - _lt_dsymutil=
1949 - fi
1950 - ;;
1951 - esac
1952 -])
1953 -
1954 -# _LT_AC_SYS_LIBPATH_AIX
1955 -# ----------------------
1956 -# Links a minimal program and checks the executable
1957 -# for the system default hardcoded library path. In most cases,
1958 -# this is /usr/lib:/lib, but when the MPI compilers are used
1959 -# the location of the communication and MPI libs are included too.
1960 -# If we don't find anything, use the default library path according
1961 -# to the aix ld manual.
1962 -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
1963 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
1964 -AC_LINK_IFELSE(AC_LANG_PROGRAM,[
1965 -lt_aix_libpath_sed='
1966 - /Import File Strings/,/^$/ {
1967 - /^0/ {
1968 - s/^0 *\(.*\)$/\1/
1969 - p
1970 - }
1971 - }'
1972 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1973 -# Check for a 64-bit object if we didn't find anything.
1974 -if test -z "$aix_libpath"; then
1975 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1976 -fi],[])
1977 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1978 -])# _LT_AC_SYS_LIBPATH_AIX
1979 -
1980 -
1981 -# _LT_AC_SHELL_INIT(ARG)
1982 -# ----------------------
1983 -AC_DEFUN([_LT_AC_SHELL_INIT],
1984 -[ifdef([AC_DIVERSION_NOTICE],
1985 - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
1986 - [AC_DIVERT_PUSH(NOTICE)])
1987 -$1
1988 -AC_DIVERT_POP
1989 -])# _LT_AC_SHELL_INIT
1990 -
1991 -
1992 -# _LT_AC_PROG_ECHO_BACKSLASH
1993 -# --------------------------
1994 -# Add some code to the start of the generated configure script which
1995 -# will find an echo command which doesn't interpret backslashes.
1996 -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
1997 -[_LT_AC_SHELL_INIT([
1998 -# Check that we are running under the correct shell.
1999 -SHELL=${CONFIG_SHELL-/bin/sh}
2000 -
2001 -case X$ECHO in
2002 -X*--fallback-echo)
2003 - # Remove one level of quotation (which was required for Make).
2004 - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
2005 - ;;
2006 -esac
2007 -
2008 -echo=${ECHO-echo}
2009 -if test "X[$]1" = X--no-reexec; then
2010 - # Discard the --no-reexec flag, and continue.
2011 - shift
2012 -elif test "X[$]1" = X--fallback-echo; then
2013 - # Avoid inline document here, it may be left over
2014 - :
2015 -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
2016 - # Yippee, $echo works!
2017 - :
2018 -else
2019 - # Restart under the correct shell.
2020 - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
2021 -fi
2022 -
2023 -if test "X[$]1" = X--fallback-echo; then
2024 - # used as fallback echo
2025 - shift
2026 - cat <<EOF
2027 -[$]*
2028 -EOF
2029 - exit 0
2030 -fi
2031 -
2032 -# The HP-UX ksh and POSIX shell print the target directory to stdout
2033 -# if CDPATH is set.
2034 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2035 -
2036 -if test -z "$ECHO"; then
2037 -if test "X${echo_test_string+set}" != Xset; then
2038 -# find a string as large as possible, as long as the shell can cope with it
2039 - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
2040 - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2041 - if (echo_test_string=`eval $cmd`) 2>/dev/null &&
2042 - echo_test_string=`eval $cmd` &&
2043 - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
2044 - then
2045 - break
2046 - fi
2047 - done
2048 -fi
2049 -
2050 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
2051 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
2052 - test "X$echo_testing_string" = "X$echo_test_string"; then
2053 - :
2054 -else
2055 - # The Solaris, AIX, and Digital Unix default echo programs unquote
2056 - # backslashes. This makes it impossible to quote backslashes using
2057 - # echo "$something" | sed 's/\\/\\\\/g'
2058 - #
2059 - # So, first we look for a working echo in the user's PATH.
2060 -
2061 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2062 - for dir in $PATH /usr/ucb; do
2063 - IFS="$lt_save_ifs"
2064 - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
2065 - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
2066 - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
2067 - test "X$echo_testing_string" = "X$echo_test_string"; then
2068 - echo="$dir/echo"
2069 - break
2070 - fi
2071 - done
2072 - IFS="$lt_save_ifs"
2073 -
2074 - if test "X$echo" = Xecho; then
2075 - # We didn't find a better echo, so look for alternatives.
2076 - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
2077 - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
2078 - test "X$echo_testing_string" = "X$echo_test_string"; then
2079 - # This shell has a builtin print -r that does the trick.
2080 - echo='print -r'
2081 - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
2082 - test "X$CONFIG_SHELL" != X/bin/ksh; then
2083 - # If we have ksh, try running configure again with it.
2084 - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
2085 - export ORIGINAL_CONFIG_SHELL
2086 - CONFIG_SHELL=/bin/ksh
2087 - export CONFIG_SHELL
2088 - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
2089 - else
2090 - # Try using printf.
2091 - echo='printf %s\n'
2092 - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
2093 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
2094 - test "X$echo_testing_string" = "X$echo_test_string"; then
2095 - # Cool, printf works
2096 - :
2097 - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
2098 - test "X$echo_testing_string" = 'X\t' &&
2099 - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2100 - test "X$echo_testing_string" = "X$echo_test_string"; then
2101 - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
2102 - export CONFIG_SHELL
2103 - SHELL="$CONFIG_SHELL"
2104 - export SHELL
2105 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
2106 - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
2107 - test "X$echo_testing_string" = 'X\t' &&
2108 - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2109 - test "X$echo_testing_string" = "X$echo_test_string"; then
2110 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
2111 - else
2112 - # maybe with a smaller string...
2113 - prev=:
2114 -
2115 - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
2116 - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
2117 - then
2118 - break
2119 - fi
2120 - prev="$cmd"
2121 - done
2122 -
2123 - if test "$prev" != 'sed 50q "[$]0"'; then
2124 - echo_test_string=`eval $prev`
2125 - export echo_test_string
2126 - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
2127 - else
2128 - # Oops. We lost completely, so just stick with echo.
2129 - echo=echo
2130 - fi
2131 - fi
2132 - fi
2133 - fi
2134 -fi
2135 -fi
2136 -
2137 -# Copy echo and quote the copy suitably for passing to libtool from
2138 -# the Makefile, instead of quoting the original, which is used later.
2139 -ECHO=$echo
2140 -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
2141 - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
2142 -fi
2143 -
2144 -AC_SUBST(ECHO)
2145 -])])# _LT_AC_PROG_ECHO_BACKSLASH
2146 -
2147 -
2148 -# _LT_AC_LOCK
2149 -# -----------
2150 -AC_DEFUN([_LT_AC_LOCK],
2151 -[AC_ARG_ENABLE([libtool-lock],
2152 - [AC_HELP_STRING([--disable-libtool-lock],
2153 - [avoid locking (might break parallel builds)])])
2154 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
2155 -
2156 -# Some flags need to be propagated to the compiler or linker for good
2157 -# libtool support.
2158 -case $host in
2159 -ia64-*-hpux*)
2160 - # Find out which ABI we are using.
2161 - echo 'int i;' > conftest.$ac_ext
2162 - if AC_TRY_EVAL(ac_compile); then
2163 - case `/usr/bin/file conftest.$ac_objext` in
2164 - *ELF-32*)
2165 - HPUX_IA64_MODE="32"
2166 - ;;
2167 - *ELF-64*)
2168 - HPUX_IA64_MODE="64"
2169 - ;;
2170 - esac
2171 - fi
2172 - rm -rf conftest*
2173 - ;;
2174 -*-*-irix6*)
2175 - # Find out which ABI we are using.
2176 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
2177 - if AC_TRY_EVAL(ac_compile); then
2178 - if test "$lt_cv_prog_gnu_ld" = yes; then
2179 - case `/usr/bin/file conftest.$ac_objext` in
2180 - *32-bit*)
2181 - LD="${LD-ld} -melf32bsmip"
2182 - ;;
2183 - *N32*)
2184 - LD="${LD-ld} -melf32bmipn32"
2185 - ;;
2186 - *64-bit*)
2187 - LD="${LD-ld} -melf64bmip"
2188 - ;;
2189 - esac
2190 - else
2191 - case `/usr/bin/file conftest.$ac_objext` in
2192 - *32-bit*)
2193 - LD="${LD-ld} -32"
2194 - ;;
2195 - *N32*)
2196 - LD="${LD-ld} -n32"
2197 - ;;
2198 - *64-bit*)
2199 - LD="${LD-ld} -64"
2200 - ;;
2201 - esac
2202 - fi
2203 - fi
2204 - rm -rf conftest*
2205 - ;;
2206 -
2207 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
2208 -s390*-*linux*|sparc*-*linux*)
2209 - # Find out which ABI we are using.
2210 - echo 'int i;' > conftest.$ac_ext
2211 - if AC_TRY_EVAL(ac_compile); then
2212 - case `/usr/bin/file conftest.o` in
2213 - *32-bit*)
2214 - case $host in
2215 - x86_64-*kfreebsd*-gnu)
2216 - LD="${LD-ld} -m elf_i386_fbsd"
2217 - ;;
2218 - x86_64-*linux*)
2219 - LD="${LD-ld} -m elf_i386"
2220 - ;;
2221 - ppc64-*linux*|powerpc64-*linux*)
2222 - LD="${LD-ld} -m elf32ppclinux"
2223 - ;;
2224 - s390x-*linux*)
2225 - LD="${LD-ld} -m elf_s390"
2226 - ;;
2227 - sparc64-*linux*)
2228 - LD="${LD-ld} -m elf32_sparc"
2229 - ;;
2230 - esac
2231 - ;;
2232 - *64-bit*)
2233 - case $host in
2234 - x86_64-*kfreebsd*-gnu)
2235 - LD="${LD-ld} -m elf_x86_64_fbsd"
2236 - ;;
2237 - x86_64-*linux*)
2238 - LD="${LD-ld} -m elf_x86_64"
2239 - ;;
2240 - ppc*-*linux*|powerpc*-*linux*)
2241 - LD="${LD-ld} -m elf64ppc"
2242 - ;;
2243 - s390*-*linux*)
2244 - LD="${LD-ld} -m elf64_s390"
2245 - ;;
2246 - sparc*-*linux*)
2247 - LD="${LD-ld} -m elf64_sparc"
2248 - ;;
2249 - esac
2250 - ;;
2251 - esac
2252 - fi
2253 - rm -rf conftest*
2254 - ;;
2255 -
2256 -*-*-sco3.2v5*)
2257 - # On SCO OpenServer 5, we need -belf to get full-featured binaries.
2258 - SAVE_CFLAGS="$CFLAGS"
2259 - CFLAGS="$CFLAGS -belf"
2260 - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
2261 - [AC_LANG_PUSH(C)
2262 - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
2263 - AC_LANG_POP])
2264 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
2265 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
2266 - CFLAGS="$SAVE_CFLAGS"
2267 - fi
2268 - ;;
2269 -sparc*-*solaris*)
2270 - # Find out which ABI we are using.
2271 - echo 'int i;' > conftest.$ac_ext
2272 - if AC_TRY_EVAL(ac_compile); then
2273 - case `/usr/bin/file conftest.o` in
2274 - *64-bit*)
2275 - case $lt_cv_prog_gnu_ld in
2276 - yes*) LD="${LD-ld} -m elf64_sparc" ;;
2277 - *)
2278 - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
2279 - LD="${LD-ld} -64"
2280 - fi
2281 - ;;
2282 - esac
2283 - ;;
2284 - esac
2285 - fi
2286 - rm -rf conftest*
2287 - ;;
2288 -
2289 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
2290 -[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
2291 - AC_CHECK_TOOL(DLLTOOL, dlltool, false)
2292 - AC_CHECK_TOOL(AS, as, false)
2293 - AC_CHECK_TOOL(OBJDUMP, objdump, false)
2294 - ;;
2295 - ])
2296 -esac
2297 -
2298 -need_locks="$enable_libtool_lock"
2299 -
2300 -])# _LT_AC_LOCK
2301 -
2302 -
2303 -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
2304 -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
2305 -# ----------------------------------------------------------------
2306 -# Check whether the given compiler option works
2307 -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
2308 -[AC_REQUIRE([LT_AC_PROG_SED])
2309 -AC_CACHE_CHECK([$1], [$2],
2310 - [$2=no
2311 - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
2312 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2313 - lt_compiler_flag="$3"
2314 - # Insert the option either (1) after the last *FLAGS variable, or
2315 - # (2) before a word containing "conftest.", or (3) at the end.
2316 - # Note that $ac_compile itself does not contain backslashes and begins
2317 - # with a dollar sign (not a hyphen), so the echo should work correctly.
2318 - # The option is referenced via a variable to avoid confusing sed.
2319 - lt_compile=`echo "$ac_compile" | $SED \
2320 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2321 - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
2322 - -e 's:$: $lt_compiler_flag:'`
2323 - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
2324 - (eval "$lt_compile" 2>conftest.err)
2325 - ac_status=$?
2326 - cat conftest.err >&AS_MESSAGE_LOG_FD
2327 - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
2328 - if (exit $ac_status) && test -s "$ac_outfile"; then
2329 - # The compiler can only warn and ignore the option if not recognized
2330 - # So say no if there are warnings other than the usual output.
2331 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
2332 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2333 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
2334 - $2=yes
2335 - fi
2336 - fi
2337 - $rm conftest*
2338 -])
2339 -
2340 -if test x"[$]$2" = xyes; then
2341 - ifelse([$5], , :, [$5])
2342 -else
2343 - ifelse([$6], , :, [$6])
2344 -fi
2345 -])# AC_LIBTOOL_COMPILER_OPTION
2346 -
2347 -
2348 -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
2349 -# [ACTION-SUCCESS], [ACTION-FAILURE])
2350 -# ------------------------------------------------------------
2351 -# Check whether the given compiler option works
2352 -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
2353 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
2354 -AC_CACHE_CHECK([$1], [$2],
2355 - [$2=no
2356 - save_LDFLAGS="$LDFLAGS"
2357 - LDFLAGS="$LDFLAGS $3"
2358 - echo "$lt_simple_link_test_code" > conftest.$ac_ext
2359 - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
2360 - # The linker can only warn and ignore the option if not recognized
2361 - # So say no if there are warnings
2362 - if test -s conftest.err; then
2363 - # Append any errors to the config.log.
2364 - cat conftest.err 1>&AS_MESSAGE_LOG_FD
2365 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
2366 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2367 - if diff conftest.exp conftest.er2 >/dev/null; then
2368 - $2=yes
2369 - fi
2370 - else
2371 - $2=yes
2372 - fi
2373 - fi
2374 - $rm -r conftest*
2375 - LDFLAGS="$save_LDFLAGS"
2376 -])
2377 -
2378 -if test x"[$]$2" = xyes; then
2379 - ifelse([$4], , :, [$4])
2380 -else
2381 - ifelse([$5], , :, [$5])
2382 -fi
2383 -])# AC_LIBTOOL_LINKER_OPTION
2384 -
2385 -
2386 -# AC_LIBTOOL_SYS_MAX_CMD_LEN
2387 -# --------------------------
2388 -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
2389 -[# find the maximum length of command line arguments
2390 -AC_MSG_CHECKING([the maximum length of command line arguments])
2391 -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
2392 - i=0
2393 - teststring="ABCD"
2394 -
2395 - case $build_os in
2396 - msdosdjgpp*)
2397 - # On DJGPP, this test can blow up pretty badly due to problems in libc
2398 - # (any single argument exceeding 2000 bytes causes a buffer overrun
2399 - # during glob expansion). Even if it were fixed, the result of this
2400 - # check would be larger than it should be.
2401 - lt_cv_sys_max_cmd_len=12288; # 12K is about right
2402 - ;;
2403 -
2404 - gnu*)
2405 - # Under GNU Hurd, this test is not required because there is
2406 - # no limit to the length of command line arguments.
2407 - # Libtool will interpret -1 as no limit whatsoever
2408 - lt_cv_sys_max_cmd_len=-1;
2409 - ;;
2410 -
2411 - cygwin* | mingw*)
2412 - # On Win9x/ME, this test blows up -- it succeeds, but takes
2413 - # about 5 minutes as the teststring grows exponentially.
2414 - # Worse, since 9x/ME are not pre-emptively multitasking,
2415 - # you end up with a "frozen" computer, even though with patience
2416 - # the test eventually succeeds (with a max line length of 256k).
2417 - # Instead, let's just punt: use the minimum linelength reported by
2418 - # all of the supported platforms: 8192 (on NT/2K/XP).
2419 - lt_cv_sys_max_cmd_len=8192;
2420 - ;;
2421 -
2422 - amigaos*)
2423 - # On AmigaOS with pdksh, this test takes hours, literally.
2424 - # So we just punt and use a minimum line length of 8192.
2425 - lt_cv_sys_max_cmd_len=8192;
2426 - ;;
2427 -
2428 - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
2429 - # This has been around since 386BSD, at least. Likely further.
2430 - if test -x /sbin/sysctl; then
2431 - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
2432 - elif test -x /usr/sbin/sysctl; then
2433 - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
2434 - else
2435 - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
2436 - fi
2437 - # And add a safety zone
2438 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
2439 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
2440 - ;;
2441 -
2442 - interix*)
2443 - # We know the value 262144 and hardcode it with a safety zone (like BSD)
2444 - lt_cv_sys_max_cmd_len=196608
2445 - ;;
2446 -
2447 - osf*)
2448 - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
2449 - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
2450 - # nice to cause kernel panics so lets avoid the loop below.
2451 - # First set a reasonable default.
2452 - lt_cv_sys_max_cmd_len=16384
2453 - #
2454 - if test -x /sbin/sysconfig; then
2455 - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
2456 - *1*) lt_cv_sys_max_cmd_len=-1 ;;
2457 - esac
2458 - fi
2459 - ;;
2460 - sco3.2v5*)
2461 - lt_cv_sys_max_cmd_len=102400
2462 - ;;
2463 - sysv5* | sco5v6* | sysv4.2uw2*)
2464 - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
2465 - if test -n "$kargmax"; then
2466 - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
2467 - else
2468 - lt_cv_sys_max_cmd_len=32768
2469 - fi
2470 - ;;
2471 - *)
2472 - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
2473 - if test -n "$lt_cv_sys_max_cmd_len"; then
2474 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
2475 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
2476 - else
2477 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
2478 - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
2479 - = "XX$teststring") >/dev/null 2>&1 &&
2480 - new_result=`expr "X$teststring" : ".*" 2>&1` &&
2481 - lt_cv_sys_max_cmd_len=$new_result &&
2482 - test $i != 17 # 1/2 MB should be enough
2483 - do
2484 - i=`expr $i + 1`
2485 - teststring=$teststring$teststring
2486 - done
2487 - teststring=
2488 - # Add a significant safety factor because C++ compilers can tack on massive
2489 - # amounts of additional arguments before passing them to the linker.
2490 - # It appears as though 1/2 is a usable value.
2491 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
2492 - fi
2493 - ;;
2494 - esac
2495 -])
2496 -if test -n $lt_cv_sys_max_cmd_len ; then
2497 - AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
2498 -else
2499 - AC_MSG_RESULT(none)
2500 -fi
2501 -])# AC_LIBTOOL_SYS_MAX_CMD_LEN
2502 -
2503 -
2504 -# _LT_AC_CHECK_DLFCN
2505 -# ------------------
2506 -AC_DEFUN([_LT_AC_CHECK_DLFCN],
2507 -[AC_CHECK_HEADERS(dlfcn.h)dnl
2508 -])# _LT_AC_CHECK_DLFCN
2509 -
2510 -
2511 -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
2512 -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
2513 -# ---------------------------------------------------------------------
2514 -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
2515 -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
2516 -if test "$cross_compiling" = yes; then :
2517 - [$4]
2518 -else
2519 - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2520 - lt_status=$lt_dlunknown
2521 - cat > conftest.$ac_ext <<EOF
2522 -[#line __oline__ "configure"
2523 -#include "confdefs.h"
2524 -
2525 -#if HAVE_DLFCN_H
2526 -#include <dlfcn.h>
2527 -#endif
2528 -
2529 -#include <stdio.h>
2530 -
2531 -#ifdef RTLD_GLOBAL
2532 -# define LT_DLGLOBAL RTLD_GLOBAL
2533 -#else
2534 -# ifdef DL_GLOBAL
2535 -# define LT_DLGLOBAL DL_GLOBAL
2536 -# else
2537 -# define LT_DLGLOBAL 0
2538 -# endif
2539 -#endif
2540 -
2541 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
2542 - find out it does not work in some platform. */
2543 -#ifndef LT_DLLAZY_OR_NOW
2544 -# ifdef RTLD_LAZY
2545 -# define LT_DLLAZY_OR_NOW RTLD_LAZY
2546 -# else
2547 -# ifdef DL_LAZY
2548 -# define LT_DLLAZY_OR_NOW DL_LAZY
2549 -# else
2550 -# ifdef RTLD_NOW
2551 -# define LT_DLLAZY_OR_NOW RTLD_NOW
2552 -# else
2553 -# ifdef DL_NOW
2554 -# define LT_DLLAZY_OR_NOW DL_NOW
2555 -# else
2556 -# define LT_DLLAZY_OR_NOW 0
2557 -# endif
2558 -# endif
2559 -# endif
2560 -# endif
2561 -#endif
2562 -
2563 -#ifdef __cplusplus
2564 -extern "C" void exit (int);
2565 -#endif
2566 -
2567 -void fnord() { int i=42;}
2568 -int main ()
2569 -{
2570 - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
2571 - int status = $lt_dlunknown;
2572 -
2573 - if (self)
2574 - {
2575 - if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
2576 - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
2577 - /* dlclose (self); */
2578 - }
2579 - else
2580 - puts (dlerror ());
2581 -
2582 - exit (status);
2583 -}]
2584 -EOF
2585 - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
2586 - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
2587 - lt_status=$?
2588 - case x$lt_status in
2589 - x$lt_dlno_uscore) $1 ;;
2590 - x$lt_dlneed_uscore) $2 ;;
2591 - x$lt_dlunknown|x*) $3 ;;
2592 - esac
2593 - else :
2594 - # compilation failed
2595 - $3
2596 - fi
2597 -fi
2598 -rm -fr conftest*
2599 -])# _LT_AC_TRY_DLOPEN_SELF
2600 -
2601 -
2602 -# AC_LIBTOOL_DLOPEN_SELF
2603 -# ----------------------
2604 -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
2605 -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
2606 -if test "x$enable_dlopen" != xyes; then
2607 - enable_dlopen=unknown
2608 - enable_dlopen_self=unknown
2609 - enable_dlopen_self_static=unknown
2610 -else
2611 - lt_cv_dlopen=no
2612 - lt_cv_dlopen_libs=
2613 -
2614 - case $host_os in
2615 - beos*)
2616 - lt_cv_dlopen="load_add_on"
2617 - lt_cv_dlopen_libs=
2618 - lt_cv_dlopen_self=yes
2619 - ;;
2620 -
2621 - mingw* | pw32*)
2622 - lt_cv_dlopen="LoadLibrary"
2623 - lt_cv_dlopen_libs=
2624 - ;;
2625 -
2626 - cygwin*)
2627 - lt_cv_dlopen="dlopen"
2628 - lt_cv_dlopen_libs=
2629 - ;;
2630 -
2631 - darwin*)
2632 - # if libdl is installed we need to link against it
2633 - AC_CHECK_LIB([dl], [dlopen],
2634 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
2635 - lt_cv_dlopen="dyld"
2636 - lt_cv_dlopen_libs=
2637 - lt_cv_dlopen_self=yes
2638 - ])
2639 - ;;
2640 -
2641 - *)
2642 - AC_CHECK_FUNC([shl_load],
2643 - [lt_cv_dlopen="shl_load"],
2644 - [AC_CHECK_LIB([dld], [shl_load],
2645 - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
2646 - [AC_CHECK_FUNC([dlopen],
2647 - [lt_cv_dlopen="dlopen"],
2648 - [AC_CHECK_LIB([dl], [dlopen],
2649 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
2650 - [AC_CHECK_LIB([svld], [dlopen],
2651 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
2652 - [AC_CHECK_LIB([dld], [dld_link],
2653 - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
2654 - ])
2655 - ])
2656 - ])
2657 - ])
2658 - ])
2659 - ;;
2660 - esac
2661 -
2662 - if test "x$lt_cv_dlopen" != xno; then
2663 - enable_dlopen=yes
2664 - else
2665 - enable_dlopen=no
2666 - fi
2667 -
2668 - case $lt_cv_dlopen in
2669 - dlopen)
2670 - save_CPPFLAGS="$CPPFLAGS"
2671 - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
2672 -
2673 - save_LDFLAGS="$LDFLAGS"
2674 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
2675 -
2676 - save_LIBS="$LIBS"
2677 - LIBS="$lt_cv_dlopen_libs $LIBS"
2678 -
2679 - AC_CACHE_CHECK([whether a program can dlopen itself],
2680 - lt_cv_dlopen_self, [dnl
2681 - _LT_AC_TRY_DLOPEN_SELF(
2682 - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
2683 - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
2684 - ])
2685 -
2686 - if test "x$lt_cv_dlopen_self" = xyes; then
2687 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
2688 - AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
2689 - lt_cv_dlopen_self_static, [dnl
2690 - _LT_AC_TRY_DLOPEN_SELF(
2691 - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
2692 - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
2693 - ])
2694 - fi
2695 -
2696 - CPPFLAGS="$save_CPPFLAGS"
2697 - LDFLAGS="$save_LDFLAGS"
2698 - LIBS="$save_LIBS"
2699 - ;;
2700 - esac
2701 -
2702 - case $lt_cv_dlopen_self in
2703 - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
2704 - *) enable_dlopen_self=unknown ;;
2705 - esac
2706 -
2707 - case $lt_cv_dlopen_self_static in
2708 - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
2709 - *) enable_dlopen_self_static=unknown ;;
2710 - esac
2711 -fi
2712 -])# AC_LIBTOOL_DLOPEN_SELF
2713 -
2714 -
2715 -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
2716 -# ---------------------------------
2717 -# Check to see if options -c and -o are simultaneously supported by compiler
2718 -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
2719 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
2720 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
2721 -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
2722 - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
2723 - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
2724 - $rm -r conftest 2>/dev/null
2725 - mkdir conftest
2726 - cd conftest
2727 - mkdir out
2728 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2729 -
2730 - lt_compiler_flag="-o out/conftest2.$ac_objext"
2731 - # Insert the option either (1) after the last *FLAGS variable, or
2732 - # (2) before a word containing "conftest.", or (3) at the end.
2733 - # Note that $ac_compile itself does not contain backslashes and begins
2734 - # with a dollar sign (not a hyphen), so the echo should work correctly.
2735 - lt_compile=`echo "$ac_compile" | $SED \
2736 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2737 - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
2738 - -e 's:$: $lt_compiler_flag:'`
2739 - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
2740 - (eval "$lt_compile" 2>out/conftest.err)
2741 - ac_status=$?
2742 - cat out/conftest.err >&AS_MESSAGE_LOG_FD
2743 - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
2744 - if (exit $ac_status) && test -s out/conftest2.$ac_objext
2745 - then
2746 - # The compiler can only warn and ignore the option if not recognized
2747 - # So say no if there are warnings
2748 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
2749 - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
2750 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
2751 - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
2752 - fi
2753 - fi
2754 - chmod u+w . 2>&AS_MESSAGE_LOG_FD
2755 - $rm conftest*
2756 - # SGI C++ compiler will create directory out/ii_files/ for
2757 - # template instantiation
2758 - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
2759 - $rm out/* && rmdir out
2760 - cd ..
2761 - rmdir conftest
2762 - $rm conftest*
2763 -])
2764 -])# AC_LIBTOOL_PROG_CC_C_O
2765 -
2766 -
2767 -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
2768 -# -----------------------------------------
2769 -# Check to see if we can do hard links to lock some files if needed
2770 -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
2771 -[AC_REQUIRE([_LT_AC_LOCK])dnl
2772 -
2773 -hard_links="nottested"
2774 -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
2775 - # do not overwrite the value of need_locks provided by the user
2776 - AC_MSG_CHECKING([if we can lock with hard links])
2777 - hard_links=yes
2778 - $rm conftest*
2779 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
2780 - touch conftest.a
2781 - ln conftest.a conftest.b 2>&5 || hard_links=no
2782 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
2783 - AC_MSG_RESULT([$hard_links])
2784 - if test "$hard_links" = no; then
2785 - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
2786 - need_locks=warn
2787 - fi
2788 -else
2789 - need_locks=no
2790 -fi
2791 -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
2792 -
2793 -
2794 -# AC_LIBTOOL_OBJDIR
2795 -# -----------------
2796 -AC_DEFUN([AC_LIBTOOL_OBJDIR],
2797 -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
2798 -[rm -f .libs 2>/dev/null
2799 -mkdir .libs 2>/dev/null
2800 -if test -d .libs; then
2801 - lt_cv_objdir=.libs
2802 -else
2803 - # MS-DOS does not allow filenames that begin with a dot.
2804 - lt_cv_objdir=_libs
2805 -fi
2806 -rmdir .libs 2>/dev/null])
2807 -objdir=$lt_cv_objdir
2808 -])# AC_LIBTOOL_OBJDIR
2809 -
2810 -
2811 -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
2812 -# ----------------------------------------------
2813 -# Check hardcoding attributes.
2814 -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
2815 -[AC_MSG_CHECKING([how to hardcode library paths into programs])
2816 -_LT_AC_TAGVAR(hardcode_action, $1)=
2817 -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
2818 - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
2819 - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
2820 -
2821 - # We can hardcode non-existant directories.
2822 - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
2823 - # If the only mechanism to avoid hardcoding is shlibpath_var, we
2824 - # have to relink, otherwise we might link with an installed library
2825 - # when we should be linking with a yet-to-be-installed one
2826 - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
2827 - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
2828 - # Linking always hardcodes the temporary library directory.
2829 - _LT_AC_TAGVAR(hardcode_action, $1)=relink
2830 - else
2831 - # We can link without hardcoding, and we can hardcode nonexisting dirs.
2832 - _LT_AC_TAGVAR(hardcode_action, $1)=immediate
2833 - fi
2834 -else
2835 - # We cannot hardcode anything, or else we can only hardcode existing
2836 - # directories.
2837 - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
2838 -fi
2839 -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
2840 -
2841 -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
2842 - # Fast installation is not supported
2843 - enable_fast_install=no
2844 -elif test "$shlibpath_overrides_runpath" = yes ||
2845 - test "$enable_shared" = no; then
2846 - # Fast installation is not necessary
2847 - enable_fast_install=needless
2848 -fi
2849 -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
2850 -
2851 -
2852 -# AC_LIBTOOL_SYS_LIB_STRIP
2853 -# ------------------------
2854 -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
2855 -[striplib=
2856 -old_striplib=
2857 -AC_MSG_CHECKING([whether stripping libraries is possible])
2858 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
2859 - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
2860 - test -z "$striplib" && striplib="$STRIP --strip-unneeded"
2861 - AC_MSG_RESULT([yes])
2862 -else
2863 -# FIXME - insert some real tests, host_os isn't really good enough
2864 - case $host_os in
2865 - darwin*)
2866 - if test -n "$STRIP" ; then
2867 - striplib="$STRIP -x"
2868 - old_striplib="$STRIP -S"
2869 - AC_MSG_RESULT([yes])
2870 - else
2871 - AC_MSG_RESULT([no])
2872 -fi
2873 - ;;
2874 - *)
2875 - AC_MSG_RESULT([no])
2876 - ;;
2877 - esac
2878 -fi
2879 -])# AC_LIBTOOL_SYS_LIB_STRIP
2880 -
2881 -
2882 -# AC_LIBTOOL_SYS_DYNAMIC_LINKER
2883 -# -----------------------------
2884 -# PORTME Fill in your ld.so characteristics
2885 -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
2886 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
2887 -AC_MSG_CHECKING([dynamic linker characteristics])
2888 -library_names_spec=
2889 -libname_spec='lib$name'
2890 -soname_spec=
2891 -shrext_cmds=".so"
2892 -postinstall_cmds=
2893 -postuninstall_cmds=
2894 -finish_cmds=
2895 -finish_eval=
2896 -shlibpath_var=
2897 -shlibpath_overrides_runpath=unknown
2898 -version_type=none
2899 -dynamic_linker="$host_os ld.so"
2900 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
2901 -m4_if($1,[],[
2902 -if test "$GCC" = yes; then
2903 - case $host_os in
2904 - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
2905 - *) lt_awk_arg="/^libraries:/" ;;
2906 - esac
2907 - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2908 - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
2909 - # if the path contains ";" then we assume it to be the separator
2910 - # otherwise default to the standard path separator (i.e. ":") - it is
2911 - # assumed that no part of a normal pathname contains ";" but that should
2912 - # okay in the real world where ";" in dirpaths is itself problematic.
2913 - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
2914 - else
2915 - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2916 - fi
2917 - # Ok, now we have the path, separated by spaces, we can step through it
2918 - # and add multilib dir if necessary.
2919 - lt_tmp_lt_search_path_spec=
2920 - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
2921 - for lt_sys_path in $lt_search_path_spec; do
2922 - if test -d "$lt_sys_path/$lt_multi_os_dir"; then
2923 - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
2924 - else
2925 - test -d "$lt_sys_path" && \
2926 - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
2927 - fi
2928 - done
2929 - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
2930 -BEGIN {RS=" "; FS="/|\n";} {
2931 - lt_foo="";
2932 - lt_count=0;
2933 - for (lt_i = NF; lt_i > 0; lt_i--) {
2934 - if ($lt_i != "" && $lt_i != ".") {
2935 - if ($lt_i == "..") {
2936 - lt_count++;
2937 - } else {
2938 - if (lt_count == 0) {
2939 - lt_foo="/" $lt_i lt_foo;
2940 - } else {
2941 - lt_count--;
2942 - }
2943 - }
2944 - }
2945 - }
2946 - if (lt_foo != "") { lt_freq[[lt_foo]]++; }
2947 - if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
2948 -}'`
2949 - sys_lib_search_path_spec=`echo $lt_search_path_spec`
2950 -else
2951 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
2952 -fi])
2953 -need_lib_prefix=unknown
2954 -hardcode_into_libs=no
2955 -
2956 -# when you set need_version to no, make sure it does not cause -set_version
2957 -# flags to be left without arguments
2958 -need_version=unknown
2959 -
2960 -case $host_os in
2961 -aix3*)
2962 - version_type=linux
2963 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
2964 - shlibpath_var=LIBPATH
2965 -
2966 - # AIX 3 has no versioning support, so we append a major version to the name.
2967 - soname_spec='${libname}${release}${shared_ext}$major'
2968 - ;;
2969 -
2970 -aix[[4-9]]*)
2971 - version_type=linux
2972 - need_lib_prefix=no
2973 - need_version=no
2974 - hardcode_into_libs=yes
2975 - if test "$host_cpu" = ia64; then
2976 - # AIX 5 supports IA64
2977 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
2978 - shlibpath_var=LD_LIBRARY_PATH
2979 - else
2980 - # With GCC up to 2.95.x, collect2 would create an import file
2981 - # for dependence libraries. The import file would start with
2982 - # the line `#! .'. This would cause the generated library to
2983 - # depend on `.', always an invalid library. This was fixed in
2984 - # development snapshots of GCC prior to 3.0.
2985 - case $host_os in
2986 - aix4 | aix4.[[01]] | aix4.[[01]].*)
2987 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
2988 - echo ' yes '
2989 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
2990 - :
2991 - else
2992 - can_build_shared=no
2993 - fi
2994 - ;;
2995 - esac
2996 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
2997 - # soname into executable. Probably we can add versioning support to
2998 - # collect2, so additional links can be useful in future.
2999 - if test "$aix_use_runtimelinking" = yes; then
3000 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
3001 - # instead of lib<name>.a to let people know that these are not
3002 - # typical AIX shared libraries.
3003 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3004 - else
3005 - # We preserve .a as extension for shared libraries through AIX4.2
3006 - # and later when we are not doing run time linking.
3007 - library_names_spec='${libname}${release}.a $libname.a'
3008 - soname_spec='${libname}${release}${shared_ext}$major'
3009 - fi
3010 - shlibpath_var=LIBPATH
3011 - fi
3012 - ;;
3013 -
3014 -amigaos*)
3015 - library_names_spec='$libname.ixlibrary $libname.a'
3016 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
3017 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
3018 - ;;
3019 -
3020 -beos*)
3021 - library_names_spec='${libname}${shared_ext}'
3022 - dynamic_linker="$host_os ld.so"
3023 - shlibpath_var=LIBRARY_PATH
3024 - ;;
3025 -
3026 -bsdi[[45]]*)
3027 - version_type=linux
3028 - need_version=no
3029 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3030 - soname_spec='${libname}${release}${shared_ext}$major'
3031 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
3032 - shlibpath_var=LD_LIBRARY_PATH
3033 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
3034 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
3035 - # the default ld.so.conf also contains /usr/contrib/lib and
3036 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
3037 - # libtool to hard-code these into programs
3038 - ;;
3039 -
3040 -cygwin* | mingw* | pw32*)
3041 - version_type=windows
3042 - shrext_cmds=".dll"
3043 - need_version=no
3044 - need_lib_prefix=no
3045 -
3046 - case $GCC,$host_os in
3047 - yes,cygwin* | yes,mingw* | yes,pw32*)
3048 - library_names_spec='$libname.dll.a'
3049 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
3050 - postinstall_cmds='base_file=`basename \${file}`~
3051 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
3052 - dldir=$destdir/`dirname \$dlpath`~
3053 - test -d \$dldir || mkdir -p \$dldir~
3054 - $install_prog $dir/$dlname \$dldir/$dlname~
3055 - chmod a+x \$dldir/$dlname'
3056 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3057 - dlpath=$dir/\$dldll~
3058 - $rm \$dlpath'
3059 - shlibpath_overrides_runpath=yes
3060 -
3061 - case $host_os in
3062 - cygwin*)
3063 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
3064 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
3065 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
3066 - ;;
3067 - mingw*)
3068 - # MinGW DLLs use traditional 'lib' prefix
3069 - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
3070 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
3071 - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
3072 - # It is most probably a Windows format PATH printed by
3073 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
3074 - # path with ; separators, and with drive letters. We can handle the
3075 - # drive letters (cygwin fileutils understands them), so leave them,
3076 - # especially as we might pass files found there to a mingw objdump,
3077 - # which wouldn't understand a cygwinified path. Ahh.
3078 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3079 - else
3080 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3081 - fi
3082 - ;;
3083 - pw32*)
3084 - # pw32 DLLs use 'pw' prefix rather than 'lib'
3085 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
3086 - ;;
3087 - esac
3088 - ;;
3089 -
3090 - *)
3091 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
3092 - ;;
3093 - esac
3094 - dynamic_linker='Win32 ld.exe'
3095 - # FIXME: first we should search . and the directory the executable is in
3096 - shlibpath_var=PATH
3097 - ;;
3098 -
3099 -darwin* | rhapsody*)
3100 - dynamic_linker="$host_os dyld"
3101 - version_type=darwin
3102 - need_lib_prefix=no
3103 - need_version=no
3104 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
3105 - soname_spec='${libname}${release}${major}$shared_ext'
3106 - shlibpath_overrides_runpath=yes
3107 - shlibpath_var=DYLD_LIBRARY_PATH
3108 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
3109 - m4_if([$1], [],[
3110 - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
3111 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
3112 - ;;
3113 -
3114 -dgux*)
3115 - version_type=linux
3116 - need_lib_prefix=no
3117 - need_version=no
3118 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
3119 - soname_spec='${libname}${release}${shared_ext}$major'
3120 - shlibpath_var=LD_LIBRARY_PATH
3121 - ;;
3122 -
3123 -freebsd1*)
3124 - dynamic_linker=no
3125 - ;;
3126 -
3127 -freebsd* | dragonfly*)
3128 - # DragonFly does not have aout. When/if they implement a new
3129 - # versioning mechanism, adjust this.
3130 - if test -x /usr/bin/objformat; then
3131 - objformat=`/usr/bin/objformat`
3132 - else
3133 - case $host_os in
3134 - freebsd[[123]]*) objformat=aout ;;
3135 - *) objformat=elf ;;
3136 - esac
3137 - fi
3138 - version_type=freebsd-$objformat
3139 - case $version_type in
3140 - freebsd-elf*)
3141 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
3142 - need_version=no
3143 - need_lib_prefix=no
3144 - ;;
3145 - freebsd-*)
3146 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
3147 - need_version=yes
3148 - ;;
3149 - esac
3150 - shlibpath_var=LD_LIBRARY_PATH
3151 - case $host_os in
3152 - freebsd2*)
3153 - shlibpath_overrides_runpath=yes
3154 - ;;
3155 - freebsd3.[[01]]* | freebsdelf3.[[01]]*)
3156 - shlibpath_overrides_runpath=yes
3157 - hardcode_into_libs=yes
3158 - ;;
3159 - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
3160 - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
3161 - shlibpath_overrides_runpath=no
3162 - hardcode_into_libs=yes
3163 - ;;
3164 - *) # from 4.6 on, and DragonFly
3165 - shlibpath_overrides_runpath=yes
3166 - hardcode_into_libs=yes
3167 - ;;
3168 - esac
3169 - ;;
3170 -
3171 -gnu*)
3172 - version_type=linux
3173 - need_lib_prefix=no
3174 - need_version=no
3175 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
3176 - soname_spec='${libname}${release}${shared_ext}$major'
3177 - shlibpath_var=LD_LIBRARY_PATH
3178 - hardcode_into_libs=yes
3179 - ;;
3180 -
3181 -hpux9* | hpux10* | hpux11*)
3182 - # Give a soname corresponding to the major version so that dld.sl refuses to
3183 - # link against other versions.
3184 - version_type=sunos
3185 - need_lib_prefix=no
3186 - need_version=no
3187 - case $host_cpu in
3188 - ia64*)
3189 - shrext_cmds='.so'
3190 - hardcode_into_libs=yes
3191 - dynamic_linker="$host_os dld.so"
3192 - shlibpath_var=LD_LIBRARY_PATH
3193 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
3194 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3195 - soname_spec='${libname}${release}${shared_ext}$major'
3196 - if test "X$HPUX_IA64_MODE" = X32; then
3197 - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
3198 - else
3199 - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
3200 - fi
3201 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
3202 - ;;
3203 - hppa*64*)
3204 - shrext_cmds='.sl'
3205 - hardcode_into_libs=yes
3206 - dynamic_linker="$host_os dld.sl"
3207 - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
3208 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
3209 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3210 - soname_spec='${libname}${release}${shared_ext}$major'
3211 - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
3212 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
3213 - ;;
3214 - *)
3215 - shrext_cmds='.sl'
3216 - dynamic_linker="$host_os dld.sl"
3217 - shlibpath_var=SHLIB_PATH
3218 - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
3219 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3220 - soname_spec='${libname}${release}${shared_ext}$major'
3221 - ;;
3222 - esac
3223 - # HP-UX runs *really* slowly unless shared libraries are mode 555.
3224 - postinstall_cmds='chmod 555 $lib'
3225 - ;;
3226 -
3227 -interix[[3-9]]*)
3228 - version_type=linux
3229 - need_lib_prefix=no
3230 - need_version=no
3231 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
3232 - soname_spec='${libname}${release}${shared_ext}$major'
3233 - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
3234 - shlibpath_var=LD_LIBRARY_PATH
3235 - shlibpath_overrides_runpath=no
3236 - hardcode_into_libs=yes
3237 - ;;
3238 -
3239 -irix5* | irix6* | nonstopux*)
3240 - case $host_os in
3241 - nonstopux*) version_type=nonstopux ;;
3242 - *)
3243 - if test "$lt_cv_prog_gnu_ld" = yes; then
3244 - version_type=linux
3245 - else
3246 - version_type=irix
3247 - fi ;;
3248 - esac
3249 - need_lib_prefix=no
3250 - need_version=no
3251 - soname_spec='${libname}${release}${shared_ext}$major'
3252 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
3253 - case $host_os in
3254 - irix5* | nonstopux*)
3255 - libsuff= shlibsuff=
3256 - ;;
3257 - *)
3258 - case $LD in # libtool.m4 will add one of these switches to LD
3259 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
3260 - libsuff= shlibsuff= libmagic=32-bit;;
3261 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
3262 - libsuff=32 shlibsuff=N32 libmagic=N32;;
3263 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
3264 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
3265 - *) libsuff= shlibsuff= libmagic=never-match;;
3266 - esac
3267 - ;;
3268 - esac
3269 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
3270 - shlibpath_overrides_runpath=no
3271 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
3272 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
3273 - hardcode_into_libs=yes
3274 - ;;
3275 -
3276 -# No shared lib support for Linux oldld, aout, or coff.
3277 -linux*oldld* | linux*aout* | linux*coff*)
3278 - dynamic_linker=no
3279 - ;;
3280 -
3281 -# This must be Linux ELF.
3282 -linux* | k*bsd*-gnu)
3283 - version_type=linux
3284 - need_lib_prefix=no
3285 - need_version=no
3286 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3287 - soname_spec='${libname}${release}${shared_ext}$major'
3288 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
3289 - shlibpath_var=LD_LIBRARY_PATH
3290 - shlibpath_overrides_runpath=no
3291 - # This implies no fast_install, which is unacceptable.
3292 - # Some rework will be needed to allow for fast_install
3293 - # before this can be enabled.
3294 - hardcode_into_libs=yes
3295 -
3296 - # Append ld.so.conf contents to the search path
3297 - if test -f /etc/ld.so.conf; then
3298 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
3299 - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
3300 - fi
3301 -
3302 - # We used to test for /lib/ld.so.1 and disable shared libraries on
3303 - # powerpc, because MkLinux only supported shared libraries with the
3304 - # GNU dynamic linker. Since this was broken with cross compilers,
3305 - # most powerpc-linux boxes support dynamic linking these days and
3306 - # people can always --disable-shared, the test was removed, and we
3307 - # assume the GNU/Linux dynamic linker is in use.
3308 - dynamic_linker='GNU/Linux ld.so'
3309 - ;;
3310 -
3311 -netbsdelf*-gnu)
3312 - version_type=linux
3313 - need_lib_prefix=no
3314 - need_version=no
3315 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
3316 - soname_spec='${libname}${release}${shared_ext}$major'
3317 - shlibpath_var=LD_LIBRARY_PATH
3318 - shlibpath_overrides_runpath=no
3319 - hardcode_into_libs=yes
3320 - dynamic_linker='NetBSD ld.elf_so'
3321 - ;;
3322 -
3323 -netbsd*)
3324 - version_type=sunos
3325 - need_lib_prefix=no
3326 - need_version=no
3327 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
3328 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
3329 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
3330 - dynamic_linker='NetBSD (a.out) ld.so'
3331 - else
3332 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
3333 - soname_spec='${libname}${release}${shared_ext}$major'
3334 - dynamic_linker='NetBSD ld.elf_so'
3335 - fi
3336 - shlibpath_var=LD_LIBRARY_PATH
3337 - shlibpath_overrides_runpath=yes
3338 - hardcode_into_libs=yes
3339 - ;;
3340 -
3341 -newsos6)
3342 - version_type=linux
3343 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3344 - shlibpath_var=LD_LIBRARY_PATH
3345 - shlibpath_overrides_runpath=yes
3346 - ;;
3347 -
3348 -nto-qnx*)
3349 - version_type=linux
3350 - need_lib_prefix=no
3351 - need_version=no
3352 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3353 - soname_spec='${libname}${release}${shared_ext}$major'
3354 - shlibpath_var=LD_LIBRARY_PATH
3355 - shlibpath_overrides_runpath=yes
3356 - ;;
3357 -
3358 -openbsd*)
3359 - version_type=sunos
3360 - sys_lib_dlsearch_path_spec="/usr/lib"
3361 - need_lib_prefix=no
3362 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
3363 - case $host_os in
3364 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
3365 - *) need_version=no ;;
3366 - esac
3367 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
3368 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
3369 - shlibpath_var=LD_LIBRARY_PATH
3370 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
3371 - case $host_os in
3372 - openbsd2.[[89]] | openbsd2.[[89]].*)
3373 - shlibpath_overrides_runpath=no
3374 - ;;
3375 - *)
3376 - shlibpath_overrides_runpath=yes
3377 - ;;
3378 - esac
3379 - else
3380 - shlibpath_overrides_runpath=yes
3381 - fi
3382 - ;;
3383 -
3384 -os2*)
3385 - libname_spec='$name'
3386 - shrext_cmds=".dll"
3387 - need_lib_prefix=no
3388 - library_names_spec='$libname${shared_ext} $libname.a'
3389 - dynamic_linker='OS/2 ld.exe'
3390 - shlibpath_var=LIBPATH
3391 - ;;
3392 -
3393 -osf3* | osf4* | osf5*)
3394 - version_type=osf
3395 - need_lib_prefix=no
3396 - need_version=no
3397 - soname_spec='${libname}${release}${shared_ext}$major'
3398 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3399 - shlibpath_var=LD_LIBRARY_PATH
3400 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
3401 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
3402 - ;;
3403 -
3404 -rdos*)
3405 - dynamic_linker=no
3406 - ;;
3407 -
3408 -solaris*)
3409 - version_type=linux
3410 - need_lib_prefix=no
3411 - need_version=no
3412 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3413 - soname_spec='${libname}${release}${shared_ext}$major'
3414 - shlibpath_var=LD_LIBRARY_PATH
3415 - shlibpath_overrides_runpath=yes
3416 - hardcode_into_libs=yes
3417 - # ldd complains unless libraries are executable
3418 - postinstall_cmds='chmod +x $lib'
3419 - ;;
3420 -
3421 -sunos4*)
3422 - version_type=sunos
3423 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
3424 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
3425 - shlibpath_var=LD_LIBRARY_PATH
3426 - shlibpath_overrides_runpath=yes
3427 - if test "$with_gnu_ld" = yes; then
3428 - need_lib_prefix=no
3429 - fi
3430 - need_version=yes
3431 - ;;
3432 -
3433 -sysv4 | sysv4.3*)
3434 - version_type=linux
3435 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3436 - soname_spec='${libname}${release}${shared_ext}$major'
3437 - shlibpath_var=LD_LIBRARY_PATH
3438 - case $host_vendor in
3439 - sni)
3440 - shlibpath_overrides_runpath=no
3441 - need_lib_prefix=no
3442 - export_dynamic_flag_spec='${wl}-Blargedynsym'
3443 - runpath_var=LD_RUN_PATH
3444 - ;;
3445 - siemens)
3446 - need_lib_prefix=no
3447 - ;;
3448 - motorola)
3449 - need_lib_prefix=no
3450 - need_version=no
3451 - shlibpath_overrides_runpath=no
3452 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
3453 - ;;
3454 - esac
3455 - ;;
3456 -
3457 -sysv4*MP*)
3458 - if test -d /usr/nec ;then
3459 - version_type=linux
3460 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
3461 - soname_spec='$libname${shared_ext}.$major'
3462 - shlibpath_var=LD_LIBRARY_PATH
3463 - fi
3464 - ;;
3465 -
3466 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
3467 - version_type=freebsd-elf
3468 - need_lib_prefix=no
3469 - need_version=no
3470 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
3471 - soname_spec='${libname}${release}${shared_ext}$major'
3472 - shlibpath_var=LD_LIBRARY_PATH
3473 - hardcode_into_libs=yes
3474 - if test "$with_gnu_ld" = yes; then
3475 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
3476 - shlibpath_overrides_runpath=no
3477 - else
3478 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
3479 - shlibpath_overrides_runpath=yes
3480 - case $host_os in
3481 - sco3.2v5*)
3482 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
3483 - ;;
3484 - esac
3485 - fi
3486 - sys_lib_dlsearch_path_spec='/usr/lib'
3487 - ;;
3488 -
3489 -uts4*)
3490 - version_type=linux
3491 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3492 - soname_spec='${libname}${release}${shared_ext}$major'
3493 - shlibpath_var=LD_LIBRARY_PATH
3494 - ;;
3495 -
3496 -*)
3497 - dynamic_linker=no
3498 - ;;
3499 -esac
3500 -AC_MSG_RESULT([$dynamic_linker])
3501 -test "$dynamic_linker" = no && can_build_shared=no
3502 -
3503 -AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
3504 -[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
3505 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
3506 -AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
3507 -[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
3508 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
3509 -
3510 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
3511 -if test "$GCC" = yes; then
3512 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
3513 -fi
3514 -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
3515 -
3516 -
3517 -# _LT_AC_TAGCONFIG
3518 -# ----------------
3519 -AC_DEFUN([_LT_AC_TAGCONFIG],
3520 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
3521 -AC_ARG_WITH([tags],
3522 - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
3523 - [include additional configurations @<:@automatic@:>@])],
3524 - [tagnames="$withval"])
3525 -
3526 -if test -f "$ltmain" && test -n "$tagnames"; then
3527 - if test ! -f "${ofile}"; then
3528 - AC_MSG_WARN([output file `$ofile' does not exist])
3529 - fi
3530 -
3531 - if test -z "$LTCC"; then
3532 - eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
3533 - if test -z "$LTCC"; then
3534 - AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
3535 - else
3536 - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
3537 - fi
3538 - fi
3539 - if test -z "$LTCFLAGS"; then
3540 - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
3541 - fi
3542 -
3543 - # Extract list of available tagged configurations in $ofile.
3544 - # Note that this assumes the entire list is on one line.
3545 - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
3546 -
3547 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
3548 - for tagname in $tagnames; do
3549 - IFS="$lt_save_ifs"
3550 - # Check whether tagname contains only valid characters
3551 - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
3552 - "") ;;
3553 - *) AC_MSG_ERROR([invalid tag name: $tagname])
3554 - ;;
3555 - esac
3556 -
3557 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
3558 - then
3559 - AC_MSG_ERROR([tag name \"$tagname\" already exists])
3560 - fi
3561 -
3562 - # Update the list of available tags.
3563 - if test -n "$tagname"; then
3564 - echo appending configuration tag \"$tagname\" to $ofile
3565 -
3566 - case $tagname in
3567 - CXX)
3568 - if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
3569 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
3570 - (test "X$CXX" != "Xg++"))) ; then
3571 - AC_LIBTOOL_LANG_CXX_CONFIG
3572 - else
3573 - tagname=""
3574 - fi
3575 - ;;
3576 -
3577 - F77)
3578 - if test -n "$F77" && test "X$F77" != "Xno"; then
3579 - AC_LIBTOOL_LANG_F77_CONFIG
3580 - else
3581 - tagname=""
3582 - fi
3583 - ;;
3584 -
3585 - GCJ)
3586 - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
3587 - AC_LIBTOOL_LANG_GCJ_CONFIG
3588 - else
3589 - tagname=""
3590 - fi
3591 - ;;
3592 -
3593 - RC)
3594 - AC_LIBTOOL_LANG_RC_CONFIG
3595 - ;;
3596 -
3597 - *)
3598 - AC_MSG_ERROR([Unsupported tag name: $tagname])
3599 - ;;
3600 - esac
3601 -
3602 - # Append the new tag name to the list of available tags.
3603 - if test -n "$tagname" ; then
3604 - available_tags="$available_tags $tagname"
3605 - fi
3606 - fi
3607 - done
3608 - IFS="$lt_save_ifs"
3609 -
3610 - # Now substitute the updated list of available tags.
3611 - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
3612 - mv "${ofile}T" "$ofile"
3613 - chmod +x "$ofile"
3614 - else
3615 - rm -f "${ofile}T"
3616 - AC_MSG_ERROR([unable to update list of available tagged configurations.])
3617 - fi
3618 -fi
3619 -])# _LT_AC_TAGCONFIG
3620 -
3621 -
3622 -# AC_LIBTOOL_DLOPEN
3623 -# -----------------
3624 -# enable checks for dlopen support
3625 -AC_DEFUN([AC_LIBTOOL_DLOPEN],
3626 - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
3627 -])# AC_LIBTOOL_DLOPEN
3628 -
3629 -
3630 -# AC_LIBTOOL_WIN32_DLL
3631 -# --------------------
3632 -# declare package support for building win32 DLLs
3633 -AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
3634 -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
3635 -])# AC_LIBTOOL_WIN32_DLL
3636 -
3637 -
3638 -# AC_ENABLE_SHARED([DEFAULT])
3639 -# ---------------------------
3640 -# implement the --enable-shared flag
3641 -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
3642 -AC_DEFUN([AC_ENABLE_SHARED],
3643 -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
3644 -AC_ARG_ENABLE([shared],
3645 - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
3646 - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
3647 - [p=${PACKAGE-default}
3648 - case $enableval in
3649 - yes) enable_shared=yes ;;
3650 - no) enable_shared=no ;;
3651 - *)
3652 - enable_shared=no
3653 - # Look at the argument we got. We use all the common list separators.
3654 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
3655 - for pkg in $enableval; do
3656 - IFS="$lt_save_ifs"
3657 - if test "X$pkg" = "X$p"; then
3658 - enable_shared=yes
3659 - fi
3660 - done
3661 - IFS="$lt_save_ifs"
3662 - ;;
3663 - esac],
3664 - [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
3665 -])# AC_ENABLE_SHARED
3666 -
3667 -
3668 -# AC_DISABLE_SHARED
3669 -# -----------------
3670 -# set the default shared flag to --disable-shared
3671 -AC_DEFUN([AC_DISABLE_SHARED],
3672 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
3673 -AC_ENABLE_SHARED(no)
3674 -])# AC_DISABLE_SHARED
3675 -
3676 -
3677 -# AC_ENABLE_STATIC([DEFAULT])
3678 -# ---------------------------
3679 -# implement the --enable-static flag
3680 -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
3681 -AC_DEFUN([AC_ENABLE_STATIC],
3682 -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
3683 -AC_ARG_ENABLE([static],
3684 - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
3685 - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
3686 - [p=${PACKAGE-default}
3687 - case $enableval in
3688 - yes) enable_static=yes ;;
3689 - no) enable_static=no ;;
3690 - *)
3691 - enable_static=no
3692 - # Look at the argument we got. We use all the common list separators.
3693 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
3694 - for pkg in $enableval; do
3695 - IFS="$lt_save_ifs"
3696 - if test "X$pkg" = "X$p"; then
3697 - enable_static=yes
3698 - fi
3699 - done
3700 - IFS="$lt_save_ifs"
3701 - ;;
3702 - esac],
3703 - [enable_static=]AC_ENABLE_STATIC_DEFAULT)
3704 -])# AC_ENABLE_STATIC
3705 -
3706 -
3707 -# AC_DISABLE_STATIC
3708 -# -----------------
3709 -# set the default static flag to --disable-static
3710 -AC_DEFUN([AC_DISABLE_STATIC],
3711 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
3712 -AC_ENABLE_STATIC(no)
3713 -])# AC_DISABLE_STATIC
3714 -
3715 -
3716 -# AC_ENABLE_FAST_INSTALL([DEFAULT])
3717 -# ---------------------------------
3718 -# implement the --enable-fast-install flag
3719 -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
3720 -AC_DEFUN([AC_ENABLE_FAST_INSTALL],
3721 -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
3722 -AC_ARG_ENABLE([fast-install],
3723 - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
3724 - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
3725 - [p=${PACKAGE-default}
3726 - case $enableval in
3727 - yes) enable_fast_install=yes ;;
3728 - no) enable_fast_install=no ;;
3729 - *)
3730 - enable_fast_install=no
3731 - # Look at the argument we got. We use all the common list separators.
3732 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
3733 - for pkg in $enableval; do
3734 - IFS="$lt_save_ifs"
3735 - if test "X$pkg" = "X$p"; then
3736 - enable_fast_install=yes
3737 - fi
3738 - done
3739 - IFS="$lt_save_ifs"
3740 - ;;
3741 - esac],
3742 - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
3743 -])# AC_ENABLE_FAST_INSTALL
3744 -
3745 -
3746 -# AC_DISABLE_FAST_INSTALL
3747 -# -----------------------
3748 -# set the default to --disable-fast-install
3749 -AC_DEFUN([AC_DISABLE_FAST_INSTALL],
3750 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
3751 -AC_ENABLE_FAST_INSTALL(no)
3752 -])# AC_DISABLE_FAST_INSTALL
3753 -
3754 -
3755 -# AC_LIBTOOL_PICMODE([MODE])
3756 -# --------------------------
3757 -# implement the --with-pic flag
3758 -# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
3759 -AC_DEFUN([AC_LIBTOOL_PICMODE],
3760 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
3761 -pic_mode=ifelse($#,1,$1,default)
3762 -])# AC_LIBTOOL_PICMODE
3763 -
3764 -
3765 -# AC_PROG_EGREP
3766 -# -------------
3767 -# This is predefined starting with Autoconf 2.54, so this conditional
3768 -# definition can be removed once we require Autoconf 2.54 or later.
3769 -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
3770 -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
3771 - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
3772 - then ac_cv_prog_egrep='grep -E'
3773 - else ac_cv_prog_egrep='egrep'
3774 - fi])
3775 - EGREP=$ac_cv_prog_egrep
3776 - AC_SUBST([EGREP])
3777 -])])
3778 -
3779 -
3780 -# AC_PATH_TOOL_PREFIX
3781 -# -------------------
3782 -# find a file program which can recognize shared library
3783 -AC_DEFUN([AC_PATH_TOOL_PREFIX],
3784 -[AC_REQUIRE([AC_PROG_EGREP])dnl
3785 -AC_MSG_CHECKING([for $1])
3786 -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
3787 -[case $MAGIC_CMD in
3788 -[[\\/*] | ?:[\\/]*])
3789 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
3790 - ;;
3791 -*)
3792 - lt_save_MAGIC_CMD="$MAGIC_CMD"
3793 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3794 -dnl $ac_dummy forces splitting on constant user-supplied paths.
3795 -dnl POSIX.2 word splitting is done only on the output of word expansions,
3796 -dnl not every word. This closes a longstanding sh security hole.
3797 - ac_dummy="ifelse([$2], , $PATH, [$2])"
3798 - for ac_dir in $ac_dummy; do
3799 - IFS="$lt_save_ifs"
3800 - test -z "$ac_dir" && ac_dir=.
3801 - if test -f $ac_dir/$1; then
3802 - lt_cv_path_MAGIC_CMD="$ac_dir/$1"
3803 - if test -n "$file_magic_test_file"; then
3804 - case $deplibs_check_method in
3805 - "file_magic "*)
3806 - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
3807 - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
3808 - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
3809 - $EGREP "$file_magic_regex" > /dev/null; then
3810 - :
3811 - else
3812 - cat <<EOF 1>&2
3813 -
3814 -*** Warning: the command libtool uses to detect shared libraries,
3815 -*** $file_magic_cmd, produces output that libtool cannot recognize.
3816 -*** The result is that libtool may fail to recognize shared libraries
3817 -*** as such. This will affect the creation of libtool libraries that
3818 -*** depend on shared libraries, but programs linked with such libtool
3819 -*** libraries will work regardless of this problem. Nevertheless, you
3820 -*** may want to report the problem to your system manager and/or to
3821 -*** bug-libtool@gnu.org
3822 -
3823 -EOF
3824 - fi ;;
3825 - esac
3826 - fi
3827 - break
3828 - fi
3829 - done
3830 - IFS="$lt_save_ifs"
3831 - MAGIC_CMD="$lt_save_MAGIC_CMD"
3832 - ;;
3833 -esac])
3834 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
3835 -if test -n "$MAGIC_CMD"; then
3836 - AC_MSG_RESULT($MAGIC_CMD)
3837 -else
3838 - AC_MSG_RESULT(no)
3839 -fi
3840 -])# AC_PATH_TOOL_PREFIX
3841 -
3842 -
3843 -# AC_PATH_MAGIC
3844 -# -------------
3845 -# find a file program which can recognize a shared library
3846 -AC_DEFUN([AC_PATH_MAGIC],
3847 -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
3848 -if test -z "$lt_cv_path_MAGIC_CMD"; then
3849 - if test -n "$ac_tool_prefix"; then
3850 - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
3851 - else
3852 - MAGIC_CMD=:
3853 - fi
3854 -fi
3855 -])# AC_PATH_MAGIC
3856 -
3857 -
3858 -# AC_PROG_LD
3859 -# ----------
3860 -# find the pathname to the GNU or non-GNU linker
3861 -AC_DEFUN([AC_PROG_LD],
3862 -[AC_ARG_WITH([gnu-ld],
3863 - [AC_HELP_STRING([--with-gnu-ld],
3864 - [assume the C compiler uses GNU ld @<:@default=no@:>@])],
3865 - [test "$withval" = no || with_gnu_ld=yes],
3866 - [with_gnu_ld=no])
3867 -AC_REQUIRE([LT_AC_PROG_SED])dnl
3868 -AC_REQUIRE([AC_PROG_CC])dnl
3869 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
3870 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
3871 -ac_prog=ld
3872 -if test "$GCC" = yes; then
3873 - # Check if gcc -print-prog-name=ld gives a path.
3874 - AC_MSG_CHECKING([for ld used by $CC])
3875 - case $host in
3876 - *-*-mingw*)
3877 - # gcc leaves a trailing carriage return which upsets mingw
3878 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
3879 - *)
3880 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
3881 - esac
3882 - case $ac_prog in
3883 - # Accept absolute paths.
3884 - [[\\/]]* | ?:[[\\/]]*)
3885 - re_direlt='/[[^/]][[^/]]*/\.\./'
3886 - # Canonicalize the pathname of ld
3887 - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
3888 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
3889 - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
3890 - done
3891 - test -z "$LD" && LD="$ac_prog"
3892 - ;;
3893 - "")
3894 - # If it fails, then pretend we aren't using GCC.
3895 - ac_prog=ld
3896 - ;;
3897 - *)
3898 - # If it is relative, then search for the first ld in PATH.
3899 - with_gnu_ld=unknown
3900 - ;;
3901 - esac
3902 -elif test "$with_gnu_ld" = yes; then
3903 - AC_MSG_CHECKING([for GNU ld])
3904 -else
3905 - AC_MSG_CHECKING([for non-GNU ld])
3906 -fi
3907 -AC_CACHE_VAL(lt_cv_path_LD,
3908 -[if test -z "$LD"; then
3909 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3910 - for ac_dir in $PATH; do
3911 - IFS="$lt_save_ifs"
3912 - test -z "$ac_dir" && ac_dir=.
3913 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
3914 - lt_cv_path_LD="$ac_dir/$ac_prog"
3915 - # Check to see if the program is GNU ld. I'd rather use --version,
3916 - # but apparently some variants of GNU ld only accept -v.
3917 - # Break only if it was the GNU/non-GNU ld that we prefer.
3918 - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
3919 - *GNU* | *'with BFD'*)
3920 - test "$with_gnu_ld" != no && break
3921 - ;;
3922 - *)
3923 - test "$with_gnu_ld" != yes && break
3924 - ;;
3925 - esac
3926 - fi
3927 - done
3928 - IFS="$lt_save_ifs"
3929 -else
3930 - lt_cv_path_LD="$LD" # Let the user override the test with a path.
3931 -fi])
3932 -LD="$lt_cv_path_LD"
3933 -if test -n "$LD"; then
3934 - AC_MSG_RESULT($LD)
3935 -else
3936 - AC_MSG_RESULT(no)
3937 -fi
3938 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
3939 -AC_PROG_LD_GNU
3940 -])# AC_PROG_LD
3941 -
3942 -
3943 -# AC_PROG_LD_GNU
3944 -# --------------
3945 -AC_DEFUN([AC_PROG_LD_GNU],
3946 -[AC_REQUIRE([AC_PROG_EGREP])dnl
3947 -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
3948 -[# I'd rather use --version here, but apparently some GNU lds only accept -v.
3949 -case `$LD -v 2>&1 </dev/null` in
3950 -*GNU* | *'with BFD'*)
3951 - lt_cv_prog_gnu_ld=yes
3952 - ;;
3953 -*)
3954 - lt_cv_prog_gnu_ld=no
3955 - ;;
3956 -esac])
3957 -with_gnu_ld=$lt_cv_prog_gnu_ld
3958 -])# AC_PROG_LD_GNU
3959 -
3960 -
3961 -# AC_PROG_LD_RELOAD_FLAG
3962 -# ----------------------
3963 -# find reload flag for linker
3964 -# -- PORTME Some linkers may need a different reload flag.
3965 -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
3966 -[AC_CACHE_CHECK([for $LD option to reload object files],
3967 - lt_cv_ld_reload_flag,
3968 - [lt_cv_ld_reload_flag='-r'])
3969 -reload_flag=$lt_cv_ld_reload_flag
3970 -case $reload_flag in
3971 -"" | " "*) ;;
3972 -*) reload_flag=" $reload_flag" ;;
3973 -esac
3974 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
3975 -case $host_os in
3976 - darwin*)
3977 - if test "$GCC" = yes; then
3978 - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
3979 - else
3980 - reload_cmds='$LD$reload_flag -o $output$reload_objs'
3981 - fi
3982 - ;;
3983 -esac
3984 -])# AC_PROG_LD_RELOAD_FLAG
3985 -
3986 -
3987 -# AC_DEPLIBS_CHECK_METHOD
3988 -# -----------------------
3989 -# how to check for library dependencies
3990 -# -- PORTME fill in with the dynamic library characteristics
3991 -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
3992 -[AC_CACHE_CHECK([how to recognize dependent libraries],
3993 -lt_cv_deplibs_check_method,
3994 -[lt_cv_file_magic_cmd='$MAGIC_CMD'
3995 -lt_cv_file_magic_test_file=
3996 -lt_cv_deplibs_check_method='unknown'
3997 -# Need to set the preceding variable on all platforms that support
3998 -# interlibrary dependencies.
3999 -# 'none' -- dependencies not supported.
4000 -# `unknown' -- same as none, but documents that we really don't know.
4001 -# 'pass_all' -- all dependencies passed with no checks.
4002 -# 'test_compile' -- check by making test program.
4003 -# 'file_magic [[regex]]' -- check by looking for files in library path
4004 -# which responds to the $file_magic_cmd with a given extended regex.
4005 -# If you have `file' or equivalent on your system and you're not sure
4006 -# whether `pass_all' will *always* work, you probably want this one.
4007 -
4008 -case $host_os in
4009 -aix[[4-9]]*)
4010 - lt_cv_deplibs_check_method=pass_all
4011 - ;;
4012 -
4013 -beos*)
4014 - lt_cv_deplibs_check_method=pass_all
4015 - ;;
4016 -
4017 -bsdi[[45]]*)
4018 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
4019 - lt_cv_file_magic_cmd='/usr/bin/file -L'
4020 - lt_cv_file_magic_test_file=/shlib/libc.so
4021 - ;;
4022 -
4023 -cygwin*)
4024 - # func_win32_libid is a shell function defined in ltmain.sh
4025 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4026 - lt_cv_file_magic_cmd='func_win32_libid'
4027 - ;;
4028 -
4029 -mingw* | pw32*)
4030 - # Base MSYS/MinGW do not provide the 'file' command needed by
4031 - # func_win32_libid shell function, so use a weaker test based on 'objdump',
4032 - # unless we find 'file', for example because we are cross-compiling.
4033 - if ( file / ) >/dev/null 2>&1; then
4034 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4035 - lt_cv_file_magic_cmd='func_win32_libid'
4036 - else
4037 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4038 - lt_cv_file_magic_cmd='$OBJDUMP -f'
4039 - fi
4040 - ;;
4041 -
4042 -darwin* | rhapsody*)
4043 - lt_cv_deplibs_check_method=pass_all
4044 - ;;
4045 -
4046 -freebsd* | dragonfly*)
4047 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
4048 - case $host_cpu in
4049 - i*86 )
4050 - # Not sure whether the presence of OpenBSD here was a mistake.
4051 - # Let's accept both of them until this is cleared up.
4052 - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
4053 - lt_cv_file_magic_cmd=/usr/bin/file
4054 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
4055 - ;;
4056 - esac
4057 - else
4058 - lt_cv_deplibs_check_method=pass_all
4059 - fi
4060 - ;;
4061 -
4062 -gnu*)
4063 - lt_cv_deplibs_check_method=pass_all
4064 - ;;
4065 -
4066 -hpux10.20* | hpux11*)
4067 - lt_cv_file_magic_cmd=/usr/bin/file
4068 - case $host_cpu in
4069 - ia64*)
4070 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
4071 - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
4072 - ;;
4073 - hppa*64*)
4074 - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
4075 - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
4076 - ;;
4077 - *)
4078 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
4079 - lt_cv_file_magic_test_file=/usr/lib/libc.sl
4080 - ;;
4081 - esac
4082 - ;;
4083 -
4084 -interix[[3-9]]*)
4085 - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
4086 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
4087 - ;;
4088 -
4089 -irix5* | irix6* | nonstopux*)
4090 - case $LD in
4091 - *-32|*"-32 ") libmagic=32-bit;;
4092 - *-n32|*"-n32 ") libmagic=N32;;
4093 - *-64|*"-64 ") libmagic=64-bit;;
4094 - *) libmagic=never-match;;
4095 - esac
4096 - lt_cv_deplibs_check_method=pass_all
4097 - ;;
4098 -
4099 -# This must be Linux ELF.
4100 -linux* | k*bsd*-gnu)
4101 - lt_cv_deplibs_check_method=pass_all
4102 - ;;
4103 -
4104 -netbsd* | netbsdelf*-gnu)
4105 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
4106 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
4107 - else
4108 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
4109 - fi
4110 - ;;
4111 -
4112 -newos6*)
4113 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
4114 - lt_cv_file_magic_cmd=/usr/bin/file
4115 - lt_cv_file_magic_test_file=/usr/lib/libnls.so
4116 - ;;
4117 -
4118 -nto-qnx*)
4119 - lt_cv_deplibs_check_method=unknown
4120 - ;;
4121 -
4122 -openbsd*)
4123 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4124 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
4125 - else
4126 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
4127 - fi
4128 - ;;
4129 -
4130 -osf3* | osf4* | osf5*)
4131 - lt_cv_deplibs_check_method=pass_all
4132 - ;;
4133 -
4134 -rdos*)
4135 - lt_cv_deplibs_check_method=pass_all
4136 - ;;
4137 -
4138 -solaris*)
4139 - lt_cv_deplibs_check_method=pass_all
4140 - ;;
4141 -
4142 -sysv4 | sysv4.3*)
4143 - case $host_vendor in
4144 - motorola)
4145 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
4146 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
4147 - ;;
4148 - ncr)
4149 - lt_cv_deplibs_check_method=pass_all
4150 - ;;
4151 - sequent)
4152 - lt_cv_file_magic_cmd='/bin/file'
4153 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
4154 - ;;
4155 - sni)
4156 - lt_cv_file_magic_cmd='/bin/file'
4157 - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
4158 - lt_cv_file_magic_test_file=/lib/libc.so
4159 - ;;
4160 - siemens)
4161 - lt_cv_deplibs_check_method=pass_all
4162 - ;;
4163 - pc)
4164 - lt_cv_deplibs_check_method=pass_all
4165 - ;;
4166 - esac
4167 - ;;
4168 -
4169 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
4170 - lt_cv_deplibs_check_method=pass_all
4171 - ;;
4172 -esac
4173 -])
4174 -file_magic_cmd=$lt_cv_file_magic_cmd
4175 -deplibs_check_method=$lt_cv_deplibs_check_method
4176 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
4177 -])# AC_DEPLIBS_CHECK_METHOD
4178 -
4179 -
4180 -# AC_PROG_NM
4181 -# ----------
4182 -# find the pathname to a BSD-compatible name lister
4183 -AC_DEFUN([AC_PROG_NM],
4184 -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
4185 -[if test -n "$NM"; then
4186 - # Let the user override the test.
4187 - lt_cv_path_NM="$NM"
4188 -else
4189 - lt_nm_to_check="${ac_tool_prefix}nm"
4190 - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
4191 - lt_nm_to_check="$lt_nm_to_check nm"
4192 - fi
4193 - for lt_tmp_nm in $lt_nm_to_check; do
4194 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
4195 - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
4196 - IFS="$lt_save_ifs"
4197 - test -z "$ac_dir" && ac_dir=.
4198 - tmp_nm="$ac_dir/$lt_tmp_nm"
4199 - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
4200 - # Check to see if the nm accepts a BSD-compat flag.
4201 - # Adding the `sed 1q' prevents false positives on HP-UX, which says:
4202 - # nm: unknown option "B" ignored
4203 - # Tru64's nm complains that /dev/null is an invalid object file
4204 - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
4205 - */dev/null* | *'Invalid file or object type'*)
4206 - lt_cv_path_NM="$tmp_nm -B"
4207 - break
4208 - ;;
4209 - *)
4210 - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
4211 - */dev/null*)
4212 - lt_cv_path_NM="$tmp_nm -p"
4213 - break
4214 - ;;
4215 - *)
4216 - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
4217 - continue # so that we can try to find one that supports BSD flags
4218 - ;;
4219 - esac
4220 - ;;
4221 - esac
4222 - fi
4223 - done
4224 - IFS="$lt_save_ifs"
4225 - done
4226 - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
4227 -fi])
4228 -NM="$lt_cv_path_NM"
4229 -])# AC_PROG_NM
4230 -
4231 -
4232 -# AC_CHECK_LIBM
4233 -# -------------
4234 -# check for math library
4235 -AC_DEFUN([AC_CHECK_LIBM],
4236 -[AC_REQUIRE([AC_CANONICAL_HOST])dnl
4237 -LIBM=
4238 -case $host in
4239 -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
4240 - # These system don't have libm, or don't need it
4241 - ;;
4242 -*-ncr-sysv4.3*)
4243 - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
4244 - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
4245 - ;;
4246 -*)
4247 - AC_CHECK_LIB(m, cos, LIBM="-lm")
4248 - ;;
4249 -esac
4250 -])# AC_CHECK_LIBM
4251 -
4252 -
4253 -# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
4254 -# -----------------------------------
4255 -# sets LIBLTDL to the link flags for the libltdl convenience library and
4256 -# LTDLINCL to the include flags for the libltdl header and adds
4257 -# --enable-ltdl-convenience to the configure arguments. Note that
4258 -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
4259 -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
4260 -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
4261 -# (note the single quotes!). If your package is not flat and you're not
4262 -# using automake, define top_builddir and top_srcdir appropriately in
4263 -# the Makefiles.
4264 -AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
4265 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4266 - case $enable_ltdl_convenience in
4267 - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
4268 - "") enable_ltdl_convenience=yes
4269 - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
4270 - esac
4271 - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
4272 - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
4273 - # For backwards non-gettext consistent compatibility...
4274 - INCLTDL="$LTDLINCL"
4275 -])# AC_LIBLTDL_CONVENIENCE
4276 -
4277 -
4278 -# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
4279 -# -----------------------------------
4280 -# sets LIBLTDL to the link flags for the libltdl installable library and
4281 -# LTDLINCL to the include flags for the libltdl header and adds
4282 -# --enable-ltdl-install to the configure arguments. Note that
4283 -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
4284 -# and an installed libltdl is not found, it is assumed to be `libltdl'.
4285 -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
4286 -# '${top_srcdir}/' (note the single quotes!). If your package is not
4287 -# flat and you're not using automake, define top_builddir and top_srcdir
4288 -# appropriately in the Makefiles.
4289 -# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
4290 -AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
4291 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4292 - AC_CHECK_LIB(ltdl, lt_dlinit,
4293 - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
4294 - [if test x"$enable_ltdl_install" = xno; then
4295 - AC_MSG_WARN([libltdl not installed, but installation disabled])
4296 - else
4297 - enable_ltdl_install=yes
4298 - fi
4299 - ])
4300 - if test x"$enable_ltdl_install" = x"yes"; then
4301 - ac_configure_args="$ac_configure_args --enable-ltdl-install"
4302 - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
4303 - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
4304 - else
4305 - ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
4306 - LIBLTDL="-lltdl"
4307 - LTDLINCL=
4308 - fi
4309 - # For backwards non-gettext consistent compatibility...
4310 - INCLTDL="$LTDLINCL"
4311 -])# AC_LIBLTDL_INSTALLABLE
4312 -
4313 -
4314 -# AC_LIBTOOL_CXX
4315 -# --------------
4316 -# enable support for C++ libraries
4317 -AC_DEFUN([AC_LIBTOOL_CXX],
4318 -[AC_REQUIRE([_LT_AC_LANG_CXX])
4319 -])# AC_LIBTOOL_CXX
4320 -
4321 -
4322 -# _LT_AC_LANG_CXX
4323 -# ---------------
4324 -AC_DEFUN([_LT_AC_LANG_CXX],
4325 -[AC_REQUIRE([AC_PROG_CXX])
4326 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
4327 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
4328 -])# _LT_AC_LANG_CXX
4329 -
4330 -# _LT_AC_PROG_CXXCPP
4331 -# ------------------
4332 -AC_DEFUN([_LT_AC_PROG_CXXCPP],
4333 -[
4334 -AC_REQUIRE([AC_PROG_CXX])
4335 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
4336 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
4337 - (test "X$CXX" != "Xg++"))) ; then
4338 - AC_PROG_CXXCPP
4339 -fi
4340 -])# _LT_AC_PROG_CXXCPP
4341 -
4342 -# AC_LIBTOOL_F77
4343 -# --------------
4344 -# enable support for Fortran 77 libraries
4345 -AC_DEFUN([AC_LIBTOOL_F77],
4346 -[AC_REQUIRE([_LT_AC_LANG_F77])
4347 -])# AC_LIBTOOL_F77
4348 -
4349 -
4350 -# _LT_AC_LANG_F77
4351 -# ---------------
4352 -AC_DEFUN([_LT_AC_LANG_F77],
4353 -[AC_REQUIRE([AC_PROG_F77])
4354 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
4355 -])# _LT_AC_LANG_F77
4356 -
4357 -
4358 -# AC_LIBTOOL_GCJ
4359 -# --------------
4360 -# enable support for GCJ libraries
4361 -AC_DEFUN([AC_LIBTOOL_GCJ],
4362 -[AC_REQUIRE([_LT_AC_LANG_GCJ])
4363 -])# AC_LIBTOOL_GCJ
4364 -
4365 -
4366 -# _LT_AC_LANG_GCJ
4367 -# ---------------
4368 -AC_DEFUN([_LT_AC_LANG_GCJ],
4369 -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
4370 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
4371 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
4372 - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
4373 - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
4374 - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
4375 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
4376 -])# _LT_AC_LANG_GCJ
4377 -
4378 -
4379 -# AC_LIBTOOL_RC
4380 -# -------------
4381 -# enable support for Windows resource files
4382 -AC_DEFUN([AC_LIBTOOL_RC],
4383 -[AC_REQUIRE([LT_AC_PROG_RC])
4384 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
4385 -])# AC_LIBTOOL_RC
4386 -
4387 -
4388 -# AC_LIBTOOL_LANG_C_CONFIG
4389 -# ------------------------
4390 -# Ensure that the configuration vars for the C compiler are
4391 -# suitably defined. Those variables are subsequently used by
4392 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
4393 -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
4394 -AC_DEFUN([_LT_AC_LANG_C_CONFIG],
4395 -[lt_save_CC="$CC"
4396 -AC_LANG_PUSH(C)
4397 -
4398 -# Source file extension for C test sources.
4399 -ac_ext=c
4400 -
4401 -# Object file extension for compiled C test sources.
4402 -objext=o
4403 -_LT_AC_TAGVAR(objext, $1)=$objext
4404 -
4405 -# Code to be used in simple compile tests
4406 -lt_simple_compile_test_code="int some_variable = 0;"
4407 -
4408 -# Code to be used in simple link tests
4409 -lt_simple_link_test_code='int main(){return(0);}'
4410 -
4411 -_LT_AC_SYS_COMPILER
4412 -
4413 -# save warnings/boilerplate of simple test code
4414 -_LT_COMPILER_BOILERPLATE
4415 -_LT_LINKER_BOILERPLATE
4416 -
4417 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
4418 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
4419 -AC_LIBTOOL_PROG_CC_C_O($1)
4420 -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
4421 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
4422 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
4423 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
4424 -AC_LIBTOOL_SYS_LIB_STRIP
4425 -AC_LIBTOOL_DLOPEN_SELF
4426 -
4427 -# Report which library types will actually be built
4428 -AC_MSG_CHECKING([if libtool supports shared libraries])
4429 -AC_MSG_RESULT([$can_build_shared])
4430 -
4431 -AC_MSG_CHECKING([whether to build shared libraries])
4432 -test "$can_build_shared" = "no" && enable_shared=no
4433 -
4434 -# On AIX, shared libraries and static libraries use the same namespace, and
4435 -# are all built from PIC.
4436 -case $host_os in
4437 -aix3*)
4438 - test "$enable_shared" = yes && enable_static=no
4439 - if test -n "$RANLIB"; then
4440 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
4441 - postinstall_cmds='$RANLIB $lib'
4442 - fi
4443 - ;;
4444 -
4445 -aix[[4-9]]*)
4446 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
4447 - test "$enable_shared" = yes && enable_static=no
4448 - fi
4449 - ;;
4450 -esac
4451 -AC_MSG_RESULT([$enable_shared])
4452 -
4453 -AC_MSG_CHECKING([whether to build static libraries])
4454 -# Make sure either enable_shared or enable_static is yes.
4455 -test "$enable_shared" = yes || enable_static=yes
4456 -AC_MSG_RESULT([$enable_static])
4457 -
4458 -AC_LIBTOOL_CONFIG($1)
4459 -
4460 -AC_LANG_POP
4461 -CC="$lt_save_CC"
4462 -])# AC_LIBTOOL_LANG_C_CONFIG
4463 -
4464 -
4465 -# AC_LIBTOOL_LANG_CXX_CONFIG
4466 -# --------------------------
4467 -# Ensure that the configuration vars for the C compiler are
4468 -# suitably defined. Those variables are subsequently used by
4469 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
4470 -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
4471 -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
4472 -[AC_LANG_PUSH(C++)
4473 -AC_REQUIRE([AC_PROG_CXX])
4474 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
4475 -
4476 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
4477 -_LT_AC_TAGVAR(allow_undefined_flag, $1)=
4478 -_LT_AC_TAGVAR(always_export_symbols, $1)=no
4479 -_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
4480 -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
4481 -_LT_AC_TAGVAR(hardcode_direct, $1)=no
4482 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
4483 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
4484 -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
4485 -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
4486 -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
4487 -_LT_AC_TAGVAR(hardcode_automatic, $1)=no
4488 -_LT_AC_TAGVAR(module_cmds, $1)=
4489 -_LT_AC_TAGVAR(module_expsym_cmds, $1)=
4490 -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
4491 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
4492 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
4493 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
4494 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
4495 -
4496 -# Dependencies to place before and after the object being linked:
4497 -_LT_AC_TAGVAR(predep_objects, $1)=
4498 -_LT_AC_TAGVAR(postdep_objects, $1)=
4499 -_LT_AC_TAGVAR(predeps, $1)=
4500 -_LT_AC_TAGVAR(postdeps, $1)=
4501 -_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
4502 -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
4503 -
4504 -# Source file extension for C++ test sources.
4505 -ac_ext=cpp
4506 -
4507 -# Object file extension for compiled C++ test sources.
4508 -objext=o
4509 -_LT_AC_TAGVAR(objext, $1)=$objext
4510 -
4511 -# Code to be used in simple compile tests
4512 -lt_simple_compile_test_code="int some_variable = 0;"
4513 -
4514 -# Code to be used in simple link tests
4515 -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
4516 -
4517 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
4518 -_LT_AC_SYS_COMPILER
4519 -
4520 -# save warnings/boilerplate of simple test code
4521 -_LT_COMPILER_BOILERPLATE
4522 -_LT_LINKER_BOILERPLATE
4523 -
4524 -# Allow CC to be a program name with arguments.
4525 -lt_save_CC=$CC
4526 -lt_save_LD=$LD
4527 -lt_save_GCC=$GCC
4528 -GCC=$GXX
4529 -lt_save_with_gnu_ld=$with_gnu_ld
4530 -lt_save_path_LD=$lt_cv_path_LD
4531 -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
4532 - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
4533 -else
4534 - $as_unset lt_cv_prog_gnu_ld
4535 -fi
4536 -if test -n "${lt_cv_path_LDCXX+set}"; then
4537 - lt_cv_path_LD=$lt_cv_path_LDCXX
4538 -else
4539 - $as_unset lt_cv_path_LD
4540 -fi
4541 -test -z "${LDCXX+set}" || LD=$LDCXX
4542 -CC=${CXX-"c++"}
4543 -compiler=$CC
4544 -_LT_AC_TAGVAR(compiler, $1)=$CC
4545 -_LT_CC_BASENAME([$compiler])
4546 -
4547 -# We don't want -fno-exception wen compiling C++ code, so set the
4548 -# no_builtin_flag separately
4549 -if test "$GXX" = yes; then
4550 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
4551 -else
4552 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
4553 -fi
4554 -
4555 -if test "$GXX" = yes; then
4556 - # Set up default GNU C++ configuration
4557 -
4558 - AC_PROG_LD
4559 -
4560 - # Check if GNU C++ uses GNU ld as the underlying linker, since the
4561 - # archiving commands below assume that GNU ld is being used.
4562 - if test "$with_gnu_ld" = yes; then
4563 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
4564 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4565 -
4566 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
4567 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
4568 -
4569 - # If archive_cmds runs LD, not CC, wlarc should be empty
4570 - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
4571 - # investigate it a little bit more. (MM)
4572 - wlarc='${wl}'
4573 -
4574 - # ancient GNU ld didn't support --whole-archive et. al.
4575 - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
4576 - grep 'no-whole-archive' > /dev/null; then
4577 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
4578 - else
4579 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
4580 - fi
4581 - else
4582 - with_gnu_ld=no
4583 - wlarc=
4584 -
4585 - # A generic and very simple default shared library creation
4586 - # command for GNU C++ for the case where it uses the native
4587 - # linker, instead of GNU ld. If possible, this setting should
4588 - # overridden to take advantage of the native linker features on
4589 - # the platform it is being used on.
4590 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
4591 - fi
4592 -
4593 - # Commands to make compiler produce verbose output that lists
4594 - # what "hidden" libraries, object files and flags are used when
4595 - # linking a shared library.
4596 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
4597 -
4598 -else
4599 - GXX=no
4600 - with_gnu_ld=no
4601 - wlarc=
4602 -fi
4603 -
4604 -# PORTME: fill in a description of your system's C++ link characteristics
4605 -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
4606 -_LT_AC_TAGVAR(ld_shlibs, $1)=yes
4607 -case $host_os in
4608 - aix3*)
4609 - # FIXME: insert proper C++ library support
4610 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4611 - ;;
4612 - aix[[4-9]]*)
4613 - if test "$host_cpu" = ia64; then
4614 - # On IA64, the linker does run time linking by default, so we don't
4615 - # have to do anything special.
4616 - aix_use_runtimelinking=no
4617 - exp_sym_flag='-Bexport'
4618 - no_entry_flag=""
4619 - else
4620 - aix_use_runtimelinking=no
4621 -
4622 - # Test if we are trying to use run time linking or normal
4623 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
4624 - # need to do runtime linking.
4625 - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
4626 - for ld_flag in $LDFLAGS; do
4627 - case $ld_flag in
4628 - *-brtl*)
4629 - aix_use_runtimelinking=yes
4630 - break
4631 - ;;
4632 - esac
4633 - done
4634 - ;;
4635 - esac
4636 -
4637 - exp_sym_flag='-bexport'
4638 - no_entry_flag='-bnoentry'
4639 - fi
4640 -
4641 - # When large executables or shared objects are built, AIX ld can
4642 - # have problems creating the table of contents. If linking a library
4643 - # or program results in "error TOC overflow" add -mminimal-toc to
4644 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
4645 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
4646 -
4647 - _LT_AC_TAGVAR(archive_cmds, $1)=''
4648 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
4649 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
4650 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
4651 -
4652 - if test "$GXX" = yes; then
4653 - case $host_os in aix4.[[012]]|aix4.[[012]].*)
4654 - # We only want to do this on AIX 4.2 and lower, the check
4655 - # below for broken collect2 doesn't work under 4.3+
4656 - collect2name=`${CC} -print-prog-name=collect2`
4657 - if test -f "$collect2name" && \
4658 - strings "$collect2name" | grep resolve_lib_name >/dev/null
4659 - then
4660 - # We have reworked collect2
4661 - :
4662 - else
4663 - # We have old collect2
4664 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
4665 - # It fails to find uninstalled libraries when the uninstalled
4666 - # path is not listed in the libpath. Setting hardcode_minus_L
4667 - # to unsupported forces relinking
4668 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
4669 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
4670 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
4671 - fi
4672 - ;;
4673 - esac
4674 - shared_flag='-shared'
4675 - if test "$aix_use_runtimelinking" = yes; then
4676 - shared_flag="$shared_flag "'${wl}-G'
4677 - fi
4678 - else
4679 - # not using gcc
4680 - if test "$host_cpu" = ia64; then
4681 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
4682 - # chokes on -Wl,-G. The following line is correct:
4683 - shared_flag='-G'
4684 - else
4685 - if test "$aix_use_runtimelinking" = yes; then
4686 - shared_flag='${wl}-G'
4687 - else
4688 - shared_flag='${wl}-bM:SRE'
4689 - fi
4690 - fi
4691 - fi
4692 -
4693 - # It seems that -bexpall does not export symbols beginning with
4694 - # underscore (_), so it is better to generate a list of symbols to export.
4695 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
4696 - if test "$aix_use_runtimelinking" = yes; then
4697 - # Warning - without using the other runtime loading flags (-brtl),
4698 - # -berok will link without error, but may produce a broken library.
4699 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
4700 - # Determine the default libpath from the value encoded in an empty executable.
4701 - _LT_AC_SYS_LIBPATH_AIX
4702 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
4703 -
4704 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4705 - else
4706 - if test "$host_cpu" = ia64; then
4707 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
4708 - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
4709 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
4710 - else
4711 - # Determine the default libpath from the value encoded in an empty executable.
4712 - _LT_AC_SYS_LIBPATH_AIX
4713 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
4714 - # Warning - without using the other run time loading flags,
4715 - # -berok will link without error, but may produce a broken library.
4716 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
4717 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
4718 - # Exported symbols can be pulled into shared objects from archives
4719 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
4720 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
4721 - # This is similar to how AIX traditionally builds its shared libraries.
4722 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
4723 - fi
4724 - fi
4725 - ;;
4726 -
4727 - beos*)
4728 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
4729 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
4730 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
4731 - # support --undefined. This deserves some investigation. FIXME
4732 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4733 - else
4734 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4735 - fi
4736 - ;;
4737 -
4738 - chorus*)
4739 - case $cc_basename in
4740 - *)
4741 - # FIXME: insert proper C++ library support
4742 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4743 - ;;
4744 - esac
4745 - ;;
4746 -
4747 - cygwin* | mingw* | pw32*)
4748 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
4749 - # as there is no search path for DLLs.
4750 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
4751 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
4752 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
4753 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
4754 -
4755 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
4756 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4757 - # If the export-symbols file already is a .def file (1st line
4758 - # is EXPORTS), use it as is; otherwise, prepend...
4759 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
4760 - cp $export_symbols $output_objdir/$soname.def;
4761 - else
4762 - echo EXPORTS > $output_objdir/$soname.def;
4763 - cat $export_symbols >> $output_objdir/$soname.def;
4764 - fi~
4765 - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4766 - else
4767 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4768 - fi
4769 - ;;
4770 - darwin* | rhapsody*)
4771 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
4772 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
4773 - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
4774 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
4775 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
4776 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
4777 - _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
4778 - if test "$GXX" = yes ; then
4779 - output_verbose_link_cmd='echo'
4780 - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
4781 - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
4782 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
4783 - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
4784 - if test "$lt_cv_apple_cc_single_mod" != "yes"; then
4785 - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
4786 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
4787 - fi
4788 - else
4789 - case $cc_basename in
4790 - xlc*)
4791 - output_verbose_link_cmd='echo'
4792 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
4793 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
4794 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
4795 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
4796 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
4797 - ;;
4798 - *)
4799 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4800 - ;;
4801 - esac
4802 - fi
4803 - ;;
4804 -
4805 - dgux*)
4806 - case $cc_basename in
4807 - ec++*)
4808 - # FIXME: insert proper C++ library support
4809 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4810 - ;;
4811 - ghcx*)
4812 - # Green Hills C++ Compiler
4813 - # FIXME: insert proper C++ library support
4814 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4815 - ;;
4816 - *)
4817 - # FIXME: insert proper C++ library support
4818 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4819 - ;;
4820 - esac
4821 - ;;
4822 - freebsd[[12]]*)
4823 - # C++ shared libraries reported to be fairly broken before switch to ELF
4824 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4825 - ;;
4826 - freebsd-elf*)
4827 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
4828 - ;;
4829 - freebsd* | dragonfly*)
4830 - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
4831 - # conventions
4832 - _LT_AC_TAGVAR(ld_shlibs, $1)=yes
4833 - ;;
4834 - gnu*)
4835 - ;;
4836 - hpux9*)
4837 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
4838 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
4839 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
4840 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
4841 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
4842 - # but as the default
4843 - # location of the library.
4844 -
4845 - case $cc_basename in
4846 - CC*)
4847 - # FIXME: insert proper C++ library support
4848 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4849 - ;;
4850 - aCC*)
4851 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4852 - # Commands to make compiler produce verbose output that lists
4853 - # what "hidden" libraries, object files and flags are used when
4854 - # linking a shared library.
4855 - #
4856 - # There doesn't appear to be a way to prevent this compiler from
4857 - # explicitly linking system object files so we need to strip them
4858 - # from the output so that they don't get included in the library
4859 - # dependencies.
4860 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
4861 - ;;
4862 - *)
4863 - if test "$GXX" = yes; then
4864 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4865 - else
4866 - # FIXME: insert proper C++ library support
4867 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4868 - fi
4869 - ;;
4870 - esac
4871 - ;;
4872 - hpux10*|hpux11*)
4873 - if test $with_gnu_ld = no; then
4874 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
4875 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
4876 -
4877 - case $host_cpu in
4878 - hppa*64*|ia64*) ;;
4879 - *)
4880 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
4881 - ;;
4882 - esac
4883 - fi
4884 - case $host_cpu in
4885 - hppa*64*|ia64*)
4886 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
4887 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
4888 - ;;
4889 - *)
4890 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
4891 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
4892 - # but as the default
4893 - # location of the library.
4894 - ;;
4895 - esac
4896 -
4897 - case $cc_basename in
4898 - CC*)
4899 - # FIXME: insert proper C++ library support
4900 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4901 - ;;
4902 - aCC*)
4903 - case $host_cpu in
4904 - hppa*64*)
4905 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
4906 - ;;
4907 - ia64*)
4908 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
4909 - ;;
4910 - *)
4911 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
4912 - ;;
4913 - esac
4914 - # Commands to make compiler produce verbose output that lists
4915 - # what "hidden" libraries, object files and flags are used when
4916 - # linking a shared library.
4917 - #
4918 - # There doesn't appear to be a way to prevent this compiler from
4919 - # explicitly linking system object files so we need to strip them
4920 - # from the output so that they don't get included in the library
4921 - # dependencies.
4922 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
4923 - ;;
4924 - *)
4925 - if test "$GXX" = yes; then
4926 - if test $with_gnu_ld = no; then
4927 - case $host_cpu in
4928 - hppa*64*)
4929 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
4930 - ;;
4931 - ia64*)
4932 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
4933 - ;;
4934 - *)
4935 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
4936 - ;;
4937 - esac
4938 - fi
4939 - else
4940 - # FIXME: insert proper C++ library support
4941 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4942 - fi
4943 - ;;
4944 - esac
4945 - ;;
4946 - interix[[3-9]]*)
4947 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
4948 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
4949 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
4950 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
4951 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
4952 - # Instead, shared libraries are loaded at an image base (0x10000000 by
4953 - # default) and relocated if they conflict, which is a slow very memory
4954 - # consuming and fragmenting process. To avoid this, we pick a random,
4955 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
4956 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
4957 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
4958 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
4959 - ;;
4960 - irix5* | irix6*)
4961 - case $cc_basename in
4962 - CC*)
4963 - # SGI C++
4964 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
4965 -
4966 - # Archives containing C++ object files must be created using
4967 - # "CC -ar", where "CC" is the IRIX C++ compiler. This is
4968 - # necessary to make sure instantiated templates are included
4969 - # in the archive.
4970 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
4971 - ;;
4972 - *)
4973 - if test "$GXX" = yes; then
4974 - if test "$with_gnu_ld" = no; then
4975 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4976 - else
4977 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
4978 - fi
4979 - fi
4980 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
4981 - ;;
4982 - esac
4983 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
4984 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
4985 - ;;
4986 - linux* | k*bsd*-gnu)
4987 - case $cc_basename in
4988 - KCC*)
4989 - # Kuck and Associates, Inc. (KAI) C++ Compiler
4990 -
4991 - # KCC will only create a shared library if the output file
4992 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
4993 - # to its proper name (with version) after linking.
4994 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
4995 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
4996 - # Commands to make compiler produce verbose output that lists
4997 - # what "hidden" libraries, object files and flags are used when
4998 - # linking a shared library.
4999 - #
5000 - # There doesn't appear to be a way to prevent this compiler from
5001 - # explicitly linking system object files so we need to strip them
5002 - # from the output so that they don't get included in the library
5003 - # dependencies.
5004 - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
5005 -
5006 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
5007 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
5008 -
5009 - # Archives containing C++ object files must be created using
5010 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
5011 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
5012 - ;;
5013 - icpc*)
5014 - # Intel C++
5015 - with_gnu_ld=yes
5016 - # version 8.0 and above of icpc choke on multiply defined symbols
5017 - # if we add $predep_objects and $postdep_objects, however 7.1 and
5018 - # earlier do not add the objects themselves.
5019 - case `$CC -V 2>&1` in
5020 - *"Version 7."*)
5021 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
5022 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5023 - ;;
5024 - *) # Version 8.0 or newer
5025 - tmp_idyn=
5026 - case $host_cpu in
5027 - ia64*) tmp_idyn=' -i_dynamic';;
5028 - esac
5029 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5030 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5031 - ;;
5032 - esac
5033 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5034 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5035 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
5036 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
5037 - ;;
5038 - pgCC* | pgcpp*)
5039 - # Portland Group C++ compiler
5040 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
5041 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
5042 -
5043 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
5044 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
5045 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
5046 - ;;
5047 - cxx*)
5048 - # Compaq C++
5049 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
5050 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
5051 -
5052 - runpath_var=LD_RUN_PATH
5053 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
5054 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
5055 -
5056 - # Commands to make compiler produce verbose output that lists
5057 - # what "hidden" libraries, object files and flags are used when
5058 - # linking a shared library.
5059 - #
5060 - # There doesn't appear to be a way to prevent this compiler from
5061 - # explicitly linking system object files so we need to strip them
5062 - # from the output so that they don't get included in the library
5063 - # dependencies.
5064 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
5065 - ;;
5066 - *)
5067 - case `$CC -V 2>&1 | sed 5q` in
5068 - *Sun\ C*)
5069 - # Sun C++ 5.9
5070 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
5071 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
5072 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
5073 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5074 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
5075 -
5076 - # Not sure whether something based on
5077 - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
5078 - # would be better.
5079 - output_verbose_link_cmd='echo'
5080 -
5081 - # Archives containing C++ object files must be created using
5082 - # "CC -xar", where "CC" is the Sun C++ compiler. This is
5083 - # necessary to make sure instantiated templates are included
5084 - # in the archive.
5085 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
5086 - ;;
5087 - esac
5088 - ;;
5089 - esac
5090 - ;;
5091 - lynxos*)
5092 - # FIXME: insert proper C++ library support
5093 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5094 - ;;
5095 - m88k*)
5096 - # FIXME: insert proper C++ library support
5097 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5098 - ;;
5099 - mvs*)
5100 - case $cc_basename in
5101 - cxx*)
5102 - # FIXME: insert proper C++ library support
5103 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5104 - ;;
5105 - *)
5106 - # FIXME: insert proper C++ library support
5107 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5108 - ;;
5109 - esac
5110 - ;;
5111 - netbsd* | netbsdelf*-gnu)
5112 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
5113 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
5114 - wlarc=
5115 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5116 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
5117 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5118 - fi
5119 - # Workaround some broken pre-1.5 toolchains
5120 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
5121 - ;;
5122 - openbsd2*)
5123 - # C++ shared libraries are fairly broken
5124 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5125 - ;;
5126 - openbsd*)
5127 - if test -f /usr/libexec/ld.so; then
5128 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
5129 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5130 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
5131 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5132 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5133 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
5134 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
5135 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
5136 - fi
5137 - output_verbose_link_cmd='echo'
5138 - else
5139 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5140 - fi
5141 - ;;
5142 - osf3*)
5143 - case $cc_basename in
5144 - KCC*)
5145 - # Kuck and Associates, Inc. (KAI) C++ Compiler
5146 -
5147 - # KCC will only create a shared library if the output file
5148 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
5149 - # to its proper name (with version) after linking.
5150 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
5151 -
5152 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5153 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
5154 -
5155 - # Archives containing C++ object files must be created using
5156 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
5157 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
5158 -
5159 - ;;
5160 - RCC*)
5161 - # Rational C++ 2.4.1
5162 - # FIXME: insert proper C++ library support
5163 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5164 - ;;
5165 - cxx*)
5166 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5167 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
5168 -
5169 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5170 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
5171 -
5172 - # Commands to make compiler produce verbose output that lists
5173 - # what "hidden" libraries, object files and flags are used when
5174 - # linking a shared library.
5175 - #
5176 - # There doesn't appear to be a way to prevent this compiler from
5177 - # explicitly linking system object files so we need to strip them
5178 - # from the output so that they don't get included in the library
5179 - # dependencies.
5180 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
5181 - ;;
5182 - *)
5183 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
5184 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5185 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5186 -
5187 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5188 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
5189 -
5190 - # Commands to make compiler produce verbose output that lists
5191 - # what "hidden" libraries, object files and flags are used when
5192 - # linking a shared library.
5193 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
5194 -
5195 - else
5196 - # FIXME: insert proper C++ library support
5197 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5198 - fi
5199 - ;;
5200 - esac
5201 - ;;
5202 - osf4* | osf5*)
5203 - case $cc_basename in
5204 - KCC*)
5205 - # Kuck and Associates, Inc. (KAI) C++ Compiler
5206 -
5207 - # KCC will only create a shared library if the output file
5208 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
5209 - # to its proper name (with version) after linking.
5210 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
5211 -
5212 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5213 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
5214 -
5215 - # Archives containing C++ object files must be created using
5216 - # the KAI C++ compiler.
5217 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
5218 - ;;
5219 - RCC*)
5220 - # Rational C++ 2.4.1
5221 - # FIXME: insert proper C++ library support
5222 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5223 - ;;
5224 - cxx*)
5225 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
5226 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
5227 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
5228 - echo "-hidden">> $lib.exp~
5229 - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
5230 - $rm $lib.exp'
5231 -
5232 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
5233 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
5234 -
5235 - # Commands to make compiler produce verbose output that lists
5236 - # what "hidden" libraries, object files and flags are used when
5237 - # linking a shared library.
5238 - #
5239 - # There doesn't appear to be a way to prevent this compiler from
5240 - # explicitly linking system object files so we need to strip them
5241 - # from the output so that they don't get included in the library
5242 - # dependencies.
5243 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
5244 - ;;
5245 - *)
5246 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
5247 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5248 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5249 -
5250 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5251 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
5252 -
5253 - # Commands to make compiler produce verbose output that lists
5254 - # what "hidden" libraries, object files and flags are used when
5255 - # linking a shared library.
5256 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
5257 -
5258 - else
5259 - # FIXME: insert proper C++ library support
5260 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5261 - fi
5262 - ;;
5263 - esac
5264 - ;;
5265 - psos*)
5266 - # FIXME: insert proper C++ library support
5267 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5268 - ;;
5269 - sunos4*)
5270 - case $cc_basename in
5271 - CC*)
5272 - # Sun C++ 4.x
5273 - # FIXME: insert proper C++ library support
5274 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5275 - ;;
5276 - lcc*)
5277 - # Lucid
5278 - # FIXME: insert proper C++ library support
5279 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5280 - ;;
5281 - *)
5282 - # FIXME: insert proper C++ library support
5283 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5284 - ;;
5285 - esac
5286 - ;;
5287 - solaris*)
5288 - case $cc_basename in
5289 - CC*)
5290 - # Sun C++ 4.2, 5.x and Centerline C++
5291 - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
5292 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
5293 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
5294 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5295 - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
5296 -
5297 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5298 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5299 - case $host_os in
5300 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
5301 - *)
5302 - # The compiler driver will combine and reorder linker options,
5303 - # but understands `-z linker_flag'.
5304 - # Supported since Solaris 2.6 (maybe 2.5.1?)
5305 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
5306 - ;;
5307 - esac
5308 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
5309 -
5310 - output_verbose_link_cmd='echo'
5311 -
5312 - # Archives containing C++ object files must be created using
5313 - # "CC -xar", where "CC" is the Sun C++ compiler. This is
5314 - # necessary to make sure instantiated templates are included
5315 - # in the archive.
5316 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
5317 - ;;
5318 - gcx*)
5319 - # Green Hills C++ Compiler
5320 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
5321 -
5322 - # The C++ compiler must be used to create the archive.
5323 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
5324 - ;;
5325 - *)
5326 - # GNU C++ compiler with Solaris linker
5327 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
5328 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
5329 - if $CC --version | grep -v '^2\.7' > /dev/null; then
5330 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
5331 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5332 - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
5333 -
5334 - # Commands to make compiler produce verbose output that lists
5335 - # what "hidden" libraries, object files and flags are used when
5336 - # linking a shared library.
5337 - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
5338 - else
5339 - # g++ 2.7 appears to require `-G' NOT `-shared' on this
5340 - # platform.
5341 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
5342 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5343 - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
5344 -
5345 - # Commands to make compiler produce verbose output that lists
5346 - # what "hidden" libraries, object files and flags are used when
5347 - # linking a shared library.
5348 - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
5349 - fi
5350 -
5351 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
5352 - case $host_os in
5353 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
5354 - *)
5355 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
5356 - ;;
5357 - esac
5358 - fi
5359 - ;;
5360 - esac
5361 - ;;
5362 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
5363 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
5364 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5365 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5366 - runpath_var='LD_RUN_PATH'
5367 -
5368 - case $cc_basename in
5369 - CC*)
5370 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
5371 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
5372 - ;;
5373 - *)
5374 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
5375 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
5376 - ;;
5377 - esac
5378 - ;;
5379 - sysv5* | sco3.2v5* | sco5v6*)
5380 - # Note: We can NOT use -z defs as we might desire, because we do not
5381 - # link with -lc, and that would cause any symbols used from libc to
5382 - # always be unresolved, which means just about no library would
5383 - # ever link correctly. If we're not using GNU ld we use -z text
5384 - # though, which does catch some bad symbols but isn't as heavy-handed
5385 - # as -z defs.
5386 - # For security reasons, it is highly recommended that you always
5387 - # use absolute paths for naming shared libraries, and exclude the
5388 - # DT_RUNPATH tag from executables and libraries. But doing so
5389 - # requires that you compile everything twice, which is a pain.
5390 - # So that behaviour is only enabled if SCOABSPATH is set to a
5391 - # non-empty value in the environment. Most likely only useful for
5392 - # creating official distributions of packages.
5393 - # This is a hack until libtool officially supports absolute path
5394 - # names for shared libraries.
5395 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
5396 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
5397 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5398 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5399 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
5400 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
5401 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
5402 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
5403 - runpath_var='LD_RUN_PATH'
5404 -
5405 - case $cc_basename in
5406 - CC*)
5407 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
5408 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
5409 - ;;
5410 - *)
5411 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
5412 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
5413 - ;;
5414 - esac
5415 - ;;
5416 - tandem*)
5417 - case $cc_basename in
5418 - NCC*)
5419 - # NonStop-UX NCC 3.20
5420 - # FIXME: insert proper C++ library support
5421 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5422 - ;;
5423 - *)
5424 - # FIXME: insert proper C++ library support
5425 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5426 - ;;
5427 - esac
5428 - ;;
5429 - vxworks*)
5430 - # FIXME: insert proper C++ library support
5431 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5432 - ;;
5433 - *)
5434 - # FIXME: insert proper C++ library support
5435 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
5436 - ;;
5437 -esac
5438 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
5439 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
5440 -
5441 -_LT_AC_TAGVAR(GCC, $1)="$GXX"
5442 -_LT_AC_TAGVAR(LD, $1)="$LD"
5443 -
5444 -AC_LIBTOOL_POSTDEP_PREDEP($1)
5445 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
5446 -AC_LIBTOOL_PROG_CC_C_O($1)
5447 -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
5448 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
5449 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
5450 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
5451 -
5452 -AC_LIBTOOL_CONFIG($1)
5453 -
5454 -AC_LANG_POP
5455 -CC=$lt_save_CC
5456 -LDCXX=$LD
5457 -LD=$lt_save_LD
5458 -GCC=$lt_save_GCC
5459 -with_gnu_ldcxx=$with_gnu_ld
5460 -with_gnu_ld=$lt_save_with_gnu_ld
5461 -lt_cv_path_LDCXX=$lt_cv_path_LD
5462 -lt_cv_path_LD=$lt_save_path_LD
5463 -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
5464 -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
5465 -])# AC_LIBTOOL_LANG_CXX_CONFIG
5466 -
5467 -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
5468 -# ------------------------------------
5469 -# Figure out "hidden" library dependencies from verbose
5470 -# compiler output when linking a shared library.
5471 -# Parse the compiler output and extract the necessary
5472 -# objects, libraries and library flags.
5473 -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
5474 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
5475 -dnl we can't use the lt_simple_compile_test_code here,
5476 -dnl because it contains code intended for an executable,
5477 -dnl not a library. It's possible we should let each
5478 -dnl tag define a new lt_????_link_test_code variable,
5479 -dnl but it's only used here...
5480 -ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
5481 -int a;
5482 -void foo (void) { a = 0; }
5483 -EOF
5484 -],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
5485 -class Foo
5486 -{
5487 -public:
5488 - Foo (void) { a = 0; }
5489 -private:
5490 - int a;
5491 -};
5492 -EOF
5493 -],[$1],[F77],[cat > conftest.$ac_ext <<EOF
5494 - subroutine foo
5495 - implicit none
5496 - integer*4 a
5497 - a=0
5498 - return
5499 - end
5500 -EOF
5501 -],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
5502 -public class foo {
5503 - private int a;
5504 - public void bar (void) {
5505 - a = 0;
5506 - }
5507 -};
5508 -EOF
5509 -])
5510 -dnl Parse the compiler output and extract the necessary
5511 -dnl objects, libraries and library flags.
5512 -if AC_TRY_EVAL(ac_compile); then
5513 - # Parse the compiler output and extract the necessary
5514 - # objects, libraries and library flags.
5515 -
5516 - # Sentinel used to keep track of whether or not we are before
5517 - # the conftest object file.
5518 - pre_test_object_deps_done=no
5519 -
5520 - # The `*' in the case matches for architectures that use `case' in
5521 - # $output_verbose_cmd can trigger glob expansion during the loop
5522 - # eval without this substitution.
5523 - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
5524 -
5525 - for p in `eval $output_verbose_link_cmd`; do
5526 - case $p in
5527 -
5528 - -L* | -R* | -l*)
5529 - # Some compilers place space between "-{L,R}" and the path.
5530 - # Remove the space.
5531 - if test $p = "-L" \
5532 - || test $p = "-R"; then
5533 - prev=$p
5534 - continue
5535 - else
5536 - prev=
5537 - fi
5538 -
5539 - if test "$pre_test_object_deps_done" = no; then
5540 - case $p in
5541 - -L* | -R*)
5542 - # Internal compiler library paths should come after those
5543 - # provided the user. The postdeps already come after the
5544 - # user supplied libs so there is no need to process them.
5545 - if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
5546 - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
5547 - else
5548 - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
5549 - fi
5550 - ;;
5551 - # The "-l" case would never come before the object being
5552 - # linked, so don't bother handling this case.
5553 - esac
5554 - else
5555 - if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
5556 - _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
5557 - else
5558 - _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
5559 - fi
5560 - fi
5561 - ;;
5562 -
5563 - *.$objext)
5564 - # This assumes that the test object file only shows up
5565 - # once in the compiler output.
5566 - if test "$p" = "conftest.$objext"; then
5567 - pre_test_object_deps_done=yes
5568 - continue
5569 - fi
5570 -
5571 - if test "$pre_test_object_deps_done" = no; then
5572 - if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
5573 - _LT_AC_TAGVAR(predep_objects, $1)="$p"
5574 - else
5575 - _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
5576 - fi
5577 - else
5578 - if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
5579 - _LT_AC_TAGVAR(postdep_objects, $1)="$p"
5580 - else
5581 - _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
5582 - fi
5583 - fi
5584 - ;;
5585 -
5586 - *) ;; # Ignore the rest.
5587 -
5588 - esac
5589 - done
5590 -
5591 - # Clean up.
5592 - rm -f a.out a.exe
5593 -else
5594 - echo "libtool.m4: error: problem compiling $1 test program"
5595 -fi
5596 -
5597 -$rm -f confest.$objext
5598 -
5599 -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
5600 -if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
5601 - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
5602 -fi
5603 -
5604 -# PORTME: override above test on systems where it is broken
5605 -ifelse([$1],[CXX],
5606 -[case $host_os in
5607 -interix[[3-9]]*)
5608 - # Interix 3.5 installs completely hosed .la files for C++, so rather than
5609 - # hack all around it, let's just trust "g++" to DTRT.
5610 - _LT_AC_TAGVAR(predep_objects,$1)=
5611 - _LT_AC_TAGVAR(postdep_objects,$1)=
5612 - _LT_AC_TAGVAR(postdeps,$1)=
5613 - ;;
5614 -
5615 -linux*)
5616 - case `$CC -V 2>&1 | sed 5q` in
5617 - *Sun\ C*)
5618 - # Sun C++ 5.9
5619 - #
5620 - # The more standards-conforming stlport4 library is
5621 - # incompatible with the Cstd library. Avoid specifying
5622 - # it if it's in CXXFLAGS. Ignore libCrun as
5623 - # -library=stlport4 depends on it.
5624 - case " $CXX $CXXFLAGS " in
5625 - *" -library=stlport4 "*)
5626 - solaris_use_stlport4=yes
5627 - ;;
5628 - esac
5629 - if test "$solaris_use_stlport4" != yes; then
5630 - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
5631 - fi
5632 - ;;
5633 - esac
5634 - ;;
5635 -
5636 -solaris*)
5637 - case $cc_basename in
5638 - CC*)
5639 - # The more standards-conforming stlport4 library is
5640 - # incompatible with the Cstd library. Avoid specifying
5641 - # it if it's in CXXFLAGS. Ignore libCrun as
5642 - # -library=stlport4 depends on it.
5643 - case " $CXX $CXXFLAGS " in
5644 - *" -library=stlport4 "*)
5645 - solaris_use_stlport4=yes
5646 - ;;
5647 - esac
5648 -
5649 - # Adding this requires a known-good setup of shared libraries for
5650 - # Sun compiler versions before 5.6, else PIC objects from an old
5651 - # archive will be linked into the output, leading to subtle bugs.
5652 - if test "$solaris_use_stlport4" != yes; then
5653 - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
5654 - fi
5655 - ;;
5656 - esac
5657 - ;;
5658 -esac
5659 -])
5660 -case " $_LT_AC_TAGVAR(postdeps, $1) " in
5661 -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
5662 -esac
5663 -])# AC_LIBTOOL_POSTDEP_PREDEP
5664 -
5665 -# AC_LIBTOOL_LANG_F77_CONFIG
5666 -# --------------------------
5667 -# Ensure that the configuration vars for the C compiler are
5668 -# suitably defined. Those variables are subsequently used by
5669 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
5670 -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
5671 -AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
5672 -[AC_REQUIRE([AC_PROG_F77])
5673 -AC_LANG_PUSH(Fortran 77)
5674 -
5675 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5676 -_LT_AC_TAGVAR(allow_undefined_flag, $1)=
5677 -_LT_AC_TAGVAR(always_export_symbols, $1)=no
5678 -_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
5679 -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
5680 -_LT_AC_TAGVAR(hardcode_direct, $1)=no
5681 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
5682 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
5683 -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
5684 -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
5685 -_LT_AC_TAGVAR(hardcode_automatic, $1)=no
5686 -_LT_AC_TAGVAR(module_cmds, $1)=
5687 -_LT_AC_TAGVAR(module_expsym_cmds, $1)=
5688 -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
5689 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
5690 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
5691 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
5692 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
5693 -
5694 -# Source file extension for f77 test sources.
5695 -ac_ext=f
5696 -
5697 -# Object file extension for compiled f77 test sources.
5698 -objext=o
5699 -_LT_AC_TAGVAR(objext, $1)=$objext
5700 -
5701 -# Code to be used in simple compile tests
5702 -lt_simple_compile_test_code="\
5703 - subroutine t
5704 - return
5705 - end
5706 -"
5707 -
5708 -# Code to be used in simple link tests
5709 -lt_simple_link_test_code="\
5710 - program t
5711 - end
5712 -"
5713 -
5714 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
5715 -_LT_AC_SYS_COMPILER
5716 -
5717 -# save warnings/boilerplate of simple test code
5718 -_LT_COMPILER_BOILERPLATE
5719 -_LT_LINKER_BOILERPLATE
5720 -
5721 -# Allow CC to be a program name with arguments.
5722 -lt_save_CC="$CC"
5723 -CC=${F77-"f77"}
5724 -compiler=$CC
5725 -_LT_AC_TAGVAR(compiler, $1)=$CC
5726 -_LT_CC_BASENAME([$compiler])
5727 -
5728 -AC_MSG_CHECKING([if libtool supports shared libraries])
5729 -AC_MSG_RESULT([$can_build_shared])
5730 -
5731 -AC_MSG_CHECKING([whether to build shared libraries])
5732 -test "$can_build_shared" = "no" && enable_shared=no
5733 -
5734 -# On AIX, shared libraries and static libraries use the same namespace, and
5735 -# are all built from PIC.
5736 -case $host_os in
5737 -aix3*)
5738 - test "$enable_shared" = yes && enable_static=no
5739 - if test -n "$RANLIB"; then
5740 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
5741 - postinstall_cmds='$RANLIB $lib'
5742 - fi
5743 - ;;
5744 -aix[[4-9]]*)
5745 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
5746 - test "$enable_shared" = yes && enable_static=no
5747 - fi
5748 - ;;
5749 -esac
5750 -AC_MSG_RESULT([$enable_shared])
5751 -
5752 -AC_MSG_CHECKING([whether to build static libraries])
5753 -# Make sure either enable_shared or enable_static is yes.
5754 -test "$enable_shared" = yes || enable_static=yes
5755 -AC_MSG_RESULT([$enable_static])
5756 -
5757 -_LT_AC_TAGVAR(GCC, $1)="$G77"
5758 -_LT_AC_TAGVAR(LD, $1)="$LD"
5759 -
5760 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
5761 -AC_LIBTOOL_PROG_CC_C_O($1)
5762 -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
5763 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
5764 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
5765 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
5766 -
5767 -AC_LIBTOOL_CONFIG($1)
5768 -
5769 -AC_LANG_POP
5770 -CC="$lt_save_CC"
5771 -])# AC_LIBTOOL_LANG_F77_CONFIG
5772 -
5773 -
5774 -# AC_LIBTOOL_LANG_GCJ_CONFIG
5775 -# --------------------------
5776 -# Ensure that the configuration vars for the C compiler are
5777 -# suitably defined. Those variables are subsequently used by
5778 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
5779 -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
5780 -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
5781 -[AC_LANG_SAVE
5782 -
5783 -# Source file extension for Java test sources.
5784 -ac_ext=java
5785 -
5786 -# Object file extension for compiled Java test sources.
5787 -objext=o
5788 -_LT_AC_TAGVAR(objext, $1)=$objext
5789 -
5790 -# Code to be used in simple compile tests
5791 -lt_simple_compile_test_code="class foo {}"
5792 -
5793 -# Code to be used in simple link tests
5794 -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
5795 -
5796 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
5797 -_LT_AC_SYS_COMPILER
5798 -
5799 -# save warnings/boilerplate of simple test code
5800 -_LT_COMPILER_BOILERPLATE
5801 -_LT_LINKER_BOILERPLATE
5802 -
5803 -# Allow CC to be a program name with arguments.
5804 -lt_save_CC="$CC"
5805 -CC=${GCJ-"gcj"}
5806 -compiler=$CC
5807 -_LT_AC_TAGVAR(compiler, $1)=$CC
5808 -_LT_CC_BASENAME([$compiler])
5809 -
5810 -# GCJ did not exist at the time GCC didn't implicitly link libc in.
5811 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5812 -
5813 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
5814 -
5815 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
5816 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
5817 -AC_LIBTOOL_PROG_CC_C_O($1)
5818 -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
5819 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
5820 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
5821 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
5822 -
5823 -AC_LIBTOOL_CONFIG($1)
5824 -
5825 -AC_LANG_RESTORE
5826 -CC="$lt_save_CC"
5827 -])# AC_LIBTOOL_LANG_GCJ_CONFIG
5828 -
5829 -
5830 -# AC_LIBTOOL_LANG_RC_CONFIG
5831 -# -------------------------
5832 -# Ensure that the configuration vars for the Windows resource compiler are
5833 -# suitably defined. Those variables are subsequently used by
5834 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
5835 -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
5836 -AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
5837 -[AC_LANG_SAVE
5838 -
5839 -# Source file extension for RC test sources.
5840 -ac_ext=rc
5841 -
5842 -# Object file extension for compiled RC test sources.
5843 -objext=o
5844 -_LT_AC_TAGVAR(objext, $1)=$objext
5845 -
5846 -# Code to be used in simple compile tests
5847 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
5848 -
5849 -# Code to be used in simple link tests
5850 -lt_simple_link_test_code="$lt_simple_compile_test_code"
5851 -
5852 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
5853 -_LT_AC_SYS_COMPILER
5854 -
5855 -# save warnings/boilerplate of simple test code
5856 -_LT_COMPILER_BOILERPLATE
5857 -_LT_LINKER_BOILERPLATE
5858 -
5859 -# Allow CC to be a program name with arguments.
5860 -lt_save_CC="$CC"
5861 -CC=${RC-"windres"}
5862 -compiler=$CC
5863 -_LT_AC_TAGVAR(compiler, $1)=$CC
5864 -_LT_CC_BASENAME([$compiler])
5865 -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
5866 -
5867 -AC_LIBTOOL_CONFIG($1)
5868 -
5869 -AC_LANG_RESTORE
5870 -CC="$lt_save_CC"
5871 -])# AC_LIBTOOL_LANG_RC_CONFIG
5872 -
5873 -
5874 -# AC_LIBTOOL_CONFIG([TAGNAME])
5875 -# ----------------------------
5876 -# If TAGNAME is not passed, then create an initial libtool script
5877 -# with a default configuration from the untagged config vars. Otherwise
5878 -# add code to config.status for appending the configuration named by
5879 -# TAGNAME from the matching tagged config vars.
5880 -AC_DEFUN([AC_LIBTOOL_CONFIG],
5881 -[# The else clause should only fire when bootstrapping the
5882 -# libtool distribution, otherwise you forgot to ship ltmain.sh
5883 -# with your package, and you will get complaints that there are
5884 -# no rules to generate ltmain.sh.
5885 -if test -f "$ltmain"; then
5886 - # See if we are running on zsh, and set the options which allow our commands through
5887 - # without removal of \ escapes.
5888 - if test -n "${ZSH_VERSION+set}" ; then
5889 - setopt NO_GLOB_SUBST
5890 - fi
5891 - # Now quote all the things that may contain metacharacters while being
5892 - # careful not to overquote the AC_SUBSTed values. We take copies of the
5893 - # variables and quote the copies for generation of the libtool script.
5894 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
5895 - SED SHELL STRIP \
5896 - libname_spec library_names_spec soname_spec extract_expsyms_cmds \
5897 - old_striplib striplib file_magic_cmd finish_cmds finish_eval \
5898 - deplibs_check_method reload_flag reload_cmds need_locks \
5899 - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
5900 - lt_cv_sys_global_symbol_to_c_name_address \
5901 - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
5902 - old_postinstall_cmds old_postuninstall_cmds \
5903 - _LT_AC_TAGVAR(compiler, $1) \
5904 - _LT_AC_TAGVAR(CC, $1) \
5905 - _LT_AC_TAGVAR(LD, $1) \
5906 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
5907 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
5908 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
5909 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
5910 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
5911 - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
5912 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
5913 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
5914 - _LT_AC_TAGVAR(old_archive_cmds, $1) \
5915 - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
5916 - _LT_AC_TAGVAR(predep_objects, $1) \
5917 - _LT_AC_TAGVAR(postdep_objects, $1) \
5918 - _LT_AC_TAGVAR(predeps, $1) \
5919 - _LT_AC_TAGVAR(postdeps, $1) \
5920 - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
5921 - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
5922 - _LT_AC_TAGVAR(archive_cmds, $1) \
5923 - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
5924 - _LT_AC_TAGVAR(postinstall_cmds, $1) \
5925 - _LT_AC_TAGVAR(postuninstall_cmds, $1) \
5926 - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
5927 - _LT_AC_TAGVAR(allow_undefined_flag, $1) \
5928 - _LT_AC_TAGVAR(no_undefined_flag, $1) \
5929 - _LT_AC_TAGVAR(export_symbols_cmds, $1) \
5930 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
5931 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
5932 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
5933 - _LT_AC_TAGVAR(hardcode_automatic, $1) \
5934 - _LT_AC_TAGVAR(module_cmds, $1) \
5935 - _LT_AC_TAGVAR(module_expsym_cmds, $1) \
5936 - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
5937 - _LT_AC_TAGVAR(fix_srcfile_path, $1) \
5938 - _LT_AC_TAGVAR(exclude_expsyms, $1) \
5939 - _LT_AC_TAGVAR(include_expsyms, $1); do
5940 -
5941 - case $var in
5942 - _LT_AC_TAGVAR(old_archive_cmds, $1) | \
5943 - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
5944 - _LT_AC_TAGVAR(archive_cmds, $1) | \
5945 - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
5946 - _LT_AC_TAGVAR(module_cmds, $1) | \
5947 - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
5948 - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
5949 - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
5950 - extract_expsyms_cmds | reload_cmds | finish_cmds | \
5951 - postinstall_cmds | postuninstall_cmds | \
5952 - old_postinstall_cmds | old_postuninstall_cmds | \
5953 - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
5954 - # Double-quote double-evaled strings.
5955 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
5956 - ;;
5957 - *)
5958 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
5959 - ;;
5960 - esac
5961 - done
5962 -
5963 - case $lt_echo in
5964 - *'\[$]0 --fallback-echo"')
5965 - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
5966 - ;;
5967 - esac
5968 -
5969 -ifelse([$1], [],
5970 - [cfgfile="${ofile}T"
5971 - trap "$rm \"$cfgfile\"; exit 1" 1 2 15
5972 - $rm -f "$cfgfile"
5973 - AC_MSG_NOTICE([creating $ofile])],
5974 - [cfgfile="$ofile"])
5975 -
5976 - cat <<__EOF__ >> "$cfgfile"
5977 -ifelse([$1], [],
5978 -[#! $SHELL
5979 -
5980 -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
5981 -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
5982 -# NOTE: Changes made to this file will be lost: look at ltmain.sh.
5983 -#
5984 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5985 -# Free Software Foundation, Inc.
5986 -#
5987 -# This file is part of GNU Libtool:
5988 -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
5989 -#
5990 -# This program is free software; you can redistribute it and/or modify
5991 -# it under the terms of the GNU General Public License as published by
5992 -# the Free Software Foundation; either version 2 of the License, or
5993 -# (at your option) any later version.
5994 -#
5995 -# This program is distributed in the hope that it will be useful, but
5996 -# WITHOUT ANY WARRANTY; without even the implied warranty of
5997 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5998 -# General Public License for more details.
5999 -#
6000 -# You should have received a copy of the GNU General Public License
6001 -# along with this program; if not, write to the Free Software
6002 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
6003 -#
6004 -# As a special exception to the GNU General Public License, if you
6005 -# distribute this file as part of a program that contains a
6006 -# configuration script generated by Autoconf, you may include it under
6007 -# the same distribution terms that you use for the rest of that program.
6008 -
6009 -# A sed program that does not truncate output.
6010 -SED=$lt_SED
6011 -
6012 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
6013 -Xsed="$SED -e 1s/^X//"
6014 -
6015 -# The HP-UX ksh and POSIX shell print the target directory to stdout
6016 -# if CDPATH is set.
6017 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
6018 -
6019 -# The names of the tagged configurations supported by this script.
6020 -available_tags=
6021 -
6022 -# ### BEGIN LIBTOOL CONFIG],
6023 -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
6024 -
6025 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
6026 -
6027 -# Shell to use when invoking shell scripts.
6028 -SHELL=$lt_SHELL
6029 -
6030 -# Whether or not to build shared libraries.
6031 -build_libtool_libs=$enable_shared
6032 -
6033 -# Whether or not to build static libraries.
6034 -build_old_libs=$enable_static
6035 -
6036 -# Whether or not to add -lc for building shared libraries.
6037 -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
6038 -
6039 -# Whether or not to disallow shared libs when runtime libs are static
6040 -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
6041 -
6042 -# Whether or not to optimize for fast installation.
6043 -fast_install=$enable_fast_install
6044 -
6045 -# The host system.
6046 -host_alias=$host_alias
6047 -host=$host
6048 -host_os=$host_os
6049 -
6050 -# The build system.
6051 -build_alias=$build_alias
6052 -build=$build
6053 -build_os=$build_os
6054 -
6055 -# An echo program that does not interpret backslashes.
6056 -echo=$lt_echo
6057 -
6058 -# The archiver.
6059 -AR=$lt_AR
6060 -AR_FLAGS=$lt_AR_FLAGS
6061 -
6062 -# A C compiler.
6063 -LTCC=$lt_LTCC
6064 -
6065 -# LTCC compiler flags.
6066 -LTCFLAGS=$lt_LTCFLAGS
6067 -
6068 -# A language-specific compiler.
6069 -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
6070 -
6071 -# Is the compiler the GNU C compiler?
6072 -with_gcc=$_LT_AC_TAGVAR(GCC, $1)
6073 -
6074 -# An ERE matcher.
6075 -EGREP=$lt_EGREP
6076 -
6077 -# The linker used to build libraries.
6078 -LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
6079 -
6080 -# Whether we need hard or soft links.
6081 -LN_S=$lt_LN_S
6082 -
6083 -# A BSD-compatible nm program.
6084 -NM=$lt_NM
6085 -
6086 -# A symbol stripping program
6087 -STRIP=$lt_STRIP
6088 -
6089 -# Used to examine libraries when file_magic_cmd begins "file"
6090 -MAGIC_CMD=$MAGIC_CMD
6091 -
6092 -# Used on cygwin: DLL creation program.
6093 -DLLTOOL="$DLLTOOL"
6094 -
6095 -# Used on cygwin: object dumper.
6096 -OBJDUMP="$OBJDUMP"
6097 -
6098 -# Used on cygwin: assembler.
6099 -AS="$AS"
6100 -
6101 -# The name of the directory that contains temporary libtool files.
6102 -objdir=$objdir
6103 -
6104 -# How to create reloadable object files.
6105 -reload_flag=$lt_reload_flag
6106 -reload_cmds=$lt_reload_cmds
6107 -
6108 -# How to pass a linker flag through the compiler.
6109 -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
6110 -
6111 -# Object file suffix (normally "o").
6112 -objext="$ac_objext"
6113 -
6114 -# Old archive suffix (normally "a").
6115 -libext="$libext"
6116 -
6117 -# Shared library suffix (normally ".so").
6118 -shrext_cmds='$shrext_cmds'
6119 -
6120 -# Executable file suffix (normally "").
6121 -exeext="$exeext"
6122 -
6123 -# Additional compiler flags for building library objects.
6124 -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
6125 -pic_mode=$pic_mode
6126 -
6127 -# What is the maximum length of a command?
6128 -max_cmd_len=$lt_cv_sys_max_cmd_len
6129 -
6130 -# Does compiler simultaneously support -c and -o options?
6131 -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
6132 -
6133 -# Must we lock files when doing compilation?
6134 -need_locks=$lt_need_locks
6135 -
6136 -# Do we need the lib prefix for modules?
6137 -need_lib_prefix=$need_lib_prefix
6138 -
6139 -# Do we need a version for libraries?
6140 -need_version=$need_version
6141 -
6142 -# Whether dlopen is supported.
6143 -dlopen_support=$enable_dlopen
6144 -
6145 -# Whether dlopen of programs is supported.
6146 -dlopen_self=$enable_dlopen_self
6147 -
6148 -# Whether dlopen of statically linked programs is supported.
6149 -dlopen_self_static=$enable_dlopen_self_static
6150 -
6151 -# Compiler flag to prevent dynamic linking.
6152 -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
6153 -
6154 -# Compiler flag to turn off builtin functions.
6155 -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
6156 -
6157 -# Compiler flag to allow reflexive dlopens.
6158 -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
6159 -
6160 -# Compiler flag to generate shared objects directly from archives.
6161 -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
6162 -
6163 -# Compiler flag to generate thread-safe objects.
6164 -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
6165 -
6166 -# Library versioning type.
6167 -version_type=$version_type
6168 -
6169 -# Format of library name prefix.
6170 -libname_spec=$lt_libname_spec
6171 -
6172 -# List of archive names. First name is the real one, the rest are links.
6173 -# The last name is the one that the linker finds with -lNAME.
6174 -library_names_spec=$lt_library_names_spec
6175 -
6176 -# The coded name of the library, if different from the real name.
6177 -soname_spec=$lt_soname_spec
6178 -
6179 -# Commands used to build and install an old-style archive.
6180 -RANLIB=$lt_RANLIB
6181 -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
6182 -old_postinstall_cmds=$lt_old_postinstall_cmds
6183 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
6184 -
6185 -# Create an old-style archive from a shared archive.
6186 -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
6187 -
6188 -# Create a temporary old-style archive to link instead of a shared archive.
6189 -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
6190 -
6191 -# Commands used to build and install a shared archive.
6192 -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
6193 -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
6194 -postinstall_cmds=$lt_postinstall_cmds
6195 -postuninstall_cmds=$lt_postuninstall_cmds
6196 -
6197 -# Commands used to build a loadable module (assumed same as above if empty)
6198 -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
6199 -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
6200 -
6201 -# Commands to strip libraries.
6202 -old_striplib=$lt_old_striplib
6203 -striplib=$lt_striplib
6204 -
6205 -# Dependencies to place before the objects being linked to create a
6206 -# shared library.
6207 -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
6208 -
6209 -# Dependencies to place after the objects being linked to create a
6210 -# shared library.
6211 -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
6212 -
6213 -# Dependencies to place before the objects being linked to create a
6214 -# shared library.
6215 -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
6216 -
6217 -# Dependencies to place after the objects being linked to create a
6218 -# shared library.
6219 -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
6220 -
6221 -# The directories searched by this compiler when creating a shared
6222 -# library
6223 -compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
6224 -
6225 -# The library search path used internally by the compiler when linking
6226 -# a shared library.
6227 -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
6228 -
6229 -# Method to check whether dependent libraries are shared objects.
6230 -deplibs_check_method=$lt_deplibs_check_method
6231 -
6232 -# Command to use when deplibs_check_method == file_magic.
6233 -file_magic_cmd=$lt_file_magic_cmd
6234 -
6235 -# Flag that allows shared libraries with undefined symbols to be built.
6236 -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
6237 -
6238 -# Flag that forces no undefined symbols.
6239 -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
6240 -
6241 -# Commands used to finish a libtool library installation in a directory.
6242 -finish_cmds=$lt_finish_cmds
6243 -
6244 -# Same as above, but a single script fragment to be evaled but not shown.
6245 -finish_eval=$lt_finish_eval
6246 -
6247 -# Take the output of nm and produce a listing of raw symbols and C names.
6248 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
6249 -
6250 -# Transform the output of nm in a proper C declaration
6251 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
6252 -
6253 -# Transform the output of nm in a C name address pair
6254 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
6255 -
6256 -# This is the shared library runtime path variable.
6257 -runpath_var=$runpath_var
6258 -
6259 -# This is the shared library path variable.
6260 -shlibpath_var=$shlibpath_var
6261 -
6262 -# Is shlibpath searched before the hard-coded library search path?
6263 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
6264 -
6265 -# How to hardcode a shared library path into an executable.
6266 -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
6267 -
6268 -# Whether we should hardcode library paths into libraries.
6269 -hardcode_into_libs=$hardcode_into_libs
6270 -
6271 -# Flag to hardcode \$libdir into a binary during linking.
6272 -# This must work even if \$libdir does not exist.
6273 -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
6274 -
6275 -# If ld is used when linking, flag to hardcode \$libdir into
6276 -# a binary during linking. This must work even if \$libdir does
6277 -# not exist.
6278 -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
6279 -
6280 -# Whether we need a single -rpath flag with a separated argument.
6281 -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
6282 -
6283 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
6284 -# resulting binary.
6285 -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
6286 -
6287 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
6288 -# resulting binary.
6289 -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
6290 -
6291 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
6292 -# the resulting binary.
6293 -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
6294 -
6295 -# Set to yes if building a shared library automatically hardcodes DIR into the library
6296 -# and all subsequent libraries and executables linked against it.
6297 -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
6298 -
6299 -# Variables whose values should be saved in libtool wrapper scripts and
6300 -# restored at relink time.
6301 -variables_saved_for_relink="$variables_saved_for_relink"
6302 -
6303 -# Whether libtool must link a program against all its dependency libraries.
6304 -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
6305 -
6306 -# Compile-time system search path for libraries
6307 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
6308 -
6309 -# Run-time system search path for libraries
6310 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
6311 -
6312 -# Fix the shell variable \$srcfile for the compiler.
6313 -fix_srcfile_path=$lt_fix_srcfile_path
6314 -
6315 -# Set to yes if exported symbols are required.
6316 -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
6317 -
6318 -# The commands to list exported symbols.
6319 -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
6320 -
6321 -# The commands to extract the exported symbol list from a shared archive.
6322 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
6323 -
6324 -# Symbols that should not be listed in the preloaded symbols.
6325 -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
6326 -
6327 -# Symbols that must always be exported.
6328 -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
6329 -
6330 -ifelse([$1],[],
6331 -[# ### END LIBTOOL CONFIG],
6332 -[# ### END LIBTOOL TAG CONFIG: $tagname])
6333 -
6334 -__EOF__
6335 -
6336 -ifelse([$1],[], [
6337 - case $host_os in
6338 - aix3*)
6339 - cat <<\EOF >> "$cfgfile"
6340 -
6341 -# AIX sometimes has problems with the GCC collect2 program. For some
6342 -# reason, if we set the COLLECT_NAMES environment variable, the problems
6343 -# vanish in a puff of smoke.
6344 -if test "X${COLLECT_NAMES+set}" != Xset; then
6345 - COLLECT_NAMES=
6346 - export COLLECT_NAMES
6347 -fi
6348 -EOF
6349 - ;;
6350 - esac
6351 -
6352 - # We use sed instead of cat because bash on DJGPP gets confused if
6353 - # if finds mixed CR/LF and LF-only lines. Since sed operates in
6354 - # text mode, it properly converts lines to CR/LF. This bash problem
6355 - # is reportedly fixed, but why not run on old versions too?
6356 - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
6357 -
6358 - mv -f "$cfgfile" "$ofile" || \
6359 - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
6360 - chmod +x "$ofile"
6361 -])
6362 -else
6363 - # If there is no Makefile yet, we rely on a make rule to execute
6364 - # `config.status --recheck' to rerun these tests and create the
6365 - # libtool script then.
6366 - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
6367 - if test -f "$ltmain_in"; then
6368 - test -f Makefile && make "$ltmain"
6369 - fi
6370 -fi
6371 -])# AC_LIBTOOL_CONFIG
6372 -
6373 -
6374 -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
6375 -# -------------------------------------------
6376 -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
6377 -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
6378 -
6379 -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
6380 -
6381 -if test "$GCC" = yes; then
6382 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
6383 -
6384 - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
6385 - lt_cv_prog_compiler_rtti_exceptions,
6386 - [-fno-rtti -fno-exceptions], [],
6387 - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
6388 -fi
6389 -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
6390 -
6391 -
6392 -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
6393 -# ---------------------------------
6394 -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
6395 -[AC_REQUIRE([AC_CANONICAL_HOST])
6396 -AC_REQUIRE([LT_AC_PROG_SED])
6397 -AC_REQUIRE([AC_PROG_NM])
6398 -AC_REQUIRE([AC_OBJEXT])
6399 -# Check for command to grab the raw symbol name followed by C symbol from nm.
6400 -AC_MSG_CHECKING([command to parse $NM output from $compiler object])
6401 -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
6402 -[
6403 -# These are sane defaults that work on at least a few old systems.
6404 -# [They come from Ultrix. What could be older than Ultrix?!! ;)]
6405 -
6406 -# Character class describing NM global symbol codes.
6407 -symcode='[[BCDEGRST]]'
6408 -
6409 -# Regexp to match symbols that can be accessed directly from C.
6410 -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
6411 -
6412 -# Transform an extracted symbol line into a proper C declaration
6413 -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
6414 -
6415 -# Transform an extracted symbol line into symbol name and symbol address
6416 -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
6417 -
6418 -# Define system-specific variables.
6419 -case $host_os in
6420 -aix*)
6421 - symcode='[[BCDT]]'
6422 - ;;
6423 -cygwin* | mingw* | pw32*)
6424 - symcode='[[ABCDGISTW]]'
6425 - ;;
6426 -hpux*) # Its linker distinguishes data from code symbols
6427 - if test "$host_cpu" = ia64; then
6428 - symcode='[[ABCDEGRST]]'
6429 - fi
6430 - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6431 - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
6432 - ;;
6433 -linux* | k*bsd*-gnu)
6434 - if test "$host_cpu" = ia64; then
6435 - symcode='[[ABCDGIRSTW]]'
6436 - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6437 - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
6438 - fi
6439 - ;;
6440 -irix* | nonstopux*)
6441 - symcode='[[BCDEGRST]]'
6442 - ;;
6443 -osf*)
6444 - symcode='[[BCDEGQRST]]'
6445 - ;;
6446 -solaris*)
6447 - symcode='[[BDRT]]'
6448 - ;;
6449 -sco3.2v5*)
6450 - symcode='[[DT]]'
6451 - ;;
6452 -sysv4.2uw2*)
6453 - symcode='[[DT]]'
6454 - ;;
6455 -sysv5* | sco5v6* | unixware* | OpenUNIX*)
6456 - symcode='[[ABDT]]'
6457 - ;;
6458 -sysv4)
6459 - symcode='[[DFNSTU]]'
6460 - ;;
6461 -esac
6462 -
6463 -# Handle CRLF in mingw tool chain
6464 -opt_cr=
6465 -case $build_os in
6466 -mingw*)
6467 - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
6468 - ;;
6469 -esac
6470 -
6471 -# If we're using GNU nm, then use its standard symbol codes.
6472 -case `$NM -V 2>&1` in
6473 -*GNU* | *'with BFD'*)
6474 - symcode='[[ABCDGIRSTW]]' ;;
6475 -esac
6476 -
6477 -# Try without a prefix undercore, then with it.
6478 -for ac_symprfx in "" "_"; do
6479 -
6480 - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
6481 - symxfrm="\\1 $ac_symprfx\\2 \\2"
6482 -
6483 - # Write the raw and C identifiers.
6484 - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6485 -
6486 - # Check to see that the pipe works correctly.
6487 - pipe_works=no
6488 -
6489 - rm -f conftest*
6490 - cat > conftest.$ac_ext <<EOF
6491 -#ifdef __cplusplus
6492 -extern "C" {
6493 -#endif
6494 -char nm_test_var;
6495 -void nm_test_func(){}
6496 -#ifdef __cplusplus
6497 -}
6498 -#endif
6499 -int main(){nm_test_var='a';nm_test_func();return(0);}
6500 -EOF
6501 -
6502 - if AC_TRY_EVAL(ac_compile); then
6503 - # Now try to grab the symbols.
6504 - nlist=conftest.nm
6505 - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
6506 - # Try sorting and uniquifying the output.
6507 - if sort "$nlist" | uniq > "$nlist"T; then
6508 - mv -f "$nlist"T "$nlist"
6509 - else
6510 - rm -f "$nlist"T
6511 - fi
6512 -
6513 - # Make sure that we snagged all the symbols we need.
6514 - if grep ' nm_test_var$' "$nlist" >/dev/null; then
6515 - if grep ' nm_test_func$' "$nlist" >/dev/null; then
6516 - cat <<EOF > conftest.$ac_ext
6517 -#ifdef __cplusplus
6518 -extern "C" {
6519 -#endif
6520 -
6521 -EOF
6522 - # Now generate the symbol file.
6523 - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
6524 -
6525 - cat <<EOF >> conftest.$ac_ext
6526 -#if defined (__STDC__) && __STDC__
6527 -# define lt_ptr_t void *
6528 -#else
6529 -# define lt_ptr_t char *
6530 -# define const
6531 -#endif
6532 -
6533 -/* The mapping between symbol names and symbols. */
6534 -const struct {
6535 - const char *name;
6536 - lt_ptr_t address;
6537 -}
6538 -lt_preloaded_symbols[[]] =
6539 -{
6540 -EOF
6541 - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
6542 - cat <<\EOF >> conftest.$ac_ext
6543 - {0, (lt_ptr_t) 0}
6544 -};
6545 -
6546 -#ifdef __cplusplus
6547 -}
6548 -#endif
6549 -EOF
6550 - # Now try linking the two files.
6551 - mv conftest.$ac_objext conftstm.$ac_objext
6552 - lt_save_LIBS="$LIBS"
6553 - lt_save_CFLAGS="$CFLAGS"
6554 - LIBS="conftstm.$ac_objext"
6555 - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
6556 - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
6557 - pipe_works=yes
6558 - fi
6559 - LIBS="$lt_save_LIBS"
6560 - CFLAGS="$lt_save_CFLAGS"
6561 - else
6562 - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
6563 - fi
6564 - else
6565 - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
6566 - fi
6567 - else
6568 - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
6569 - fi
6570 - else
6571 - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
6572 - cat conftest.$ac_ext >&5
6573 - fi
6574 - rm -rf conftest* conftst*
6575 -
6576 - # Do not use the global_symbol_pipe unless it works.
6577 - if test "$pipe_works" = yes; then
6578 - break
6579 - else
6580 - lt_cv_sys_global_symbol_pipe=
6581 - fi
6582 -done
6583 -])
6584 -if test -z "$lt_cv_sys_global_symbol_pipe"; then
6585 - lt_cv_sys_global_symbol_to_cdecl=
6586 -fi
6587 -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
6588 - AC_MSG_RESULT(failed)
6589 -else
6590 - AC_MSG_RESULT(ok)
6591 -fi
6592 -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
6593 -
6594 -
6595 -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
6596 -# ---------------------------------------
6597 -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
6598 -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
6599 -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
6600 -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
6601 -
6602 -AC_MSG_CHECKING([for $compiler option to produce PIC])
6603 - ifelse([$1],[CXX],[
6604 - # C++ specific cases for pic, static, wl, etc.
6605 - if test "$GXX" = yes; then
6606 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6607 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
6608 -
6609 - case $host_os in
6610 - aix*)
6611 - # All AIX code is PIC.
6612 - if test "$host_cpu" = ia64; then
6613 - # AIX 5 now supports IA64 processor
6614 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6615 - fi
6616 - ;;
6617 - amigaos*)
6618 - # FIXME: we need at least 68020 code to build shared libraries, but
6619 - # adding the `-m68020' flag to GCC prevents building anything better,
6620 - # like `-m68040'.
6621 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
6622 - ;;
6623 - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
6624 - # PIC is the default for these OSes.
6625 - ;;
6626 - mingw* | cygwin* | os2* | pw32*)
6627 - # This hack is so that the source file can tell whether it is being
6628 - # built for inclusion in a dll (and should export symbols for example).
6629 - # Although the cygwin gcc ignores -fPIC, still need this for old-style
6630 - # (--disable-auto-import) libraries
6631 - m4_if([$1], [GCJ], [],
6632 - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
6633 - ;;
6634 - darwin* | rhapsody*)
6635 - # PIC is the default on this platform
6636 - # Common symbols not allowed in MH_DYLIB files
6637 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
6638 - ;;
6639 - *djgpp*)
6640 - # DJGPP does not support shared libraries at all
6641 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
6642 - ;;
6643 - interix[[3-9]]*)
6644 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
6645 - # Instead, we relocate shared libraries at runtime.
6646 - ;;
6647 - sysv4*MP*)
6648 - if test -d /usr/nec; then
6649 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
6650 - fi
6651 - ;;
6652 - hpux*)
6653 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
6654 - # not for PA HP-UX.
6655 - case $host_cpu in
6656 - hppa*64*|ia64*)
6657 - ;;
6658 - *)
6659 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
6660 - ;;
6661 - esac
6662 - ;;
6663 - *)
6664 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
6665 - ;;
6666 - esac
6667 - else
6668 - case $host_os in
6669 - aix[[4-9]]*)
6670 - # All AIX code is PIC.
6671 - if test "$host_cpu" = ia64; then
6672 - # AIX 5 now supports IA64 processor
6673 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6674 - else
6675 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
6676 - fi
6677 - ;;
6678 - chorus*)
6679 - case $cc_basename in
6680 - cxch68*)
6681 - # Green Hills C++ Compiler
6682 - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
6683 - ;;
6684 - esac
6685 - ;;
6686 - darwin*)
6687 - # PIC is the default on this platform
6688 - # Common symbols not allowed in MH_DYLIB files
6689 - case $cc_basename in
6690 - xlc*)
6691 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
6692 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6693 - ;;
6694 - esac
6695 - ;;
6696 - dgux*)
6697 - case $cc_basename in
6698 - ec++*)
6699 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
6700 - ;;
6701 - ghcx*)
6702 - # Green Hills C++ Compiler
6703 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
6704 - ;;
6705 - *)
6706 - ;;
6707 - esac
6708 - ;;
6709 - freebsd* | dragonfly*)
6710 - # FreeBSD uses GNU C++
6711 - ;;
6712 - hpux9* | hpux10* | hpux11*)
6713 - case $cc_basename in
6714 - CC*)
6715 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6716 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
6717 - if test "$host_cpu" != ia64; then
6718 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
6719 - fi
6720 - ;;
6721 - aCC*)
6722 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6723 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
6724 - case $host_cpu in
6725 - hppa*64*|ia64*)
6726 - # +Z the default
6727 - ;;
6728 - *)
6729 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
6730 - ;;
6731 - esac
6732 - ;;
6733 - *)
6734 - ;;
6735 - esac
6736 - ;;
6737 - interix*)
6738 - # This is c89, which is MS Visual C++ (no shared libs)
6739 - # Anyone wants to do a port?
6740 - ;;
6741 - irix5* | irix6* | nonstopux*)
6742 - case $cc_basename in
6743 - CC*)
6744 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6745 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
6746 - # CC pic flag -KPIC is the default.
6747 - ;;
6748 - *)
6749 - ;;
6750 - esac
6751 - ;;
6752 - linux* | k*bsd*-gnu)
6753 - case $cc_basename in
6754 - KCC*)
6755 - # KAI C++ Compiler
6756 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
6757 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
6758 - ;;
6759 - icpc* | ecpc*)
6760 - # Intel C++
6761 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6762 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
6763 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
6764 - ;;
6765 - pgCC* | pgcpp*)
6766 - # Portland Group C++ compiler.
6767 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6768 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
6769 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6770 - ;;
6771 - cxx*)
6772 - # Compaq C++
6773 - # Make sure the PIC flag is empty. It appears that all Alpha
6774 - # Linux and Compaq Tru64 Unix objects are PIC.
6775 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
6776 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
6777 - ;;
6778 - *)
6779 - case `$CC -V 2>&1 | sed 5q` in
6780 - *Sun\ C*)
6781 - # Sun C++ 5.9
6782 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
6783 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6784 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
6785 - ;;
6786 - esac
6787 - ;;
6788 - esac
6789 - ;;
6790 - lynxos*)
6791 - ;;
6792 - m88k*)
6793 - ;;
6794 - mvs*)
6795 - case $cc_basename in
6796 - cxx*)
6797 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
6798 - ;;
6799 - *)
6800 - ;;
6801 - esac
6802 - ;;
6803 - netbsd* | netbsdelf*-gnu)
6804 - ;;
6805 - osf3* | osf4* | osf5*)
6806 - case $cc_basename in
6807 - KCC*)
6808 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
6809 - ;;
6810 - RCC*)
6811 - # Rational C++ 2.4.1
6812 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
6813 - ;;
6814 - cxx*)
6815 - # Digital/Compaq C++
6816 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6817 - # Make sure the PIC flag is empty. It appears that all Alpha
6818 - # Linux and Compaq Tru64 Unix objects are PIC.
6819 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
6820 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
6821 - ;;
6822 - *)
6823 - ;;
6824 - esac
6825 - ;;
6826 - psos*)
6827 - ;;
6828 - solaris*)
6829 - case $cc_basename in
6830 - CC*)
6831 - # Sun C++ 4.2, 5.x and Centerline C++
6832 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
6833 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6834 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
6835 - ;;
6836 - gcx*)
6837 - # Green Hills C++ Compiler
6838 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
6839 - ;;
6840 - *)
6841 - ;;
6842 - esac
6843 - ;;
6844 - sunos4*)
6845 - case $cc_basename in
6846 - CC*)
6847 - # Sun C++ 4.x
6848 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
6849 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6850 - ;;
6851 - lcc*)
6852 - # Lucid
6853 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
6854 - ;;
6855 - *)
6856 - ;;
6857 - esac
6858 - ;;
6859 - tandem*)
6860 - case $cc_basename in
6861 - NCC*)
6862 - # NonStop-UX NCC 3.20
6863 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
6864 - ;;
6865 - *)
6866 - ;;
6867 - esac
6868 - ;;
6869 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
6870 - case $cc_basename in
6871 - CC*)
6872 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6873 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
6874 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6875 - ;;
6876 - esac
6877 - ;;
6878 - vxworks*)
6879 - ;;
6880 - *)
6881 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
6882 - ;;
6883 - esac
6884 - fi
6885 -],
6886 -[
6887 - if test "$GCC" = yes; then
6888 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6889 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
6890 -
6891 - case $host_os in
6892 - aix*)
6893 - # All AIX code is PIC.
6894 - if test "$host_cpu" = ia64; then
6895 - # AIX 5 now supports IA64 processor
6896 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6897 - fi
6898 - ;;
6899 -
6900 - amigaos*)
6901 - # FIXME: we need at least 68020 code to build shared libraries, but
6902 - # adding the `-m68020' flag to GCC prevents building anything better,
6903 - # like `-m68040'.
6904 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
6905 - ;;
6906 -
6907 - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
6908 - # PIC is the default for these OSes.
6909 - ;;
6910 -
6911 - mingw* | cygwin* | pw32* | os2*)
6912 - # This hack is so that the source file can tell whether it is being
6913 - # built for inclusion in a dll (and should export symbols for example).
6914 - # Although the cygwin gcc ignores -fPIC, still need this for old-style
6915 - # (--disable-auto-import) libraries
6916 - m4_if([$1], [GCJ], [],
6917 - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
6918 - ;;
6919 -
6920 - darwin* | rhapsody*)
6921 - # PIC is the default on this platform
6922 - # Common symbols not allowed in MH_DYLIB files
6923 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
6924 - ;;
6925 -
6926 - interix[[3-9]]*)
6927 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
6928 - # Instead, we relocate shared libraries at runtime.
6929 - ;;
6930 -
6931 - msdosdjgpp*)
6932 - # Just because we use GCC doesn't mean we suddenly get shared libraries
6933 - # on systems that don't support them.
6934 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
6935 - enable_shared=no
6936 - ;;
6937 -
6938 - sysv4*MP*)
6939 - if test -d /usr/nec; then
6940 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
6941 - fi
6942 - ;;
6943 -
6944 - hpux*)
6945 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
6946 - # not for PA HP-UX.
6947 - case $host_cpu in
6948 - hppa*64*|ia64*)
6949 - # +Z the default
6950 - ;;
6951 - *)
6952 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
6953 - ;;
6954 - esac
6955 - ;;
6956 -
6957 - *)
6958 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
6959 - ;;
6960 - esac
6961 - else
6962 - # PORTME Check for flag to pass linker flags through the system compiler.
6963 - case $host_os in
6964 - aix*)
6965 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6966 - if test "$host_cpu" = ia64; then
6967 - # AIX 5 now supports IA64 processor
6968 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
6969 - else
6970 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
6971 - fi
6972 - ;;
6973 - darwin*)
6974 - # PIC is the default on this platform
6975 - # Common symbols not allowed in MH_DYLIB files
6976 - case $cc_basename in
6977 - xlc*)
6978 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
6979 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6980 - ;;
6981 - esac
6982 - ;;
6983 -
6984 - mingw* | cygwin* | pw32* | os2*)
6985 - # This hack is so that the source file can tell whether it is being
6986 - # built for inclusion in a dll (and should export symbols for example).
6987 - m4_if([$1], [GCJ], [],
6988 - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
6989 - ;;
6990 -
6991 - hpux9* | hpux10* | hpux11*)
6992 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
6993 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
6994 - # not for PA HP-UX.
6995 - case $host_cpu in
6996 - hppa*64*|ia64*)
6997 - # +Z the default
6998 - ;;
6999 - *)
7000 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
7001 - ;;
7002 - esac
7003 - # Is there a better lt_prog_compiler_static that works with the bundled CC?
7004 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
7005 - ;;
7006 -
7007 - irix5* | irix6* | nonstopux*)
7008 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7009 - # PIC (with -KPIC) is the default.
7010 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
7011 - ;;
7012 -
7013 - newsos6)
7014 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
7015 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7016 - ;;
7017 -
7018 - linux* | k*bsd*-gnu)
7019 - case $cc_basename in
7020 - icc* | ecc*)
7021 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7022 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
7023 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
7024 - ;;
7025 - pgcc* | pgf77* | pgf90* | pgf95*)
7026 - # Portland Group compilers (*not* the Pentium gcc compiler,
7027 - # which looks to be a dead project)
7028 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7029 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
7030 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7031 - ;;
7032 - ccc*)
7033 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7034 - # All Alpha code is PIC.
7035 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
7036 - ;;
7037 - *)
7038 - case `$CC -V 2>&1 | sed 5q` in
7039 - *Sun\ C*)
7040 - # Sun C 5.9
7041 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
7042 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7043 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7044 - ;;
7045 - *Sun\ F*)
7046 - # Sun Fortran 8.3 passes all unrecognized flags to the linker
7047 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
7048 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7049 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
7050 - ;;
7051 - esac
7052 - ;;
7053 - esac
7054 - ;;
7055 -
7056 - osf3* | osf4* | osf5*)
7057 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7058 - # All OSF/1 code is PIC.
7059 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
7060 - ;;
7061 -
7062 - rdos*)
7063 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
7064 - ;;
7065 -
7066 - solaris*)
7067 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
7068 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7069 - case $cc_basename in
7070 - f77* | f90* | f95*)
7071 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
7072 - *)
7073 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
7074 - esac
7075 - ;;
7076 -
7077 - sunos4*)
7078 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
7079 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
7080 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7081 - ;;
7082 -
7083 - sysv4 | sysv4.2uw2* | sysv4.3*)
7084 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7085 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
7086 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7087 - ;;
7088 -
7089 - sysv4*MP*)
7090 - if test -d /usr/nec ;then
7091 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
7092 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7093 - fi
7094 - ;;
7095 -
7096 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
7097 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7098 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
7099 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7100 - ;;
7101 -
7102 - unicos*)
7103 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
7104 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
7105 - ;;
7106 -
7107 - uts4*)
7108 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
7109 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
7110 - ;;
7111 -
7112 - *)
7113 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
7114 - ;;
7115 - esac
7116 - fi
7117 -])
7118 -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
7119 -
7120 -#
7121 -# Check to make sure the PIC flag actually works.
7122 -#
7123 -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
7124 - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
7125 - _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
7126 - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
7127 - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
7128 - "" | " "*) ;;
7129 - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
7130 - esac],
7131 - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
7132 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
7133 -fi
7134 -case $host_os in
7135 - # For platforms which do not support PIC, -DPIC is meaningless:
7136 - *djgpp*)
7137 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
7138 - ;;
7139 - *)
7140 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
7141 - ;;
7142 -esac
7143 -
7144 -#
7145 -# Check to make sure the static flag actually works.
7146 -#
7147 -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
7148 -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
7149 - _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
7150 - $lt_tmp_static_flag,
7151 - [],
7152 - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
7153 -])
7154 -
7155 -
7156 -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
7157 -# ------------------------------------
7158 -# See if the linker supports building shared libraries.
7159 -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
7160 -[AC_REQUIRE([LT_AC_PROG_SED])dnl
7161 -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
7162 -ifelse([$1],[CXX],[
7163 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
7164 - case $host_os in
7165 - aix[[4-9]]*)
7166 - # If we're using GNU nm, then we don't want the "-C" option.
7167 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
7168 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
7169 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
7170 - else
7171 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
7172 - fi
7173 - ;;
7174 - pw32*)
7175 - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
7176 - ;;
7177 - cygwin* | mingw*)
7178 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
7179 - ;;
7180 - linux* | k*bsd*-gnu)
7181 - _LT_AC_TAGVAR(link_all_deplibs, $1)=no
7182 - ;;
7183 - *)
7184 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
7185 - ;;
7186 - esac
7187 - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
7188 -],[
7189 - runpath_var=
7190 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=
7191 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
7192 - _LT_AC_TAGVAR(archive_cmds, $1)=
7193 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
7194 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
7195 - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
7196 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
7197 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
7198 - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
7199 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
7200 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
7201 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
7202 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
7203 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
7204 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
7205 - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
7206 - _LT_AC_TAGVAR(hardcode_automatic, $1)=no
7207 - _LT_AC_TAGVAR(module_cmds, $1)=
7208 - _LT_AC_TAGVAR(module_expsym_cmds, $1)=
7209 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
7210 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
7211 - # include_expsyms should be a list of space-separated symbols to be *always*
7212 - # included in the symbol list
7213 - _LT_AC_TAGVAR(include_expsyms, $1)=
7214 - # exclude_expsyms can be an extended regexp of symbols to exclude
7215 - # it will be wrapped by ` (' and `)$', so one must not match beginning or
7216 - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
7217 - # as well as any symbol that contains `d'.
7218 - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
7219 - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
7220 - # platforms (ab)use it in PIC code, but their linkers get confused if
7221 - # the symbol is explicitly referenced. Since portable code cannot
7222 - # rely on this symbol name, it's probably fine to never include it in
7223 - # preloaded symbol tables.
7224 - # Exclude shared library initialization/finalization symbols.
7225 -dnl Note also adjust exclude_expsyms for C++ above.
7226 - extract_expsyms_cmds=
7227 - # Just being paranoid about ensuring that cc_basename is set.
7228 - _LT_CC_BASENAME([$compiler])
7229 - case $host_os in
7230 - cygwin* | mingw* | pw32*)
7231 - # FIXME: the MSVC++ port hasn't been tested in a loooong time
7232 - # When not using gcc, we currently assume that we are using
7233 - # Microsoft Visual C++.
7234 - if test "$GCC" != yes; then
7235 - with_gnu_ld=no
7236 - fi
7237 - ;;
7238 - interix*)
7239 - # we just hope/assume this is gcc and not c89 (= MSVC++)
7240 - with_gnu_ld=yes
7241 - ;;
7242 - openbsd*)
7243 - with_gnu_ld=no
7244 - ;;
7245 - esac
7246 -
7247 - _LT_AC_TAGVAR(ld_shlibs, $1)=yes
7248 - if test "$with_gnu_ld" = yes; then
7249 - # If archive_cmds runs LD, not CC, wlarc should be empty
7250 - wlarc='${wl}'
7251 -
7252 - # Set some defaults for GNU ld with shared library support. These
7253 - # are reset later if shared libraries are not supported. Putting them
7254 - # here allows them to be overridden if necessary.
7255 - runpath_var=LD_RUN_PATH
7256 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
7257 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7258 - # ancient GNU ld didn't support --whole-archive et. al.
7259 - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
7260 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
7261 - else
7262 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
7263 - fi
7264 - supports_anon_versioning=no
7265 - case `$LD -v 2>/dev/null` in
7266 - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
7267 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
7268 - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
7269 - *\ 2.11.*) ;; # other 2.11 versions
7270 - *) supports_anon_versioning=yes ;;
7271 - esac
7272 -
7273 - # See if GNU ld supports shared libraries.
7274 - case $host_os in
7275 - aix[[3-9]]*)
7276 - # On AIX/PPC, the GNU linker is very broken
7277 - if test "$host_cpu" != ia64; then
7278 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7279 - cat <<EOF 1>&2
7280 -
7281 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
7282 -*** to be unable to reliably create shared libraries on AIX.
7283 -*** Therefore, libtool is disabling shared libraries support. If you
7284 -*** really care for shared libraries, you may want to modify your PATH
7285 -*** so that a non-GNU linker is found, and then restart.
7286 -
7287 -EOF
7288 - fi
7289 - ;;
7290 -
7291 - amigaos*)
7292 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
7293 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7294 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7295 -
7296 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
7297 - # that the semantics of dynamic libraries on AmigaOS, at least up
7298 - # to version 4, is to share data among multiple programs linked
7299 - # with the same dynamic library. Since this doesn't match the
7300 - # behavior of shared libraries on other platforms, we can't use
7301 - # them.
7302 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7303 - ;;
7304 -
7305 - beos*)
7306 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7307 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
7308 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
7309 - # support --undefined. This deserves some investigation. FIXME
7310 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7311 - else
7312 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7313 - fi
7314 - ;;
7315 -
7316 - cygwin* | mingw* | pw32*)
7317 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
7318 - # as there is no search path for DLLs.
7319 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7320 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
7321 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
7322 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
7323 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
7324 -
7325 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
7326 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7327 - # If the export-symbols file already is a .def file (1st line
7328 - # is EXPORTS), use it as is; otherwise, prepend...
7329 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
7330 - cp $export_symbols $output_objdir/$soname.def;
7331 - else
7332 - echo EXPORTS > $output_objdir/$soname.def;
7333 - cat $export_symbols >> $output_objdir/$soname.def;
7334 - fi~
7335 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7336 - else
7337 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7338 - fi
7339 - ;;
7340 -
7341 - interix[[3-9]]*)
7342 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
7343 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7344 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7345 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7346 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
7347 - # Instead, shared libraries are loaded at an image base (0x10000000 by
7348 - # default) and relocated if they conflict, which is a slow very memory
7349 - # consuming and fragmenting process. To avoid this, we pick a random,
7350 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
7351 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
7352 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7353 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7354 - ;;
7355 -
7356 - gnu* | linux* | k*bsd*-gnu)
7357 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7358 - tmp_addflag=
7359 - case $cc_basename,$host_cpu in
7360 - pgcc*) # Portland Group C compiler
7361 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7362 - tmp_addflag=' $pic_flag'
7363 - ;;
7364 - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
7365 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7366 - tmp_addflag=' $pic_flag -Mnomain' ;;
7367 - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
7368 - tmp_addflag=' -i_dynamic' ;;
7369 - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
7370 - tmp_addflag=' -i_dynamic -nofor_main' ;;
7371 - ifc* | ifort*) # Intel Fortran compiler
7372 - tmp_addflag=' -nofor_main' ;;
7373 - esac
7374 - case `$CC -V 2>&1 | sed 5q` in
7375 - *Sun\ C*) # Sun C 5.9
7376 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7377 - tmp_sharedflag='-G' ;;
7378 - *Sun\ F*) # Sun Fortran 8.3
7379 - tmp_sharedflag='-G' ;;
7380 - *)
7381 - tmp_sharedflag='-shared' ;;
7382 - esac
7383 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7384 -
7385 - if test $supports_anon_versioning = yes; then
7386 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
7387 - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
7388 - $echo "local: *; };" >> $output_objdir/$libname.ver~
7389 - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
7390 - fi
7391 - _LT_AC_TAGVAR(link_all_deplibs, $1)=no
7392 - else
7393 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7394 - fi
7395 - ;;
7396 -
7397 - netbsd* | netbsdelf*-gnu)
7398 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
7399 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
7400 - wlarc=
7401 - else
7402 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7403 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7404 - fi
7405 - ;;
7406 -
7407 - solaris*)
7408 - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
7409 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7410 - cat <<EOF 1>&2
7411 -
7412 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
7413 -*** create shared libraries on Solaris systems. Therefore, libtool
7414 -*** is disabling shared libraries support. We urge you to upgrade GNU
7415 -*** binutils to release 2.9.1 or newer. Another option is to modify
7416 -*** your PATH or compiler configuration so that the native linker is
7417 -*** used, and then restart.
7418 -
7419 -EOF
7420 - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7421 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7422 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7423 - else
7424 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7425 - fi
7426 - ;;
7427 -
7428 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
7429 - case `$LD -v 2>&1` in
7430 - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
7431 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7432 - cat <<_LT_EOF 1>&2
7433 -
7434 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
7435 -*** reliably create shared libraries on SCO systems. Therefore, libtool
7436 -*** is disabling shared libraries support. We urge you to upgrade GNU
7437 -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
7438 -*** your PATH or compiler configuration so that the native linker is
7439 -*** used, and then restart.
7440 -
7441 -_LT_EOF
7442 - ;;
7443 - *)
7444 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7445 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
7446 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
7447 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
7448 - else
7449 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7450 - fi
7451 - ;;
7452 - esac
7453 - ;;
7454 -
7455 - sunos4*)
7456 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
7457 - wlarc=
7458 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7459 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7460 - ;;
7461 -
7462 - *)
7463 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7464 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7465 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7466 - else
7467 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7468 - fi
7469 - ;;
7470 - esac
7471 -
7472 - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
7473 - runpath_var=
7474 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
7475 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
7476 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
7477 - fi
7478 - else
7479 - # PORTME fill in a description of your system's linker (not GNU ld)
7480 - case $host_os in
7481 - aix3*)
7482 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
7483 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
7484 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
7485 - # Note: this linker hardcodes the directories in LIBPATH if there
7486 - # are no directories specified by -L.
7487 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7488 - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
7489 - # Neither direct hardcoding nor static linking is supported with a
7490 - # broken collect2.
7491 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
7492 - fi
7493 - ;;
7494 -
7495 - aix[[4-9]]*)
7496 - if test "$host_cpu" = ia64; then
7497 - # On IA64, the linker does run time linking by default, so we don't
7498 - # have to do anything special.
7499 - aix_use_runtimelinking=no
7500 - exp_sym_flag='-Bexport'
7501 - no_entry_flag=""
7502 - else
7503 - # If we're using GNU nm, then we don't want the "-C" option.
7504 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
7505 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
7506 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
7507 - else
7508 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
7509 - fi
7510 - aix_use_runtimelinking=no
7511 -
7512 - # Test if we are trying to use run time linking or normal
7513 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
7514 - # need to do runtime linking.
7515 - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
7516 - for ld_flag in $LDFLAGS; do
7517 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
7518 - aix_use_runtimelinking=yes
7519 - break
7520 - fi
7521 - done
7522 - ;;
7523 - esac
7524 -
7525 - exp_sym_flag='-bexport'
7526 - no_entry_flag='-bnoentry'
7527 - fi
7528 -
7529 - # When large executables or shared objects are built, AIX ld can
7530 - # have problems creating the table of contents. If linking a library
7531 - # or program results in "error TOC overflow" add -mminimal-toc to
7532 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
7533 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
7534 -
7535 - _LT_AC_TAGVAR(archive_cmds, $1)=''
7536 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7537 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
7538 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7539 -
7540 - if test "$GCC" = yes; then
7541 - case $host_os in aix4.[[012]]|aix4.[[012]].*)
7542 - # We only want to do this on AIX 4.2 and lower, the check
7543 - # below for broken collect2 doesn't work under 4.3+
7544 - collect2name=`${CC} -print-prog-name=collect2`
7545 - if test -f "$collect2name" && \
7546 - strings "$collect2name" | grep resolve_lib_name >/dev/null
7547 - then
7548 - # We have reworked collect2
7549 - :
7550 - else
7551 - # We have old collect2
7552 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
7553 - # It fails to find uninstalled libraries when the uninstalled
7554 - # path is not listed in the libpath. Setting hardcode_minus_L
7555 - # to unsupported forces relinking
7556 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7557 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7558 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
7559 - fi
7560 - ;;
7561 - esac
7562 - shared_flag='-shared'
7563 - if test "$aix_use_runtimelinking" = yes; then
7564 - shared_flag="$shared_flag "'${wl}-G'
7565 - fi
7566 - else
7567 - # not using gcc
7568 - if test "$host_cpu" = ia64; then
7569 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
7570 - # chokes on -Wl,-G. The following line is correct:
7571 - shared_flag='-G'
7572 - else
7573 - if test "$aix_use_runtimelinking" = yes; then
7574 - shared_flag='${wl}-G'
7575 - else
7576 - shared_flag='${wl}-bM:SRE'
7577 - fi
7578 - fi
7579 - fi
7580 -
7581 - # It seems that -bexpall does not export symbols beginning with
7582 - # underscore (_), so it is better to generate a list of symbols to export.
7583 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
7584 - if test "$aix_use_runtimelinking" = yes; then
7585 - # Warning - without using the other runtime loading flags (-brtl),
7586 - # -berok will link without error, but may produce a broken library.
7587 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
7588 - # Determine the default libpath from the value encoded in an empty executable.
7589 - _LT_AC_SYS_LIBPATH_AIX
7590 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
7591 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
7592 - else
7593 - if test "$host_cpu" = ia64; then
7594 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
7595 - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
7596 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
7597 - else
7598 - # Determine the default libpath from the value encoded in an empty executable.
7599 - _LT_AC_SYS_LIBPATH_AIX
7600 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
7601 - # Warning - without using the other run time loading flags,
7602 - # -berok will link without error, but may produce a broken library.
7603 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
7604 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
7605 - # Exported symbols can be pulled into shared objects from archives
7606 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
7607 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
7608 - # This is similar to how AIX traditionally builds its shared libraries.
7609 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
7610 - fi
7611 - fi
7612 - ;;
7613 -
7614 - amigaos*)
7615 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
7616 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7617 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7618 - # see comment about different semantics on the GNU ld section
7619 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7620 - ;;
7621 -
7622 - bsdi[[45]]*)
7623 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
7624 - ;;
7625 -
7626 - cygwin* | mingw* | pw32*)
7627 - # When not using gcc, we currently assume that we are using
7628 - # Microsoft Visual C++.
7629 - # hardcode_libdir_flag_spec is actually meaningless, as there is
7630 - # no search path for DLLs.
7631 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
7632 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
7633 - # Tell ltmain to make .lib files, not .a files.
7634 - libext=lib
7635 - # Tell ltmain to make .dll files, not .so files.
7636 - shrext_cmds=".dll"
7637 - # FIXME: Setting linknames here is a bad hack.
7638 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
7639 - # The linker will automatically build a .lib file if we build a DLL.
7640 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
7641 - # FIXME: Should let the user specify the lib program.
7642 - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
7643 - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
7644 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
7645 - ;;
7646 -
7647 - darwin* | rhapsody*)
7648 - case $host_os in
7649 - rhapsody* | darwin1.[[012]])
7650 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
7651 - ;;
7652 - *) # Darwin 1.3 on
7653 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
7654 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
7655 - else
7656 - case ${MACOSX_DEPLOYMENT_TARGET} in
7657 - 10.[[012]])
7658 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
7659 - ;;
7660 - 10.*)
7661 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
7662 - ;;
7663 - esac
7664 - fi
7665 - ;;
7666 - esac
7667 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7668 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
7669 - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
7670 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
7671 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
7672 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7673 - if test "$GCC" = yes ; then
7674 - output_verbose_link_cmd='echo'
7675 - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
7676 - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
7677 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
7678 - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
7679 - else
7680 - case $cc_basename in
7681 - xlc*)
7682 - output_verbose_link_cmd='echo'
7683 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
7684 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
7685 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
7686 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7687 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7688 - ;;
7689 - *)
7690 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7691 - ;;
7692 - esac
7693 - fi
7694 - ;;
7695 -
7696 - dgux*)
7697 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
7698 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7699 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7700 - ;;
7701 -
7702 - freebsd1*)
7703 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7704 - ;;
7705 -
7706 - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
7707 - # support. Future versions do this automatically, but an explicit c++rt0.o
7708 - # does not break anything, and helps significantly (at the cost of a little
7709 - # extra space).
7710 - freebsd2.2*)
7711 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
7712 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7713 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7714 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7715 - ;;
7716 -
7717 - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
7718 - freebsd2*)
7719 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
7720 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7721 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7722 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7723 - ;;
7724 -
7725 - # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
7726 - freebsd* | dragonfly*)
7727 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
7728 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7729 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7730 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7731 - ;;
7732 -
7733 - hpux9*)
7734 - if test "$GCC" = yes; then
7735 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
7736 - else
7737 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
7738 - fi
7739 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
7740 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7741 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7742 -
7743 - # hardcode_minus_L: Not really in the search PATH,
7744 - # but as the default location of the library.
7745 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7746 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7747 - ;;
7748 -
7749 - hpux10*)
7750 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
7751 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7752 - else
7753 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
7754 - fi
7755 - if test "$with_gnu_ld" = no; then
7756 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
7757 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7758 -
7759 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7760 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7761 -
7762 - # hardcode_minus_L: Not really in the search PATH,
7763 - # but as the default location of the library.
7764 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7765 - fi
7766 - ;;
7767 -
7768 - hpux11*)
7769 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
7770 - case $host_cpu in
7771 - hppa*64*)
7772 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7773 - ;;
7774 - ia64*)
7775 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7776 - ;;
7777 - *)
7778 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7779 - ;;
7780 - esac
7781 - else
7782 - case $host_cpu in
7783 - hppa*64*)
7784 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7785 - ;;
7786 - ia64*)
7787 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
7788 - ;;
7789 - *)
7790 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
7791 - ;;
7792 - esac
7793 - fi
7794 - if test "$with_gnu_ld" = no; then
7795 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
7796 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7797 -
7798 - case $host_cpu in
7799 - hppa*64*|ia64*)
7800 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
7801 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
7802 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7803 - ;;
7804 - *)
7805 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7806 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7807 -
7808 - # hardcode_minus_L: Not really in the search PATH,
7809 - # but as the default location of the library.
7810 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7811 - ;;
7812 - esac
7813 - fi
7814 - ;;
7815 -
7816 - irix5* | irix6* | nonstopux*)
7817 - if test "$GCC" = yes; then
7818 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7819 - else
7820 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7821 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
7822 - fi
7823 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7824 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7825 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7826 - ;;
7827 -
7828 - netbsd* | netbsdelf*-gnu)
7829 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
7830 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
7831 - else
7832 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
7833 - fi
7834 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7835 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7836 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7837 - ;;
7838 -
7839 - newsos6)
7840 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
7841 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7842 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7843 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7844 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7845 - ;;
7846 -
7847 - openbsd*)
7848 - if test -f /usr/libexec/ld.so; then
7849 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7850 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7851 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7852 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
7853 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
7854 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7855 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7856 - else
7857 - case $host_os in
7858 - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
7859 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
7860 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7861 - ;;
7862 - *)
7863 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
7864 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7865 - ;;
7866 - esac
7867 - fi
7868 - else
7869 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
7870 - fi
7871 - ;;
7872 -
7873 - os2*)
7874 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7875 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7876 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
7877 - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
7878 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
7879 - ;;
7880 -
7881 - osf3*)
7882 - if test "$GCC" = yes; then
7883 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
7884 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7885 - else
7886 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
7887 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7888 - fi
7889 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7890 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7891 - ;;
7892 -
7893 - osf4* | osf5*) # as osf3* with the addition of -msym flag
7894 - if test "$GCC" = yes; then
7895 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
7896 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7897 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7898 - else
7899 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
7900 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7901 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
7902 - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
7903 -
7904 - # Both c and cxx compiler support -rpath directly
7905 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
7906 - fi
7907 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7908 - ;;
7909 -
7910 - solaris*)
7911 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
7912 - if test "$GCC" = yes; then
7913 - wlarc='${wl}'
7914 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7915 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
7916 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
7917 - else
7918 - wlarc=''
7919 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
7920 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
7921 - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
7922 - fi
7923 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7924 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7925 - case $host_os in
7926 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
7927 - *)
7928 - # The compiler driver will combine and reorder linker options,
7929 - # but understands `-z linker_flag'. GCC discards it without `$wl',
7930 - # but is careful enough not to reorder.
7931 - # Supported since Solaris 2.6 (maybe 2.5.1?)
7932 - if test "$GCC" = yes; then
7933 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
7934 - else
7935 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
7936 - fi
7937 - ;;
7938 - esac
7939 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7940 - ;;
7941 -
7942 - sunos4*)
7943 - if test "x$host_vendor" = xsequent; then
7944 - # Use $CC to link under sequent, because it throws in some extra .o
7945 - # files that make .init and .fini sections work.
7946 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
7947 - else
7948 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
7949 - fi
7950 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7951 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7952 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7953 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7954 - ;;
7955 -
7956 - sysv4)
7957 - case $host_vendor in
7958 - sni)
7959 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
7960 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
7961 - ;;
7962 - siemens)
7963 - ## LD is ld it makes a PLAMLIB
7964 - ## CC just makes a GrossModule.
7965 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
7966 - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
7967 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
7968 - ;;
7969 - motorola)
7970 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
7971 - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
7972 - ;;
7973 - esac
7974 - runpath_var='LD_RUN_PATH'
7975 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7976 - ;;
7977 -
7978 - sysv4.3*)
7979 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
7980 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7981 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
7982 - ;;
7983 -
7984 - sysv4*MP*)
7985 - if test -d /usr/nec; then
7986 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
7987 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7988 - runpath_var=LD_RUN_PATH
7989 - hardcode_runpath_var=yes
7990 - _LT_AC_TAGVAR(ld_shlibs, $1)=yes
7991 - fi
7992 - ;;
7993 -
7994 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
7995 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
7996 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7997 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7998 - runpath_var='LD_RUN_PATH'
7999 -
8000 - if test "$GCC" = yes; then
8001 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8002 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8003 - else
8004 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8005 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8006 - fi
8007 - ;;
8008 -
8009 - sysv5* | sco3.2v5* | sco5v6*)
8010 - # Note: We can NOT use -z defs as we might desire, because we do not
8011 - # link with -lc, and that would cause any symbols used from libc to
8012 - # always be unresolved, which means just about no library would
8013 - # ever link correctly. If we're not using GNU ld we use -z text
8014 - # though, which does catch some bad symbols but isn't as heavy-handed
8015 - # as -z defs.
8016 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
8017 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
8018 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8019 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8020 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
8021 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
8022 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
8023 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
8024 - runpath_var='LD_RUN_PATH'
8025 -
8026 - if test "$GCC" = yes; then
8027 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8028 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8029 - else
8030 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8031 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8032 - fi
8033 - ;;
8034 -
8035 - uts4*)
8036 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
8037 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
8038 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8039 - ;;
8040 -
8041 - *)
8042 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8043 - ;;
8044 - esac
8045 - fi
8046 -])
8047 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
8048 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
8049 -
8050 -#
8051 -# Do we need to explicitly link libc?
8052 -#
8053 -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
8054 -x|xyes)
8055 - # Assume -lc should be added
8056 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
8057 -
8058 - if test "$enable_shared" = yes && test "$GCC" = yes; then
8059 - case $_LT_AC_TAGVAR(archive_cmds, $1) in
8060 - *'~'*)
8061 - # FIXME: we may have to deal with multi-command sequences.
8062 - ;;
8063 - '$CC '*)
8064 - # Test whether the compiler implicitly links with -lc since on some
8065 - # systems, -lgcc has to come before -lc. If gcc already passes -lc
8066 - # to ld, don't add -lc before -lgcc.
8067 - AC_MSG_CHECKING([whether -lc should be explicitly linked in])
8068 - $rm conftest*
8069 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
8070 -
8071 - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
8072 - soname=conftest
8073 - lib=conftest
8074 - libobjs=conftest.$ac_objext
8075 - deplibs=
8076 - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
8077 - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
8078 - compiler_flags=-v
8079 - linker_flags=-v
8080 - verstring=
8081 - output_objdir=.
8082 - libname=conftest
8083 - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
8084 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=
8085 - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
8086 - then
8087 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8088 - else
8089 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
8090 - fi
8091 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
8092 - else
8093 - cat conftest.err 1>&5
8094 - fi
8095 - $rm conftest*
8096 - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
8097 - ;;
8098 - esac
8099 - fi
8100 - ;;
8101 -esac
8102 -])# AC_LIBTOOL_PROG_LD_SHLIBS
8103 -
8104 -
8105 -# _LT_AC_FILE_LTDLL_C
8106 -# -------------------
8107 -# Be careful that the start marker always follows a newline.
8108 -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
8109 -# /* ltdll.c starts here */
8110 -# #define WIN32_LEAN_AND_MEAN
8111 -# #include <windows.h>
8112 -# #undef WIN32_LEAN_AND_MEAN
8113 -# #include <stdio.h>
8114 -#
8115 -# #ifndef __CYGWIN__
8116 -# # ifdef __CYGWIN32__
8117 -# # define __CYGWIN__ __CYGWIN32__
8118 -# # endif
8119 -# #endif
8120 -#
8121 -# #ifdef __cplusplus
8122 -# extern "C" {
8123 -# #endif
8124 -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
8125 -# #ifdef __cplusplus
8126 -# }
8127 -# #endif
8128 -#
8129 -# #ifdef __CYGWIN__
8130 -# #include <cygwin/cygwin_dll.h>
8131 -# DECLARE_CYGWIN_DLL( DllMain );
8132 -# #endif
8133 -# HINSTANCE __hDllInstance_base;
8134 -#
8135 -# BOOL APIENTRY
8136 -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
8137 -# {
8138 -# __hDllInstance_base = hInst;
8139 -# return TRUE;
8140 -# }
8141 -# /* ltdll.c ends here */
8142 -])# _LT_AC_FILE_LTDLL_C
8143 -
8144 -
8145 -# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
8146 -# ---------------------------------
8147 -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
8148 -
8149 -
8150 -# old names
8151 -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
8152 -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
8153 -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
8154 -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
8155 -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
8156 -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
8157 -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
8158 -
8159 -# This is just to silence aclocal about the macro not being used
8160 -ifelse([AC_DISABLE_FAST_INSTALL])
8161 -
8162 -AC_DEFUN([LT_AC_PROG_GCJ],
8163 -[AC_CHECK_TOOL(GCJ, gcj, no)
8164 - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
8165 - AC_SUBST(GCJFLAGS)
8166 -])
8167 -
8168 -AC_DEFUN([LT_AC_PROG_RC],
8169 -[AC_CHECK_TOOL(RC, windres, no)
8170 -])
8171 -
8172 -
8173 -# Cheap backport of AS_EXECUTABLE_P and required macros
8174 -# from Autoconf 2.59; we should not use $as_executable_p directly.
8175 -
8176 -# _AS_TEST_PREPARE
8177 -# ----------------
8178 -m4_ifndef([_AS_TEST_PREPARE],
8179 -[m4_defun([_AS_TEST_PREPARE],
8180 -[if test -x / >/dev/null 2>&1; then
8181 - as_executable_p='test -x'
8182 -else
8183 - as_executable_p='test -f'
8184 -fi
8185 -])])# _AS_TEST_PREPARE
8186 -
8187 -# AS_EXECUTABLE_P
8188 -# ---------------
8189 -# Check whether a file is executable.
8190 -m4_ifndef([AS_EXECUTABLE_P],
8191 -[m4_defun([AS_EXECUTABLE_P],
8192 -[AS_REQUIRE([_AS_TEST_PREPARE])dnl
8193 -$as_executable_p $1[]dnl
8194 -])])# AS_EXECUTABLE_P
8195 -
8196 -# NOTE: This macro has been submitted for inclusion into #
8197 -# GNU Autoconf as AC_PROG_SED. When it is available in #
8198 -# a released version of Autoconf we should remove this #
8199 -# macro and use it instead. #
8200 -# LT_AC_PROG_SED
8201 -# --------------
8202 -# Check for a fully-functional sed program, that truncates
8203 -# as few characters as possible. Prefer GNU sed if found.
8204 -AC_DEFUN([LT_AC_PROG_SED],
8205 -[AC_MSG_CHECKING([for a sed that does not truncate output])
8206 -AC_CACHE_VAL(lt_cv_path_SED,
8207 -[# Loop through the user's path and test for sed and gsed.
8208 -# Then use that list of sed's as ones to test for truncation.
8209 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8210 -for as_dir in $PATH
8211 -do
8212 - IFS=$as_save_IFS
8213 - test -z "$as_dir" && as_dir=.
8214 - for lt_ac_prog in sed gsed; do
8215 - for ac_exec_ext in '' $ac_executable_extensions; do
8216 - if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
8217 - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
8218 - fi
8219 - done
8220 - done
8221 -done
8222 -IFS=$as_save_IFS
8223 -lt_ac_max=0
8224 -lt_ac_count=0
8225 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris
8226 -# along with /bin/sed that truncates output.
8227 -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
8228 - test ! -f $lt_ac_sed && continue
8229 - cat /dev/null > conftest.in
8230 - lt_ac_count=0
8231 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in
8232 - # Check for GNU sed and select it if it is found.
8233 - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
8234 - lt_cv_path_SED=$lt_ac_sed
8235 - break
8236 - fi
8237 - while true; do
8238 - cat conftest.in conftest.in >conftest.tmp
8239 - mv conftest.tmp conftest.in
8240 - cp conftest.in conftest.nl
8241 - echo >>conftest.nl
8242 - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
8243 - cmp -s conftest.out conftest.nl || break
8244 - # 10000 chars as input seems more than enough
8245 - test $lt_ac_count -gt 10 && break
8246 - lt_ac_count=`expr $lt_ac_count + 1`
8247 - if test $lt_ac_count -gt $lt_ac_max; then
8248 - lt_ac_max=$lt_ac_count
8249 - lt_cv_path_SED=$lt_ac_sed
8250 - fi
8251 - done
8252 -done
8253 -])
8254 -SED=$lt_cv_path_SED
8255 -AC_SUBST([SED])
8256 -AC_MSG_RESULT([$SED])
8257 -])
8258 -
8259 -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
8260 -#
8261 -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
8262 -#
8263 -# This program is free software; you can redistribute it and/or modify
8264 -# it under the terms of the GNU General Public License as published by
8265 -# the Free Software Foundation; either version 2 of the License, or
8266 -# (at your option) any later version.
8267 -#
8268 -# This program is distributed in the hope that it will be useful, but
8269 -# WITHOUT ANY WARRANTY; without even the implied warranty of
8270 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8271 -# General Public License for more details.
8272 -#
8273 -# You should have received a copy of the GNU General Public License
8274 -# along with this program; if not, write to the Free Software
8275 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
8276 -#
8277 -# As a special exception to the GNU General Public License, if you
8278 -# distribute this file as part of a program that contains a
8279 -# configuration script generated by Autoconf, you may include it under
8280 -# the same distribution terms that you use for the rest of that program.
8281 -
8282 -# PKG_PROG_PKG_CONFIG([MIN-VERSION])
8283 -# ----------------------------------
8284 -AC_DEFUN([PKG_PROG_PKG_CONFIG],
8285 -[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
8286 -m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
8287 -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
8288 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
8289 - AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
8290 -fi
8291 -if test -n "$PKG_CONFIG"; then
8292 - _pkg_min_version=m4_default([$1], [0.9.0])
8293 - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
8294 - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
8295 - AC_MSG_RESULT([yes])
8296 - else
8297 - AC_MSG_RESULT([no])
8298 - PKG_CONFIG=""
8299 - fi
8300 -
8301 -fi[]dnl
8302 -])# PKG_PROG_PKG_CONFIG
8303 -
8304 -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
8305 -#
8306 -# Check to see whether a particular set of modules exists. Similar
8307 -# to PKG_CHECK_MODULES(), but does not set variables or print errors.
8308 -#
8309 -#
8310 -# Similar to PKG_CHECK_MODULES, make sure that the first instance of
8311 -# this or PKG_CHECK_MODULES is called, or make sure to call
8312 -# PKG_CHECK_EXISTS manually
8313 -# --------------------------------------------------------------
8314 -AC_DEFUN([PKG_CHECK_EXISTS],
8315 -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
8316 -if test -n "$PKG_CONFIG" && \
8317 - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
8318 - m4_ifval([$2], [$2], [:])
8319 -m4_ifvaln([$3], [else
8320 - $3])dnl
8321 -fi])
8322 -
8323 -
8324 -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
8325 -# ---------------------------------------------
8326 -m4_define([_PKG_CONFIG],
8327 -[if test -n "$PKG_CONFIG"; then
8328 - if test -n "$$1"; then
8329 - pkg_cv_[]$1="$$1"
8330 - else
8331 - PKG_CHECK_EXISTS([$3],
8332 - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
8333 - [pkg_failed=yes])
8334 - fi
8335 -else
8336 - pkg_failed=untried
8337 -fi[]dnl
8338 -])# _PKG_CONFIG
8339 -
8340 -# _PKG_SHORT_ERRORS_SUPPORTED
8341 -# -----------------------------
8342 -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
8343 -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
8344 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
8345 - _pkg_short_errors_supported=yes
8346 -else
8347 - _pkg_short_errors_supported=no
8348 -fi[]dnl
8349 -])# _PKG_SHORT_ERRORS_SUPPORTED
8350 -
8351 -
8352 -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
8353 -# [ACTION-IF-NOT-FOUND])
8354 -#
8355 -#
8356 -# Note that if there is a possibility the first call to
8357 -# PKG_CHECK_MODULES might not happen, you should be sure to include an
8358 -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
8359 -#
8360 -#
8361 -# --------------------------------------------------------------
8362 -AC_DEFUN([PKG_CHECK_MODULES],
8363 -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
8364 -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
8365 -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
8366 -
8367 -pkg_failed=no
8368 -AC_MSG_CHECKING([for $1])
8369 -
8370 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
8371 -_PKG_CONFIG([$1][_LIBS], [libs], [$2])
8372 -
8373 -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
8374 -and $1[]_LIBS to avoid the need to call pkg-config.
8375 -See the pkg-config man page for more details.])
8376 -
8377 -if test $pkg_failed = yes; then
8378 - _PKG_SHORT_ERRORS_SUPPORTED
8379 - if test $_pkg_short_errors_supported = yes; then
8380 - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
8381 - else
8382 - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
8383 - fi
8384 - # Put the nasty error message in config.log where it belongs
8385 - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
8386 -
8387 - ifelse([$4], , [AC_MSG_ERROR(dnl
8388 -[Package requirements ($2) were not met:
8389 -
8390 -$$1_PKG_ERRORS
8391 -
8392 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
8393 -installed software in a non-standard prefix.
8394 -
8395 -_PKG_TEXT
8396 -])],
8397 - [AC_MSG_RESULT([no])
8398 - $4])
8399 -elif test $pkg_failed = untried; then
8400 - ifelse([$4], , [AC_MSG_FAILURE(dnl
8401 -[The pkg-config script could not be found or is too old. Make sure it
8402 -is in your PATH or set the PKG_CONFIG environment variable to the full
8403 -path to pkg-config.
8404 -
8405 -_PKG_TEXT
8406 -
8407 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
8408 - [$4])
8409 -else
8410 - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
8411 - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
8412 - AC_MSG_RESULT([yes])
8413 - ifelse([$3], , :, [$3])
8414 -fi[]dnl
8415 -])# PKG_CHECK_MODULES
8416 -
8417 -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
8418 -#
8419 -# This file is free software; the Free Software Foundation
8420 -# gives unlimited permission to copy and/or distribute it,
8421 -# with or without modifications, as long as this notice is preserved.
8422 -
8423 -# AM_AUTOMAKE_VERSION(VERSION)
8424 -# ----------------------------
8425 -# Automake X.Y traces this macro to ensure aclocal.m4 has been
8426 -# generated from the m4 files accompanying Automake X.Y.
8427 -# (This private macro should not be called outside this file.)
8428 -AC_DEFUN([AM_AUTOMAKE_VERSION],
8429 -[am__api_version='1.10'
8430 -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
8431 -dnl require some minimum version. Point them to the right macro.
8432 -m4_if([$1], [1.10.1], [],
8433 - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
8434 -])
8435 -
8436 -# _AM_AUTOCONF_VERSION(VERSION)
8437 -# -----------------------------
8438 -# aclocal traces this macro to find the Autoconf version.
8439 -# This is a private macro too. Using m4_define simplifies
8440 -# the logic in aclocal, which can simply ignore this definition.
8441 -m4_define([_AM_AUTOCONF_VERSION], [])
8442 -
8443 -# AM_SET_CURRENT_AUTOMAKE_VERSION
8444 -# -------------------------------
8445 -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
8446 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
8447 -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
8448 -[AM_AUTOMAKE_VERSION([1.10.1])dnl
8449 -m4_ifndef([AC_AUTOCONF_VERSION],
8450 - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
8451 -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
8452 -
8453 -# Figure out how to run the assembler. -*- Autoconf -*-
8454 -
8455 -# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
8456 -#
8457 -# This file is free software; the Free Software Foundation
8458 -# gives unlimited permission to copy and/or distribute it,
8459 -# with or without modifications, as long as this notice is preserved.
8460 -
8461 -# serial 5
8462 -
8463 -# AM_PROG_AS
8464 -# ----------
8465 -AC_DEFUN([AM_PROG_AS],
8466 -[# By default we simply use the C compiler to build assembly code.
8467 -AC_REQUIRE([AC_PROG_CC])
8468 -test "${CCAS+set}" = set || CCAS=$CC
8469 -test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
8470 -AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)])
8471 -AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
8472 -_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
8473 -])
8474 -
8475 -# AM_AUX_DIR_EXPAND -*- Autoconf -*-
8476 -
8477 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
8478 -#
8479 -# This file is free software; the Free Software Foundation
8480 -# gives unlimited permission to copy and/or distribute it,
8481 -# with or without modifications, as long as this notice is preserved.
8482 -
8483 -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
8484 -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
8485 -# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
8486 -#
8487 -# Of course, Automake must honor this variable whenever it calls a
8488 -# tool from the auxiliary directory. The problem is that $srcdir (and
8489 -# therefore $ac_aux_dir as well) can be either absolute or relative,
8490 -# depending on how configure is run. This is pretty annoying, since
8491 -# it makes $ac_aux_dir quite unusable in subdirectories: in the top
8492 -# source directory, any form will work fine, but in subdirectories a
8493 -# relative path needs to be adjusted first.
8494 -#
8495 -# $ac_aux_dir/missing
8496 -# fails when called from a subdirectory if $ac_aux_dir is relative
8497 -# $top_srcdir/$ac_aux_dir/missing
8498 -# fails if $ac_aux_dir is absolute,
8499 -# fails when called from a subdirectory in a VPATH build with
8500 -# a relative $ac_aux_dir
8501 -#
8502 -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
8503 -# are both prefixed by $srcdir. In an in-source build this is usually
8504 -# harmless because $srcdir is `.', but things will broke when you
8505 -# start a VPATH build or use an absolute $srcdir.
8506 -#
8507 -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
8508 -# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
8509 -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
8510 -# and then we would define $MISSING as
8511 -# MISSING="\${SHELL} $am_aux_dir/missing"
8512 -# This will work as long as MISSING is not called from configure, because
8513 -# unfortunately $(top_srcdir) has no meaning in configure.
8514 -# However there are other variables, like CC, which are often used in
8515 -# configure, and could therefore not use this "fixed" $ac_aux_dir.
8516 -#
8517 -# Another solution, used here, is to always expand $ac_aux_dir to an
8518 -# absolute PATH. The drawback is that using absolute paths prevent a
8519 -# configured tree to be moved without reconfiguration.
8520 -
8521 -AC_DEFUN([AM_AUX_DIR_EXPAND],
8522 -[dnl Rely on autoconf to set up CDPATH properly.
8523 -AC_PREREQ([2.50])dnl
8524 -# expand $ac_aux_dir to an absolute path
8525 -am_aux_dir=`cd $ac_aux_dir && pwd`
8526 -])
8527 -
8528 -# AM_CONDITIONAL -*- Autoconf -*-
8529 -
8530 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
8531 -# Free Software Foundation, Inc.
8532 -#
8533 -# This file is free software; the Free Software Foundation
8534 -# gives unlimited permission to copy and/or distribute it,
8535 -# with or without modifications, as long as this notice is preserved.
8536 -
8537 -# serial 8
8538 -
8539 -# AM_CONDITIONAL(NAME, SHELL-CONDITION)
8540 -# -------------------------------------
8541 -# Define a conditional.
8542 -AC_DEFUN([AM_CONDITIONAL],
8543 -[AC_PREREQ(2.52)dnl
8544 - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
8545 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
8546 -AC_SUBST([$1_TRUE])dnl
8547 -AC_SUBST([$1_FALSE])dnl
8548 -_AM_SUBST_NOTMAKE([$1_TRUE])dnl
8549 -_AM_SUBST_NOTMAKE([$1_FALSE])dnl
8550 -if $2; then
8551 - $1_TRUE=
8552 - $1_FALSE='#'
8553 -else
8554 - $1_TRUE='#'
8555 - $1_FALSE=
8556 -fi
8557 -AC_CONFIG_COMMANDS_PRE(
8558 -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
8559 - AC_MSG_ERROR([[conditional "$1" was never defined.
8560 -Usually this means the macro was only invoked conditionally.]])
8561 -fi])])
8562 -
8563 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
8564 -# Free Software Foundation, Inc.
8565 -#
8566 -# This file is free software; the Free Software Foundation
8567 -# gives unlimited permission to copy and/or distribute it,
8568 -# with or without modifications, as long as this notice is preserved.
8569 -
8570 -# serial 9
8571 -
8572 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
8573 -# written in clear, in which case automake, when reading aclocal.m4,
8574 -# will think it sees a *use*, and therefore will trigger all it's
8575 -# C support machinery. Also note that it means that autoscan, seeing
8576 -# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
8577 -
8578 -
8579 -# _AM_DEPENDENCIES(NAME)
8580 -# ----------------------
8581 -# See how the compiler implements dependency checking.
8582 -# NAME is "CC", "CXX", "GCJ", or "OBJC".
8583 -# We try a few techniques and use that to set a single cache variable.
8584 -#
8585 -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
8586 -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
8587 -# dependency, and given that the user is not expected to run this macro,
8588 -# just rely on AC_PROG_CC.
8589 -AC_DEFUN([_AM_DEPENDENCIES],
8590 -[AC_REQUIRE([AM_SET_DEPDIR])dnl
8591 -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
8592 -AC_REQUIRE([AM_MAKE_INCLUDE])dnl
8593 -AC_REQUIRE([AM_DEP_TRACK])dnl
8594 -
8595 -ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
8596 - [$1], CXX, [depcc="$CXX" am_compiler_list=],
8597 - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
8598 - [$1], UPC, [depcc="$UPC" am_compiler_list=],
8599 - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
8600 - [depcc="$$1" am_compiler_list=])
8601 -
8602 -AC_CACHE_CHECK([dependency style of $depcc],
8603 - [am_cv_$1_dependencies_compiler_type],
8604 -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
8605 - # We make a subdir and do the tests there. Otherwise we can end up
8606 - # making bogus files that we don't know about and never remove. For
8607 - # instance it was reported that on HP-UX the gcc test will end up
8608 - # making a dummy file named `D' -- because `-MD' means `put the output
8609 - # in D'.
8610 - mkdir conftest.dir
8611 - # Copy depcomp to subdir because otherwise we won't find it if we're
8612 - # using a relative directory.
8613 - cp "$am_depcomp" conftest.dir
8614 - cd conftest.dir
8615 - # We will build objects and dependencies in a subdirectory because
8616 - # it helps to detect inapplicable dependency modes. For instance
8617 - # both Tru64's cc and ICC support -MD to output dependencies as a
8618 - # side effect of compilation, but ICC will put the dependencies in
8619 - # the current directory while Tru64 will put them in the object
8620 - # directory.
8621 - mkdir sub
8622 -
8623 - am_cv_$1_dependencies_compiler_type=none
8624 - if test "$am_compiler_list" = ""; then
8625 - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
8626 - fi
8627 - for depmode in $am_compiler_list; do
8628 - # Setup a source with many dependencies, because some compilers
8629 - # like to wrap large dependency lists on column 80 (with \), and
8630 - # we should not choose a depcomp mode which is confused by this.
8631 - #
8632 - # We need to recreate these files for each test, as the compiler may
8633 - # overwrite some of them when testing with obscure command lines.
8634 - # This happens at least with the AIX C compiler.
8635 - : > sub/conftest.c
8636 - for i in 1 2 3 4 5 6; do
8637 - echo '#include "conftst'$i'.h"' >> sub/conftest.c
8638 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
8639 - # Solaris 8's {/usr,}/bin/sh.
8640 - touch sub/conftst$i.h
8641 - done
8642 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
8643 -
8644 - case $depmode in
8645 - nosideeffect)
8646 - # after this tag, mechanisms are not by side-effect, so they'll
8647 - # only be used when explicitly requested
8648 - if test "x$enable_dependency_tracking" = xyes; then
8649 - continue
8650 - else
8651 - break
8652 - fi
8653 - ;;
8654 - none) break ;;
8655 - esac
8656 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
8657 - # mode. It turns out that the SunPro C++ compiler does not properly
8658 - # handle `-M -o', and we need to detect this.
8659 - if depmode=$depmode \
8660 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
8661 - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
8662 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
8663 - >/dev/null 2>conftest.err &&
8664 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
8665 - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
8666 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
8667 - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
8668 - # icc doesn't choke on unknown options, it will just issue warnings
8669 - # or remarks (even with -Werror). So we grep stderr for any message
8670 - # that says an option was ignored or not supported.
8671 - # When given -MP, icc 7.0 and 7.1 complain thusly:
8672 - # icc: Command line warning: ignoring option '-M'; no argument required
8673 - # The diagnosis changed in icc 8.0:
8674 - # icc: Command line remark: option '-MP' not supported
8675 - if (grep 'ignoring option' conftest.err ||
8676 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
8677 - am_cv_$1_dependencies_compiler_type=$depmode
8678 - break
8679 - fi
8680 - fi
8681 - done
8682 -
8683 - cd ..
8684 - rm -rf conftest.dir
8685 -else
8686 - am_cv_$1_dependencies_compiler_type=none
8687 -fi
8688 -])
8689 -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
8690 -AM_CONDITIONAL([am__fastdep$1], [
8691 - test "x$enable_dependency_tracking" != xno \
8692 - && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
8693 -])
8694 -
8695 -
8696 -# AM_SET_DEPDIR
8697 -# -------------
8698 -# Choose a directory name for dependency files.
8699 -# This macro is AC_REQUIREd in _AM_DEPENDENCIES
8700 -AC_DEFUN([AM_SET_DEPDIR],
8701 -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
8702 -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
8703 -])
8704 -
8705 -
8706 -# AM_DEP_TRACK
8707 -# ------------
8708 -AC_DEFUN([AM_DEP_TRACK],
8709 -[AC_ARG_ENABLE(dependency-tracking,
8710 -[ --disable-dependency-tracking speeds up one-time build
8711 - --enable-dependency-tracking do not reject slow dependency extractors])
8712 -if test "x$enable_dependency_tracking" != xno; then
8713 - am_depcomp="$ac_aux_dir/depcomp"
8714 - AMDEPBACKSLASH='\'
8715 -fi
8716 -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
8717 -AC_SUBST([AMDEPBACKSLASH])dnl
8718 -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
8719 -])
8720 -
8721 -# Generate code to set up dependency tracking. -*- Autoconf -*-
8722 -
8723 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
8724 -# Free Software Foundation, Inc.
8725 -#
8726 -# This file is free software; the Free Software Foundation
8727 -# gives unlimited permission to copy and/or distribute it,
8728 -# with or without modifications, as long as this notice is preserved.
8729 -
8730 -#serial 3
8731 -
8732 -# _AM_OUTPUT_DEPENDENCY_COMMANDS
8733 -# ------------------------------
8734 -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
8735 -[for mf in $CONFIG_FILES; do
8736 - # Strip MF so we end up with the name of the file.
8737 - mf=`echo "$mf" | sed -e 's/:.*$//'`
8738 - # Check whether this is an Automake generated Makefile or not.
8739 - # We used to match only the files named `Makefile.in', but
8740 - # some people rename them; so instead we look at the file content.
8741 - # Grep'ing the first line is not enough: some people post-process
8742 - # each Makefile.in and add a new line on top of each file to say so.
8743 - # Grep'ing the whole file is not good either: AIX grep has a line
8744 - # limit of 2048, but all sed's we know have understand at least 4000.
8745 - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
8746 - dirpart=`AS_DIRNAME("$mf")`
8747 - else
8748 - continue
8749 - fi
8750 - # Extract the definition of DEPDIR, am__include, and am__quote
8751 - # from the Makefile without running `make'.
8752 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
8753 - test -z "$DEPDIR" && continue
8754 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
8755 - test -z "am__include" && continue
8756 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
8757 - # When using ansi2knr, U may be empty or an underscore; expand it
8758 - U=`sed -n 's/^U = //p' < "$mf"`
8759 - # Find all dependency output files, they are included files with
8760 - # $(DEPDIR) in their names. We invoke sed twice because it is the
8761 - # simplest approach to changing $(DEPDIR) to its actual value in the
8762 - # expansion.
8763 - for file in `sed -n "
8764 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
8765 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
8766 - # Make sure the directory exists.
8767 - test -f "$dirpart/$file" && continue
8768 - fdir=`AS_DIRNAME(["$file"])`
8769 - AS_MKDIR_P([$dirpart/$fdir])
8770 - # echo "creating $dirpart/$file"
8771 - echo '# dummy' > "$dirpart/$file"
8772 - done
8773 -done
8774 -])# _AM_OUTPUT_DEPENDENCY_COMMANDS
8775 -
8776 -
8777 -# AM_OUTPUT_DEPENDENCY_COMMANDS
8778 -# -----------------------------
8779 -# This macro should only be invoked once -- use via AC_REQUIRE.
8780 -#
8781 -# This code is only required when automatic dependency tracking
8782 -# is enabled. FIXME. This creates each `.P' file that we will
8783 -# need in order to bootstrap the dependency handling code.
8784 -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
8785 -[AC_CONFIG_COMMANDS([depfiles],
8786 - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
8787 - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
8788 -])
8789 -
8790 -# Do all the work for Automake. -*- Autoconf -*-
8791 -
8792 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
8793 -# 2005, 2006, 2008 Free Software Foundation, Inc.
8794 -#
8795 -# This file is free software; the Free Software Foundation
8796 -# gives unlimited permission to copy and/or distribute it,
8797 -# with or without modifications, as long as this notice is preserved.
8798 -
8799 -# serial 13
8800 -
8801 -# This macro actually does too much. Some checks are only needed if
8802 -# your package does certain things. But this isn't really a big deal.
8803 -
8804 -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
8805 -# AM_INIT_AUTOMAKE([OPTIONS])
8806 -# -----------------------------------------------
8807 -# The call with PACKAGE and VERSION arguments is the old style
8808 -# call (pre autoconf-2.50), which is being phased out. PACKAGE
8809 -# and VERSION should now be passed to AC_INIT and removed from
8810 -# the call to AM_INIT_AUTOMAKE.
8811 -# We support both call styles for the transition. After
8812 -# the next Automake release, Autoconf can make the AC_INIT
8813 -# arguments mandatory, and then we can depend on a new Autoconf
8814 -# release and drop the old call support.
8815 -AC_DEFUN([AM_INIT_AUTOMAKE],
8816 -[AC_PREREQ([2.60])dnl
8817 -dnl Autoconf wants to disallow AM_ names. We explicitly allow
8818 -dnl the ones we care about.
8819 -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
8820 -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
8821 -AC_REQUIRE([AC_PROG_INSTALL])dnl
8822 -if test "`cd $srcdir && pwd`" != "`pwd`"; then
8823 - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
8824 - # is not polluted with repeated "-I."
8825 - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
8826 - # test to see if srcdir already configured
8827 - if test -f $srcdir/config.status; then
8828 - AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
8829 - fi
8830 -fi
8831 -
8832 -# test whether we have cygpath
8833 -if test -z "$CYGPATH_W"; then
8834 - if (cygpath --version) >/dev/null 2>/dev/null; then
8835 - CYGPATH_W='cygpath -w'
8836 - else
8837 - CYGPATH_W=echo
8838 - fi
8839 -fi
8840 -AC_SUBST([CYGPATH_W])
8841 -
8842 -# Define the identity of the package.
8843 -dnl Distinguish between old-style and new-style calls.
8844 -m4_ifval([$2],
8845 -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
8846 - AC_SUBST([PACKAGE], [$1])dnl
8847 - AC_SUBST([VERSION], [$2])],
8848 -[_AM_SET_OPTIONS([$1])dnl
8849 -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
8850 -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
8851 - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
8852 - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
8853 - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
8854 -
8855 -_AM_IF_OPTION([no-define],,
8856 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
8857 - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
8858 -
8859 -# Some tools Automake needs.
8860 -AC_REQUIRE([AM_SANITY_CHECK])dnl
8861 -AC_REQUIRE([AC_ARG_PROGRAM])dnl
8862 -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
8863 -AM_MISSING_PROG(AUTOCONF, autoconf)
8864 -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
8865 -AM_MISSING_PROG(AUTOHEADER, autoheader)
8866 -AM_MISSING_PROG(MAKEINFO, makeinfo)
8867 -AM_PROG_INSTALL_SH
8868 -AM_PROG_INSTALL_STRIP
8869 -AC_REQUIRE([AM_PROG_MKDIR_P])dnl
8870 -# We need awk for the "check" target. The system "awk" is bad on
8871 -# some platforms.
8872 -AC_REQUIRE([AC_PROG_AWK])dnl
8873 -AC_REQUIRE([AC_PROG_MAKE_SET])dnl
8874 -AC_REQUIRE([AM_SET_LEADING_DOT])dnl
8875 -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
8876 - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
8877 - [_AM_PROG_TAR([v7])])])
8878 -_AM_IF_OPTION([no-dependencies],,
8879 -[AC_PROVIDE_IFELSE([AC_PROG_CC],
8880 - [_AM_DEPENDENCIES(CC)],
8881 - [define([AC_PROG_CC],
8882 - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
8883 -AC_PROVIDE_IFELSE([AC_PROG_CXX],
8884 - [_AM_DEPENDENCIES(CXX)],
8885 - [define([AC_PROG_CXX],
8886 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
8887 -AC_PROVIDE_IFELSE([AC_PROG_OBJC],
8888 - [_AM_DEPENDENCIES(OBJC)],
8889 - [define([AC_PROG_OBJC],
8890 - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
8891 -])
8892 -])
8893 -
8894 -
8895 -# When config.status generates a header, we must update the stamp-h file.
8896 -# This file resides in the same directory as the config header
8897 -# that is generated. The stamp files are numbered to have different names.
8898 -
8899 -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
8900 -# loop where config.status creates the headers, so we can generate
8901 -# our stamp files there.
8902 -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
8903 -[# Compute $1's index in $config_headers.
8904 -_am_arg=$1
8905 -_am_stamp_count=1
8906 -for _am_header in $config_headers :; do
8907 - case $_am_header in
8908 - $_am_arg | $_am_arg:* )
8909 - break ;;
8910 - * )
8911 - _am_stamp_count=`expr $_am_stamp_count + 1` ;;
8912 - esac
8913 -done
8914 -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
8915 -
8916 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
8917 -#
8918 -# This file is free software; the Free Software Foundation
8919 -# gives unlimited permission to copy and/or distribute it,
8920 -# with or without modifications, as long as this notice is preserved.
8921 -
8922 -# AM_PROG_INSTALL_SH
8923 -# ------------------
8924 -# Define $install_sh.
8925 -AC_DEFUN([AM_PROG_INSTALL_SH],
8926 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
8927 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
8928 -AC_SUBST(install_sh)])
8929 -
8930 -# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
8931 -#
8932 -# This file is free software; the Free Software Foundation
8933 -# gives unlimited permission to copy and/or distribute it,
8934 -# with or without modifications, as long as this notice is preserved.
8935 -
8936 -# serial 2
8937 -
8938 -# Check whether the underlying file-system supports filenames
8939 -# with a leading dot. For instance MS-DOS doesn't.
8940 -AC_DEFUN([AM_SET_LEADING_DOT],
8941 -[rm -rf .tst 2>/dev/null
8942 -mkdir .tst 2>/dev/null
8943 -if test -d .tst; then
8944 - am__leading_dot=.
8945 -else
8946 - am__leading_dot=_
8947 -fi
8948 -rmdir .tst 2>/dev/null
8949 -AC_SUBST([am__leading_dot])])
8950 -
8951 -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
8952 -# From Jim Meyering
8953 -
8954 -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
8955 -# Free Software Foundation, Inc.
8956 -#
8957 -# This file is free software; the Free Software Foundation
8958 -# gives unlimited permission to copy and/or distribute it,
8959 -# with or without modifications, as long as this notice is preserved.
8960 -
8961 -# serial 4
8962 -
8963 -AC_DEFUN([AM_MAINTAINER_MODE],
8964 -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
8965 - dnl maintainer-mode is disabled by default
8966 - AC_ARG_ENABLE(maintainer-mode,
8967 -[ --enable-maintainer-mode enable make rules and dependencies not useful
8968 - (and sometimes confusing) to the casual installer],
8969 - USE_MAINTAINER_MODE=$enableval,
8970 - USE_MAINTAINER_MODE=no)
8971 - AC_MSG_RESULT([$USE_MAINTAINER_MODE])
8972 - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
8973 - MAINT=$MAINTAINER_MODE_TRUE
8974 - AC_SUBST(MAINT)dnl
8975 -]
8976 -)
8977 -
8978 -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
8979 -
8980 -# Check to see how 'make' treats includes. -*- Autoconf -*-
8981 -
8982 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
8983 -#
8984 -# This file is free software; the Free Software Foundation
8985 -# gives unlimited permission to copy and/or distribute it,
8986 -# with or without modifications, as long as this notice is preserved.
8987 -
8988 -# serial 3
8989 -
8990 -# AM_MAKE_INCLUDE()
8991 -# -----------------
8992 -# Check to see how make treats includes.
8993 -AC_DEFUN([AM_MAKE_INCLUDE],
8994 -[am_make=${MAKE-make}
8995 -cat > confinc << 'END'
8996 -am__doit:
8997 - @echo done
8998 -.PHONY: am__doit
8999 -END
9000 -# If we don't find an include directive, just comment out the code.
9001 -AC_MSG_CHECKING([for style of include used by $am_make])
9002 -am__include="#"
9003 -am__quote=
9004 -_am_result=none
9005 -# First try GNU make style include.
9006 -echo "include confinc" > confmf
9007 -# We grep out `Entering directory' and `Leaving directory'
9008 -# messages which can occur if `w' ends up in MAKEFLAGS.
9009 -# In particular we don't look at `^make:' because GNU make might
9010 -# be invoked under some other name (usually "gmake"), in which
9011 -# case it prints its new name instead of `make'.
9012 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
9013 - am__include=include
9014 - am__quote=
9015 - _am_result=GNU
9016 -fi
9017 -# Now try BSD make style include.
9018 -if test "$am__include" = "#"; then
9019 - echo '.include "confinc"' > confmf
9020 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
9021 - am__include=.include
9022 - am__quote="\""
9023 - _am_result=BSD
9024 - fi
9025 -fi
9026 -AC_SUBST([am__include])
9027 -AC_SUBST([am__quote])
9028 -AC_MSG_RESULT([$_am_result])
9029 -rm -f confinc confmf
9030 -])
9031 -
9032 -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
9033 -# Free Software Foundation, Inc.
9034 -#
9035 -# This file is free software; the Free Software Foundation
9036 -# gives unlimited permission to copy and/or distribute it,
9037 -# with or without modifications, as long as this notice is preserved.
9038 -
9039 -# serial 5
9040 -
9041 -# AM_PROG_CC_C_O
9042 -# --------------
9043 -# Like AC_PROG_CC_C_O, but changed for automake.
9044 -AC_DEFUN([AM_PROG_CC_C_O],
9045 -[AC_REQUIRE([AC_PROG_CC_C_O])dnl
9046 -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
9047 -AC_REQUIRE_AUX_FILE([compile])dnl
9048 -# FIXME: we rely on the cache variable name because
9049 -# there is no other way.
9050 -set dummy $CC
9051 -ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
9052 -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
9053 - # Losing compiler, so override with the script.
9054 - # FIXME: It is wrong to rewrite CC.
9055 - # But if we don't then we get into trouble of one sort or another.
9056 - # A longer-term fix would be to have automake use am__CC in this case,
9057 - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
9058 - CC="$am_aux_dir/compile $CC"
9059 -fi
9060 -dnl Make sure AC_PROG_CC is never called again, or it will override our
9061 -dnl setting of CC.
9062 -m4_define([AC_PROG_CC],
9063 - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
9064 -])
9065 -
9066 -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
9067 -
9068 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
9069 -# Free Software Foundation, Inc.
9070 -#
9071 -# This file is free software; the Free Software Foundation
9072 -# gives unlimited permission to copy and/or distribute it,
9073 -# with or without modifications, as long as this notice is preserved.
9074 -
9075 -# serial 5
9076 -
9077 -# AM_MISSING_PROG(NAME, PROGRAM)
9078 -# ------------------------------
9079 -AC_DEFUN([AM_MISSING_PROG],
9080 -[AC_REQUIRE([AM_MISSING_HAS_RUN])
9081 -$1=${$1-"${am_missing_run}$2"}
9082 -AC_SUBST($1)])
9083 -
9084 -
9085 -# AM_MISSING_HAS_RUN
9086 -# ------------------
9087 -# Define MISSING if not defined so far and test if it supports --run.
9088 -# If it does, set am_missing_run to use it, otherwise, to nothing.
9089 -AC_DEFUN([AM_MISSING_HAS_RUN],
9090 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
9091 -AC_REQUIRE_AUX_FILE([missing])dnl
9092 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
9093 -# Use eval to expand $SHELL
9094 -if eval "$MISSING --run true"; then
9095 - am_missing_run="$MISSING --run "
9096 -else
9097 - am_missing_run=
9098 - AC_MSG_WARN([`missing' script is too old or missing])
9099 -fi
9100 -])
9101 -
9102 -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
9103 -#
9104 -# This file is free software; the Free Software Foundation
9105 -# gives unlimited permission to copy and/or distribute it,
9106 -# with or without modifications, as long as this notice is preserved.
9107 -
9108 -# AM_PROG_MKDIR_P
9109 -# ---------------
9110 -# Check for `mkdir -p'.
9111 -AC_DEFUN([AM_PROG_MKDIR_P],
9112 -[AC_PREREQ([2.60])dnl
9113 -AC_REQUIRE([AC_PROG_MKDIR_P])dnl
9114 -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
9115 -dnl while keeping a definition of mkdir_p for backward compatibility.
9116 -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
9117 -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
9118 -dnl Makefile.ins that do not define MKDIR_P, so we do our own
9119 -dnl adjustment using top_builddir (which is defined more often than
9120 -dnl MKDIR_P).
9121 -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
9122 -case $mkdir_p in
9123 - [[\\/$]]* | ?:[[\\/]]*) ;;
9124 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
9125 -esac
9126 -])
9127 -
9128 -# Helper functions for option handling. -*- Autoconf -*-
9129 -
9130 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
9131 -#
9132 -# This file is free software; the Free Software Foundation
9133 -# gives unlimited permission to copy and/or distribute it,
9134 -# with or without modifications, as long as this notice is preserved.
9135 -
9136 -# serial 3
9137 -
9138 -# _AM_MANGLE_OPTION(NAME)
9139 -# -----------------------
9140 -AC_DEFUN([_AM_MANGLE_OPTION],
9141 -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
9142 -
9143 -# _AM_SET_OPTION(NAME)
9144 -# ------------------------------
9145 -# Set option NAME. Presently that only means defining a flag for this option.
9146 -AC_DEFUN([_AM_SET_OPTION],
9147 -[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
9148 -
9149 -# _AM_SET_OPTIONS(OPTIONS)
9150 -# ----------------------------------
9151 -# OPTIONS is a space-separated list of Automake options.
9152 -AC_DEFUN([_AM_SET_OPTIONS],
9153 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
9154 -
9155 -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
9156 -# -------------------------------------------
9157 -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
9158 -AC_DEFUN([_AM_IF_OPTION],
9159 -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
9160 -
9161 -# Check to make sure that the build environment is sane. -*- Autoconf -*-
9162 -
9163 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
9164 -# Free Software Foundation, Inc.
9165 -#
9166 -# This file is free software; the Free Software Foundation
9167 -# gives unlimited permission to copy and/or distribute it,
9168 -# with or without modifications, as long as this notice is preserved.
9169 -
9170 -# serial 4
9171 -
9172 -# AM_SANITY_CHECK
9173 -# ---------------
9174 -AC_DEFUN([AM_SANITY_CHECK],
9175 -[AC_MSG_CHECKING([whether build environment is sane])
9176 -# Just in case
9177 -sleep 1
9178 -echo timestamp > conftest.file
9179 -# Do `set' in a subshell so we don't clobber the current shell's
9180 -# arguments. Must try -L first in case configure is actually a
9181 -# symlink; some systems play weird games with the mod time of symlinks
9182 -# (eg FreeBSD returns the mod time of the symlink's containing
9183 -# directory).
9184 -if (
9185 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
9186 - if test "$[*]" = "X"; then
9187 - # -L didn't work.
9188 - set X `ls -t $srcdir/configure conftest.file`
9189 - fi
9190 - rm -f conftest.file
9191 - if test "$[*]" != "X $srcdir/configure conftest.file" \
9192 - && test "$[*]" != "X conftest.file $srcdir/configure"; then
9193 -
9194 - # If neither matched, then we have a broken ls. This can happen
9195 - # if, for instance, CONFIG_SHELL is bash and it inherits a
9196 - # broken ls alias from the environment. This has actually
9197 - # happened. Such a system could not be considered "sane".
9198 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
9199 -alias in your environment])
9200 - fi
9201 -
9202 - test "$[2]" = conftest.file
9203 - )
9204 -then
9205 - # Ok.
9206 - :
9207 -else
9208 - AC_MSG_ERROR([newly created file is older than distributed files!
9209 -Check your system clock])
9210 -fi
9211 -AC_MSG_RESULT(yes)])
9212 -
9213 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
9214 -#
9215 -# This file is free software; the Free Software Foundation
9216 -# gives unlimited permission to copy and/or distribute it,
9217 -# with or without modifications, as long as this notice is preserved.
9218 -
9219 -# AM_PROG_INSTALL_STRIP
9220 -# ---------------------
9221 -# One issue with vendor `install' (even GNU) is that you can't
9222 -# specify the program used to strip binaries. This is especially
9223 -# annoying in cross-compiling environments, where the build's strip
9224 -# is unlikely to handle the host's binaries.
9225 -# Fortunately install-sh will honor a STRIPPROG variable, so we
9226 -# always use install-sh in `make install-strip', and initialize
9227 -# STRIPPROG with the value of the STRIP variable (set by the user).
9228 -AC_DEFUN([AM_PROG_INSTALL_STRIP],
9229 -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
9230 -# Installed binaries are usually stripped using `strip' when the user
9231 -# run `make install-strip'. However `strip' might not be the right
9232 -# tool to use in cross-compilation environments, therefore Automake
9233 -# will honor the `STRIP' environment variable to overrule this program.
9234 -dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
9235 -if test "$cross_compiling" != no; then
9236 - AC_CHECK_TOOL([STRIP], [strip], :)
9237 -fi
9238 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
9239 -AC_SUBST([INSTALL_STRIP_PROGRAM])])
9240 -
9241 -# Copyright (C) 2006 Free Software Foundation, Inc.
9242 -#
9243 -# This file is free software; the Free Software Foundation
9244 -# gives unlimited permission to copy and/or distribute it,
9245 -# with or without modifications, as long as this notice is preserved.
9246 -
9247 -# _AM_SUBST_NOTMAKE(VARIABLE)
9248 -# ---------------------------
9249 -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
9250 -# This macro is traced by Automake.
9251 -AC_DEFUN([_AM_SUBST_NOTMAKE])
9252 -
9253 -# Check how to create a tarball. -*- Autoconf -*-
9254 -
9255 -# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
9256 -#
9257 -# This file is free software; the Free Software Foundation
9258 -# gives unlimited permission to copy and/or distribute it,
9259 -# with or without modifications, as long as this notice is preserved.
9260 -
9261 -# serial 2
9262 -
9263 -# _AM_PROG_TAR(FORMAT)
9264 -# --------------------
9265 -# Check how to create a tarball in format FORMAT.
9266 -# FORMAT should be one of `v7', `ustar', or `pax'.
9267 -#
9268 -# Substitute a variable $(am__tar) that is a command
9269 -# writing to stdout a FORMAT-tarball containing the directory
9270 -# $tardir.
9271 -# tardir=directory && $(am__tar) > result.tar
9272 -#
9273 -# Substitute a variable $(am__untar) that extract such
9274 -# a tarball read from stdin.
9275 -# $(am__untar) < result.tar
9276 -AC_DEFUN([_AM_PROG_TAR],
9277 -[# Always define AMTAR for backward compatibility.
9278 -AM_MISSING_PROG([AMTAR], [tar])
9279 -m4_if([$1], [v7],
9280 - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
9281 - [m4_case([$1], [ustar],, [pax],,
9282 - [m4_fatal([Unknown tar format])])
9283 -AC_MSG_CHECKING([how to create a $1 tar archive])
9284 -# Loop over all known methods to create a tar archive until one works.
9285 -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
9286 -_am_tools=${am_cv_prog_tar_$1-$_am_tools}
9287 -# Do not fold the above two line into one, because Tru64 sh and
9288 -# Solaris sh will not grok spaces in the rhs of `-'.
9289 -for _am_tool in $_am_tools
9290 -do
9291 - case $_am_tool in
9292 - gnutar)
9293 - for _am_tar in tar gnutar gtar;
9294 - do
9295 - AM_RUN_LOG([$_am_tar --version]) && break
9296 - done
9297 - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
9298 - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
9299 - am__untar="$_am_tar -xf -"
9300 - ;;
9301 - plaintar)
9302 - # Must skip GNU tar: if it does not support --format= it doesn't create
9303 - # ustar tarball either.
9304 - (tar --version) >/dev/null 2>&1 && continue
9305 - am__tar='tar chf - "$$tardir"'
9306 - am__tar_='tar chf - "$tardir"'
9307 - am__untar='tar xf -'
9308 - ;;
9309 - pax)
9310 - am__tar='pax -L -x $1 -w "$$tardir"'
9311 - am__tar_='pax -L -x $1 -w "$tardir"'
9312 - am__untar='pax -r'
9313 - ;;
9314 - cpio)
9315 - am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
9316 - am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
9317 - am__untar='cpio -i -H $1 -d'
9318 - ;;
9319 - none)
9320 - am__tar=false
9321 - am__tar_=false
9322 - am__untar=false
9323 - ;;
9324 - esac
9325 -
9326 - # If the value was cached, stop now. We just wanted to have am__tar
9327 - # and am__untar set.
9328 - test -n "${am_cv_prog_tar_$1}" && break
9329 -
9330 - # tar/untar a dummy directory, and stop if the command works
9331 - rm -rf conftest.dir
9332 - mkdir conftest.dir
9333 - echo GrepMe > conftest.dir/file
9334 - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
9335 - rm -rf conftest.dir
9336 - if test -s conftest.tar; then
9337 - AM_RUN_LOG([$am__untar <conftest.tar])
9338 - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
9339 - fi
9340 -done
9341 -rm -rf conftest.dir
9342 -
9343 -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
9344 -AC_MSG_RESULT([$am_cv_prog_tar_$1])])
9345 -AC_SUBST([am__tar])
9346 -AC_SUBST([am__untar])
9347 -]) # _AM_PROG_TAR
9348 -
9349 -m4_include([m4/codeset.m4])
9350 -m4_include([m4/gettext.m4])
9351 -m4_include([m4/glibc21.m4])
9352 -m4_include([m4/iconv.m4])
9353 -m4_include([m4/intdiv0.m4])
9354 -m4_include([m4/inttypes-pri.m4])
9355 -m4_include([m4/inttypes.m4])
9356 -m4_include([m4/inttypes_h.m4])
9357 -m4_include([m4/isc-posix.m4])
9358 -m4_include([m4/lcmessage.m4])
9359 -m4_include([m4/lib-ld.m4])
9360 -m4_include([m4/lib-link.m4])
9361 -m4_include([m4/lib-prefix.m4])
9362 -m4_include([m4/nls.m4])
9363 -m4_include([m4/po.m4])
9364 -m4_include([m4/progtest.m4])
9365 -m4_include([m4/stdint_h.m4])
9366 -m4_include([m4/uintmax_t.m4])
9367 -m4_include([m4/ulonglong.m4])
9368 diff -rupN original/compile new/compile
9369 --- original/compile 2009-03-28 22:34:09.000000000 -0430
9370 +++ new/compile 1969-12-31 20:00:00.000000000 -0400
9371 @@ -1,142 +0,0 @@
9372 -#! /bin/sh
9373 -# Wrapper for compilers which do not understand `-c -o'.
9374 -
9375 -scriptversion=2005-05-14.22
9376 -
9377 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
9378 -# Written by Tom Tromey <tromey@cygnus.com>.
9379 -#
9380 -# This program is free software; you can redistribute it and/or modify
9381 -# it under the terms of the GNU General Public License as published by
9382 -# the Free Software Foundation; either version 2, or (at your option)
9383 -# any later version.
9384 -#
9385 -# This program is distributed in the hope that it will be useful,
9386 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
9387 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9388 -# GNU General Public License for more details.
9389 -#
9390 -# You should have received a copy of the GNU General Public License
9391 -# along with this program; if not, write to the Free Software
9392 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
9393 -
9394 -# As a special exception to the GNU General Public License, if you
9395 -# distribute this file as part of a program that contains a
9396 -# configuration script generated by Autoconf, you may include it under
9397 -# the same distribution terms that you use for the rest of that program.
9398 -
9399 -# This file is maintained in Automake, please report
9400 -# bugs to <bug-automake@gnu.org> or send patches to
9401 -# <automake-patches@gnu.org>.
9402 -
9403 -case $1 in
9404 - '')
9405 - echo "$0: No command. Try \`$0 --help' for more information." 1>&2
9406 - exit 1;
9407 - ;;
9408 - -h | --h*)
9409 - cat <<\EOF
9410 -Usage: compile [--help] [--version] PROGRAM [ARGS]
9411 -
9412 -Wrapper for compilers which do not understand `-c -o'.
9413 -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
9414 -arguments, and rename the output as expected.
9415 -
9416 -If you are trying to build a whole package this is not the
9417 -right script to run: please start by reading the file `INSTALL'.
9418 -
9419 -Report bugs to <bug-automake@gnu.org>.
9420 -EOF
9421 - exit $?
9422 - ;;
9423 - -v | --v*)
9424 - echo "compile $scriptversion"
9425 - exit $?
9426 - ;;
9427 -esac
9428 -
9429 -ofile=
9430 -cfile=
9431 -eat=
9432 -
9433 -for arg
9434 -do
9435 - if test -n "$eat"; then
9436 - eat=
9437 - else
9438 - case $1 in
9439 - -o)
9440 - # configure might choose to run compile as `compile cc -o foo foo.c'.
9441 - # So we strip `-o arg' only if arg is an object.
9442 - eat=1
9443 - case $2 in
9444 - *.o | *.obj)
9445 - ofile=$2
9446 - ;;
9447 - *)
9448 - set x "$@" -o "$2"
9449 - shift
9450 - ;;
9451 - esac
9452 - ;;
9453 - *.c)
9454 - cfile=$1
9455 - set x "$@" "$1"
9456 - shift
9457 - ;;
9458 - *)
9459 - set x "$@" "$1"
9460 - shift
9461 - ;;
9462 - esac
9463 - fi
9464 - shift
9465 -done
9466 -
9467 -if test -z "$ofile" || test -z "$cfile"; then
9468 - # If no `-o' option was seen then we might have been invoked from a
9469 - # pattern rule where we don't need one. That is ok -- this is a
9470 - # normal compilation that the losing compiler can handle. If no
9471 - # `.c' file was seen then we are probably linking. That is also
9472 - # ok.
9473 - exec "$@"
9474 -fi
9475 -
9476 -# Name of file we expect compiler to create.
9477 -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
9478 -
9479 -# Create the lock directory.
9480 -# Note: use `[/.-]' here to ensure that we don't use the same name
9481 -# that we are using for the .o file. Also, base the name on the expected
9482 -# object file name, since that is what matters with a parallel build.
9483 -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
9484 -while true; do
9485 - if mkdir "$lockdir" >/dev/null 2>&1; then
9486 - break
9487 - fi
9488 - sleep 1
9489 -done
9490 -# FIXME: race condition here if user kills between mkdir and trap.
9491 -trap "rmdir '$lockdir'; exit 1" 1 2 15
9492 -
9493 -# Run the compile.
9494 -"$@"
9495 -ret=$?
9496 -
9497 -if test -f "$cofile"; then
9498 - mv "$cofile" "$ofile"
9499 -elif test -f "${cofile}bj"; then
9500 - mv "${cofile}bj" "$ofile"
9501 -fi
9502 -
9503 -rmdir "$lockdir"
9504 -exit $ret
9505 -
9506 -# Local Variables:
9507 -# mode: shell-script
9508 -# sh-indentation: 2
9509 -# eval: (add-hook 'write-file-hooks 'time-stamp)
9510 -# time-stamp-start: "scriptversion="
9511 -# time-stamp-format: "%:y-%02m-%02d.%02H"
9512 -# time-stamp-end: "$"
9513 -# End:
9514 diff -rupN original/config.guess new/config.guess
9515 --- original/config.guess 2008-07-07 19:11:25.000000000 -0430
9516 +++ new/config.guess 1969-12-31 20:00:00.000000000 -0400
9517 @@ -1,1526 +0,0 @@
9518 -#! /bin/sh
9519 -# Attempt to guess a canonical system name.
9520 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
9521 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
9522 -# Free Software Foundation, Inc.
9523 -
9524 -timestamp='2008-01-23'
9525 -
9526 -# This file is free software; you can redistribute it and/or modify it
9527 -# under the terms of the GNU General Public License as published by
9528 -# the Free Software Foundation; either version 2 of the License, or
9529 -# (at your option) any later version.
9530 -#
9531 -# This program is distributed in the hope that it will be useful, but
9532 -# WITHOUT ANY WARRANTY; without even the implied warranty of
9533 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9534 -# General Public License for more details.
9535 -#
9536 -# You should have received a copy of the GNU General Public License
9537 -# along with this program; if not, write to the Free Software
9538 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
9539 -# 02110-1301, USA.
9540 -#
9541 -# As a special exception to the GNU General Public License, if you
9542 -# distribute this file as part of a program that contains a
9543 -# configuration script generated by Autoconf, you may include it under
9544 -# the same distribution terms that you use for the rest of that program.
9545 -
9546 -
9547 -# Originally written by Per Bothner <per@bothner.com>.
9548 -# Please send patches to <config-patches@gnu.org>. Submit a context
9549 -# diff and a properly formatted ChangeLog entry.
9550 -#
9551 -# This script attempts to guess a canonical system name similar to
9552 -# config.sub. If it succeeds, it prints the system name on stdout, and
9553 -# exits with 0. Otherwise, it exits with 1.
9554 -#
9555 -# The plan is that this can be called by configure scripts if you
9556 -# don't specify an explicit build system type.
9557 -
9558 -me=`echo "$0" | sed -e 's,.*/,,'`
9559 -
9560 -usage="\
9561 -Usage: $0 [OPTION]
9562 -
9563 -Output the configuration name of the system \`$me' is run on.
9564 -
9565 -Operation modes:
9566 - -h, --help print this help, then exit
9567 - -t, --time-stamp print date of last modification, then exit
9568 - -v, --version print version number, then exit
9569 -
9570 -Report bugs and patches to <config-patches@gnu.org>."
9571 -
9572 -version="\
9573 -GNU config.guess ($timestamp)
9574 -
9575 -Originally written by Per Bothner.
9576 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
9577 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9578 -
9579 -This is free software; see the source for copying conditions. There is NO
9580 -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
9581 -
9582 -help="
9583 -Try \`$me --help' for more information."
9584 -
9585 -# Parse command line
9586 -while test $# -gt 0 ; do
9587 - case $1 in
9588 - --time-stamp | --time* | -t )
9589 - echo "$timestamp" ; exit ;;
9590 - --version | -v )
9591 - echo "$version" ; exit ;;
9592 - --help | --h* | -h )
9593 - echo "$usage"; exit ;;
9594 - -- ) # Stop option processing
9595 - shift; break ;;
9596 - - ) # Use stdin as input.
9597 - break ;;
9598 - -* )
9599 - echo "$me: invalid option $1$help" >&2
9600 - exit 1 ;;
9601 - * )
9602 - break ;;
9603 - esac
9604 -done
9605 -
9606 -if test $# != 0; then
9607 - echo "$me: too many arguments$help" >&2
9608 - exit 1
9609 -fi
9610 -
9611 -trap 'exit 1' 1 2 15
9612 -
9613 -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
9614 -# compiler to aid in system detection is discouraged as it requires
9615 -# temporary files to be created and, as you can see below, it is a
9616 -# headache to deal with in a portable fashion.
9617 -
9618 -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
9619 -# use `HOST_CC' if defined, but it is deprecated.
9620 -
9621 -# Portable tmp directory creation inspired by the Autoconf team.
9622 -
9623 -set_cc_for_build='
9624 -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
9625 -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
9626 -: ${TMPDIR=/tmp} ;
9627 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
9628 - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
9629 - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
9630 - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
9631 -dummy=$tmp/dummy ;
9632 -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
9633 -case $CC_FOR_BUILD,$HOST_CC,$CC in
9634 - ,,) echo "int x;" > $dummy.c ;
9635 - for c in cc gcc c89 c99 ; do
9636 - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
9637 - CC_FOR_BUILD="$c"; break ;
9638 - fi ;
9639 - done ;
9640 - if test x"$CC_FOR_BUILD" = x ; then
9641 - CC_FOR_BUILD=no_compiler_found ;
9642 - fi
9643 - ;;
9644 - ,,*) CC_FOR_BUILD=$CC ;;
9645 - ,*,*) CC_FOR_BUILD=$HOST_CC ;;
9646 -esac ; set_cc_for_build= ;'
9647 -
9648 -# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
9649 -# (ghazi@noc.rutgers.edu 1994-08-24)
9650 -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
9651 - PATH=$PATH:/.attbin ; export PATH
9652 -fi
9653 -
9654 -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
9655 -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
9656 -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
9657 -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
9658 -
9659 -# Note: order is significant - the case branches are not exclusive.
9660 -
9661 -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
9662 - *:NetBSD:*:*)
9663 - # NetBSD (nbsd) targets should (where applicable) match one or
9664 - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
9665 - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
9666 - # switched to ELF, *-*-netbsd* would select the old
9667 - # object file format. This provides both forward
9668 - # compatibility and a consistent mechanism for selecting the
9669 - # object file format.
9670 - #
9671 - # Note: NetBSD doesn't particularly care about the vendor
9672 - # portion of the name. We always set it to "unknown".
9673 - sysctl="sysctl -n hw.machine_arch"
9674 - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
9675 - /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
9676 - case "${UNAME_MACHINE_ARCH}" in
9677 - armeb) machine=armeb-unknown ;;
9678 - arm*) machine=arm-unknown ;;
9679 - sh3el) machine=shl-unknown ;;
9680 - sh3eb) machine=sh-unknown ;;
9681 - sh5el) machine=sh5le-unknown ;;
9682 - *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
9683 - esac
9684 - # The Operating System including object format, if it has switched
9685 - # to ELF recently, or will in the future.
9686 - case "${UNAME_MACHINE_ARCH}" in
9687 - arm*|i386|m68k|ns32k|sh3*|sparc|vax)
9688 - eval $set_cc_for_build
9689 - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
9690 - | grep __ELF__ >/dev/null
9691 - then
9692 - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
9693 - # Return netbsd for either. FIX?
9694 - os=netbsd
9695 - else
9696 - os=netbsdelf
9697 - fi
9698 - ;;
9699 - *)
9700 - os=netbsd
9701 - ;;
9702 - esac
9703 - # The OS release
9704 - # Debian GNU/NetBSD machines have a different userland, and
9705 - # thus, need a distinct triplet. However, they do not need
9706 - # kernel version information, so it can be replaced with a
9707 - # suitable tag, in the style of linux-gnu.
9708 - case "${UNAME_VERSION}" in
9709 - Debian*)
9710 - release='-gnu'
9711 - ;;
9712 - *)
9713 - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
9714 - ;;
9715 - esac
9716 - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
9717 - # contains redundant information, the shorter form:
9718 - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
9719 - echo "${machine}-${os}${release}"
9720 - exit ;;
9721 - *:OpenBSD:*:*)
9722 - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
9723 - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
9724 - exit ;;
9725 - *:ekkoBSD:*:*)
9726 - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
9727 - exit ;;
9728 - *:SolidBSD:*:*)
9729 - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
9730 - exit ;;
9731 - macppc:MirBSD:*:*)
9732 - echo powerpc-unknown-mirbsd${UNAME_RELEASE}
9733 - exit ;;
9734 - *:MirBSD:*:*)
9735 - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
9736 - exit ;;
9737 - alpha:OSF1:*:*)
9738 - case $UNAME_RELEASE in
9739 - *4.0)
9740 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
9741 - ;;
9742 - *5.*)
9743 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
9744 - ;;
9745 - esac
9746 - # According to Compaq, /usr/sbin/psrinfo has been available on
9747 - # OSF/1 and Tru64 systems produced since 1995. I hope that
9748 - # covers most systems running today. This code pipes the CPU
9749 - # types through head -n 1, so we only detect the type of CPU 0.
9750 - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
9751 - case "$ALPHA_CPU_TYPE" in
9752 - "EV4 (21064)")
9753 - UNAME_MACHINE="alpha" ;;
9754 - "EV4.5 (21064)")
9755 - UNAME_MACHINE="alpha" ;;
9756 - "LCA4 (21066/21068)")
9757 - UNAME_MACHINE="alpha" ;;
9758 - "EV5 (21164)")
9759 - UNAME_MACHINE="alphaev5" ;;
9760 - "EV5.6 (21164A)")
9761 - UNAME_MACHINE="alphaev56" ;;
9762 - "EV5.6 (21164PC)")
9763 - UNAME_MACHINE="alphapca56" ;;
9764 - "EV5.7 (21164PC)")
9765 - UNAME_MACHINE="alphapca57" ;;
9766 - "EV6 (21264)")
9767 - UNAME_MACHINE="alphaev6" ;;
9768 - "EV6.7 (21264A)")
9769 - UNAME_MACHINE="alphaev67" ;;
9770 - "EV6.8CB (21264C)")
9771 - UNAME_MACHINE="alphaev68" ;;
9772 - "EV6.8AL (21264B)")
9773 - UNAME_MACHINE="alphaev68" ;;
9774 - "EV6.8CX (21264D)")
9775 - UNAME_MACHINE="alphaev68" ;;
9776 - "EV6.9A (21264/EV69A)")
9777 - UNAME_MACHINE="alphaev69" ;;
9778 - "EV7 (21364)")
9779 - UNAME_MACHINE="alphaev7" ;;
9780 - "EV7.9 (21364A)")
9781 - UNAME_MACHINE="alphaev79" ;;
9782 - esac
9783 - # A Pn.n version is a patched version.
9784 - # A Vn.n version is a released version.
9785 - # A Tn.n version is a released field test version.
9786 - # A Xn.n version is an unreleased experimental baselevel.
9787 - # 1.2 uses "1.2" for uname -r.
9788 - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
9789 - exit ;;
9790 - Alpha\ *:Windows_NT*:*)
9791 - # How do we know it's Interix rather than the generic POSIX subsystem?
9792 - # Should we change UNAME_MACHINE based on the output of uname instead
9793 - # of the specific Alpha model?
9794 - echo alpha-pc-interix
9795 - exit ;;
9796 - 21064:Windows_NT:50:3)
9797 - echo alpha-dec-winnt3.5
9798 - exit ;;
9799 - Amiga*:UNIX_System_V:4.0:*)
9800 - echo m68k-unknown-sysv4
9801 - exit ;;
9802 - *:[Aa]miga[Oo][Ss]:*:*)
9803 - echo ${UNAME_MACHINE}-unknown-amigaos
9804 - exit ;;
9805 - *:[Mm]orph[Oo][Ss]:*:*)
9806 - echo ${UNAME_MACHINE}-unknown-morphos
9807 - exit ;;
9808 - *:OS/390:*:*)
9809 - echo i370-ibm-openedition
9810 - exit ;;
9811 - *:z/VM:*:*)
9812 - echo s390-ibm-zvmoe
9813 - exit ;;
9814 - *:OS400:*:*)
9815 - echo powerpc-ibm-os400
9816 - exit ;;
9817 - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
9818 - echo arm-acorn-riscix${UNAME_RELEASE}
9819 - exit ;;
9820 - arm:riscos:*:*|arm:RISCOS:*:*)
9821 - echo arm-unknown-riscos
9822 - exit ;;
9823 - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
9824 - echo hppa1.1-hitachi-hiuxmpp
9825 - exit ;;
9826 - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
9827 - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
9828 - if test "`(/bin/universe) 2>/dev/null`" = att ; then
9829 - echo pyramid-pyramid-sysv3
9830 - else
9831 - echo pyramid-pyramid-bsd
9832 - fi
9833 - exit ;;
9834 - NILE*:*:*:dcosx)
9835 - echo pyramid-pyramid-svr4
9836 - exit ;;
9837 - DRS?6000:unix:4.0:6*)
9838 - echo sparc-icl-nx6
9839 - exit ;;
9840 - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
9841 - case `/usr/bin/uname -p` in
9842 - sparc) echo sparc-icl-nx7; exit ;;
9843 - esac ;;
9844 - sun4H:SunOS:5.*:*)
9845 - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
9846 - exit ;;
9847 - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
9848 - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
9849 - exit ;;
9850 - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
9851 - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
9852 - exit ;;
9853 - sun4*:SunOS:6*:*)
9854 - # According to config.sub, this is the proper way to canonicalize
9855 - # SunOS6. Hard to guess exactly what SunOS6 will be like, but
9856 - # it's likely to be more like Solaris than SunOS4.
9857 - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
9858 - exit ;;
9859 - sun4*:SunOS:*:*)
9860 - case "`/usr/bin/arch -k`" in
9861 - Series*|S4*)
9862 - UNAME_RELEASE=`uname -v`
9863 - ;;
9864 - esac
9865 - # Japanese Language versions have a version number like `4.1.3-JL'.
9866 - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
9867 - exit ;;
9868 - sun3*:SunOS:*:*)
9869 - echo m68k-sun-sunos${UNAME_RELEASE}
9870 - exit ;;
9871 - sun*:*:4.2BSD:*)
9872 - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
9873 - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
9874 - case "`/bin/arch`" in
9875 - sun3)
9876 - echo m68k-sun-sunos${UNAME_RELEASE}
9877 - ;;
9878 - sun4)
9879 - echo sparc-sun-sunos${UNAME_RELEASE}
9880 - ;;
9881 - esac
9882 - exit ;;
9883 - aushp:SunOS:*:*)
9884 - echo sparc-auspex-sunos${UNAME_RELEASE}
9885 - exit ;;
9886 - # The situation for MiNT is a little confusing. The machine name
9887 - # can be virtually everything (everything which is not
9888 - # "atarist" or "atariste" at least should have a processor
9889 - # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
9890 - # to the lowercase version "mint" (or "freemint"). Finally
9891 - # the system name "TOS" denotes a system which is actually not
9892 - # MiNT. But MiNT is downward compatible to TOS, so this should
9893 - # be no problem.
9894 - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
9895 - echo m68k-atari-mint${UNAME_RELEASE}
9896 - exit ;;
9897 - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
9898 - echo m68k-atari-mint${UNAME_RELEASE}
9899 - exit ;;
9900 - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
9901 - echo m68k-atari-mint${UNAME_RELEASE}
9902 - exit ;;
9903 - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
9904 - echo m68k-milan-mint${UNAME_RELEASE}
9905 - exit ;;
9906 - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
9907 - echo m68k-hades-mint${UNAME_RELEASE}
9908 - exit ;;
9909 - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
9910 - echo m68k-unknown-mint${UNAME_RELEASE}
9911 - exit ;;
9912 - m68k:machten:*:*)
9913 - echo m68k-apple-machten${UNAME_RELEASE}
9914 - exit ;;
9915 - powerpc:machten:*:*)
9916 - echo powerpc-apple-machten${UNAME_RELEASE}
9917 - exit ;;
9918 - RISC*:Mach:*:*)
9919 - echo mips-dec-mach_bsd4.3
9920 - exit ;;
9921 - RISC*:ULTRIX:*:*)
9922 - echo mips-dec-ultrix${UNAME_RELEASE}
9923 - exit ;;
9924 - VAX*:ULTRIX*:*:*)
9925 - echo vax-dec-ultrix${UNAME_RELEASE}
9926 - exit ;;
9927 - 2020:CLIX:*:* | 2430:CLIX:*:*)
9928 - echo clipper-intergraph-clix${UNAME_RELEASE}
9929 - exit ;;
9930 - mips:*:*:UMIPS | mips:*:*:RISCos)
9931 - eval $set_cc_for_build
9932 - sed 's/^ //' << EOF >$dummy.c
9933 -#ifdef __cplusplus
9934 -#include <stdio.h> /* for printf() prototype */
9935 - int main (int argc, char *argv[]) {
9936 -#else
9937 - int main (argc, argv) int argc; char *argv[]; {
9938 -#endif
9939 - #if defined (host_mips) && defined (MIPSEB)
9940 - #if defined (SYSTYPE_SYSV)
9941 - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
9942 - #endif
9943 - #if defined (SYSTYPE_SVR4)
9944 - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
9945 - #endif
9946 - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
9947 - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
9948 - #endif
9949 - #endif
9950 - exit (-1);
9951 - }
9952 -EOF
9953 - $CC_FOR_BUILD -o $dummy $dummy.c &&
9954 - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
9955 - SYSTEM_NAME=`$dummy $dummyarg` &&
9956 - { echo "$SYSTEM_NAME"; exit; }
9957 - echo mips-mips-riscos${UNAME_RELEASE}
9958 - exit ;;
9959 - Motorola:PowerMAX_OS:*:*)
9960 - echo powerpc-motorola-powermax
9961 - exit ;;
9962 - Motorola:*:4.3:PL8-*)
9963 - echo powerpc-harris-powermax
9964 - exit ;;
9965 - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
9966 - echo powerpc-harris-powermax
9967 - exit ;;
9968 - Night_Hawk:Power_UNIX:*:*)
9969 - echo powerpc-harris-powerunix
9970 - exit ;;
9971 - m88k:CX/UX:7*:*)
9972 - echo m88k-harris-cxux7
9973 - exit ;;
9974 - m88k:*:4*:R4*)
9975 - echo m88k-motorola-sysv4
9976 - exit ;;
9977 - m88k:*:3*:R3*)
9978 - echo m88k-motorola-sysv3
9979 - exit ;;
9980 - AViiON:dgux:*:*)
9981 - # DG/UX returns AViiON for all architectures
9982 - UNAME_PROCESSOR=`/usr/bin/uname -p`
9983 - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
9984 - then
9985 - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
9986 - [ ${TARGET_BINARY_INTERFACE}x = x ]
9987 - then
9988 - echo m88k-dg-dgux${UNAME_RELEASE}
9989 - else
9990 - echo m88k-dg-dguxbcs${UNAME_RELEASE}
9991 - fi
9992 - else
9993 - echo i586-dg-dgux${UNAME_RELEASE}
9994 - fi
9995 - exit ;;
9996 - M88*:DolphinOS:*:*) # DolphinOS (SVR3)
9997 - echo m88k-dolphin-sysv3
9998 - exit ;;
9999 - M88*:*:R3*:*)
10000 - # Delta 88k system running SVR3
10001 - echo m88k-motorola-sysv3
10002 - exit ;;
10003 - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
10004 - echo m88k-tektronix-sysv3
10005 - exit ;;
10006 - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
10007 - echo m68k-tektronix-bsd
10008 - exit ;;
10009 - *:IRIX*:*:*)
10010 - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
10011 - exit ;;
10012 - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
10013 - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
10014 - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
10015 - i*86:AIX:*:*)
10016 - echo i386-ibm-aix
10017 - exit ;;
10018 - ia64:AIX:*:*)
10019 - if [ -x /usr/bin/oslevel ] ; then
10020 - IBM_REV=`/usr/bin/oslevel`
10021 - else
10022 - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
10023 - fi
10024 - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
10025 - exit ;;
10026 - *:AIX:2:3)
10027 - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
10028 - eval $set_cc_for_build
10029 - sed 's/^ //' << EOF >$dummy.c
10030 - #include <sys/systemcfg.h>
10031 -
10032 - main()
10033 - {
10034 - if (!__power_pc())
10035 - exit(1);
10036 - puts("powerpc-ibm-aix3.2.5");
10037 - exit(0);
10038 - }
10039 -EOF
10040 - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
10041 - then
10042 - echo "$SYSTEM_NAME"
10043 - else
10044 - echo rs6000-ibm-aix3.2.5
10045 - fi
10046 - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
10047 - echo rs6000-ibm-aix3.2.4
10048 - else
10049 - echo rs6000-ibm-aix3.2
10050 - fi
10051 - exit ;;
10052 - *:AIX:*:[456])
10053 - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
10054 - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
10055 - IBM_ARCH=rs6000
10056 - else
10057 - IBM_ARCH=powerpc
10058 - fi
10059 - if [ -x /usr/bin/oslevel ] ; then
10060 - IBM_REV=`/usr/bin/oslevel`
10061 - else
10062 - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
10063 - fi
10064 - echo ${IBM_ARCH}-ibm-aix${IBM_REV}
10065 - exit ;;
10066 - *:AIX:*:*)
10067 - echo rs6000-ibm-aix
10068 - exit ;;
10069 - ibmrt:4.4BSD:*|romp-ibm:BSD:*)
10070 - echo romp-ibm-bsd4.4
10071 - exit ;;
10072 - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
10073 - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
10074 - exit ;; # report: romp-ibm BSD 4.3
10075 - *:BOSX:*:*)
10076 - echo rs6000-bull-bosx
10077 - exit ;;
10078 - DPX/2?00:B.O.S.:*:*)
10079 - echo m68k-bull-sysv3
10080 - exit ;;
10081 - 9000/[34]??:4.3bsd:1.*:*)
10082 - echo m68k-hp-bsd
10083 - exit ;;
10084 - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
10085 - echo m68k-hp-bsd4.4
10086 - exit ;;
10087 - 9000/[34678]??:HP-UX:*:*)
10088 - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
10089 - case "${UNAME_MACHINE}" in
10090 - 9000/31? ) HP_ARCH=m68000 ;;
10091 - 9000/[34]?? ) HP_ARCH=m68k ;;
10092 - 9000/[678][0-9][0-9])
10093 - if [ -x /usr/bin/getconf ]; then
10094 - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
10095 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
10096 - case "${sc_cpu_version}" in
10097 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
10098 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
10099 - 532) # CPU_PA_RISC2_0
10100 - case "${sc_kernel_bits}" in
10101 - 32) HP_ARCH="hppa2.0n" ;;
10102 - 64) HP_ARCH="hppa2.0w" ;;
10103 - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
10104 - esac ;;
10105 - esac
10106 - fi
10107 - if [ "${HP_ARCH}" = "" ]; then
10108 - eval $set_cc_for_build
10109 - sed 's/^ //' << EOF >$dummy.c
10110 -
10111 - #define _HPUX_SOURCE
10112 - #include <stdlib.h>
10113 - #include <unistd.h>
10114 -
10115 - int main ()
10116 - {
10117 - #if defined(_SC_KERNEL_BITS)
10118 - long bits = sysconf(_SC_KERNEL_BITS);
10119 - #endif
10120 - long cpu = sysconf (_SC_CPU_VERSION);
10121 -
10122 - switch (cpu)
10123 - {
10124 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
10125 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
10126 - case CPU_PA_RISC2_0:
10127 - #if defined(_SC_KERNEL_BITS)
10128 - switch (bits)
10129 - {
10130 - case 64: puts ("hppa2.0w"); break;
10131 - case 32: puts ("hppa2.0n"); break;
10132 - default: puts ("hppa2.0"); break;
10133 - } break;
10134 - #else /* !defined(_SC_KERNEL_BITS) */
10135 - puts ("hppa2.0"); break;
10136 - #endif
10137 - default: puts ("hppa1.0"); break;
10138 - }
10139 - exit (0);
10140 - }
10141 -EOF
10142 - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
10143 - test -z "$HP_ARCH" && HP_ARCH=hppa
10144 - fi ;;
10145 - esac
10146 - if [ ${HP_ARCH} = "hppa2.0w" ]
10147 - then
10148 - eval $set_cc_for_build
10149 -
10150 - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
10151 - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
10152 - # generating 64-bit code. GNU and HP use different nomenclature:
10153 - #
10154 - # $ CC_FOR_BUILD=cc ./config.guess
10155 - # => hppa2.0w-hp-hpux11.23
10156 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
10157 - # => hppa64-hp-hpux11.23
10158 -
10159 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
10160 - grep __LP64__ >/dev/null
10161 - then
10162 - HP_ARCH="hppa2.0w"
10163 - else
10164 - HP_ARCH="hppa64"
10165 - fi
10166 - fi
10167 - echo ${HP_ARCH}-hp-hpux${HPUX_REV}
10168 - exit ;;
10169 - ia64:HP-UX:*:*)
10170 - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
10171 - echo ia64-hp-hpux${HPUX_REV}
10172 - exit ;;
10173 - 3050*:HI-UX:*:*)
10174 - eval $set_cc_for_build
10175 - sed 's/^ //' << EOF >$dummy.c
10176 - #include <unistd.h>
10177 - int
10178 - main ()
10179 - {
10180 - long cpu = sysconf (_SC_CPU_VERSION);
10181 - /* The order matters, because CPU_IS_HP_MC68K erroneously returns
10182 - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
10183 - results, however. */
10184 - if (CPU_IS_PA_RISC (cpu))
10185 - {
10186 - switch (cpu)
10187 - {
10188 - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
10189 - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
10190 - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
10191 - default: puts ("hppa-hitachi-hiuxwe2"); break;
10192 - }
10193 - }
10194 - else if (CPU_IS_HP_MC68K (cpu))
10195 - puts ("m68k-hitachi-hiuxwe2");
10196 - else puts ("unknown-hitachi-hiuxwe2");
10197 - exit (0);
10198 - }
10199 -EOF
10200 - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
10201 - { echo "$SYSTEM_NAME"; exit; }
10202 - echo unknown-hitachi-hiuxwe2
10203 - exit ;;
10204 - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
10205 - echo hppa1.1-hp-bsd
10206 - exit ;;
10207 - 9000/8??:4.3bsd:*:*)
10208 - echo hppa1.0-hp-bsd
10209 - exit ;;
10210 - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
10211 - echo hppa1.0-hp-mpeix
10212 - exit ;;
10213 - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
10214 - echo hppa1.1-hp-osf
10215 - exit ;;
10216 - hp8??:OSF1:*:*)
10217 - echo hppa1.0-hp-osf
10218 - exit ;;
10219 - i*86:OSF1:*:*)
10220 - if [ -x /usr/sbin/sysversion ] ; then
10221 - echo ${UNAME_MACHINE}-unknown-osf1mk
10222 - else
10223 - echo ${UNAME_MACHINE}-unknown-osf1
10224 - fi
10225 - exit ;;
10226 - parisc*:Lites*:*:*)
10227 - echo hppa1.1-hp-lites
10228 - exit ;;
10229 - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
10230 - echo c1-convex-bsd
10231 - exit ;;
10232 - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
10233 - if getsysinfo -f scalar_acc
10234 - then echo c32-convex-bsd
10235 - else echo c2-convex-bsd
10236 - fi
10237 - exit ;;
10238 - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
10239 - echo c34-convex-bsd
10240 - exit ;;
10241 - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
10242 - echo c38-convex-bsd
10243 - exit ;;
10244 - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
10245 - echo c4-convex-bsd
10246 - exit ;;
10247 - CRAY*Y-MP:*:*:*)
10248 - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
10249 - exit ;;
10250 - CRAY*[A-Z]90:*:*:*)
10251 - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
10252 - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
10253 - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
10254 - -e 's/\.[^.]*$/.X/'
10255 - exit ;;
10256 - CRAY*TS:*:*:*)
10257 - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
10258 - exit ;;
10259 - CRAY*T3E:*:*:*)
10260 - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
10261 - exit ;;
10262 - CRAY*SV1:*:*:*)
10263 - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
10264 - exit ;;
10265 - *:UNICOS/mp:*:*)
10266 - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
10267 - exit ;;
10268 - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
10269 - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
10270 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
10271 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
10272 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
10273 - exit ;;
10274 - 5000:UNIX_System_V:4.*:*)
10275 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
10276 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
10277 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
10278 - exit ;;
10279 - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
10280 - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
10281 - exit ;;
10282 - sparc*:BSD/OS:*:*)
10283 - echo sparc-unknown-bsdi${UNAME_RELEASE}
10284 - exit ;;
10285 - *:BSD/OS:*:*)
10286 - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
10287 - exit ;;
10288 - *:FreeBSD:*:*)
10289 - case ${UNAME_MACHINE} in
10290 - pc98)
10291 - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
10292 - amd64)
10293 - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
10294 - *)
10295 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
10296 - esac
10297 - exit ;;
10298 - i*:CYGWIN*:*)
10299 - echo ${UNAME_MACHINE}-pc-cygwin
10300 - exit ;;
10301 - *:MINGW*:*)
10302 - echo ${UNAME_MACHINE}-pc-mingw32
10303 - exit ;;
10304 - i*:windows32*:*)
10305 - # uname -m includes "-pc" on this system.
10306 - echo ${UNAME_MACHINE}-mingw32
10307 - exit ;;
10308 - i*:PW*:*)
10309 - echo ${UNAME_MACHINE}-pc-pw32
10310 - exit ;;
10311 - *:Interix*:[3456]*)
10312 - case ${UNAME_MACHINE} in
10313 - x86)
10314 - echo i586-pc-interix${UNAME_RELEASE}
10315 - exit ;;
10316 - EM64T | authenticamd)
10317 - echo x86_64-unknown-interix${UNAME_RELEASE}
10318 - exit ;;
10319 - IA64)
10320 - echo ia64-unknown-interix${UNAME_RELEASE}
10321 - exit ;;
10322 - esac ;;
10323 - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
10324 - echo i${UNAME_MACHINE}-pc-mks
10325 - exit ;;
10326 - i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
10327 - # How do we know it's Interix rather than the generic POSIX subsystem?
10328 - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
10329 - # UNAME_MACHINE based on the output of uname instead of i386?
10330 - echo i586-pc-interix
10331 - exit ;;
10332 - i*:UWIN*:*)
10333 - echo ${UNAME_MACHINE}-pc-uwin
10334 - exit ;;
10335 - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
10336 - echo x86_64-unknown-cygwin
10337 - exit ;;
10338 - p*:CYGWIN*:*)
10339 - echo powerpcle-unknown-cygwin
10340 - exit ;;
10341 - prep*:SunOS:5.*:*)
10342 - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
10343 - exit ;;
10344 - *:GNU:*:*)
10345 - # the GNU system
10346 - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
10347 - exit ;;
10348 - *:GNU/*:*:*)
10349 - # other systems with GNU libc and userland
10350 - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
10351 - exit ;;
10352 - i*86:Minix:*:*)
10353 - echo ${UNAME_MACHINE}-pc-minix
10354 - exit ;;
10355 - arm*:Linux:*:*)
10356 - eval $set_cc_for_build
10357 - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
10358 - | grep -q __ARM_EABI__
10359 - then
10360 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10361 - else
10362 - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
10363 - fi
10364 - exit ;;
10365 - avr32*:Linux:*:*)
10366 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10367 - exit ;;
10368 - cris:Linux:*:*)
10369 - echo cris-axis-linux-gnu
10370 - exit ;;
10371 - crisv32:Linux:*:*)
10372 - echo crisv32-axis-linux-gnu
10373 - exit ;;
10374 - frv:Linux:*:*)
10375 - echo frv-unknown-linux-gnu
10376 - exit ;;
10377 - ia64:Linux:*:*)
10378 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10379 - exit ;;
10380 - m32r*:Linux:*:*)
10381 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10382 - exit ;;
10383 - m68*:Linux:*:*)
10384 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10385 - exit ;;
10386 - mips:Linux:*:*)
10387 - eval $set_cc_for_build
10388 - sed 's/^ //' << EOF >$dummy.c
10389 - #undef CPU
10390 - #undef mips
10391 - #undef mipsel
10392 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
10393 - CPU=mipsel
10394 - #else
10395 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
10396 - CPU=mips
10397 - #else
10398 - CPU=
10399 - #endif
10400 - #endif
10401 -EOF
10402 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
10403 - /^CPU/{
10404 - s: ::g
10405 - p
10406 - }'`"
10407 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
10408 - ;;
10409 - mips64:Linux:*:*)
10410 - eval $set_cc_for_build
10411 - sed 's/^ //' << EOF >$dummy.c
10412 - #undef CPU
10413 - #undef mips64
10414 - #undef mips64el
10415 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
10416 - CPU=mips64el
10417 - #else
10418 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
10419 - CPU=mips64
10420 - #else
10421 - CPU=
10422 - #endif
10423 - #endif
10424 -EOF
10425 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
10426 - /^CPU/{
10427 - s: ::g
10428 - p
10429 - }'`"
10430 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
10431 - ;;
10432 - or32:Linux:*:*)
10433 - echo or32-unknown-linux-gnu
10434 - exit ;;
10435 - ppc:Linux:*:*)
10436 - echo powerpc-unknown-linux-gnu
10437 - exit ;;
10438 - ppc64:Linux:*:*)
10439 - echo powerpc64-unknown-linux-gnu
10440 - exit ;;
10441 - alpha:Linux:*:*)
10442 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
10443 - EV5) UNAME_MACHINE=alphaev5 ;;
10444 - EV56) UNAME_MACHINE=alphaev56 ;;
10445 - PCA56) UNAME_MACHINE=alphapca56 ;;
10446 - PCA57) UNAME_MACHINE=alphapca56 ;;
10447 - EV6) UNAME_MACHINE=alphaev6 ;;
10448 - EV67) UNAME_MACHINE=alphaev67 ;;
10449 - EV68*) UNAME_MACHINE=alphaev68 ;;
10450 - esac
10451 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
10452 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
10453 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
10454 - exit ;;
10455 - parisc:Linux:*:* | hppa:Linux:*:*)
10456 - # Look for CPU level
10457 - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
10458 - PA7*) echo hppa1.1-unknown-linux-gnu ;;
10459 - PA8*) echo hppa2.0-unknown-linux-gnu ;;
10460 - *) echo hppa-unknown-linux-gnu ;;
10461 - esac
10462 - exit ;;
10463 - parisc64:Linux:*:* | hppa64:Linux:*:*)
10464 - echo hppa64-unknown-linux-gnu
10465 - exit ;;
10466 - s390:Linux:*:* | s390x:Linux:*:*)
10467 - echo ${UNAME_MACHINE}-ibm-linux
10468 - exit ;;
10469 - sh64*:Linux:*:*)
10470 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10471 - exit ;;
10472 - sh*:Linux:*:*)
10473 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10474 - exit ;;
10475 - sparc:Linux:*:* | sparc64:Linux:*:*)
10476 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10477 - exit ;;
10478 - vax:Linux:*:*)
10479 - echo ${UNAME_MACHINE}-dec-linux-gnu
10480 - exit ;;
10481 - x86_64:Linux:*:*)
10482 - echo x86_64-unknown-linux-gnu
10483 - exit ;;
10484 - xtensa*:Linux:*:*)
10485 - echo ${UNAME_MACHINE}-unknown-linux-gnu
10486 - exit ;;
10487 - i*86:Linux:*:*)
10488 - # The BFD linker knows what the default object file format is, so
10489 - # first see if it will tell us. cd to the root directory to prevent
10490 - # problems with other programs or directories called `ld' in the path.
10491 - # Set LC_ALL=C to ensure ld outputs messages in English.
10492 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
10493 - | sed -ne '/supported targets:/!d
10494 - s/[ ][ ]*/ /g
10495 - s/.*supported targets: *//
10496 - s/ .*//
10497 - p'`
10498 - case "$ld_supported_targets" in
10499 - elf32-i386)
10500 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
10501 - ;;
10502 - a.out-i386-linux)
10503 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
10504 - exit ;;
10505 - coff-i386)
10506 - echo "${UNAME_MACHINE}-pc-linux-gnucoff"
10507 - exit ;;
10508 - "")
10509 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
10510 - # one that does not give us useful --help.
10511 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
10512 - exit ;;
10513 - esac
10514 - # Determine whether the default compiler is a.out or elf
10515 - eval $set_cc_for_build
10516 - sed 's/^ //' << EOF >$dummy.c
10517 - #include <features.h>
10518 - #ifdef __ELF__
10519 - # ifdef __GLIBC__
10520 - # if __GLIBC__ >= 2
10521 - LIBC=gnu
10522 - # else
10523 - LIBC=gnulibc1
10524 - # endif
10525 - # else
10526 - LIBC=gnulibc1
10527 - # endif
10528 - #else
10529 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
10530 - LIBC=gnu
10531 - #else
10532 - LIBC=gnuaout
10533 - #endif
10534 - #endif
10535 - #ifdef __dietlibc__
10536 - LIBC=dietlibc
10537 - #endif
10538 -EOF
10539 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
10540 - /^LIBC/{
10541 - s: ::g
10542 - p
10543 - }'`"
10544 - test x"${LIBC}" != x && {
10545 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
10546 - exit
10547 - }
10548 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
10549 - ;;
10550 - i*86:DYNIX/ptx:4*:*)
10551 - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
10552 - # earlier versions are messed up and put the nodename in both
10553 - # sysname and nodename.
10554 - echo i386-sequent-sysv4
10555 - exit ;;
10556 - i*86:UNIX_SV:4.2MP:2.*)
10557 - # Unixware is an offshoot of SVR4, but it has its own version
10558 - # number series starting with 2...
10559 - # I am not positive that other SVR4 systems won't match this,
10560 - # I just have to hope. -- rms.
10561 - # Use sysv4.2uw... so that sysv4* matches it.
10562 - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
10563 - exit ;;
10564 - i*86:OS/2:*:*)
10565 - # If we were able to find `uname', then EMX Unix compatibility
10566 - # is probably installed.
10567 - echo ${UNAME_MACHINE}-pc-os2-emx
10568 - exit ;;
10569 - i*86:XTS-300:*:STOP)
10570 - echo ${UNAME_MACHINE}-unknown-stop
10571 - exit ;;
10572 - i*86:atheos:*:*)
10573 - echo ${UNAME_MACHINE}-unknown-atheos
10574 - exit ;;
10575 - i*86:syllable:*:*)
10576 - echo ${UNAME_MACHINE}-pc-syllable
10577 - exit ;;
10578 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
10579 - echo i386-unknown-lynxos${UNAME_RELEASE}
10580 - exit ;;
10581 - i*86:*DOS:*:*)
10582 - echo ${UNAME_MACHINE}-pc-msdosdjgpp
10583 - exit ;;
10584 - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
10585 - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
10586 - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
10587 - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
10588 - else
10589 - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
10590 - fi
10591 - exit ;;
10592 - i*86:*:5:[678]*)
10593 - # UnixWare 7.x, OpenUNIX and OpenServer 6.
10594 - case `/bin/uname -X | grep "^Machine"` in
10595 - *486*) UNAME_MACHINE=i486 ;;
10596 - *Pentium) UNAME_MACHINE=i586 ;;
10597 - *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
10598 - esac
10599 - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
10600 - exit ;;
10601 - i*86:*:3.2:*)
10602 - if test -f /usr/options/cb.name; then
10603 - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
10604 - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
10605 - elif /bin/uname -X 2>/dev/null >/dev/null ; then
10606 - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
10607 - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
10608 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
10609 - && UNAME_MACHINE=i586
10610 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
10611 - && UNAME_MACHINE=i686
10612 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
10613 - && UNAME_MACHINE=i686
10614 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
10615 - else
10616 - echo ${UNAME_MACHINE}-pc-sysv32
10617 - fi
10618 - exit ;;
10619 - pc:*:*:*)
10620 - # Left here for compatibility:
10621 - # uname -m prints for DJGPP always 'pc', but it prints nothing about
10622 - # the processor, so we play safe by assuming i386.
10623 - echo i386-pc-msdosdjgpp
10624 - exit ;;
10625 - Intel:Mach:3*:*)
10626 - echo i386-pc-mach3
10627 - exit ;;
10628 - paragon:*:*:*)
10629 - echo i860-intel-osf1
10630 - exit ;;
10631 - i860:*:4.*:*) # i860-SVR4
10632 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
10633 - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
10634 - else # Add other i860-SVR4 vendors below as they are discovered.
10635 - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
10636 - fi
10637 - exit ;;
10638 - mini*:CTIX:SYS*5:*)
10639 - # "miniframe"
10640 - echo m68010-convergent-sysv
10641 - exit ;;
10642 - mc68k:UNIX:SYSTEM5:3.51m)
10643 - echo m68k-convergent-sysv
10644 - exit ;;
10645 - M680?0:D-NIX:5.3:*)
10646 - echo m68k-diab-dnix
10647 - exit ;;
10648 - M68*:*:R3V[5678]*:*)
10649 - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
10650 - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
10651 - OS_REL=''
10652 - test -r /etc/.relid \
10653 - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
10654 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
10655 - && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
10656 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
10657 - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
10658 - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
10659 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
10660 - && { echo i486-ncr-sysv4; exit; } ;;
10661 - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
10662 - echo m68k-unknown-lynxos${UNAME_RELEASE}
10663 - exit ;;
10664 - mc68030:UNIX_System_V:4.*:*)
10665 - echo m68k-atari-sysv4
10666 - exit ;;
10667 - TSUNAMI:LynxOS:2.*:*)
10668 - echo sparc-unknown-lynxos${UNAME_RELEASE}
10669 - exit ;;
10670 - rs6000:LynxOS:2.*:*)
10671 - echo rs6000-unknown-lynxos${UNAME_RELEASE}
10672 - exit ;;
10673 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
10674 - echo powerpc-unknown-lynxos${UNAME_RELEASE}
10675 - exit ;;
10676 - SM[BE]S:UNIX_SV:*:*)
10677 - echo mips-dde-sysv${UNAME_RELEASE}
10678 - exit ;;
10679 - RM*:ReliantUNIX-*:*:*)
10680 - echo mips-sni-sysv4
10681 - exit ;;
10682 - RM*:SINIX-*:*:*)
10683 - echo mips-sni-sysv4
10684 - exit ;;
10685 - *:SINIX-*:*:*)
10686 - if uname -p 2>/dev/null >/dev/null ; then
10687 - UNAME_MACHINE=`(uname -p) 2>/dev/null`
10688 - echo ${UNAME_MACHINE}-sni-sysv4
10689 - else
10690 - echo ns32k-sni-sysv
10691 - fi
10692 - exit ;;
10693 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
10694 - # says <Richard.M.Bartel@ccMail.Census.GOV>
10695 - echo i586-unisys-sysv4
10696 - exit ;;
10697 - *:UNIX_System_V:4*:FTX*)
10698 - # From Gerald Hewes <hewes@openmarket.com>.
10699 - # How about differentiating between stratus architectures? -djm
10700 - echo hppa1.1-stratus-sysv4
10701 - exit ;;
10702 - *:*:*:FTX*)
10703 - # From seanf@swdc.stratus.com.
10704 - echo i860-stratus-sysv4
10705 - exit ;;
10706 - i*86:VOS:*:*)
10707 - # From Paul.Green@stratus.com.
10708 - echo ${UNAME_MACHINE}-stratus-vos
10709 - exit ;;
10710 - *:VOS:*:*)
10711 - # From Paul.Green@stratus.com.
10712 - echo hppa1.1-stratus-vos
10713 - exit ;;
10714 - mc68*:A/UX:*:*)
10715 - echo m68k-apple-aux${UNAME_RELEASE}
10716 - exit ;;
10717 - news*:NEWS-OS:6*:*)
10718 - echo mips-sony-newsos6
10719 - exit ;;
10720 - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
10721 - if [ -d /usr/nec ]; then
10722 - echo mips-nec-sysv${UNAME_RELEASE}
10723 - else
10724 - echo mips-unknown-sysv${UNAME_RELEASE}
10725 - fi
10726 - exit ;;
10727 - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
10728 - echo powerpc-be-beos
10729 - exit ;;
10730 - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
10731 - echo powerpc-apple-beos
10732 - exit ;;
10733 - BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
10734 - echo i586-pc-beos
10735 - exit ;;
10736 - SX-4:SUPER-UX:*:*)
10737 - echo sx4-nec-superux${UNAME_RELEASE}
10738 - exit ;;
10739 - SX-5:SUPER-UX:*:*)
10740 - echo sx5-nec-superux${UNAME_RELEASE}
10741 - exit ;;
10742 - SX-6:SUPER-UX:*:*)
10743 - echo sx6-nec-superux${UNAME_RELEASE}
10744 - exit ;;
10745 - SX-7:SUPER-UX:*:*)
10746 - echo sx7-nec-superux${UNAME_RELEASE}
10747 - exit ;;
10748 - SX-8:SUPER-UX:*:*)
10749 - echo sx8-nec-superux${UNAME_RELEASE}
10750 - exit ;;
10751 - SX-8R:SUPER-UX:*:*)
10752 - echo sx8r-nec-superux${UNAME_RELEASE}
10753 - exit ;;
10754 - Power*:Rhapsody:*:*)
10755 - echo powerpc-apple-rhapsody${UNAME_RELEASE}
10756 - exit ;;
10757 - *:Rhapsody:*:*)
10758 - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
10759 - exit ;;
10760 - *:Darwin:*:*)
10761 - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
10762 - case $UNAME_PROCESSOR in
10763 - unknown) UNAME_PROCESSOR=powerpc ;;
10764 - esac
10765 - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
10766 - exit ;;
10767 - *:procnto*:*:* | *:QNX:[0123456789]*:*)
10768 - UNAME_PROCESSOR=`uname -p`
10769 - if test "$UNAME_PROCESSOR" = "x86"; then
10770 - UNAME_PROCESSOR=i386
10771 - UNAME_MACHINE=pc
10772 - fi
10773 - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
10774 - exit ;;
10775 - *:QNX:*:4*)
10776 - echo i386-pc-qnx
10777 - exit ;;
10778 - NSE-?:NONSTOP_KERNEL:*:*)
10779 - echo nse-tandem-nsk${UNAME_RELEASE}
10780 - exit ;;
10781 - NSR-?:NONSTOP_KERNEL:*:*)
10782 - echo nsr-tandem-nsk${UNAME_RELEASE}
10783 - exit ;;
10784 - *:NonStop-UX:*:*)
10785 - echo mips-compaq-nonstopux
10786 - exit ;;
10787 - BS2000:POSIX*:*:*)
10788 - echo bs2000-siemens-sysv
10789 - exit ;;
10790 - DS/*:UNIX_System_V:*:*)
10791 - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
10792 - exit ;;
10793 - *:Plan9:*:*)
10794 - # "uname -m" is not consistent, so use $cputype instead. 386
10795 - # is converted to i386 for consistency with other x86
10796 - # operating systems.
10797 - if test "$cputype" = "386"; then
10798 - UNAME_MACHINE=i386
10799 - else
10800 - UNAME_MACHINE="$cputype"
10801 - fi
10802 - echo ${UNAME_MACHINE}-unknown-plan9
10803 - exit ;;
10804 - *:TOPS-10:*:*)
10805 - echo pdp10-unknown-tops10
10806 - exit ;;
10807 - *:TENEX:*:*)
10808 - echo pdp10-unknown-tenex
10809 - exit ;;
10810 - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
10811 - echo pdp10-dec-tops20
10812 - exit ;;
10813 - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
10814 - echo pdp10-xkl-tops20
10815 - exit ;;
10816 - *:TOPS-20:*:*)
10817 - echo pdp10-unknown-tops20
10818 - exit ;;
10819 - *:ITS:*:*)
10820 - echo pdp10-unknown-its
10821 - exit ;;
10822 - SEI:*:*:SEIUX)
10823 - echo mips-sei-seiux${UNAME_RELEASE}
10824 - exit ;;
10825 - *:DragonFly:*:*)
10826 - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
10827 - exit ;;
10828 - *:*VMS:*:*)
10829 - UNAME_MACHINE=`(uname -p) 2>/dev/null`
10830 - case "${UNAME_MACHINE}" in
10831 - A*) echo alpha-dec-vms ; exit ;;
10832 - I*) echo ia64-dec-vms ; exit ;;
10833 - V*) echo vax-dec-vms ; exit ;;
10834 - esac ;;
10835 - *:XENIX:*:SysV)
10836 - echo i386-pc-xenix
10837 - exit ;;
10838 - i*86:skyos:*:*)
10839 - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
10840 - exit ;;
10841 - i*86:rdos:*:*)
10842 - echo ${UNAME_MACHINE}-pc-rdos
10843 - exit ;;
10844 -esac
10845 -
10846 -#echo '(No uname command or uname output not recognized.)' 1>&2
10847 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
10848 -
10849 -eval $set_cc_for_build
10850 -cat >$dummy.c <<EOF
10851 -#ifdef _SEQUENT_
10852 -# include <sys/types.h>
10853 -# include <sys/utsname.h>
10854 -#endif
10855 -main ()
10856 -{
10857 -#if defined (sony)
10858 -#if defined (MIPSEB)
10859 - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
10860 - I don't know.... */
10861 - printf ("mips-sony-bsd\n"); exit (0);
10862 -#else
10863 -#include <sys/param.h>
10864 - printf ("m68k-sony-newsos%s\n",
10865 -#ifdef NEWSOS4
10866 - "4"
10867 -#else
10868 - ""
10869 -#endif
10870 - ); exit (0);
10871 -#endif
10872 -#endif
10873 -
10874 -#if defined (__arm) && defined (__acorn) && defined (__unix)
10875 - printf ("arm-acorn-riscix\n"); exit (0);
10876 -#endif
10877 -
10878 -#if defined (hp300) && !defined (hpux)
10879 - printf ("m68k-hp-bsd\n"); exit (0);
10880 -#endif
10881 -
10882 -#if defined (NeXT)
10883 -#if !defined (__ARCHITECTURE__)
10884 -#define __ARCHITECTURE__ "m68k"
10885 -#endif
10886 - int version;
10887 - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
10888 - if (version < 4)
10889 - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
10890 - else
10891 - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
10892 - exit (0);
10893 -#endif
10894 -
10895 -#if defined (MULTIMAX) || defined (n16)
10896 -#if defined (UMAXV)
10897 - printf ("ns32k-encore-sysv\n"); exit (0);
10898 -#else
10899 -#if defined (CMU)
10900 - printf ("ns32k-encore-mach\n"); exit (0);
10901 -#else
10902 - printf ("ns32k-encore-bsd\n"); exit (0);
10903 -#endif
10904 -#endif
10905 -#endif
10906 -
10907 -#if defined (__386BSD__)
10908 - printf ("i386-pc-bsd\n"); exit (0);
10909 -#endif
10910 -
10911 -#if defined (sequent)
10912 -#if defined (i386)
10913 - printf ("i386-sequent-dynix\n"); exit (0);
10914 -#endif
10915 -#if defined (ns32000)
10916 - printf ("ns32k-sequent-dynix\n"); exit (0);
10917 -#endif
10918 -#endif
10919 -
10920 -#if defined (_SEQUENT_)
10921 - struct utsname un;
10922 -
10923 - uname(&un);
10924 -
10925 - if (strncmp(un.version, "V2", 2) == 0) {
10926 - printf ("i386-sequent-ptx2\n"); exit (0);
10927 - }
10928 - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
10929 - printf ("i386-sequent-ptx1\n"); exit (0);
10930 - }
10931 - printf ("i386-sequent-ptx\n"); exit (0);
10932 -
10933 -#endif
10934 -
10935 -#if defined (vax)
10936 -# if !defined (ultrix)
10937 -# include <sys/param.h>
10938 -# if defined (BSD)
10939 -# if BSD == 43
10940 - printf ("vax-dec-bsd4.3\n"); exit (0);
10941 -# else
10942 -# if BSD == 199006
10943 - printf ("vax-dec-bsd4.3reno\n"); exit (0);
10944 -# else
10945 - printf ("vax-dec-bsd\n"); exit (0);
10946 -# endif
10947 -# endif
10948 -# else
10949 - printf ("vax-dec-bsd\n"); exit (0);
10950 -# endif
10951 -# else
10952 - printf ("vax-dec-ultrix\n"); exit (0);
10953 -# endif
10954 -#endif
10955 -
10956 -#if defined (alliant) && defined (i860)
10957 - printf ("i860-alliant-bsd\n"); exit (0);
10958 -#endif
10959 -
10960 - exit (1);
10961 -}
10962 -EOF
10963 -
10964 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
10965 - { echo "$SYSTEM_NAME"; exit; }
10966 -
10967 -# Apollos put the system type in the environment.
10968 -
10969 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
10970 -
10971 -# Convex versions that predate uname can use getsysinfo(1)
10972 -
10973 -if [ -x /usr/convex/getsysinfo ]
10974 -then
10975 - case `getsysinfo -f cpu_type` in
10976 - c1*)
10977 - echo c1-convex-bsd
10978 - exit ;;
10979 - c2*)
10980 - if getsysinfo -f scalar_acc
10981 - then echo c32-convex-bsd
10982 - else echo c2-convex-bsd
10983 - fi
10984 - exit ;;
10985 - c34*)
10986 - echo c34-convex-bsd
10987 - exit ;;
10988 - c38*)
10989 - echo c38-convex-bsd
10990 - exit ;;
10991 - c4*)
10992 - echo c4-convex-bsd
10993 - exit ;;
10994 - esac
10995 -fi
10996 -
10997 -cat >&2 <<EOF
10998 -$0: unable to guess system type
10999 -
11000 -This script, last modified $timestamp, has failed to recognize
11001 -the operating system you are using. It is advised that you
11002 -download the most up to date version of the config scripts from
11003 -
11004 - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
11005 -and
11006 - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
11007 -
11008 -If the version you run ($0) is already up to date, please
11009 -send the following data and any information you think might be
11010 -pertinent to <config-patches@gnu.org> in order to provide the needed
11011 -information to handle your system.
11012 -
11013 -config.guess timestamp = $timestamp
11014 -
11015 -uname -m = `(uname -m) 2>/dev/null || echo unknown`
11016 -uname -r = `(uname -r) 2>/dev/null || echo unknown`
11017 -uname -s = `(uname -s) 2>/dev/null || echo unknown`
11018 -uname -v = `(uname -v) 2>/dev/null || echo unknown`
11019 -
11020 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
11021 -/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
11022 -
11023 -hostinfo = `(hostinfo) 2>/dev/null`
11024 -/bin/universe = `(/bin/universe) 2>/dev/null`
11025 -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
11026 -/bin/arch = `(/bin/arch) 2>/dev/null`
11027 -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
11028 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
11029 -
11030 -UNAME_MACHINE = ${UNAME_MACHINE}
11031 -UNAME_RELEASE = ${UNAME_RELEASE}
11032 -UNAME_SYSTEM = ${UNAME_SYSTEM}
11033 -UNAME_VERSION = ${UNAME_VERSION}
11034 -EOF
11035 -
11036 -exit 1
11037 -
11038 -# Local variables:
11039 -# eval: (add-hook 'write-file-hooks 'time-stamp)
11040 -# time-stamp-start: "timestamp='"
11041 -# time-stamp-format: "%:y-%02m-%02d"
11042 -# time-stamp-end: "'"
11043 -# End:
11044 diff -rupN original/config.rpath new/config.rpath
11045 --- original/config.rpath 2009-03-28 22:33:59.000000000 -0430
11046 +++ new/config.rpath 1969-12-31 20:00:00.000000000 -0400
11047 @@ -1,548 +0,0 @@
11048 -#! /bin/sh
11049 -# Output a system dependent set of variables, describing how to set the
11050 -# run time search path of shared libraries in an executable.
11051 -#
11052 -# Copyright 1996-2003 Free Software Foundation, Inc.
11053 -# Taken from GNU libtool, 2001
11054 -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
11055 -#
11056 -# This program is free software; you can redistribute it and/or modify
11057 -# it under the terms of the GNU General Public License as published by
11058 -# the Free Software Foundation; either version 2 of the License, or
11059 -# (at your option) any later version.
11060 -#
11061 -# This program is distributed in the hope that it will be useful, but
11062 -# WITHOUT ANY WARRANTY; without even the implied warranty of
11063 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11064 -# General Public License for more details.
11065 -#
11066 -# You should have received a copy of the GNU General Public License
11067 -# along with this program; if not, write to the Free Software
11068 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
11069 -#
11070 -# As a special exception to the GNU General Public License, if you
11071 -# distribute this file as part of a program that contains a
11072 -# configuration script generated by Autoconf, you may include it under
11073 -# the same distribution terms that you use for the rest of that program.
11074 -#
11075 -# The first argument passed to this file is the canonical host specification,
11076 -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
11077 -# or
11078 -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
11079 -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
11080 -# should be set by the caller.
11081 -#
11082 -# The set of defined variables is at the end of this script.
11083 -
11084 -# Known limitations:
11085 -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
11086 -# than 256 bytes, otherwise the compiler driver will dump core. The only
11087 -# known workaround is to choose shorter directory names for the build
11088 -# directory and/or the installation directory.
11089 -
11090 -# All known linkers require a `.a' archive for static linking (except M$VC,
11091 -# which needs '.lib').
11092 -libext=a
11093 -shrext=.so
11094 -
11095 -host="$1"
11096 -host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
11097 -host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
11098 -host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
11099 -
11100 -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
11101 -
11102 -wl=
11103 -if test "$GCC" = yes; then
11104 - wl='-Wl,'
11105 -else
11106 - case "$host_os" in
11107 - aix*)
11108 - wl='-Wl,'
11109 - ;;
11110 - mingw* | pw32* | os2*)
11111 - ;;
11112 - hpux9* | hpux10* | hpux11*)
11113 - wl='-Wl,'
11114 - ;;
11115 - irix5* | irix6* | nonstopux*)
11116 - wl='-Wl,'
11117 - ;;
11118 - newsos6)
11119 - ;;
11120 - linux*)
11121 - case $CC in
11122 - icc|ecc)
11123 - wl='-Wl,'
11124 - ;;
11125 - ccc)
11126 - wl='-Wl,'
11127 - ;;
11128 - esac
11129 - ;;
11130 - osf3* | osf4* | osf5*)
11131 - wl='-Wl,'
11132 - ;;
11133 - sco3.2v5*)
11134 - ;;
11135 - solaris*)
11136 - wl='-Wl,'
11137 - ;;
11138 - sunos4*)
11139 - wl='-Qoption ld '
11140 - ;;
11141 - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
11142 - wl='-Wl,'
11143 - ;;
11144 - sysv4*MP*)
11145 - ;;
11146 - uts4*)
11147 - ;;
11148 - esac
11149 -fi
11150 -
11151 -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
11152 -
11153 -hardcode_libdir_flag_spec=
11154 -hardcode_libdir_separator=
11155 -hardcode_direct=no
11156 -hardcode_minus_L=no
11157 -
11158 -case "$host_os" in
11159 - cygwin* | mingw* | pw32*)
11160 - # FIXME: the MSVC++ port hasn't been tested in a loooong time
11161 - # When not using gcc, we currently assume that we are using
11162 - # Microsoft Visual C++.
11163 - if test "$GCC" != yes; then
11164 - with_gnu_ld=no
11165 - fi
11166 - ;;
11167 - openbsd*)
11168 - with_gnu_ld=no
11169 - ;;
11170 -esac
11171 -
11172 -ld_shlibs=yes
11173 -if test "$with_gnu_ld" = yes; then
11174 - case "$host_os" in
11175 - aix3* | aix4* | aix5*)
11176 - # On AIX/PPC, the GNU linker is very broken
11177 - if test "$host_cpu" != ia64; then
11178 - ld_shlibs=no
11179 - fi
11180 - ;;
11181 - amigaos*)
11182 - hardcode_libdir_flag_spec='-L$libdir'
11183 - hardcode_minus_L=yes
11184 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
11185 - # that the semantics of dynamic libraries on AmigaOS, at least up
11186 - # to version 4, is to share data among multiple programs linked
11187 - # with the same dynamic library. Since this doesn't match the
11188 - # behavior of shared libraries on other platforms, we can use
11189 - # them.
11190 - ld_shlibs=no
11191 - ;;
11192 - beos*)
11193 - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
11194 - :
11195 - else
11196 - ld_shlibs=no
11197 - fi
11198 - ;;
11199 - cygwin* | mingw* | pw32*)
11200 - # hardcode_libdir_flag_spec is actually meaningless, as there is
11201 - # no search path for DLLs.
11202 - hardcode_libdir_flag_spec='-L$libdir'
11203 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
11204 - :
11205 - else
11206 - ld_shlibs=no
11207 - fi
11208 - ;;
11209 - netbsd*)
11210 - ;;
11211 - solaris* | sysv5*)
11212 - if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
11213 - ld_shlibs=no
11214 - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
11215 - :
11216 - else
11217 - ld_shlibs=no
11218 - fi
11219 - ;;
11220 - sunos4*)
11221 - hardcode_direct=yes
11222 - ;;
11223 - *)
11224 - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
11225 - :
11226 - else
11227 - ld_shlibs=no
11228 - fi
11229 - ;;
11230 - esac
11231 - if test "$ld_shlibs" = yes; then
11232 - # Unlike libtool, we use -rpath here, not --rpath, since the documented
11233 - # option of GNU ld is called -rpath, not --rpath.
11234 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11235 - fi
11236 -else
11237 - case "$host_os" in
11238 - aix3*)
11239 - # Note: this linker hardcodes the directories in LIBPATH if there
11240 - # are no directories specified by -L.
11241 - hardcode_minus_L=yes
11242 - if test "$GCC" = yes; then
11243 - # Neither direct hardcoding nor static linking is supported with a
11244 - # broken collect2.
11245 - hardcode_direct=unsupported
11246 - fi
11247 - ;;
11248 - aix4* | aix5*)
11249 - if test "$host_cpu" = ia64; then
11250 - # On IA64, the linker does run time linking by default, so we don't
11251 - # have to do anything special.
11252 - aix_use_runtimelinking=no
11253 - else
11254 - aix_use_runtimelinking=no
11255 - # Test if we are trying to use run time linking or normal
11256 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
11257 - # need to do runtime linking.
11258 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
11259 - for ld_flag in $LDFLAGS; do
11260 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
11261 - aix_use_runtimelinking=yes
11262 - break
11263 - fi
11264 - done
11265 - esac
11266 - fi
11267 - hardcode_direct=yes
11268 - hardcode_libdir_separator=':'
11269 - if test "$GCC" = yes; then
11270 - case $host_os in aix4.[012]|aix4.[012].*)
11271 - collect2name=`${CC} -print-prog-name=collect2`
11272 - if test -f "$collect2name" && \
11273 - strings "$collect2name" | grep resolve_lib_name >/dev/null
11274 - then
11275 - # We have reworked collect2
11276 - hardcode_direct=yes
11277 - else
11278 - # We have old collect2
11279 - hardcode_direct=unsupported
11280 - hardcode_minus_L=yes
11281 - hardcode_libdir_flag_spec='-L$libdir'
11282 - hardcode_libdir_separator=
11283 - fi
11284 - esac
11285 - fi
11286 - # Begin _LT_AC_SYS_LIBPATH_AIX.
11287 - echo 'int main () { return 0; }' > conftest.c
11288 - ${CC} ${LDFLAGS} conftest.c -o conftest
11289 - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
11290 -}'`
11291 - if test -z "$aix_libpath"; then
11292 - aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
11293 -}'`
11294 - fi
11295 - if test -z "$aix_libpath"; then
11296 - aix_libpath="/usr/lib:/lib"
11297 - fi
11298 - rm -f conftest.c conftest
11299 - # End _LT_AC_SYS_LIBPATH_AIX.
11300 - if test "$aix_use_runtimelinking" = yes; then
11301 - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11302 - else
11303 - if test "$host_cpu" = ia64; then
11304 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
11305 - else
11306 - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11307 - fi
11308 - fi
11309 - ;;
11310 - amigaos*)
11311 - hardcode_libdir_flag_spec='-L$libdir'
11312 - hardcode_minus_L=yes
11313 - # see comment about different semantics on the GNU ld section
11314 - ld_shlibs=no
11315 - ;;
11316 - bsdi4*)
11317 - ;;
11318 - cygwin* | mingw* | pw32*)
11319 - # When not using gcc, we currently assume that we are using
11320 - # Microsoft Visual C++.
11321 - # hardcode_libdir_flag_spec is actually meaningless, as there is
11322 - # no search path for DLLs.
11323 - hardcode_libdir_flag_spec=' '
11324 - libext=lib
11325 - ;;
11326 - darwin* | rhapsody*)
11327 - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
11328 - hardcode_direct=no
11329 - fi
11330 - ;;
11331 - dgux*)
11332 - hardcode_libdir_flag_spec='-L$libdir'
11333 - ;;
11334 - freebsd1*)
11335 - ld_shlibs=no
11336 - ;;
11337 - freebsd2.2*)
11338 - hardcode_libdir_flag_spec='-R$libdir'
11339 - hardcode_direct=yes
11340 - ;;
11341 - freebsd2*)
11342 - hardcode_direct=yes
11343 - hardcode_minus_L=yes
11344 - ;;
11345 - freebsd*)
11346 - hardcode_libdir_flag_spec='-R$libdir'
11347 - hardcode_direct=yes
11348 - ;;
11349 - hpux9*)
11350 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
11351 - hardcode_libdir_separator=:
11352 - hardcode_direct=yes
11353 - # hardcode_minus_L: Not really in the search PATH,
11354 - # but as the default location of the library.
11355 - hardcode_minus_L=yes
11356 - ;;
11357 - hpux10* | hpux11*)
11358 - if test "$with_gnu_ld" = no; then
11359 - case "$host_cpu" in
11360 - hppa*64*)
11361 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
11362 - hardcode_libdir_separator=:
11363 - hardcode_direct=no
11364 - ;;
11365 - ia64*)
11366 - hardcode_libdir_flag_spec='-L$libdir'
11367 - hardcode_direct=no
11368 - # hardcode_minus_L: Not really in the search PATH,
11369 - # but as the default location of the library.
11370 - hardcode_minus_L=yes
11371 - ;;
11372 - *)
11373 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
11374 - hardcode_libdir_separator=:
11375 - hardcode_direct=yes
11376 - # hardcode_minus_L: Not really in the search PATH,
11377 - # but as the default location of the library.
11378 - hardcode_minus_L=yes
11379 - ;;
11380 - esac
11381 - fi
11382 - ;;
11383 - irix5* | irix6* | nonstopux*)
11384 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11385 - hardcode_libdir_separator=:
11386 - ;;
11387 - netbsd*)
11388 - hardcode_libdir_flag_spec='-R$libdir'
11389 - hardcode_direct=yes
11390 - ;;
11391 - newsos6)
11392 - hardcode_direct=yes
11393 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11394 - hardcode_libdir_separator=:
11395 - ;;
11396 - openbsd*)
11397 - hardcode_direct=yes
11398 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
11399 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
11400 - else
11401 - case "$host_os" in
11402 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
11403 - hardcode_libdir_flag_spec='-R$libdir'
11404 - ;;
11405 - *)
11406 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
11407 - ;;
11408 - esac
11409 - fi
11410 - ;;
11411 - os2*)
11412 - hardcode_libdir_flag_spec='-L$libdir'
11413 - hardcode_minus_L=yes
11414 - ;;
11415 - osf3*)
11416 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11417 - hardcode_libdir_separator=:
11418 - ;;
11419 - osf4* | osf5*)
11420 - if test "$GCC" = yes; then
11421 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11422 - else
11423 - # Both cc and cxx compiler support -rpath directly
11424 - hardcode_libdir_flag_spec='-rpath $libdir'
11425 - fi
11426 - hardcode_libdir_separator=:
11427 - ;;
11428 - sco3.2v5*)
11429 - ;;
11430 - solaris*)
11431 - hardcode_libdir_flag_spec='-R$libdir'
11432 - ;;
11433 - sunos4*)
11434 - hardcode_libdir_flag_spec='-L$libdir'
11435 - hardcode_direct=yes
11436 - hardcode_minus_L=yes
11437 - ;;
11438 - sysv4)
11439 - case $host_vendor in
11440 - sni)
11441 - hardcode_direct=yes # is this really true???
11442 - ;;
11443 - siemens)
11444 - hardcode_direct=no
11445 - ;;
11446 - motorola)
11447 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
11448 - ;;
11449 - esac
11450 - ;;
11451 - sysv4.3*)
11452 - ;;
11453 - sysv4*MP*)
11454 - if test -d /usr/nec; then
11455 - ld_shlibs=yes
11456 - fi
11457 - ;;
11458 - sysv4.2uw2*)
11459 - hardcode_direct=yes
11460 - hardcode_minus_L=no
11461 - ;;
11462 - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
11463 - ;;
11464 - sysv5*)
11465 - hardcode_libdir_flag_spec=
11466 - ;;
11467 - uts4*)
11468 - hardcode_libdir_flag_spec='-L$libdir'
11469 - ;;
11470 - *)
11471 - ld_shlibs=no
11472 - ;;
11473 - esac
11474 -fi
11475 -
11476 -# Check dynamic linker characteristics
11477 -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
11478 -libname_spec='lib$name'
11479 -case "$host_os" in
11480 - aix3*)
11481 - ;;
11482 - aix4* | aix5*)
11483 - ;;
11484 - amigaos*)
11485 - ;;
11486 - beos*)
11487 - ;;
11488 - bsdi4*)
11489 - ;;
11490 - cygwin* | mingw* | pw32*)
11491 - shrext=.dll
11492 - ;;
11493 - darwin* | rhapsody*)
11494 - shrext=.dylib
11495 - ;;
11496 - dgux*)
11497 - ;;
11498 - freebsd1*)
11499 - ;;
11500 - freebsd*)
11501 - ;;
11502 - gnu*)
11503 - ;;
11504 - hpux9* | hpux10* | hpux11*)
11505 - case "$host_cpu" in
11506 - ia64*)
11507 - shrext=.so
11508 - ;;
11509 - hppa*64*)
11510 - shrext=.sl
11511 - ;;
11512 - *)
11513 - shrext=.sl
11514 - ;;
11515 - esac
11516 - ;;
11517 - irix5* | irix6* | nonstopux*)
11518 - case "$host_os" in
11519 - irix5* | nonstopux*)
11520 - libsuff= shlibsuff=
11521 - ;;
11522 - *)
11523 - case $LD in
11524 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
11525 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
11526 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
11527 - *) libsuff= shlibsuff= ;;
11528 - esac
11529 - ;;
11530 - esac
11531 - ;;
11532 - linux*oldld* | linux*aout* | linux*coff*)
11533 - ;;
11534 - linux*)
11535 - ;;
11536 - netbsd*)
11537 - ;;
11538 - newsos6)
11539 - ;;
11540 - nto-qnx)
11541 - ;;
11542 - openbsd*)
11543 - ;;
11544 - os2*)
11545 - libname_spec='$name'
11546 - shrext=.dll
11547 - ;;
11548 - osf3* | osf4* | osf5*)
11549 - ;;
11550 - sco3.2v5*)
11551 - ;;
11552 - solaris*)
11553 - ;;
11554 - sunos4*)
11555 - ;;
11556 - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
11557 - ;;
11558 - sysv4*MP*)
11559 - ;;
11560 - uts4*)
11561 - ;;
11562 -esac
11563 -
11564 -sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
11565 -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
11566 -shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
11567 -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
11568 -
11569 -sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
11570 -
11571 -# How to pass a linker flag through the compiler.
11572 -wl="$escaped_wl"
11573 -
11574 -# Static library suffix (normally "a").
11575 -libext="$libext"
11576 -
11577 -# Shared library suffix (normally "so").
11578 -shlibext="$shlibext"
11579 -
11580 -# Flag to hardcode \$libdir into a binary during linking.
11581 -# This must work even if \$libdir does not exist.
11582 -hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
11583 -
11584 -# Whether we need a single -rpath flag with a separated argument.
11585 -hardcode_libdir_separator="$hardcode_libdir_separator"
11586 -
11587 -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
11588 -# resulting binary.
11589 -hardcode_direct="$hardcode_direct"
11590 -
11591 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
11592 -# resulting binary.
11593 -hardcode_minus_L="$hardcode_minus_L"
11594 -
11595 -EOF
11596 diff -rupN original/config.sub new/config.sub
11597 --- original/config.sub 2008-07-07 19:11:25.000000000 -0430
11598 +++ new/config.sub 1969-12-31 20:00:00.000000000 -0400
11599 @@ -1,1658 +0,0 @@
11600 -#! /bin/sh
11601 -# Configuration validation subroutine script.
11602 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
11603 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
11604 -# Free Software Foundation, Inc.
11605 -
11606 -timestamp='2008-01-16'
11607 -
11608 -# This file is (in principle) common to ALL GNU software.
11609 -# The presence of a machine in this file suggests that SOME GNU software
11610 -# can handle that machine. It does not imply ALL GNU software can.
11611 -#
11612 -# This file is free software; you can redistribute it and/or modify
11613 -# it under the terms of the GNU General Public License as published by
11614 -# the Free Software Foundation; either version 2 of the License, or
11615 -# (at your option) any later version.
11616 -#
11617 -# This program is distributed in the hope that it will be useful,
11618 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
11619 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11620 -# GNU General Public License for more details.
11621 -#
11622 -# You should have received a copy of the GNU General Public License
11623 -# along with this program; if not, write to the Free Software
11624 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
11625 -# 02110-1301, USA.
11626 -#
11627 -# As a special exception to the GNU General Public License, if you
11628 -# distribute this file as part of a program that contains a
11629 -# configuration script generated by Autoconf, you may include it under
11630 -# the same distribution terms that you use for the rest of that program.
11631 -
11632 -
11633 -# Please send patches to <config-patches@gnu.org>. Submit a context
11634 -# diff and a properly formatted ChangeLog entry.
11635 -#
11636 -# Configuration subroutine to validate and canonicalize a configuration type.
11637 -# Supply the specified configuration type as an argument.
11638 -# If it is invalid, we print an error message on stderr and exit with code 1.
11639 -# Otherwise, we print the canonical config type on stdout and succeed.
11640 -
11641 -# This file is supposed to be the same for all GNU packages
11642 -# and recognize all the CPU types, system types and aliases
11643 -# that are meaningful with *any* GNU software.
11644 -# Each package is responsible for reporting which valid configurations
11645 -# it does not support. The user should be able to distinguish
11646 -# a failure to support a valid configuration from a meaningless
11647 -# configuration.
11648 -
11649 -# The goal of this file is to map all the various variations of a given
11650 -# machine specification into a single specification in the form:
11651 -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
11652 -# or in some cases, the newer four-part form:
11653 -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
11654 -# It is wrong to echo any other type of specification.
11655 -
11656 -me=`echo "$0" | sed -e 's,.*/,,'`
11657 -
11658 -usage="\
11659 -Usage: $0 [OPTION] CPU-MFR-OPSYS
11660 - $0 [OPTION] ALIAS
11661 -
11662 -Canonicalize a configuration name.
11663 -
11664 -Operation modes:
11665 - -h, --help print this help, then exit
11666 - -t, --time-stamp print date of last modification, then exit
11667 - -v, --version print version number, then exit
11668 -
11669 -Report bugs and patches to <config-patches@gnu.org>."
11670 -
11671 -version="\
11672 -GNU config.sub ($timestamp)
11673 -
11674 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
11675 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
11676 -
11677 -This is free software; see the source for copying conditions. There is NO
11678 -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
11679 -
11680 -help="
11681 -Try \`$me --help' for more information."
11682 -
11683 -# Parse command line
11684 -while test $# -gt 0 ; do
11685 - case $1 in
11686 - --time-stamp | --time* | -t )
11687 - echo "$timestamp" ; exit ;;
11688 - --version | -v )
11689 - echo "$version" ; exit ;;
11690 - --help | --h* | -h )
11691 - echo "$usage"; exit ;;
11692 - -- ) # Stop option processing
11693 - shift; break ;;
11694 - - ) # Use stdin as input.
11695 - break ;;
11696 - -* )
11697 - echo "$me: invalid option $1$help"
11698 - exit 1 ;;
11699 -
11700 - *local*)
11701 - # First pass through any local machine types.
11702 - echo $1
11703 - exit ;;
11704 -
11705 - * )
11706 - break ;;
11707 - esac
11708 -done
11709 -
11710 -case $# in
11711 - 0) echo "$me: missing argument$help" >&2
11712 - exit 1;;
11713 - 1) ;;
11714 - *) echo "$me: too many arguments$help" >&2
11715 - exit 1;;
11716 -esac
11717 -
11718 -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
11719 -# Here we must recognize all the valid KERNEL-OS combinations.
11720 -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
11721 -case $maybe_os in
11722 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
11723 - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
11724 - storm-chaos* | os2-emx* | rtmk-nova*)
11725 - os=-$maybe_os
11726 - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
11727 - ;;
11728 - *)
11729 - basic_machine=`echo $1 | sed 's/-[^-]*$//'`
11730 - if [ $basic_machine != $1 ]
11731 - then os=`echo $1 | sed 's/.*-/-/'`
11732 - else os=; fi
11733 - ;;
11734 -esac
11735 -
11736 -### Let's recognize common machines as not being operating systems so
11737 -### that things like config.sub decstation-3100 work. We also
11738 -### recognize some manufacturers as not being operating systems, so we
11739 -### can provide default operating systems below.
11740 -case $os in
11741 - -sun*os*)
11742 - # Prevent following clause from handling this invalid input.
11743 - ;;
11744 - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
11745 - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
11746 - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
11747 - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
11748 - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
11749 - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
11750 - -apple | -axis | -knuth | -cray)
11751 - os=
11752 - basic_machine=$1
11753 - ;;
11754 - -sim | -cisco | -oki | -wec | -winbond)
11755 - os=
11756 - basic_machine=$1
11757 - ;;
11758 - -scout)
11759 - ;;
11760 - -wrs)
11761 - os=-vxworks
11762 - basic_machine=$1
11763 - ;;
11764 - -chorusos*)
11765 - os=-chorusos
11766 - basic_machine=$1
11767 - ;;
11768 - -chorusrdb)
11769 - os=-chorusrdb
11770 - basic_machine=$1
11771 - ;;
11772 - -hiux*)
11773 - os=-hiuxwe2
11774 - ;;
11775 - -sco6)
11776 - os=-sco5v6
11777 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11778 - ;;
11779 - -sco5)
11780 - os=-sco3.2v5
11781 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11782 - ;;
11783 - -sco4)
11784 - os=-sco3.2v4
11785 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11786 - ;;
11787 - -sco3.2.[4-9]*)
11788 - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
11789 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11790 - ;;
11791 - -sco3.2v[4-9]*)
11792 - # Don't forget version if it is 3.2v4 or newer.
11793 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11794 - ;;
11795 - -sco5v6*)
11796 - # Don't forget version if it is 3.2v4 or newer.
11797 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11798 - ;;
11799 - -sco*)
11800 - os=-sco3.2v2
11801 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11802 - ;;
11803 - -udk*)
11804 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11805 - ;;
11806 - -isc)
11807 - os=-isc2.2
11808 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11809 - ;;
11810 - -clix*)
11811 - basic_machine=clipper-intergraph
11812 - ;;
11813 - -isc*)
11814 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
11815 - ;;
11816 - -lynx*)
11817 - os=-lynxos
11818 - ;;
11819 - -ptx*)
11820 - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
11821 - ;;
11822 - -windowsnt*)
11823 - os=`echo $os | sed -e 's/windowsnt/winnt/'`
11824 - ;;
11825 - -psos*)
11826 - os=-psos
11827 - ;;
11828 - -mint | -mint[0-9]*)
11829 - basic_machine=m68k-atari
11830 - os=-mint
11831 - ;;
11832 -esac
11833 -
11834 -# Decode aliases for certain CPU-COMPANY combinations.
11835 -case $basic_machine in
11836 - # Recognize the basic CPU types without company name.
11837 - # Some are omitted here because they have special meanings below.
11838 - 1750a | 580 \
11839 - | a29k \
11840 - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
11841 - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
11842 - | am33_2.0 \
11843 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
11844 - | bfin \
11845 - | c4x | clipper \
11846 - | d10v | d30v | dlx | dsp16xx \
11847 - | fido | fr30 | frv \
11848 - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
11849 - | i370 | i860 | i960 | ia64 \
11850 - | ip2k | iq2000 \
11851 - | m32c | m32r | m32rle | m68000 | m68k | m88k \
11852 - | maxq | mb | microblaze | mcore | mep \
11853 - | mips | mipsbe | mipseb | mipsel | mipsle \
11854 - | mips16 \
11855 - | mips64 | mips64el \
11856 - | mips64vr | mips64vrel \
11857 - | mips64orion | mips64orionel \
11858 - | mips64vr4100 | mips64vr4100el \
11859 - | mips64vr4300 | mips64vr4300el \
11860 - | mips64vr5000 | mips64vr5000el \
11861 - | mips64vr5900 | mips64vr5900el \
11862 - | mipsisa32 | mipsisa32el \
11863 - | mipsisa32r2 | mipsisa32r2el \
11864 - | mipsisa64 | mipsisa64el \
11865 - | mipsisa64r2 | mipsisa64r2el \
11866 - | mipsisa64sb1 | mipsisa64sb1el \
11867 - | mipsisa64sr71k | mipsisa64sr71kel \
11868 - | mipstx39 | mipstx39el \
11869 - | mn10200 | mn10300 \
11870 - | mt \
11871 - | msp430 \
11872 - | nios | nios2 \
11873 - | ns16k | ns32k \
11874 - | or32 \
11875 - | pdp10 | pdp11 | pj | pjl \
11876 - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
11877 - | pyramid \
11878 - | score \
11879 - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
11880 - | sh64 | sh64le \
11881 - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
11882 - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
11883 - | spu | strongarm \
11884 - | tahoe | thumb | tic4x | tic80 | tron \
11885 - | v850 | v850e \
11886 - | we32k \
11887 - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
11888 - | z8k)
11889 - basic_machine=$basic_machine-unknown
11890 - ;;
11891 - m6811 | m68hc11 | m6812 | m68hc12)
11892 - # Motorola 68HC11/12.
11893 - basic_machine=$basic_machine-unknown
11894 - os=-none
11895 - ;;
11896 - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
11897 - ;;
11898 - ms1)
11899 - basic_machine=mt-unknown
11900 - ;;
11901 -
11902 - # We use `pc' rather than `unknown'
11903 - # because (1) that's what they normally are, and
11904 - # (2) the word "unknown" tends to confuse beginning users.
11905 - i*86 | x86_64)
11906 - basic_machine=$basic_machine-pc
11907 - ;;
11908 - # Object if more than one company name word.
11909 - *-*-*)
11910 - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
11911 - exit 1
11912 - ;;
11913 - # Recognize the basic CPU types with company name.
11914 - 580-* \
11915 - | a29k-* \
11916 - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
11917 - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
11918 - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
11919 - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
11920 - | avr-* | avr32-* \
11921 - | bfin-* | bs2000-* \
11922 - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
11923 - | clipper-* | craynv-* | cydra-* \
11924 - | d10v-* | d30v-* | dlx-* \
11925 - | elxsi-* \
11926 - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
11927 - | h8300-* | h8500-* \
11928 - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
11929 - | i*86-* | i860-* | i960-* | ia64-* \
11930 - | ip2k-* | iq2000-* \
11931 - | m32c-* | m32r-* | m32rle-* \
11932 - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
11933 - | m88110-* | m88k-* | maxq-* | mcore-* \
11934 - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
11935 - | mips16-* \
11936 - | mips64-* | mips64el-* \
11937 - | mips64vr-* | mips64vrel-* \
11938 - | mips64orion-* | mips64orionel-* \
11939 - | mips64vr4100-* | mips64vr4100el-* \
11940 - | mips64vr4300-* | mips64vr4300el-* \
11941 - | mips64vr5000-* | mips64vr5000el-* \
11942 - | mips64vr5900-* | mips64vr5900el-* \
11943 - | mipsisa32-* | mipsisa32el-* \
11944 - | mipsisa32r2-* | mipsisa32r2el-* \
11945 - | mipsisa64-* | mipsisa64el-* \
11946 - | mipsisa64r2-* | mipsisa64r2el-* \
11947 - | mipsisa64sb1-* | mipsisa64sb1el-* \
11948 - | mipsisa64sr71k-* | mipsisa64sr71kel-* \
11949 - | mipstx39-* | mipstx39el-* \
11950 - | mmix-* \
11951 - | mt-* \
11952 - | msp430-* \
11953 - | nios-* | nios2-* \
11954 - | none-* | np1-* | ns16k-* | ns32k-* \
11955 - | orion-* \
11956 - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
11957 - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
11958 - | pyramid-* \
11959 - | romp-* | rs6000-* \
11960 - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
11961 - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
11962 - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
11963 - | sparclite-* \
11964 - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
11965 - | tahoe-* | thumb-* \
11966 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
11967 - | tron-* \
11968 - | v850-* | v850e-* | vax-* \
11969 - | we32k-* \
11970 - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
11971 - | xstormy16-* | xtensa*-* \
11972 - | ymp-* \
11973 - | z8k-*)
11974 - ;;
11975 - # Recognize the basic CPU types without company name, with glob match.
11976 - xtensa*)
11977 - basic_machine=$basic_machine-unknown
11978 - ;;
11979 - # Recognize the various machine names and aliases which stand
11980 - # for a CPU type and a company and sometimes even an OS.
11981 - 386bsd)
11982 - basic_machine=i386-unknown
11983 - os=-bsd
11984 - ;;
11985 - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
11986 - basic_machine=m68000-att
11987 - ;;
11988 - 3b*)
11989 - basic_machine=we32k-att
11990 - ;;
11991 - a29khif)
11992 - basic_machine=a29k-amd
11993 - os=-udi
11994 - ;;
11995 - abacus)
11996 - basic_machine=abacus-unknown
11997 - ;;
11998 - adobe68k)
11999 - basic_machine=m68010-adobe
12000 - os=-scout
12001 - ;;
12002 - alliant | fx80)
12003 - basic_machine=fx80-alliant
12004 - ;;
12005 - altos | altos3068)
12006 - basic_machine=m68k-altos
12007 - ;;
12008 - am29k)
12009 - basic_machine=a29k-none
12010 - os=-bsd
12011 - ;;
12012 - amd64)
12013 - basic_machine=x86_64-pc
12014 - ;;
12015 - amd64-*)
12016 - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
12017 - ;;
12018 - amdahl)
12019 - basic_machine=580-amdahl
12020 - os=-sysv
12021 - ;;
12022 - amiga | amiga-*)
12023 - basic_machine=m68k-unknown
12024 - ;;
12025 - amigaos | amigados)
12026 - basic_machine=m68k-unknown
12027 - os=-amigaos
12028 - ;;
12029 - amigaunix | amix)
12030 - basic_machine=m68k-unknown
12031 - os=-sysv4
12032 - ;;
12033 - apollo68)
12034 - basic_machine=m68k-apollo
12035 - os=-sysv
12036 - ;;
12037 - apollo68bsd)
12038 - basic_machine=m68k-apollo
12039 - os=-bsd
12040 - ;;
12041 - aux)
12042 - basic_machine=m68k-apple
12043 - os=-aux
12044 - ;;
12045 - balance)
12046 - basic_machine=ns32k-sequent
12047 - os=-dynix
12048 - ;;
12049 - blackfin)
12050 - basic_machine=bfin-unknown
12051 - os=-linux
12052 - ;;
12053 - blackfin-*)
12054 - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
12055 - os=-linux
12056 - ;;
12057 - c90)
12058 - basic_machine=c90-cray
12059 - os=-unicos
12060 - ;;
12061 - convex-c1)
12062 - basic_machine=c1-convex
12063 - os=-bsd
12064 - ;;
12065 - convex-c2)
12066 - basic_machine=c2-convex
12067 - os=-bsd
12068 - ;;
12069 - convex-c32)
12070 - basic_machine=c32-convex
12071 - os=-bsd
12072 - ;;
12073 - convex-c34)
12074 - basic_machine=c34-convex
12075 - os=-bsd
12076 - ;;
12077 - convex-c38)
12078 - basic_machine=c38-convex
12079 - os=-bsd
12080 - ;;
12081 - cray | j90)
12082 - basic_machine=j90-cray
12083 - os=-unicos
12084 - ;;
12085 - craynv)
12086 - basic_machine=craynv-cray
12087 - os=-unicosmp
12088 - ;;
12089 - cr16)
12090 - basic_machine=cr16-unknown
12091 - os=-elf
12092 - ;;
12093 - crds | unos)
12094 - basic_machine=m68k-crds
12095 - ;;
12096 - crisv32 | crisv32-* | etraxfs*)
12097 - basic_machine=crisv32-axis
12098 - ;;
12099 - cris | cris-* | etrax*)
12100 - basic_machine=cris-axis
12101 - ;;
12102 - crx)
12103 - basic_machine=crx-unknown
12104 - os=-elf
12105 - ;;
12106 - da30 | da30-*)
12107 - basic_machine=m68k-da30
12108 - ;;
12109 - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
12110 - basic_machine=mips-dec
12111 - ;;
12112 - decsystem10* | dec10*)
12113 - basic_machine=pdp10-dec
12114 - os=-tops10
12115 - ;;
12116 - decsystem20* | dec20*)
12117 - basic_machine=pdp10-dec
12118 - os=-tops20
12119 - ;;
12120 - delta | 3300 | motorola-3300 | motorola-delta \
12121 - | 3300-motorola | delta-motorola)
12122 - basic_machine=m68k-motorola
12123 - ;;
12124 - delta88)
12125 - basic_machine=m88k-motorola
12126 - os=-sysv3
12127 - ;;
12128 - djgpp)
12129 - basic_machine=i586-pc
12130 - os=-msdosdjgpp
12131 - ;;
12132 - dpx20 | dpx20-*)
12133 - basic_machine=rs6000-bull
12134 - os=-bosx
12135 - ;;
12136 - dpx2* | dpx2*-bull)
12137 - basic_machine=m68k-bull
12138 - os=-sysv3
12139 - ;;
12140 - ebmon29k)
12141 - basic_machine=a29k-amd
12142 - os=-ebmon
12143 - ;;
12144 - elxsi)
12145 - basic_machine=elxsi-elxsi
12146 - os=-bsd
12147 - ;;
12148 - encore | umax | mmax)
12149 - basic_machine=ns32k-encore
12150 - ;;
12151 - es1800 | OSE68k | ose68k | ose | OSE)
12152 - basic_machine=m68k-ericsson
12153 - os=-ose
12154 - ;;
12155 - fx2800)
12156 - basic_machine=i860-alliant
12157 - ;;
12158 - genix)
12159 - basic_machine=ns32k-ns
12160 - ;;
12161 - gmicro)
12162 - basic_machine=tron-gmicro
12163 - os=-sysv
12164 - ;;
12165 - go32)
12166 - basic_machine=i386-pc
12167 - os=-go32
12168 - ;;
12169 - h3050r* | hiux*)
12170 - basic_machine=hppa1.1-hitachi
12171 - os=-hiuxwe2
12172 - ;;
12173 - h8300hms)
12174 - basic_machine=h8300-hitachi
12175 - os=-hms
12176 - ;;
12177 - h8300xray)
12178 - basic_machine=h8300-hitachi
12179 - os=-xray
12180 - ;;
12181 - h8500hms)
12182 - basic_machine=h8500-hitachi
12183 - os=-hms
12184 - ;;
12185 - harris)
12186 - basic_machine=m88k-harris
12187 - os=-sysv3
12188 - ;;
12189 - hp300-*)
12190 - basic_machine=m68k-hp
12191 - ;;
12192 - hp300bsd)
12193 - basic_machine=m68k-hp
12194 - os=-bsd
12195 - ;;
12196 - hp300hpux)
12197 - basic_machine=m68k-hp
12198 - os=-hpux
12199 - ;;
12200 - hp3k9[0-9][0-9] | hp9[0-9][0-9])
12201 - basic_machine=hppa1.0-hp
12202 - ;;
12203 - hp9k2[0-9][0-9] | hp9k31[0-9])
12204 - basic_machine=m68000-hp
12205 - ;;
12206 - hp9k3[2-9][0-9])
12207 - basic_machine=m68k-hp
12208 - ;;
12209 - hp9k6[0-9][0-9] | hp6[0-9][0-9])
12210 - basic_machine=hppa1.0-hp
12211 - ;;
12212 - hp9k7[0-79][0-9] | hp7[0-79][0-9])
12213 - basic_machine=hppa1.1-hp
12214 - ;;
12215 - hp9k78[0-9] | hp78[0-9])
12216 - # FIXME: really hppa2.0-hp
12217 - basic_machine=hppa1.1-hp
12218 - ;;
12219 - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
12220 - # FIXME: really hppa2.0-hp
12221 - basic_machine=hppa1.1-hp
12222 - ;;
12223 - hp9k8[0-9][13679] | hp8[0-9][13679])
12224 - basic_machine=hppa1.1-hp
12225 - ;;
12226 - hp9k8[0-9][0-9] | hp8[0-9][0-9])
12227 - basic_machine=hppa1.0-hp
12228 - ;;
12229 - hppa-next)
12230 - os=-nextstep3
12231 - ;;
12232 - hppaosf)
12233 - basic_machine=hppa1.1-hp
12234 - os=-osf
12235 - ;;
12236 - hppro)
12237 - basic_machine=hppa1.1-hp
12238 - os=-proelf
12239 - ;;
12240 - i370-ibm* | ibm*)
12241 - basic_machine=i370-ibm
12242 - ;;
12243 -# I'm not sure what "Sysv32" means. Should this be sysv3.2?
12244 - i*86v32)
12245 - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
12246 - os=-sysv32
12247 - ;;
12248 - i*86v4*)
12249 - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
12250 - os=-sysv4
12251 - ;;
12252 - i*86v)
12253 - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
12254 - os=-sysv
12255 - ;;
12256 - i*86sol2)
12257 - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
12258 - os=-solaris2
12259 - ;;
12260 - i386mach)
12261 - basic_machine=i386-mach
12262 - os=-mach
12263 - ;;
12264 - i386-vsta | vsta)
12265 - basic_machine=i386-unknown
12266 - os=-vsta
12267 - ;;
12268 - iris | iris4d)
12269 - basic_machine=mips-sgi
12270 - case $os in
12271 - -irix*)
12272 - ;;
12273 - *)
12274 - os=-irix4
12275 - ;;
12276 - esac
12277 - ;;
12278 - isi68 | isi)
12279 - basic_machine=m68k-isi
12280 - os=-sysv
12281 - ;;
12282 - m68knommu)
12283 - basic_machine=m68k-unknown
12284 - os=-linux
12285 - ;;
12286 - m68knommu-*)
12287 - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
12288 - os=-linux
12289 - ;;
12290 - m88k-omron*)
12291 - basic_machine=m88k-omron
12292 - ;;
12293 - magnum | m3230)
12294 - basic_machine=mips-mips
12295 - os=-sysv
12296 - ;;
12297 - merlin)
12298 - basic_machine=ns32k-utek
12299 - os=-sysv
12300 - ;;
12301 - mingw32)
12302 - basic_machine=i386-pc
12303 - os=-mingw32
12304 - ;;
12305 - mingw32ce)
12306 - basic_machine=arm-unknown
12307 - os=-mingw32ce
12308 - ;;
12309 - miniframe)
12310 - basic_machine=m68000-convergent
12311 - ;;
12312 - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
12313 - basic_machine=m68k-atari
12314 - os=-mint
12315 - ;;
12316 - mips3*-*)
12317 - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
12318 - ;;
12319 - mips3*)
12320 - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
12321 - ;;
12322 - monitor)
12323 - basic_machine=m68k-rom68k
12324 - os=-coff
12325 - ;;
12326 - morphos)
12327 - basic_machine=powerpc-unknown
12328 - os=-morphos
12329 - ;;
12330 - msdos)
12331 - basic_machine=i386-pc
12332 - os=-msdos
12333 - ;;
12334 - ms1-*)
12335 - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
12336 - ;;
12337 - mvs)
12338 - basic_machine=i370-ibm
12339 - os=-mvs
12340 - ;;
12341 - ncr3000)
12342 - basic_machine=i486-ncr
12343 - os=-sysv4
12344 - ;;
12345 - netbsd386)
12346 - basic_machine=i386-unknown
12347 - os=-netbsd
12348 - ;;
12349 - netwinder)
12350 - basic_machine=armv4l-rebel
12351 - os=-linux
12352 - ;;
12353 - news | news700 | news800 | news900)
12354 - basic_machine=m68k-sony
12355 - os=-newsos
12356 - ;;
12357 - news1000)
12358 - basic_machine=m68030-sony
12359 - os=-newsos
12360 - ;;
12361 - news-3600 | risc-news)
12362 - basic_machine=mips-sony
12363 - os=-newsos
12364 - ;;
12365 - necv70)
12366 - basic_machine=v70-nec
12367 - os=-sysv
12368 - ;;
12369 - next | m*-next )
12370 - basic_machine=m68k-next
12371 - case $os in
12372 - -nextstep* )
12373 - ;;
12374 - -ns2*)
12375 - os=-nextstep2
12376 - ;;
12377 - *)
12378 - os=-nextstep3
12379 - ;;
12380 - esac
12381 - ;;
12382 - nh3000)
12383 - basic_machine=m68k-harris
12384 - os=-cxux
12385 - ;;
12386 - nh[45]000)
12387 - basic_machine=m88k-harris
12388 - os=-cxux
12389 - ;;
12390 - nindy960)
12391 - basic_machine=i960-intel
12392 - os=-nindy
12393 - ;;
12394 - mon960)
12395 - basic_machine=i960-intel
12396 - os=-mon960
12397 - ;;
12398 - nonstopux)
12399 - basic_machine=mips-compaq
12400 - os=-nonstopux
12401 - ;;
12402 - np1)
12403 - basic_machine=np1-gould
12404 - ;;
12405 - nsr-tandem)
12406 - basic_machine=nsr-tandem
12407 - ;;
12408 - op50n-* | op60c-*)
12409 - basic_machine=hppa1.1-oki
12410 - os=-proelf
12411 - ;;
12412 - openrisc | openrisc-*)
12413 - basic_machine=or32-unknown
12414 - ;;
12415 - os400)
12416 - basic_machine=powerpc-ibm
12417 - os=-os400
12418 - ;;
12419 - OSE68000 | ose68000)
12420 - basic_machine=m68000-ericsson
12421 - os=-ose
12422 - ;;
12423 - os68k)
12424 - basic_machine=m68k-none
12425 - os=-os68k
12426 - ;;
12427 - pa-hitachi)
12428 - basic_machine=hppa1.1-hitachi
12429 - os=-hiuxwe2
12430 - ;;
12431 - paragon)
12432 - basic_machine=i860-intel
12433 - os=-osf
12434 - ;;
12435 - parisc)
12436 - basic_machine=hppa-unknown
12437 - os=-linux
12438 - ;;
12439 - parisc-*)
12440 - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
12441 - os=-linux
12442 - ;;
12443 - pbd)
12444 - basic_machine=sparc-tti
12445 - ;;
12446 - pbb)
12447 - basic_machine=m68k-tti
12448 - ;;
12449 - pc532 | pc532-*)
12450 - basic_machine=ns32k-pc532
12451 - ;;
12452 - pc98)
12453 - basic_machine=i386-pc
12454 - ;;
12455 - pc98-*)
12456 - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
12457 - ;;
12458 - pentium | p5 | k5 | k6 | nexgen | viac3)
12459 - basic_machine=i586-pc
12460 - ;;
12461 - pentiumpro | p6 | 6x86 | athlon | athlon_*)
12462 - basic_machine=i686-pc
12463 - ;;
12464 - pentiumii | pentium2 | pentiumiii | pentium3)
12465 - basic_machine=i686-pc
12466 - ;;
12467 - pentium4)
12468 - basic_machine=i786-pc
12469 - ;;
12470 - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
12471 - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
12472 - ;;
12473 - pentiumpro-* | p6-* | 6x86-* | athlon-*)
12474 - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
12475 - ;;
12476 - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
12477 - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
12478 - ;;
12479 - pentium4-*)
12480 - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
12481 - ;;
12482 - pn)
12483 - basic_machine=pn-gould
12484 - ;;
12485 - power) basic_machine=power-ibm
12486 - ;;
12487 - ppc) basic_machine=powerpc-unknown
12488 - ;;
12489 - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
12490 - ;;
12491 - ppcle | powerpclittle | ppc-le | powerpc-little)
12492 - basic_machine=powerpcle-unknown
12493 - ;;
12494 - ppcle-* | powerpclittle-*)
12495 - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
12496 - ;;
12497 - ppc64) basic_machine=powerpc64-unknown
12498 - ;;
12499 - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
12500 - ;;
12501 - ppc64le | powerpc64little | ppc64-le | powerpc64-little)
12502 - basic_machine=powerpc64le-unknown
12503 - ;;
12504 - ppc64le-* | powerpc64little-*)
12505 - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
12506 - ;;
12507 - ps2)
12508 - basic_machine=i386-ibm
12509 - ;;
12510 - pw32)
12511 - basic_machine=i586-unknown
12512 - os=-pw32
12513 - ;;
12514 - rdos)
12515 - basic_machine=i386-pc
12516 - os=-rdos
12517 - ;;
12518 - rom68k)
12519 - basic_machine=m68k-rom68k
12520 - os=-coff
12521 - ;;
12522 - rm[46]00)
12523 - basic_machine=mips-siemens
12524 - ;;
12525 - rtpc | rtpc-*)
12526 - basic_machine=romp-ibm
12527 - ;;
12528 - s390 | s390-*)
12529 - basic_machine=s390-ibm
12530 - ;;
12531 - s390x | s390x-*)
12532 - basic_machine=s390x-ibm
12533 - ;;
12534 - sa29200)
12535 - basic_machine=a29k-amd
12536 - os=-udi
12537 - ;;
12538 - sb1)
12539 - basic_machine=mipsisa64sb1-unknown
12540 - ;;
12541 - sb1el)
12542 - basic_machine=mipsisa64sb1el-unknown
12543 - ;;
12544 - sde)
12545 - basic_machine=mipsisa32-sde
12546 - os=-elf
12547 - ;;
12548 - sei)
12549 - basic_machine=mips-sei
12550 - os=-seiux
12551 - ;;
12552 - sequent)
12553 - basic_machine=i386-sequent
12554 - ;;
12555 - sh)
12556 - basic_machine=sh-hitachi
12557 - os=-hms
12558 - ;;
12559 - sh5el)
12560 - basic_machine=sh5le-unknown
12561 - ;;
12562 - sh64)
12563 - basic_machine=sh64-unknown
12564 - ;;
12565 - sparclite-wrs | simso-wrs)
12566 - basic_machine=sparclite-wrs
12567 - os=-vxworks
12568 - ;;
12569 - sps7)
12570 - basic_machine=m68k-bull
12571 - os=-sysv2
12572 - ;;
12573 - spur)
12574 - basic_machine=spur-unknown
12575 - ;;
12576 - st2000)
12577 - basic_machine=m68k-tandem
12578 - ;;
12579 - stratus)
12580 - basic_machine=i860-stratus
12581 - os=-sysv4
12582 - ;;
12583 - sun2)
12584 - basic_machine=m68000-sun
12585 - ;;
12586 - sun2os3)
12587 - basic_machine=m68000-sun
12588 - os=-sunos3
12589 - ;;
12590 - sun2os4)
12591 - basic_machine=m68000-sun
12592 - os=-sunos4
12593 - ;;
12594 - sun3os3)
12595 - basic_machine=m68k-sun
12596 - os=-sunos3
12597 - ;;
12598 - sun3os4)
12599 - basic_machine=m68k-sun
12600 - os=-sunos4
12601 - ;;
12602 - sun4os3)
12603 - basic_machine=sparc-sun
12604 - os=-sunos3
12605 - ;;
12606 - sun4os4)
12607 - basic_machine=sparc-sun
12608 - os=-sunos4
12609 - ;;
12610 - sun4sol2)
12611 - basic_machine=sparc-sun
12612 - os=-solaris2
12613 - ;;
12614 - sun3 | sun3-*)
12615 - basic_machine=m68k-sun
12616 - ;;
12617 - sun4)
12618 - basic_machine=sparc-sun
12619 - ;;
12620 - sun386 | sun386i | roadrunner)
12621 - basic_machine=i386-sun
12622 - ;;
12623 - sv1)
12624 - basic_machine=sv1-cray
12625 - os=-unicos
12626 - ;;
12627 - symmetry)
12628 - basic_machine=i386-sequent
12629 - os=-dynix
12630 - ;;
12631 - t3e)
12632 - basic_machine=alphaev5-cray
12633 - os=-unicos
12634 - ;;
12635 - t90)
12636 - basic_machine=t90-cray
12637 - os=-unicos
12638 - ;;
12639 - tic54x | c54x*)
12640 - basic_machine=tic54x-unknown
12641 - os=-coff
12642 - ;;
12643 - tic55x | c55x*)
12644 - basic_machine=tic55x-unknown
12645 - os=-coff
12646 - ;;
12647 - tic6x | c6x*)
12648 - basic_machine=tic6x-unknown
12649 - os=-coff
12650 - ;;
12651 - tile*)
12652 - basic_machine=tile-unknown
12653 - os=-linux-gnu
12654 - ;;
12655 - tx39)
12656 - basic_machine=mipstx39-unknown
12657 - ;;
12658 - tx39el)
12659 - basic_machine=mipstx39el-unknown
12660 - ;;
12661 - toad1)
12662 - basic_machine=pdp10-xkl
12663 - os=-tops20
12664 - ;;
12665 - tower | tower-32)
12666 - basic_machine=m68k-ncr
12667 - ;;
12668 - tpf)
12669 - basic_machine=s390x-ibm
12670 - os=-tpf
12671 - ;;
12672 - udi29k)
12673 - basic_machine=a29k-amd
12674 - os=-udi
12675 - ;;
12676 - ultra3)
12677 - basic_machine=a29k-nyu
12678 - os=-sym1
12679 - ;;
12680 - v810 | necv810)
12681 - basic_machine=v810-nec
12682 - os=-none
12683 - ;;
12684 - vaxv)
12685 - basic_machine=vax-dec
12686 - os=-sysv
12687 - ;;
12688 - vms)
12689 - basic_machine=vax-dec
12690 - os=-vms
12691 - ;;
12692 - vpp*|vx|vx-*)
12693 - basic_machine=f301-fujitsu
12694 - ;;
12695 - vxworks960)
12696 - basic_machine=i960-wrs
12697 - os=-vxworks
12698 - ;;
12699 - vxworks68)
12700 - basic_machine=m68k-wrs
12701 - os=-vxworks
12702 - ;;
12703 - vxworks29k)
12704 - basic_machine=a29k-wrs
12705 - os=-vxworks
12706 - ;;
12707 - w65*)
12708 - basic_machine=w65-wdc
12709 - os=-none
12710 - ;;
12711 - w89k-*)
12712 - basic_machine=hppa1.1-winbond
12713 - os=-proelf
12714 - ;;
12715 - xbox)
12716 - basic_machine=i686-pc
12717 - os=-mingw32
12718 - ;;
12719 - xps | xps100)
12720 - basic_machine=xps100-honeywell
12721 - ;;
12722 - ymp)
12723 - basic_machine=ymp-cray
12724 - os=-unicos
12725 - ;;
12726 - z8k-*-coff)
12727 - basic_machine=z8k-unknown
12728 - os=-sim
12729 - ;;
12730 - none)
12731 - basic_machine=none-none
12732 - os=-none
12733 - ;;
12734 -
12735 -# Here we handle the default manufacturer of certain CPU types. It is in
12736 -# some cases the only manufacturer, in others, it is the most popular.
12737 - w89k)
12738 - basic_machine=hppa1.1-winbond
12739 - ;;
12740 - op50n)
12741 - basic_machine=hppa1.1-oki
12742 - ;;
12743 - op60c)
12744 - basic_machine=hppa1.1-oki
12745 - ;;
12746 - romp)
12747 - basic_machine=romp-ibm
12748 - ;;
12749 - mmix)
12750 - basic_machine=mmix-knuth
12751 - ;;
12752 - rs6000)
12753 - basic_machine=rs6000-ibm
12754 - ;;
12755 - vax)
12756 - basic_machine=vax-dec
12757 - ;;
12758 - pdp10)
12759 - # there are many clones, so DEC is not a safe bet
12760 - basic_machine=pdp10-unknown
12761 - ;;
12762 - pdp11)
12763 - basic_machine=pdp11-dec
12764 - ;;
12765 - we32k)
12766 - basic_machine=we32k-att
12767 - ;;
12768 - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
12769 - basic_machine=sh-unknown
12770 - ;;
12771 - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
12772 - basic_machine=sparc-sun
12773 - ;;
12774 - cydra)
12775 - basic_machine=cydra-cydrome
12776 - ;;
12777 - orion)
12778 - basic_machine=orion-highlevel
12779 - ;;
12780 - orion105)
12781 - basic_machine=clipper-highlevel
12782 - ;;
12783 - mac | mpw | mac-mpw)
12784 - basic_machine=m68k-apple
12785 - ;;
12786 - pmac | pmac-mpw)
12787 - basic_machine=powerpc-apple
12788 - ;;
12789 - *-unknown)
12790 - # Make sure to match an already-canonicalized machine name.
12791 - ;;
12792 - *)
12793 - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
12794 - exit 1
12795 - ;;
12796 -esac
12797 -
12798 -# Here we canonicalize certain aliases for manufacturers.
12799 -case $basic_machine in
12800 - *-digital*)
12801 - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
12802 - ;;
12803 - *-commodore*)
12804 - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
12805 - ;;
12806 - *)
12807 - ;;
12808 -esac
12809 -
12810 -# Decode manufacturer-specific aliases for certain operating systems.
12811 -
12812 -if [ x"$os" != x"" ]
12813 -then
12814 -case $os in
12815 - # First match some system type aliases
12816 - # that might get confused with valid system types.
12817 - # -solaris* is a basic system type, with this one exception.
12818 - -solaris1 | -solaris1.*)
12819 - os=`echo $os | sed -e 's|solaris1|sunos4|'`
12820 - ;;
12821 - -solaris)
12822 - os=-solaris2
12823 - ;;
12824 - -svr4*)
12825 - os=-sysv4
12826 - ;;
12827 - -unixware*)
12828 - os=-sysv4.2uw
12829 - ;;
12830 - -gnu/linux*)
12831 - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
12832 - ;;
12833 - # First accept the basic system types.
12834 - # The portable systems comes first.
12835 - # Each alternative MUST END IN A *, to match a version number.
12836 - # -sysv* is not here because it comes later, after sysvr4.
12837 - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
12838 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
12839 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
12840 - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
12841 - | -aos* \
12842 - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
12843 - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
12844 - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
12845 - | -openbsd* | -solidbsd* \
12846 - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
12847 - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
12848 - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
12849 - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
12850 - | -chorusos* | -chorusrdb* \
12851 - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
12852 - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
12853 - | -uxpv* | -beos* | -mpeix* | -udk* \
12854 - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
12855 - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
12856 - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
12857 - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
12858 - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
12859 - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
12860 - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
12861 - # Remember, each alternative MUST END IN *, to match a version number.
12862 - ;;
12863 - -qnx*)
12864 - case $basic_machine in
12865 - x86-* | i*86-*)
12866 - ;;
12867 - *)
12868 - os=-nto$os
12869 - ;;
12870 - esac
12871 - ;;
12872 - -nto-qnx*)
12873 - ;;
12874 - -nto*)
12875 - os=`echo $os | sed -e 's|nto|nto-qnx|'`
12876 - ;;
12877 - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
12878 - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
12879 - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
12880 - ;;
12881 - -mac*)
12882 - os=`echo $os | sed -e 's|mac|macos|'`
12883 - ;;
12884 - -linux-dietlibc)
12885 - os=-linux-dietlibc
12886 - ;;
12887 - -linux*)
12888 - os=`echo $os | sed -e 's|linux|linux-gnu|'`
12889 - ;;
12890 - -sunos5*)
12891 - os=`echo $os | sed -e 's|sunos5|solaris2|'`
12892 - ;;
12893 - -sunos6*)
12894 - os=`echo $os | sed -e 's|sunos6|solaris3|'`
12895 - ;;
12896 - -opened*)
12897 - os=-openedition
12898 - ;;
12899 - -os400*)
12900 - os=-os400
12901 - ;;
12902 - -wince*)
12903 - os=-wince
12904 - ;;
12905 - -osfrose*)
12906 - os=-osfrose
12907 - ;;
12908 - -osf*)
12909 - os=-osf
12910 - ;;
12911 - -utek*)
12912 - os=-bsd
12913 - ;;
12914 - -dynix*)
12915 - os=-bsd
12916 - ;;
12917 - -acis*)
12918 - os=-aos
12919 - ;;
12920 - -atheos*)
12921 - os=-atheos
12922 - ;;
12923 - -syllable*)
12924 - os=-syllable
12925 - ;;
12926 - -386bsd)
12927 - os=-bsd
12928 - ;;
12929 - -ctix* | -uts*)
12930 - os=-sysv
12931 - ;;
12932 - -nova*)
12933 - os=-rtmk-nova
12934 - ;;
12935 - -ns2 )
12936 - os=-nextstep2
12937 - ;;
12938 - -nsk*)
12939 - os=-nsk
12940 - ;;
12941 - # Preserve the version number of sinix5.
12942 - -sinix5.*)
12943 - os=`echo $os | sed -e 's|sinix|sysv|'`
12944 - ;;
12945 - -sinix*)
12946 - os=-sysv4
12947 - ;;
12948 - -tpf*)
12949 - os=-tpf
12950 - ;;
12951 - -triton*)
12952 - os=-sysv3
12953 - ;;
12954 - -oss*)
12955 - os=-sysv3
12956 - ;;
12957 - -svr4)
12958 - os=-sysv4
12959 - ;;
12960 - -svr3)
12961 - os=-sysv3
12962 - ;;
12963 - -sysvr4)
12964 - os=-sysv4
12965 - ;;
12966 - # This must come after -sysvr4.
12967 - -sysv*)
12968 - ;;
12969 - -ose*)
12970 - os=-ose
12971 - ;;
12972 - -es1800*)
12973 - os=-ose
12974 - ;;
12975 - -xenix)
12976 - os=-xenix
12977 - ;;
12978 - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
12979 - os=-mint
12980 - ;;
12981 - -aros*)
12982 - os=-aros
12983 - ;;
12984 - -kaos*)
12985 - os=-kaos
12986 - ;;
12987 - -zvmoe)
12988 - os=-zvmoe
12989 - ;;
12990 - -none)
12991 - ;;
12992 - *)
12993 - # Get rid of the `-' at the beginning of $os.
12994 - os=`echo $os | sed 's/[^-]*-//'`
12995 - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
12996 - exit 1
12997 - ;;
12998 -esac
12999 -else
13000 -
13001 -# Here we handle the default operating systems that come with various machines.
13002 -# The value should be what the vendor currently ships out the door with their
13003 -# machine or put another way, the most popular os provided with the machine.
13004 -
13005 -# Note that if you're going to try to match "-MANUFACTURER" here (say,
13006 -# "-sun"), then you have to tell the case statement up towards the top
13007 -# that MANUFACTURER isn't an operating system. Otherwise, code above
13008 -# will signal an error saying that MANUFACTURER isn't an operating
13009 -# system, and we'll never get to this point.
13010 -
13011 -case $basic_machine in
13012 - score-*)
13013 - os=-elf
13014 - ;;
13015 - spu-*)
13016 - os=-elf
13017 - ;;
13018 - *-acorn)
13019 - os=-riscix1.2
13020 - ;;
13021 - arm*-rebel)
13022 - os=-linux
13023 - ;;
13024 - arm*-semi)
13025 - os=-aout
13026 - ;;
13027 - c4x-* | tic4x-*)
13028 - os=-coff
13029 - ;;
13030 - # This must come before the *-dec entry.
13031 - pdp10-*)
13032 - os=-tops20
13033 - ;;
13034 - pdp11-*)
13035 - os=-none
13036 - ;;
13037 - *-dec | vax-*)
13038 - os=-ultrix4.2
13039 - ;;
13040 - m68*-apollo)
13041 - os=-domain
13042 - ;;
13043 - i386-sun)
13044 - os=-sunos4.0.2
13045 - ;;
13046 - m68000-sun)
13047 - os=-sunos3
13048 - # This also exists in the configure program, but was not the
13049 - # default.
13050 - # os=-sunos4
13051 - ;;
13052 - m68*-cisco)
13053 - os=-aout
13054 - ;;
13055 - mep-*)
13056 - os=-elf
13057 - ;;
13058 - mips*-cisco)
13059 - os=-elf
13060 - ;;
13061 - mips*-*)
13062 - os=-elf
13063 - ;;
13064 - or32-*)
13065 - os=-coff
13066 - ;;
13067 - *-tti) # must be before sparc entry or we get the wrong os.
13068 - os=-sysv3
13069 - ;;
13070 - sparc-* | *-sun)
13071 - os=-sunos4.1.1
13072 - ;;
13073 - *-be)
13074 - os=-beos
13075 - ;;
13076 - *-haiku)
13077 - os=-haiku
13078 - ;;
13079 - *-ibm)
13080 - os=-aix
13081 - ;;
13082 - *-knuth)
13083 - os=-mmixware
13084 - ;;
13085 - *-wec)
13086 - os=-proelf
13087 - ;;
13088 - *-winbond)
13089 - os=-proelf
13090 - ;;
13091 - *-oki)
13092 - os=-proelf
13093 - ;;
13094 - *-hp)
13095 - os=-hpux
13096 - ;;
13097 - *-hitachi)
13098 - os=-hiux
13099 - ;;
13100 - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
13101 - os=-sysv
13102 - ;;
13103 - *-cbm)
13104 - os=-amigaos
13105 - ;;
13106 - *-dg)
13107 - os=-dgux
13108 - ;;
13109 - *-dolphin)
13110 - os=-sysv3
13111 - ;;
13112 - m68k-ccur)
13113 - os=-rtu
13114 - ;;
13115 - m88k-omron*)
13116 - os=-luna
13117 - ;;
13118 - *-next )
13119 - os=-nextstep
13120 - ;;
13121 - *-sequent)
13122 - os=-ptx
13123 - ;;
13124 - *-crds)
13125 - os=-unos
13126 - ;;
13127 - *-ns)
13128 - os=-genix
13129 - ;;
13130 - i370-*)
13131 - os=-mvs
13132 - ;;
13133 - *-next)
13134 - os=-nextstep3
13135 - ;;
13136 - *-gould)
13137 - os=-sysv
13138 - ;;
13139 - *-highlevel)
13140 - os=-bsd
13141 - ;;
13142 - *-encore)
13143 - os=-bsd
13144 - ;;
13145 - *-sgi)
13146 - os=-irix
13147 - ;;
13148 - *-siemens)
13149 - os=-sysv4
13150 - ;;
13151 - *-masscomp)
13152 - os=-rtu
13153 - ;;
13154 - f30[01]-fujitsu | f700-fujitsu)
13155 - os=-uxpv
13156 - ;;
13157 - *-rom68k)
13158 - os=-coff
13159 - ;;
13160 - *-*bug)
13161 - os=-coff
13162 - ;;
13163 - *-apple)
13164 - os=-macos
13165 - ;;
13166 - *-atari*)
13167 - os=-mint
13168 - ;;
13169 - *)
13170 - os=-none
13171 - ;;
13172 -esac
13173 -fi
13174 -
13175 -# Here we handle the case where we know the os, and the CPU type, but not the
13176 -# manufacturer. We pick the logical manufacturer.
13177 -vendor=unknown
13178 -case $basic_machine in
13179 - *-unknown)
13180 - case $os in
13181 - -riscix*)
13182 - vendor=acorn
13183 - ;;
13184 - -sunos*)
13185 - vendor=sun
13186 - ;;
13187 - -aix*)
13188 - vendor=ibm
13189 - ;;
13190 - -beos*)
13191 - vendor=be
13192 - ;;
13193 - -hpux*)
13194 - vendor=hp
13195 - ;;
13196 - -mpeix*)
13197 - vendor=hp
13198 - ;;
13199 - -hiux*)
13200 - vendor=hitachi
13201 - ;;
13202 - -unos*)
13203 - vendor=crds
13204 - ;;
13205 - -dgux*)
13206 - vendor=dg
13207 - ;;
13208 - -luna*)
13209 - vendor=omron
13210 - ;;
13211 - -genix*)
13212 - vendor=ns
13213 - ;;
13214 - -mvs* | -opened*)
13215 - vendor=ibm
13216 - ;;
13217 - -os400*)
13218 - vendor=ibm
13219 - ;;
13220 - -ptx*)
13221 - vendor=sequent
13222 - ;;
13223 - -tpf*)
13224 - vendor=ibm
13225 - ;;
13226 - -vxsim* | -vxworks* | -windiss*)
13227 - vendor=wrs
13228 - ;;
13229 - -aux*)
13230 - vendor=apple
13231 - ;;
13232 - -hms*)
13233 - vendor=hitachi
13234 - ;;
13235 - -mpw* | -macos*)
13236 - vendor=apple
13237 - ;;
13238 - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
13239 - vendor=atari
13240 - ;;
13241 - -vos*)
13242 - vendor=stratus
13243 - ;;
13244 - esac
13245 - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
13246 - ;;
13247 -esac
13248 -
13249 -echo $basic_machine$os
13250 -exit
13251 -
13252 -# Local variables:
13253 -# eval: (add-hook 'write-file-hooks 'time-stamp)
13254 -# time-stamp-start: "timestamp='"
13255 -# time-stamp-format: "%:y-%02m-%02d"
13256 -# time-stamp-end: "'"
13257 -# End:
13258 diff -rupN original/configure new/configure
13259 --- original/configure 2009-03-29 01:17:39.000000000 -0430
13260 +++ new/configure 1969-12-31 20:00:00.000000000 -0400
13261 @@ -1,29304 +0,0 @@
13262 -#! /bin/sh
13263 -# Guess values for system-dependent variables and create Makefiles.
13264 -# Generated by GNU Autoconf 2.63.
13265 -#
13266 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
13267 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13268 -# This configure script is free software; the Free Software Foundation
13269 -# gives unlimited permission to copy, distribute and modify it.
13270 -## --------------------- ##
13271 -## M4sh Initialization. ##
13272 -## --------------------- ##
13273 -
13274 -# Be more Bourne compatible
13275 -DUALCASE=1; export DUALCASE # for MKS sh
13276 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
13277 - emulate sh
13278 - NULLCMD=:
13279 - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
13280 - # is contrary to our usage. Disable this feature.
13281 - alias -g '${1+"$@"}'='"$@"'
13282 - setopt NO_GLOB_SUBST
13283 -else
13284 - case `(set -o) 2>/dev/null` in
13285 - *posix*) set -o posix ;;
13286 -esac
13287 -
13288 -fi
13289 -
13290 -
13291 -
13292 -
13293 -# PATH needs CR
13294 -# Avoid depending upon Character Ranges.
13295 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
13296 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
13297 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
13298 -as_cr_digits='0123456789'
13299 -as_cr_alnum=$as_cr_Letters$as_cr_digits
13300 -
13301 -as_nl='
13302 -'
13303 -export as_nl
13304 -# Printing a long string crashes Solaris 7 /usr/bin/printf.
13305 -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
13306 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
13307 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
13308 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
13309 - as_echo='printf %s\n'
13310 - as_echo_n='printf %s'
13311 -else
13312 - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
13313 - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
13314 - as_echo_n='/usr/ucb/echo -n'
13315 - else
13316 - as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
13317 - as_echo_n_body='eval
13318 - arg=$1;
13319 - case $arg in
13320 - *"$as_nl"*)
13321 - expr "X$arg" : "X\\(.*\\)$as_nl";
13322 - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
13323 - esac;
13324 - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
13325 - '
13326 - export as_echo_n_body
13327 - as_echo_n='sh -c $as_echo_n_body as_echo'
13328 - fi
13329 - export as_echo_body
13330 - as_echo='sh -c $as_echo_body as_echo'
13331 -fi
13332 -
13333 -# The user is always right.
13334 -if test "${PATH_SEPARATOR+set}" != set; then
13335 - PATH_SEPARATOR=:
13336 - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
13337 - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
13338 - PATH_SEPARATOR=';'
13339 - }
13340 -fi
13341 -
13342 -# Support unset when possible.
13343 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
13344 - as_unset=unset
13345 -else
13346 - as_unset=false
13347 -fi
13348 -
13349 -
13350 -# IFS
13351 -# We need space, tab and new line, in precisely that order. Quoting is
13352 -# there to prevent editors from complaining about space-tab.
13353 -# (If _AS_PATH_WALK were called with IFS unset, it would disable word
13354 -# splitting by setting IFS to empty value.)
13355 -IFS=" "" $as_nl"
13356 -
13357 -# Find who we are. Look in the path if we contain no directory separator.
13358 -case $0 in
13359 - *[\\/]* ) as_myself=$0 ;;
13360 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13361 -for as_dir in $PATH
13362 -do
13363 - IFS=$as_save_IFS
13364 - test -z "$as_dir" && as_dir=.
13365 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
13366 -done
13367 -IFS=$as_save_IFS
13368 -
13369 - ;;
13370 -esac
13371 -# We did not find ourselves, most probably we were run as `sh COMMAND'
13372 -# in which case we are not to be found in the path.
13373 -if test "x$as_myself" = x; then
13374 - as_myself=$0
13375 -fi
13376 -if test ! -f "$as_myself"; then
13377 - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
13378 - { (exit 1); exit 1; }
13379 -fi
13380 -
13381 -# Work around bugs in pre-3.0 UWIN ksh.
13382 -for as_var in ENV MAIL MAILPATH
13383 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
13384 -done
13385 -PS1='$ '
13386 -PS2='> '
13387 -PS4='+ '
13388 -
13389 -# NLS nuisances.
13390 -LC_ALL=C
13391 -export LC_ALL
13392 -LANGUAGE=C
13393 -export LANGUAGE
13394 -
13395 -# Required to use basename.
13396 -if expr a : '\(a\)' >/dev/null 2>&1 &&
13397 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
13398 - as_expr=expr
13399 -else
13400 - as_expr=false
13401 -fi
13402 -
13403 -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
13404 - as_basename=basename
13405 -else
13406 - as_basename=false
13407 -fi
13408 -
13409 -
13410 -# Name of the executable.
13411 -as_me=`$as_basename -- "$0" ||
13412 -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
13413 - X"$0" : 'X\(//\)$' \| \
13414 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
13415 -$as_echo X/"$0" |
13416 - sed '/^.*\/\([^/][^/]*\)\/*$/{
13417 - s//\1/
13418 - q
13419 - }
13420 - /^X\/\(\/\/\)$/{
13421 - s//\1/
13422 - q
13423 - }
13424 - /^X\/\(\/\).*/{
13425 - s//\1/
13426 - q
13427 - }
13428 - s/.*/./; q'`
13429 -
13430 -# CDPATH.
13431 -$as_unset CDPATH
13432 -
13433 -
13434 -if test "x$CONFIG_SHELL" = x; then
13435 - if (eval ":") 2>/dev/null; then
13436 - as_have_required=yes
13437 -else
13438 - as_have_required=no
13439 -fi
13440 -
13441 - if test $as_have_required = yes && (eval ":
13442 -(as_func_return () {
13443 - (exit \$1)
13444 -}
13445 -as_func_success () {
13446 - as_func_return 0
13447 -}
13448 -as_func_failure () {
13449 - as_func_return 1
13450 -}
13451 -as_func_ret_success () {
13452 - return 0
13453 -}
13454 -as_func_ret_failure () {
13455 - return 1
13456 -}
13457 -
13458 -exitcode=0
13459 -if as_func_success; then
13460 - :
13461 -else
13462 - exitcode=1
13463 - echo as_func_success failed.
13464 -fi
13465 -
13466 -if as_func_failure; then
13467 - exitcode=1
13468 - echo as_func_failure succeeded.
13469 -fi
13470 -
13471 -if as_func_ret_success; then
13472 - :
13473 -else
13474 - exitcode=1
13475 - echo as_func_ret_success failed.
13476 -fi
13477 -
13478 -if as_func_ret_failure; then
13479 - exitcode=1
13480 - echo as_func_ret_failure succeeded.
13481 -fi
13482 -
13483 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
13484 - :
13485 -else
13486 - exitcode=1
13487 - echo positional parameters were not saved.
13488 -fi
13489 -
13490 -test \$exitcode = 0) || { (exit 1); exit 1; }
13491 -
13492 -(
13493 - as_lineno_1=\$LINENO
13494 - as_lineno_2=\$LINENO
13495 - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
13496 - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
13497 -") 2> /dev/null; then
13498 - :
13499 -else
13500 - as_candidate_shells=
13501 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13502 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
13503 -do
13504 - IFS=$as_save_IFS
13505 - test -z "$as_dir" && as_dir=.
13506 - case $as_dir in
13507 - /*)
13508 - for as_base in sh bash ksh sh5; do
13509 - as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
13510 - done;;
13511 - esac
13512 -done
13513 -IFS=$as_save_IFS
13514 -
13515 -
13516 - for as_shell in $as_candidate_shells $SHELL; do
13517 - # Try only shells that exist, to save several forks.
13518 - if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
13519 - { ("$as_shell") 2> /dev/null <<\_ASEOF
13520 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
13521 - emulate sh
13522 - NULLCMD=:
13523 - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
13524 - # is contrary to our usage. Disable this feature.
13525 - alias -g '${1+"$@"}'='"$@"'
13526 - setopt NO_GLOB_SUBST
13527 -else
13528 - case `(set -o) 2>/dev/null` in
13529 - *posix*) set -o posix ;;
13530 -esac
13531 -
13532 -fi
13533 -
13534 -
13535 -:
13536 -_ASEOF
13537 -}; then
13538 - CONFIG_SHELL=$as_shell
13539 - as_have_required=yes
13540 - if { "$as_shell" 2> /dev/null <<\_ASEOF
13541 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
13542 - emulate sh
13543 - NULLCMD=:
13544 - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
13545 - # is contrary to our usage. Disable this feature.
13546 - alias -g '${1+"$@"}'='"$@"'
13547 - setopt NO_GLOB_SUBST
13548 -else
13549 - case `(set -o) 2>/dev/null` in
13550 - *posix*) set -o posix ;;
13551 -esac
13552 -
13553 -fi
13554 -
13555 -
13556 -:
13557 -(as_func_return () {
13558 - (exit $1)
13559 -}
13560 -as_func_success () {
13561 - as_func_return 0
13562 -}
13563 -as_func_failure () {
13564 - as_func_return 1
13565 -}
13566 -as_func_ret_success () {
13567 - return 0
13568 -}
13569 -as_func_ret_failure () {
13570 - return 1
13571 -}
13572 -
13573 -exitcode=0
13574 -if as_func_success; then
13575 - :
13576 -else
13577 - exitcode=1
13578 - echo as_func_success failed.
13579 -fi
13580 -
13581 -if as_func_failure; then
13582 - exitcode=1
13583 - echo as_func_failure succeeded.
13584 -fi
13585 -
13586 -if as_func_ret_success; then
13587 - :
13588 -else
13589 - exitcode=1
13590 - echo as_func_ret_success failed.
13591 -fi
13592 -
13593 -if as_func_ret_failure; then
13594 - exitcode=1
13595 - echo as_func_ret_failure succeeded.
13596 -fi
13597 -
13598 -if ( set x; as_func_ret_success y && test x = "$1" ); then
13599 - :
13600 -else
13601 - exitcode=1
13602 - echo positional parameters were not saved.
13603 -fi
13604 -
13605 -test $exitcode = 0) || { (exit 1); exit 1; }
13606 -
13607 -(
13608 - as_lineno_1=$LINENO
13609 - as_lineno_2=$LINENO
13610 - test "x$as_lineno_1" != "x$as_lineno_2" &&
13611 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
13612 -
13613 -_ASEOF
13614 -}; then
13615 - break
13616 -fi
13617 -
13618 -fi
13619 -
13620 - done
13621 -
13622 - if test "x$CONFIG_SHELL" != x; then
13623 - for as_var in BASH_ENV ENV
13624 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
13625 - done
13626 - export CONFIG_SHELL
13627 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
13628 -fi
13629 -
13630 -
13631 - if test $as_have_required = no; then
13632 - echo This script requires a shell more modern than all the
13633 - echo shells that I found on your system. Please install a
13634 - echo modern shell, or manually run the script under such a
13635 - echo shell if you do have one.
13636 - { (exit 1); exit 1; }
13637 -fi
13638 -
13639 -
13640 -fi
13641 -
13642 -fi
13643 -
13644 -
13645 -
13646 -(eval "as_func_return () {
13647 - (exit \$1)
13648 -}
13649 -as_func_success () {
13650 - as_func_return 0
13651 -}
13652 -as_func_failure () {
13653 - as_func_return 1
13654 -}
13655 -as_func_ret_success () {
13656 - return 0
13657 -}
13658 -as_func_ret_failure () {
13659 - return 1
13660 -}
13661 -
13662 -exitcode=0
13663 -if as_func_success; then
13664 - :
13665 -else
13666 - exitcode=1
13667 - echo as_func_success failed.
13668 -fi
13669 -
13670 -if as_func_failure; then
13671 - exitcode=1
13672 - echo as_func_failure succeeded.
13673 -fi
13674 -
13675 -if as_func_ret_success; then
13676 - :
13677 -else
13678 - exitcode=1
13679 - echo as_func_ret_success failed.
13680 -fi
13681 -
13682 -if as_func_ret_failure; then
13683 - exitcode=1
13684 - echo as_func_ret_failure succeeded.
13685 -fi
13686 -
13687 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
13688 - :
13689 -else
13690 - exitcode=1
13691 - echo positional parameters were not saved.
13692 -fi
13693 -
13694 -test \$exitcode = 0") || {
13695 - echo No shell found that supports shell functions.
13696 - echo Please tell bug-autoconf@gnu.org about your system,
13697 - echo including any error possibly output before this message.
13698 - echo This can help us improve future autoconf versions.
13699 - echo Configuration will now proceed without shell functions.
13700 -}
13701 -
13702 -
13703 -
13704 - as_lineno_1=$LINENO
13705 - as_lineno_2=$LINENO
13706 - test "x$as_lineno_1" != "x$as_lineno_2" &&
13707 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
13708 -
13709 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
13710 - # uniformly replaced by the line number. The first 'sed' inserts a
13711 - # line-number line after each line using $LINENO; the second 'sed'
13712 - # does the real work. The second script uses 'N' to pair each
13713 - # line-number line with the line containing $LINENO, and appends
13714 - # trailing '-' during substitution so that $LINENO is not a special
13715 - # case at line end.
13716 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
13717 - # scripts with optimization help from Paolo Bonzini. Blame Lee
13718 - # E. McMahon (1931-1989) for sed's syntax. :-)
13719 - sed -n '
13720 - p
13721 - /[$]LINENO/=
13722 - ' <$as_myself |
13723 - sed '
13724 - s/[$]LINENO.*/&-/
13725 - t lineno
13726 - b
13727 - :lineno
13728 - N
13729 - :loop
13730 - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
13731 - t loop
13732 - s/-\n.*//
13733 - ' >$as_me.lineno &&
13734 - chmod +x "$as_me.lineno" ||
13735 - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
13736 - { (exit 1); exit 1; }; }
13737 -
13738 - # Don't try to exec as it changes $[0], causing all sort of problems
13739 - # (the dirname of $[0] is not the place where we might find the
13740 - # original and so on. Autoconf is especially sensitive to this).
13741 - . "./$as_me.lineno"
13742 - # Exit status is that of the last command.
13743 - exit
13744 -}
13745 -
13746 -
13747 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
13748 - as_dirname=dirname
13749 -else
13750 - as_dirname=false
13751 -fi
13752 -
13753 -ECHO_C= ECHO_N= ECHO_T=
13754 -case `echo -n x` in
13755 --n*)
13756 - case `echo 'x\c'` in
13757 - *c*) ECHO_T=' ';; # ECHO_T is single tab character.
13758 - *) ECHO_C='\c';;
13759 - esac;;
13760 -*)
13761 - ECHO_N='-n';;
13762 -esac
13763 -if expr a : '\(a\)' >/dev/null 2>&1 &&
13764 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
13765 - as_expr=expr
13766 -else
13767 - as_expr=false
13768 -fi
13769 -
13770 -rm -f conf$$ conf$$.exe conf$$.file
13771 -if test -d conf$$.dir; then
13772 - rm -f conf$$.dir/conf$$.file
13773 -else
13774 - rm -f conf$$.dir
13775 - mkdir conf$$.dir 2>/dev/null
13776 -fi
13777 -if (echo >conf$$.file) 2>/dev/null; then
13778 - if ln -s conf$$.file conf$$ 2>/dev/null; then
13779 - as_ln_s='ln -s'
13780 - # ... but there are two gotchas:
13781 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
13782 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
13783 - # In both cases, we have to default to `cp -p'.
13784 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
13785 - as_ln_s='cp -p'
13786 - elif ln conf$$.file conf$$ 2>/dev/null; then
13787 - as_ln_s=ln
13788 - else
13789 - as_ln_s='cp -p'
13790 - fi
13791 -else
13792 - as_ln_s='cp -p'
13793 -fi
13794 -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
13795 -rmdir conf$$.dir 2>/dev/null
13796 -
13797 -if mkdir -p . 2>/dev/null; then
13798 - as_mkdir_p=:
13799 -else
13800 - test -d ./-p && rmdir ./-p
13801 - as_mkdir_p=false
13802 -fi
13803 -
13804 -if test -x / >/dev/null 2>&1; then
13805 - as_test_x='test -x'
13806 -else
13807 - if ls -dL / >/dev/null 2>&1; then
13808 - as_ls_L_option=L
13809 - else
13810 - as_ls_L_option=
13811 - fi
13812 - as_test_x='
13813 - eval sh -c '\''
13814 - if test -d "$1"; then
13815 - test -d "$1/.";
13816 - else
13817 - case $1 in
13818 - -*)set "./$1";;
13819 - esac;
13820 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
13821 - ???[sx]*):;;*)false;;esac;fi
13822 - '\'' sh
13823 - '
13824 -fi
13825 -as_executable_p=$as_test_x
13826 -
13827 -# Sed expression to map a string onto a valid CPP name.
13828 -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
13829 -
13830 -# Sed expression to map a string onto a valid variable name.
13831 -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
13832 -
13833 -
13834 -
13835 -
13836 -# Check that we are running under the correct shell.
13837 -SHELL=${CONFIG_SHELL-/bin/sh}
13838 -
13839 -case X$ECHO in
13840 -X*--fallback-echo)
13841 - # Remove one level of quotation (which was required for Make).
13842 - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
13843 - ;;
13844 -esac
13845 -
13846 -echo=${ECHO-echo}
13847 -if test "X$1" = X--no-reexec; then
13848 - # Discard the --no-reexec flag, and continue.
13849 - shift
13850 -elif test "X$1" = X--fallback-echo; then
13851 - # Avoid inline document here, it may be left over
13852 - :
13853 -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
13854 - # Yippee, $echo works!
13855 - :
13856 -else
13857 - # Restart under the correct shell.
13858 - exec $SHELL "$0" --no-reexec ${1+"$@"}
13859 -fi
13860 -
13861 -if test "X$1" = X--fallback-echo; then
13862 - # used as fallback echo
13863 - shift
13864 - cat <<EOF
13865 -$*
13866 -EOF
13867 - exit 0
13868 -fi
13869 -
13870 -# The HP-UX ksh and POSIX shell print the target directory to stdout
13871 -# if CDPATH is set.
13872 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
13873 -
13874 -if test -z "$ECHO"; then
13875 -if test "X${echo_test_string+set}" != Xset; then
13876 -# find a string as large as possible, as long as the shell can cope with it
13877 - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
13878 - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
13879 - if (echo_test_string=`eval $cmd`) 2>/dev/null &&
13880 - echo_test_string=`eval $cmd` &&
13881 - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
13882 - then
13883 - break
13884 - fi
13885 - done
13886 -fi
13887 -
13888 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
13889 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
13890 - test "X$echo_testing_string" = "X$echo_test_string"; then
13891 - :
13892 -else
13893 - # The Solaris, AIX, and Digital Unix default echo programs unquote
13894 - # backslashes. This makes it impossible to quote backslashes using
13895 - # echo "$something" | sed 's/\\/\\\\/g'
13896 - #
13897 - # So, first we look for a working echo in the user's PATH.
13898 -
13899 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
13900 - for dir in $PATH /usr/ucb; do
13901 - IFS="$lt_save_ifs"
13902 - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
13903 - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
13904 - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
13905 - test "X$echo_testing_string" = "X$echo_test_string"; then
13906 - echo="$dir/echo"
13907 - break
13908 - fi
13909 - done
13910 - IFS="$lt_save_ifs"
13911 -
13912 - if test "X$echo" = Xecho; then
13913 - # We didn't find a better echo, so look for alternatives.
13914 - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
13915 - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
13916 - test "X$echo_testing_string" = "X$echo_test_string"; then
13917 - # This shell has a builtin print -r that does the trick.
13918 - echo='print -r'
13919 - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
13920 - test "X$CONFIG_SHELL" != X/bin/ksh; then
13921 - # If we have ksh, try running configure again with it.
13922 - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
13923 - export ORIGINAL_CONFIG_SHELL
13924 - CONFIG_SHELL=/bin/ksh
13925 - export CONFIG_SHELL
13926 - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
13927 - else
13928 - # Try using printf.
13929 - echo='printf %s\n'
13930 - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
13931 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
13932 - test "X$echo_testing_string" = "X$echo_test_string"; then
13933 - # Cool, printf works
13934 - :
13935 - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
13936 - test "X$echo_testing_string" = 'X\t' &&
13937 - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
13938 - test "X$echo_testing_string" = "X$echo_test_string"; then
13939 - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
13940 - export CONFIG_SHELL
13941 - SHELL="$CONFIG_SHELL"
13942 - export SHELL
13943 - echo="$CONFIG_SHELL $0 --fallback-echo"
13944 - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
13945 - test "X$echo_testing_string" = 'X\t' &&
13946 - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
13947 - test "X$echo_testing_string" = "X$echo_test_string"; then
13948 - echo="$CONFIG_SHELL $0 --fallback-echo"
13949 - else
13950 - # maybe with a smaller string...
13951 - prev=:
13952 -
13953 - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
13954 - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
13955 - then
13956 - break
13957 - fi
13958 - prev="$cmd"
13959 - done
13960 -
13961 - if test "$prev" != 'sed 50q "$0"'; then
13962 - echo_test_string=`eval $prev`
13963 - export echo_test_string
13964 - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
13965 - else
13966 - # Oops. We lost completely, so just stick with echo.
13967 - echo=echo
13968 - fi
13969 - fi
13970 - fi
13971 - fi
13972 -fi
13973 -fi
13974 -
13975 -# Copy echo and quote the copy suitably for passing to libtool from
13976 -# the Makefile, instead of quoting the original, which is used later.
13977 -ECHO=$echo
13978 -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
13979 - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
13980 -fi
13981 -
13982 -
13983 -
13984 -
13985 -tagnames=${tagnames+${tagnames},}CXX
13986 -
13987 -tagnames=${tagnames+${tagnames},}F77
13988 -
13989 -exec 7<&0 </dev/null 6>&1
13990 -
13991 -# Name of the host.
13992 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
13993 -# so uname gets run too.
13994 -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
13995 -
13996 -#
13997 -# Initializations.
13998 -#
13999 -ac_default_prefix=/usr/local
14000 -ac_clean_files=
14001 -ac_config_libobj_dir=.
14002 -LIBOBJS=
14003 -cross_compiling=no
14004 -subdirs=
14005 -MFLAGS=
14006 -MAKEFLAGS=
14007 -SHELL=${CONFIG_SHELL-/bin/sh}
14008 -
14009 -# Identity of this package.
14010 -PACKAGE_NAME=
14011 -PACKAGE_TARNAME=
14012 -PACKAGE_VERSION=
14013 -PACKAGE_STRING=
14014 -PACKAGE_BUGREPORT=
14015 -
14016 -ac_unique_file="libpcsxcore/psxhw.c"
14017 -# Factoring default headers for most tests.
14018 -ac_includes_default="\
14019 -#include <stdio.h>
14020 -#ifdef HAVE_SYS_TYPES_H
14021 -# include <sys/types.h>
14022 -#endif
14023 -#ifdef HAVE_SYS_STAT_H
14024 -# include <sys/stat.h>
14025 -#endif
14026 -#ifdef STDC_HEADERS
14027 -# include <stdlib.h>
14028 -# include <stddef.h>
14029 -#else
14030 -# ifdef HAVE_STDLIB_H
14031 -# include <stdlib.h>
14032 -# endif
14033 -#endif
14034 -#ifdef HAVE_STRING_H
14035 -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
14036 -# include <memory.h>
14037 -# endif
14038 -# include <string.h>
14039 -#endif
14040 -#ifdef HAVE_STRINGS_H
14041 -# include <strings.h>
14042 -#endif
14043 -#ifdef HAVE_INTTYPES_H
14044 -# include <inttypes.h>
14045 -#endif
14046 -#ifdef HAVE_STDINT_H
14047 -# include <stdint.h>
14048 -#endif
14049 -#ifdef HAVE_UNISTD_H
14050 -# include <unistd.h>
14051 -#endif"
14052 -
14053 -ac_subst_vars='LTLIBOBJS
14054 -LIBOBJS
14055 -NASM
14056 -ARCH_PPC_FALSE
14057 -ARCH_PPC_TRUE
14058 -ARCH_X86_64_FALSE
14059 -ARCH_X86_64_TRUE
14060 -ARCH_X86_FALSE
14061 -ARCH_X86_TRUE
14062 -DFBINIMAGE
14063 -FLTK_LDFLAGS
14064 -FLTK_CXXFLAGS
14065 -FLTKCONFIG
14066 -ALSA_LIBS
14067 -HAVE_ALSA_FALSE
14068 -HAVE_ALSA_TRUE
14069 -BURN_LIBS
14070 -BURN_CFLAGS
14071 -ENABLE_NAUTILUSBURN_FALSE
14072 -ENABLE_NAUTILUSBURN_TRUE
14073 -GIO2_LIBS
14074 -GIO2_CFLAGS
14075 -GLADE2_LIBS
14076 -GLADE2_CFLAGS
14077 -GTK2_LIBS
14078 -GTK2_CFLAGS
14079 -GLIB2_LIBS
14080 -GLIB2_CFLAGS
14081 -PKG_CONFIG
14082 -ALL_LINGUAS
14083 -INTLTOOL_PERL
14084 -INTLTOOL_POLICY_RULE
14085 -INTLTOOL_SERVICE_RULE
14086 -INTLTOOL_THEME_RULE
14087 -INTLTOOL_SCHEMAS_RULE
14088 -INTLTOOL_CAVES_RULE
14089 -INTLTOOL_XML_NOMERGE_RULE
14090 -INTLTOOL_XML_RULE
14091 -INTLTOOL_KBD_RULE
14092 -INTLTOOL_XAM_RULE
14093 -INTLTOOL_UI_RULE
14094 -INTLTOOL_SOUNDLIST_RULE
14095 -INTLTOOL_SHEET_RULE
14096 -INTLTOOL_SERVER_RULE
14097 -INTLTOOL_PONG_RULE
14098 -INTLTOOL_OAF_RULE
14099 -INTLTOOL_PROP_RULE
14100 -INTLTOOL_KEYS_RULE
14101 -INTLTOOL_DIRECTORY_RULE
14102 -INTLTOOL_DESKTOP_RULE
14103 -INTLTOOL_EXTRACT
14104 -INTLTOOL_MERGE
14105 -INTLTOOL_UPDATE
14106 -POSUB
14107 -LTLIBINTL
14108 -LIBINTL
14109 -INTLLIBS
14110 -INTL_LIBTOOL_SUFFIX_PREFIX
14111 -INTLOBJS
14112 -GENCAT
14113 -INSTOBJEXT
14114 -DATADIRNAME
14115 -CATOBJEXT
14116 -USE_INCLUDED_LIBINTL
14117 -BUILD_INCLUDED_LIBINTL
14118 -INTLBISON
14119 -LTLIBICONV
14120 -LIBICONV
14121 -GLIBC21
14122 -ALLOCA
14123 -MSGMERGE
14124 -XGETTEXT
14125 -GMSGFMT
14126 -MSGFMT
14127 -USE_NLS
14128 -MKINSTALLDIRS
14129 -GETTEXT_PACKAGE
14130 -am__fastdepCCAS_FALSE
14131 -am__fastdepCCAS_TRUE
14132 -CCASDEPMODE
14133 -CCASFLAGS
14134 -CCAS
14135 -LIBTOOL
14136 -ac_ct_F77
14137 -FFLAGS
14138 -F77
14139 -CXXCPP
14140 -CPP
14141 -NMEDIT
14142 -DSYMUTIL
14143 -RANLIB
14144 -AR
14145 -ECHO
14146 -LN_S
14147 -EGREP
14148 -GREP
14149 -SED
14150 -am__fastdepCXX_FALSE
14151 -am__fastdepCXX_TRUE
14152 -CXXDEPMODE
14153 -ac_ct_CXX
14154 -CXXFLAGS
14155 -CXX
14156 -am__fastdepCC_FALSE
14157 -am__fastdepCC_TRUE
14158 -CCDEPMODE
14159 -AMDEPBACKSLASH
14160 -AMDEP_FALSE
14161 -AMDEP_TRUE
14162 -am__quote
14163 -am__include
14164 -DEPDIR
14165 -OBJEXT
14166 -EXEEXT
14167 -ac_ct_CC
14168 -CPPFLAGS
14169 -LDFLAGS
14170 -CFLAGS
14171 -CC
14172 -MAINT
14173 -MAINTAINER_MODE_FALSE
14174 -MAINTAINER_MODE_TRUE
14175 -am__untar
14176 -am__tar
14177 -AMTAR
14178 -am__leading_dot
14179 -SET_MAKE
14180 -AWK
14181 -mkdir_p
14182 -MKDIR_P
14183 -INSTALL_STRIP_PROGRAM
14184 -STRIP
14185 -install_sh
14186 -MAKEINFO
14187 -AUTOHEADER
14188 -AUTOMAKE
14189 -AUTOCONF
14190 -ACLOCAL
14191 -VERSION
14192 -PACKAGE
14193 -CYGPATH_W
14194 -am__isrc
14195 -INSTALL_DATA
14196 -INSTALL_SCRIPT
14197 -INSTALL_PROGRAM
14198 -target_os
14199 -target_vendor
14200 -target_cpu
14201 -target
14202 -host_os
14203 -host_vendor
14204 -host_cpu
14205 -host
14206 -build_os
14207 -build_vendor
14208 -build_cpu
14209 -build
14210 -target_alias
14211 -host_alias
14212 -build_alias
14213 -LIBS
14214 -ECHO_T
14215 -ECHO_N
14216 -ECHO_C
14217 -DEFS
14218 -mandir
14219 -localedir
14220 -libdir
14221 -psdir
14222 -pdfdir
14223 -dvidir
14224 -htmldir
14225 -infodir
14226 -docdir
14227 -oldincludedir
14228 -includedir
14229 -localstatedir
14230 -sharedstatedir
14231 -sysconfdir
14232 -datadir
14233 -datarootdir
14234 -libexecdir
14235 -sbindir
14236 -bindir
14237 -program_transform_name
14238 -prefix
14239 -exec_prefix
14240 -PACKAGE_BUGREPORT
14241 -PACKAGE_STRING
14242 -PACKAGE_VERSION
14243 -PACKAGE_TARNAME
14244 -PACKAGE_NAME
14245 -PATH_SEPARATOR
14246 -SHELL'
14247 -ac_subst_files=''
14248 -ac_user_opts='
14249 -enable_option_checking
14250 -enable_maintainer_mode
14251 -enable_dependency_tracking
14252 -enable_shared
14253 -enable_static
14254 -enable_fast_install
14255 -with_gnu_ld
14256 -enable_libtool_lock
14257 -with_pic
14258 -with_tags
14259 -enable_nls
14260 -enable_rpath
14261 -with_libiconv_prefix
14262 -with_included_gettext
14263 -with_libintl_prefix
14264 -enable_nautilusburn
14265 -enable_alsa
14266 -enable_dfbinimage
14267 -enable_dynarec
14268 -'
14269 - ac_precious_vars='build_alias
14270 -host_alias
14271 -target_alias
14272 -CC
14273 -CFLAGS
14274 -LDFLAGS
14275 -LIBS
14276 -CPPFLAGS
14277 -CXX
14278 -CXXFLAGS
14279 -CCC
14280 -CPP
14281 -CXXCPP
14282 -F77
14283 -FFLAGS
14284 -CCAS
14285 -CCASFLAGS
14286 -PKG_CONFIG
14287 -GLIB2_CFLAGS
14288 -GLIB2_LIBS
14289 -GTK2_CFLAGS
14290 -GTK2_LIBS
14291 -GLADE2_CFLAGS
14292 -GLADE2_LIBS
14293 -GIO2_CFLAGS
14294 -GIO2_LIBS
14295 -BURN_CFLAGS
14296 -BURN_LIBS'
14297 -
14298 -
14299 -# Initialize some variables set by options.
14300 -ac_init_help=
14301 -ac_init_version=false
14302 -ac_unrecognized_opts=
14303 -ac_unrecognized_sep=
14304 -# The variables have the same names as the options, with
14305 -# dashes changed to underlines.
14306 -cache_file=/dev/null
14307 -exec_prefix=NONE
14308 -no_create=
14309 -no_recursion=
14310 -prefix=NONE
14311 -program_prefix=NONE
14312 -program_suffix=NONE
14313 -program_transform_name=s,x,x,
14314 -silent=
14315 -site=
14316 -srcdir=
14317 -verbose=
14318 -x_includes=NONE
14319 -x_libraries=NONE
14320 -
14321 -# Installation directory options.
14322 -# These are left unexpanded so users can "make install exec_prefix=/foo"
14323 -# and all the variables that are supposed to be based on exec_prefix
14324 -# by default will actually change.
14325 -# Use braces instead of parens because sh, perl, etc. also accept them.
14326 -# (The list follows the same order as the GNU Coding Standards.)
14327 -bindir='${exec_prefix}/bin'
14328 -sbindir='${exec_prefix}/sbin'
14329 -libexecdir='${exec_prefix}/libexec'
14330 -datarootdir='${prefix}/share'
14331 -datadir='${datarootdir}'
14332 -sysconfdir='${prefix}/etc'
14333 -sharedstatedir='${prefix}/com'
14334 -localstatedir='${prefix}/var'
14335 -includedir='${prefix}/include'
14336 -oldincludedir='/usr/include'
14337 -docdir='${datarootdir}/doc/${PACKAGE}'
14338 -infodir='${datarootdir}/info'
14339 -htmldir='${docdir}'
14340 -dvidir='${docdir}'
14341 -pdfdir='${docdir}'
14342 -psdir='${docdir}'
14343 -libdir='${exec_prefix}/lib'
14344 -localedir='${datarootdir}/locale'
14345 -mandir='${datarootdir}/man'
14346 -
14347 -ac_prev=
14348 -ac_dashdash=
14349 -for ac_option
14350 -do
14351 - # If the previous option needs an argument, assign it.
14352 - if test -n "$ac_prev"; then
14353 - eval $ac_prev=\$ac_option
14354 - ac_prev=
14355 - continue
14356 - fi
14357 -
14358 - case $ac_option in
14359 - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
14360 - *) ac_optarg=yes ;;
14361 - esac
14362 -
14363 - # Accept the important Cygnus configure options, so we can diagnose typos.
14364 -
14365 - case $ac_dashdash$ac_option in
14366 - --)
14367 - ac_dashdash=yes ;;
14368 -
14369 - -bindir | --bindir | --bindi | --bind | --bin | --bi)
14370 - ac_prev=bindir ;;
14371 - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
14372 - bindir=$ac_optarg ;;
14373 -
14374 - -build | --build | --buil | --bui | --bu)
14375 - ac_prev=build_alias ;;
14376 - -build=* | --build=* | --buil=* | --bui=* | --bu=*)
14377 - build_alias=$ac_optarg ;;
14378 -
14379 - -cache-file | --cache-file | --cache-fil | --cache-fi \
14380 - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
14381 - ac_prev=cache_file ;;
14382 - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
14383 - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
14384 - cache_file=$ac_optarg ;;
14385 -
14386 - --config-cache | -C)
14387 - cache_file=config.cache ;;
14388 -
14389 - -datadir | --datadir | --datadi | --datad)
14390 - ac_prev=datadir ;;
14391 - -datadir=* | --datadir=* | --datadi=* | --datad=*)
14392 - datadir=$ac_optarg ;;
14393 -
14394 - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
14395 - | --dataroo | --dataro | --datar)
14396 - ac_prev=datarootdir ;;
14397 - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
14398 - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
14399 - datarootdir=$ac_optarg ;;
14400 -
14401 - -disable-* | --disable-*)
14402 - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
14403 - # Reject names that are not valid shell variable names.
14404 - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
14405 - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
14406 - { (exit 1); exit 1; }; }
14407 - ac_useropt_orig=$ac_useropt
14408 - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
14409 - case $ac_user_opts in
14410 - *"
14411 -"enable_$ac_useropt"
14412 -"*) ;;
14413 - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
14414 - ac_unrecognized_sep=', ';;
14415 - esac
14416 - eval enable_$ac_useropt=no ;;
14417 -
14418 - -docdir | --docdir | --docdi | --doc | --do)
14419 - ac_prev=docdir ;;
14420 - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
14421 - docdir=$ac_optarg ;;
14422 -
14423 - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
14424 - ac_prev=dvidir ;;
14425 - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
14426 - dvidir=$ac_optarg ;;
14427 -
14428 - -enable-* | --enable-*)
14429 - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
14430 - # Reject names that are not valid shell variable names.
14431 - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
14432 - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
14433 - { (exit 1); exit 1; }; }
14434 - ac_useropt_orig=$ac_useropt
14435 - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
14436 - case $ac_user_opts in
14437 - *"
14438 -"enable_$ac_useropt"
14439 -"*) ;;
14440 - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
14441 - ac_unrecognized_sep=', ';;
14442 - esac
14443 - eval enable_$ac_useropt=\$ac_optarg ;;
14444 -
14445 - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
14446 - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
14447 - | --exec | --exe | --ex)
14448 - ac_prev=exec_prefix ;;
14449 - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
14450 - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
14451 - | --exec=* | --exe=* | --ex=*)
14452 - exec_prefix=$ac_optarg ;;
14453 -
14454 - -gas | --gas | --ga | --g)
14455 - # Obsolete; use --with-gas.
14456 - with_gas=yes ;;
14457 -
14458 - -help | --help | --hel | --he | -h)
14459 - ac_init_help=long ;;
14460 - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
14461 - ac_init_help=recursive ;;
14462 - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
14463 - ac_init_help=short ;;
14464 -
14465 - -host | --host | --hos | --ho)
14466 - ac_prev=host_alias ;;
14467 - -host=* | --host=* | --hos=* | --ho=*)
14468 - host_alias=$ac_optarg ;;
14469 -
14470 - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
14471 - ac_prev=htmldir ;;
14472 - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
14473 - | --ht=*)
14474 - htmldir=$ac_optarg ;;
14475 -
14476 - -includedir | --includedir | --includedi | --included | --include \
14477 - | --includ | --inclu | --incl | --inc)
14478 - ac_prev=includedir ;;
14479 - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
14480 - | --includ=* | --inclu=* | --incl=* | --inc=*)
14481 - includedir=$ac_optarg ;;
14482 -
14483 - -infodir | --infodir | --infodi | --infod | --info | --inf)
14484 - ac_prev=infodir ;;
14485 - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
14486 - infodir=$ac_optarg ;;
14487 -
14488 - -libdir | --libdir | --libdi | --libd)
14489 - ac_prev=libdir ;;
14490 - -libdir=* | --libdir=* | --libdi=* | --libd=*)
14491 - libdir=$ac_optarg ;;
14492 -
14493 - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
14494 - | --libexe | --libex | --libe)
14495 - ac_prev=libexecdir ;;
14496 - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
14497 - | --libexe=* | --libex=* | --libe=*)
14498 - libexecdir=$ac_optarg ;;
14499 -
14500 - -localedir | --localedir | --localedi | --localed | --locale)
14501 - ac_prev=localedir ;;
14502 - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
14503 - localedir=$ac_optarg ;;
14504 -
14505 - -localstatedir | --localstatedir | --localstatedi | --localstated \
14506 - | --localstate | --localstat | --localsta | --localst | --locals)
14507 - ac_prev=localstatedir ;;
14508 - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
14509 - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
14510 - localstatedir=$ac_optarg ;;
14511 -
14512 - -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
14513 - ac_prev=mandir ;;
14514 - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
14515 - mandir=$ac_optarg ;;
14516 -
14517 - -nfp | --nfp | --nf)
14518 - # Obsolete; use --without-fp.
14519 - with_fp=no ;;
14520 -
14521 - -no-create | --no-create | --no-creat | --no-crea | --no-cre \
14522 - | --no-cr | --no-c | -n)
14523 - no_create=yes ;;
14524 -
14525 - -no-recursion | --no-recursion | --no-recursio | --no-recursi \
14526 - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
14527 - no_recursion=yes ;;
14528 -
14529 - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
14530 - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
14531 - | --oldin | --oldi | --old | --ol | --o)
14532 - ac_prev=oldincludedir ;;
14533 - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
14534 - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
14535 - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
14536 - oldincludedir=$ac_optarg ;;
14537 -
14538 - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
14539 - ac_prev=prefix ;;
14540 - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
14541 - prefix=$ac_optarg ;;
14542 -
14543 - -program-prefix | --program-prefix | --program-prefi | --program-pref \
14544 - | --program-pre | --program-pr | --program-p)
14545 - ac_prev=program_prefix ;;
14546 - -program-prefix=* | --program-prefix=* | --program-prefi=* \
14547 - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
14548 - program_prefix=$ac_optarg ;;
14549 -
14550 - -program-suffix | --program-suffix | --program-suffi | --program-suff \
14551 - | --program-suf | --program-su | --program-s)
14552 - ac_prev=program_suffix ;;
14553 - -program-suffix=* | --program-suffix=* | --program-suffi=* \
14554 - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
14555 - program_suffix=$ac_optarg ;;
14556 -
14557 - -program-transform-name | --program-transform-name \
14558 - | --program-transform-nam | --program-transform-na \
14559 - | --program-transform-n | --program-transform- \
14560 - | --program-transform | --program-transfor \
14561 - | --program-transfo | --program-transf \
14562 - | --program-trans | --program-tran \
14563 - | --progr-tra | --program-tr | --program-t)
14564 - ac_prev=program_transform_name ;;
14565 - -program-transform-name=* | --program-transform-name=* \
14566 - | --program-transform-nam=* | --program-transform-na=* \
14567 - | --program-transform-n=* | --program-transform-=* \
14568 - | --program-transform=* | --program-transfor=* \
14569 - | --program-transfo=* | --program-transf=* \
14570 - | --program-trans=* | --program-tran=* \
14571 - | --progr-tra=* | --program-tr=* | --program-t=*)
14572 - program_transform_name=$ac_optarg ;;
14573 -
14574 - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
14575 - ac_prev=pdfdir ;;
14576 - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
14577 - pdfdir=$ac_optarg ;;
14578 -
14579 - -psdir | --psdir | --psdi | --psd | --ps)
14580 - ac_prev=psdir ;;
14581 - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
14582 - psdir=$ac_optarg ;;
14583 -
14584 - -q | -quiet | --quiet | --quie | --qui | --qu | --q \
14585 - | -silent | --silent | --silen | --sile | --sil)
14586 - silent=yes ;;
14587 -
14588 - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
14589 - ac_prev=sbindir ;;
14590 - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
14591 - | --sbi=* | --sb=*)
14592 - sbindir=$ac_optarg ;;
14593 -
14594 - -sharedstatedir | --sharedstatedir | --sharedstatedi \
14595 - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
14596 - | --sharedst | --shareds | --shared | --share | --shar \
14597 - | --sha | --sh)
14598 - ac_prev=sharedstatedir ;;
14599 - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
14600 - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
14601 - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
14602 - | --sha=* | --sh=*)
14603 - sharedstatedir=$ac_optarg ;;
14604 -
14605 - -site | --site | --sit)
14606 - ac_prev=site ;;
14607 - -site=* | --site=* | --sit=*)
14608 - site=$ac_optarg ;;
14609 -
14610 - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
14611 - ac_prev=srcdir ;;
14612 - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
14613 - srcdir=$ac_optarg ;;
14614 -
14615 - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
14616 - | --syscon | --sysco | --sysc | --sys | --sy)
14617 - ac_prev=sysconfdir ;;
14618 - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
14619 - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
14620 - sysconfdir=$ac_optarg ;;
14621 -
14622 - -target | --target | --targe | --targ | --tar | --ta | --t)
14623 - ac_prev=target_alias ;;
14624 - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
14625 - target_alias=$ac_optarg ;;
14626 -
14627 - -v | -verbose | --verbose | --verbos | --verbo | --verb)
14628 - verbose=yes ;;
14629 -
14630 - -version | --version | --versio | --versi | --vers | -V)
14631 - ac_init_version=: ;;
14632 -
14633 - -with-* | --with-*)
14634 - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
14635 - # Reject names that are not valid shell variable names.
14636 - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
14637 - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
14638 - { (exit 1); exit 1; }; }
14639 - ac_useropt_orig=$ac_useropt
14640 - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
14641 - case $ac_user_opts in
14642 - *"
14643 -"with_$ac_useropt"
14644 -"*) ;;
14645 - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
14646 - ac_unrecognized_sep=', ';;
14647 - esac
14648 - eval with_$ac_useropt=\$ac_optarg ;;
14649 -
14650 - -without-* | --without-*)
14651 - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
14652 - # Reject names that are not valid shell variable names.
14653 - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
14654 - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
14655 - { (exit 1); exit 1; }; }
14656 - ac_useropt_orig=$ac_useropt
14657 - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
14658 - case $ac_user_opts in
14659 - *"
14660 -"with_$ac_useropt"
14661 -"*) ;;
14662 - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
14663 - ac_unrecognized_sep=', ';;
14664 - esac
14665 - eval with_$ac_useropt=no ;;
14666 -
14667 - --x)
14668 - # Obsolete; use --with-x.
14669 - with_x=yes ;;
14670 -
14671 - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
14672 - | --x-incl | --x-inc | --x-in | --x-i)
14673 - ac_prev=x_includes ;;
14674 - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
14675 - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
14676 - x_includes=$ac_optarg ;;
14677 -
14678 - -x-libraries | --x-libraries | --x-librarie | --x-librari \
14679 - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
14680 - ac_prev=x_libraries ;;
14681 - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
14682 - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
14683 - x_libraries=$ac_optarg ;;
14684 -
14685 - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
14686 -Try \`$0 --help' for more information." >&2
14687 - { (exit 1); exit 1; }; }
14688 - ;;
14689 -
14690 - *=*)
14691 - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
14692 - # Reject names that are not valid shell variable names.
14693 - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
14694 - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
14695 - { (exit 1); exit 1; }; }
14696 - eval $ac_envvar=\$ac_optarg
14697 - export $ac_envvar ;;
14698 -
14699 - *)
14700 - # FIXME: should be removed in autoconf 3.0.
14701 - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
14702 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
14703 - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
14704 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
14705 - ;;
14706 -
14707 - esac
14708 -done
14709 -
14710 -if test -n "$ac_prev"; then
14711 - ac_option=--`echo $ac_prev | sed 's/_/-/g'`
14712 - { $as_echo "$as_me: error: missing argument to $ac_option" >&2
14713 - { (exit 1); exit 1; }; }
14714 -fi
14715 -
14716 -if test -n "$ac_unrecognized_opts"; then
14717 - case $enable_option_checking in
14718 - no) ;;
14719 - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
14720 - { (exit 1); exit 1; }; } ;;
14721 - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
14722 - esac
14723 -fi
14724 -
14725 -# Check all directory arguments for consistency.
14726 -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
14727 - datadir sysconfdir sharedstatedir localstatedir includedir \
14728 - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
14729 - libdir localedir mandir
14730 -do
14731 - eval ac_val=\$$ac_var
14732 - # Remove trailing slashes.
14733 - case $ac_val in
14734 - */ )
14735 - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
14736 - eval $ac_var=\$ac_val;;
14737 - esac
14738 - # Be sure to have absolute directory names.
14739 - case $ac_val in
14740 - [\\/$]* | ?:[\\/]* ) continue;;
14741 - NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
14742 - esac
14743 - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
14744 - { (exit 1); exit 1; }; }
14745 -done
14746 -
14747 -# There might be people who depend on the old broken behavior: `$host'
14748 -# used to hold the argument of --host etc.
14749 -# FIXME: To remove some day.
14750 -build=$build_alias
14751 -host=$host_alias
14752 -target=$target_alias
14753 -
14754 -# FIXME: To remove some day.
14755 -if test "x$host_alias" != x; then
14756 - if test "x$build_alias" = x; then
14757 - cross_compiling=maybe
14758 - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
14759 - If a cross compiler is detected then cross compile mode will be used." >&2
14760 - elif test "x$build_alias" != "x$host_alias"; then
14761 - cross_compiling=yes
14762 - fi
14763 -fi
14764 -
14765 -ac_tool_prefix=
14766 -test -n "$host_alias" && ac_tool_prefix=$host_alias-
14767 -
14768 -test "$silent" = yes && exec 6>/dev/null
14769 -
14770 -
14771 -ac_pwd=`pwd` && test -n "$ac_pwd" &&
14772 -ac_ls_di=`ls -di .` &&
14773 -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
14774 - { $as_echo "$as_me: error: working directory cannot be determined" >&2
14775 - { (exit 1); exit 1; }; }
14776 -test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
14777 - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
14778 - { (exit 1); exit 1; }; }
14779 -
14780 -
14781 -# Find the source files, if location was not specified.
14782 -if test -z "$srcdir"; then
14783 - ac_srcdir_defaulted=yes
14784 - # Try the directory containing this script, then the parent directory.
14785 - ac_confdir=`$as_dirname -- "$as_myself" ||
14786 -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
14787 - X"$as_myself" : 'X\(//\)[^/]' \| \
14788 - X"$as_myself" : 'X\(//\)$' \| \
14789 - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
14790 -$as_echo X"$as_myself" |
14791 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
14792 - s//\1/
14793 - q
14794 - }
14795 - /^X\(\/\/\)[^/].*/{
14796 - s//\1/
14797 - q
14798 - }
14799 - /^X\(\/\/\)$/{
14800 - s//\1/
14801 - q
14802 - }
14803 - /^X\(\/\).*/{
14804 - s//\1/
14805 - q
14806 - }
14807 - s/.*/./; q'`
14808 - srcdir=$ac_confdir
14809 - if test ! -r "$srcdir/$ac_unique_file"; then
14810 - srcdir=..
14811 - fi
14812 -else
14813 - ac_srcdir_defaulted=no
14814 -fi
14815 -if test ! -r "$srcdir/$ac_unique_file"; then
14816 - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
14817 - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
14818 - { (exit 1); exit 1; }; }
14819 -fi
14820 -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
14821 -ac_abs_confdir=`(
14822 - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
14823 - { (exit 1); exit 1; }; }
14824 - pwd)`
14825 -# When building in place, set srcdir=.
14826 -if test "$ac_abs_confdir" = "$ac_pwd"; then
14827 - srcdir=.
14828 -fi
14829 -# Remove unnecessary trailing slashes from srcdir.
14830 -# Double slashes in file names in object file debugging info
14831 -# mess up M-x gdb in Emacs.
14832 -case $srcdir in
14833 -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
14834 -esac
14835 -for ac_var in $ac_precious_vars; do
14836 - eval ac_env_${ac_var}_set=\${${ac_var}+set}
14837 - eval ac_env_${ac_var}_value=\$${ac_var}
14838 - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
14839 - eval ac_cv_env_${ac_var}_value=\$${ac_var}
14840 -done
14841 -
14842 -#
14843 -# Report the --help message.
14844 -#
14845 -if test "$ac_init_help" = "long"; then
14846 - # Omit some internal or obsolete options to make the list less imposing.
14847 - # This message is too long to be a string in the A/UX 3.1 sh.
14848 - cat <<_ACEOF
14849 -\`configure' configures this package to adapt to many kinds of systems.
14850 -
14851 -Usage: $0 [OPTION]... [VAR=VALUE]...
14852 -
14853 -To assign environment variables (e.g., CC, CFLAGS...), specify them as
14854 -VAR=VALUE. See below for descriptions of some of the useful variables.
14855 -
14856 -Defaults for the options are specified in brackets.
14857 -
14858 -Configuration:
14859 - -h, --help display this help and exit
14860 - --help=short display options specific to this package
14861 - --help=recursive display the short help of all the included packages
14862 - -V, --version display version information and exit
14863 - -q, --quiet, --silent do not print \`checking...' messages
14864 - --cache-file=FILE cache test results in FILE [disabled]
14865 - -C, --config-cache alias for \`--cache-file=config.cache'
14866 - -n, --no-create do not create output files
14867 - --srcdir=DIR find the sources in DIR [configure dir or \`..']
14868 -
14869 -Installation directories:
14870 - --prefix=PREFIX install architecture-independent files in PREFIX
14871 - [$ac_default_prefix]
14872 - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
14873 - [PREFIX]
14874 -
14875 -By default, \`make install' will install all the files in
14876 -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
14877 -an installation prefix other than \`$ac_default_prefix' using \`--prefix',
14878 -for instance \`--prefix=\$HOME'.
14879 -
14880 -For better control, use the options below.
14881 -
14882 -Fine tuning of the installation directories:
14883 - --bindir=DIR user executables [EPREFIX/bin]
14884 - --sbindir=DIR system admin executables [EPREFIX/sbin]
14885 - --libexecdir=DIR program executables [EPREFIX/libexec]
14886 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14887 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14888 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]
14889 - --libdir=DIR object code libraries [EPREFIX/lib]
14890 - --includedir=DIR C header files [PREFIX/include]
14891 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
14892 - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
14893 - --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
14894 - --infodir=DIR info documentation [DATAROOTDIR/info]
14895 - --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
14896 - --mandir=DIR man documentation [DATAROOTDIR/man]
14897 - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
14898 - --htmldir=DIR html documentation [DOCDIR]
14899 - --dvidir=DIR dvi documentation [DOCDIR]
14900 - --pdfdir=DIR pdf documentation [DOCDIR]
14901 - --psdir=DIR ps documentation [DOCDIR]
14902 -_ACEOF
14903 -
14904 - cat <<\_ACEOF
14905 -
14906 -Program names:
14907 - --program-prefix=PREFIX prepend PREFIX to installed program names
14908 - --program-suffix=SUFFIX append SUFFIX to installed program names
14909 - --program-transform-name=PROGRAM run sed PROGRAM on installed program names
14910 -
14911 -System types:
14912 - --build=BUILD configure for building on BUILD [guessed]
14913 - --host=HOST cross-compile to build programs to run on HOST [BUILD]
14914 - --target=TARGET configure for building compilers for TARGET [HOST]
14915 -_ACEOF
14916 -fi
14917 -
14918 -if test -n "$ac_init_help"; then
14919 -
14920 - cat <<\_ACEOF
14921 -
14922 -Optional Features:
14923 - --disable-option-checking ignore unrecognized --enable/--with options
14924 - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
14925 - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
14926 - --enable-maintainer-mode enable make rules and dependencies not useful
14927 - (and sometimes confusing) to the casual installer
14928 - --disable-dependency-tracking speeds up one-time build
14929 - --enable-dependency-tracking do not reject slow dependency extractors
14930 - --enable-shared[=PKGS] build shared libraries [default=yes]
14931 - --enable-static[=PKGS] build static libraries [default=yes]
14932 - --enable-fast-install[=PKGS]
14933 - optimize for fast installation [default=yes]
14934 - --disable-libtool-lock avoid locking (might break parallel builds)
14935 - --disable-nls do not use Native Language Support
14936 - --disable-rpath do not hardcode runtime library paths
14937 - --enable-nautilusburn build dfiso with libnautilusburn (default yes)
14938 - --enable-alsa include alsa 0.9 output plugin
14939 - --enable-dfbinimage build dfbinimage plugin (default no)
14940 - --enable-dynarec=... force selection of dynamic recompiler platform (x86, x86_64, ppc) (default: autodetect)
14941 -
14942 -Optional Packages:
14943 - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
14944 - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
14945 - --with-gnu-ld assume the C compiler uses GNU ld [default=no]
14946 - --with-pic try to use only PIC/non-PIC objects [default=use
14947 - both]
14948 - --with-tags[=TAGS] include additional configurations [automatic]
14949 - --with-gnu-ld assume the C compiler uses GNU ld default=no
14950 - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
14951 - --without-libiconv-prefix don't search for libiconv in includedir and libdir
14952 - --with-included-gettext use the GNU gettext library included here
14953 - --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
14954 - --without-libintl-prefix don't search for libintl in includedir and libdir
14955 -
14956 -Some influential environment variables:
14957 - CC C compiler command
14958 - CFLAGS C compiler flags
14959 - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
14960 - nonstandard directory <lib dir>
14961 - LIBS libraries to pass to the linker, e.g. -l<library>
14962 - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
14963 - you have headers in a nonstandard directory <include dir>
14964 - CXX C++ compiler command
14965 - CXXFLAGS C++ compiler flags
14966 - CPP C preprocessor
14967 - CXXCPP C++ preprocessor
14968 - F77 Fortran 77 compiler command
14969 - FFLAGS Fortran 77 compiler flags
14970 - CCAS assembler compiler command (defaults to CC)
14971 - CCASFLAGS assembler compiler flags (defaults to CFLAGS)
14972 - PKG_CONFIG path to pkg-config utility
14973 - GLIB2_CFLAGS
14974 - C compiler flags for GLIB2, overriding pkg-config
14975 - GLIB2_LIBS linker flags for GLIB2, overriding pkg-config
14976 - GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
14977 - GTK2_LIBS linker flags for GTK2, overriding pkg-config
14978 - GLADE2_CFLAGS
14979 - C compiler flags for GLADE2, overriding pkg-config
14980 - GLADE2_LIBS linker flags for GLADE2, overriding pkg-config
14981 - GIO2_CFLAGS C compiler flags for GIO2, overriding pkg-config
14982 - GIO2_LIBS linker flags for GIO2, overriding pkg-config
14983 - BURN_CFLAGS C compiler flags for BURN, overriding pkg-config
14984 - BURN_LIBS linker flags for BURN, overriding pkg-config
14985 -
14986 -Use these variables to override the choices made by `configure' or to help
14987 -it to find libraries and programs with nonstandard names/locations.
14988 -
14989 -_ACEOF
14990 -ac_status=$?
14991 -fi
14992 -
14993 -if test "$ac_init_help" = "recursive"; then
14994 - # If there are subdirs, report their specific --help.
14995 - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
14996 - test -d "$ac_dir" ||
14997 - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
14998 - continue
14999 - ac_builddir=.
15000 -
15001 -case "$ac_dir" in
15002 -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
15003 -*)
15004 - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
15005 - # A ".." for each directory in $ac_dir_suffix.
15006 - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
15007 - case $ac_top_builddir_sub in
15008 - "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
15009 - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
15010 - esac ;;
15011 -esac
15012 -ac_abs_top_builddir=$ac_pwd
15013 -ac_abs_builddir=$ac_pwd$ac_dir_suffix
15014 -# for backward compatibility:
15015 -ac_top_builddir=$ac_top_build_prefix
15016 -
15017 -case $srcdir in
15018 - .) # We are building in place.
15019 - ac_srcdir=.
15020 - ac_top_srcdir=$ac_top_builddir_sub
15021 - ac_abs_top_srcdir=$ac_pwd ;;
15022 - [\\/]* | ?:[\\/]* ) # Absolute name.
15023 - ac_srcdir=$srcdir$ac_dir_suffix;
15024 - ac_top_srcdir=$srcdir
15025 - ac_abs_top_srcdir=$srcdir ;;
15026 - *) # Relative name.
15027 - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
15028 - ac_top_srcdir=$ac_top_build_prefix$srcdir
15029 - ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
15030 -esac
15031 -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
15032 -
15033 - cd "$ac_dir" || { ac_status=$?; continue; }
15034 - # Check for guested configure.
15035 - if test -f "$ac_srcdir/configure.gnu"; then
15036 - echo &&
15037 - $SHELL "$ac_srcdir/configure.gnu" --help=recursive
15038 - elif test -f "$ac_srcdir/configure"; then
15039 - echo &&
15040 - $SHELL "$ac_srcdir/configure" --help=recursive
15041 - else
15042 - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
15043 - fi || ac_status=$?
15044 - cd "$ac_pwd" || { ac_status=$?; break; }
15045 - done
15046 -fi
15047 -
15048 -test -n "$ac_init_help" && exit $ac_status
15049 -if $ac_init_version; then
15050 - cat <<\_ACEOF
15051 -configure
15052 -generated by GNU Autoconf 2.63
15053 -
15054 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
15055 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
15056 -This configure script is free software; the Free Software Foundation
15057 -gives unlimited permission to copy, distribute and modify it.
15058 -_ACEOF
15059 - exit
15060 -fi
15061 -cat >config.log <<_ACEOF
15062 -This file contains any messages produced by compilers while
15063 -running configure, to aid debugging if configure makes a mistake.
15064 -
15065 -It was created by $as_me, which was
15066 -generated by GNU Autoconf 2.63. Invocation command line was
15067 -
15068 - $ $0 $@
15069 -
15070 -_ACEOF
15071 -exec 5>>config.log
15072 -{
15073 -cat <<_ASUNAME
15074 -## --------- ##
15075 -## Platform. ##
15076 -## --------- ##
15077 -
15078 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
15079 -uname -m = `(uname -m) 2>/dev/null || echo unknown`
15080 -uname -r = `(uname -r) 2>/dev/null || echo unknown`
15081 -uname -s = `(uname -s) 2>/dev/null || echo unknown`
15082 -uname -v = `(uname -v) 2>/dev/null || echo unknown`
15083 -
15084 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
15085 -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
15086 -
15087 -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
15088 -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
15089 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
15090 -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
15091 -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
15092 -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
15093 -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
15094 -
15095 -_ASUNAME
15096 -
15097 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15098 -for as_dir in $PATH
15099 -do
15100 - IFS=$as_save_IFS
15101 - test -z "$as_dir" && as_dir=.
15102 - $as_echo "PATH: $as_dir"
15103 -done
15104 -IFS=$as_save_IFS
15105 -
15106 -} >&5
15107 -
15108 -cat >&5 <<_ACEOF
15109 -
15110 -
15111 -## ----------- ##
15112 -## Core tests. ##
15113 -## ----------- ##
15114 -
15115 -_ACEOF
15116 -
15117 -
15118 -# Keep a trace of the command line.
15119 -# Strip out --no-create and --no-recursion so they do not pile up.
15120 -# Strip out --silent because we don't want to record it for future runs.
15121 -# Also quote any args containing shell meta-characters.
15122 -# Make two passes to allow for proper duplicate-argument suppression.
15123 -ac_configure_args=
15124 -ac_configure_args0=
15125 -ac_configure_args1=
15126 -ac_must_keep_next=false
15127 -for ac_pass in 1 2
15128 -do
15129 - for ac_arg
15130 - do
15131 - case $ac_arg in
15132 - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
15133 - -q | -quiet | --quiet | --quie | --qui | --qu | --q \
15134 - | -silent | --silent | --silen | --sile | --sil)
15135 - continue ;;
15136 - *\'*)
15137 - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
15138 - esac
15139 - case $ac_pass in
15140 - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
15141 - 2)
15142 - ac_configure_args1="$ac_configure_args1 '$ac_arg'"
15143 - if test $ac_must_keep_next = true; then
15144 - ac_must_keep_next=false # Got value, back to normal.
15145 - else
15146 - case $ac_arg in
15147 - *=* | --config-cache | -C | -disable-* | --disable-* \
15148 - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
15149 - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
15150 - | -with-* | --with-* | -without-* | --without-* | --x)
15151 - case "$ac_configure_args0 " in
15152 - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
15153 - esac
15154 - ;;
15155 - -* ) ac_must_keep_next=true ;;
15156 - esac
15157 - fi
15158 - ac_configure_args="$ac_configure_args '$ac_arg'"
15159 - ;;
15160 - esac
15161 - done
15162 -done
15163 -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
15164 -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
15165 -
15166 -# When interrupted or exit'd, cleanup temporary files, and complete
15167 -# config.log. We remove comments because anyway the quotes in there
15168 -# would cause problems or look ugly.
15169 -# WARNING: Use '\'' to represent an apostrophe within the trap.
15170 -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
15171 -trap 'exit_status=$?
15172 - # Save into config.log some information that might help in debugging.
15173 - {
15174 - echo
15175 -
15176 - cat <<\_ASBOX
15177 -## ---------------- ##
15178 -## Cache variables. ##
15179 -## ---------------- ##
15180 -_ASBOX
15181 - echo
15182 - # The following way of writing the cache mishandles newlines in values,
15183 -(
15184 - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
15185 - eval ac_val=\$$ac_var
15186 - case $ac_val in #(
15187 - *${as_nl}*)
15188 - case $ac_var in #(
15189 - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
15190 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
15191 - esac
15192 - case $ac_var in #(
15193 - _ | IFS | as_nl) ;; #(
15194 - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
15195 - *) $as_unset $ac_var ;;
15196 - esac ;;
15197 - esac
15198 - done
15199 - (set) 2>&1 |
15200 - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
15201 - *${as_nl}ac_space=\ *)
15202 - sed -n \
15203 - "s/'\''/'\''\\\\'\'''\''/g;
15204 - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
15205 - ;; #(
15206 - *)
15207 - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
15208 - ;;
15209 - esac |
15210 - sort
15211 -)
15212 - echo
15213 -
15214 - cat <<\_ASBOX
15215 -## ----------------- ##
15216 -## Output variables. ##
15217 -## ----------------- ##
15218 -_ASBOX
15219 - echo
15220 - for ac_var in $ac_subst_vars
15221 - do
15222 - eval ac_val=\$$ac_var
15223 - case $ac_val in
15224 - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
15225 - esac
15226 - $as_echo "$ac_var='\''$ac_val'\''"
15227 - done | sort
15228 - echo
15229 -
15230 - if test -n "$ac_subst_files"; then
15231 - cat <<\_ASBOX
15232 -## ------------------- ##
15233 -## File substitutions. ##
15234 -## ------------------- ##
15235 -_ASBOX
15236 - echo
15237 - for ac_var in $ac_subst_files
15238 - do
15239 - eval ac_val=\$$ac_var
15240 - case $ac_val in
15241 - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
15242 - esac
15243 - $as_echo "$ac_var='\''$ac_val'\''"
15244 - done | sort
15245 - echo
15246 - fi
15247 -
15248 - if test -s confdefs.h; then
15249 - cat <<\_ASBOX
15250 -## ----------- ##
15251 -## confdefs.h. ##
15252 -## ----------- ##
15253 -_ASBOX
15254 - echo
15255 - cat confdefs.h
15256 - echo
15257 - fi
15258 - test "$ac_signal" != 0 &&
15259 - $as_echo "$as_me: caught signal $ac_signal"
15260 - $as_echo "$as_me: exit $exit_status"
15261 - } >&5
15262 - rm -f core *.core core.conftest.* &&
15263 - rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
15264 - exit $exit_status
15265 -' 0
15266 -for ac_signal in 1 2 13 15; do
15267 - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
15268 -done
15269 -ac_signal=0
15270 -
15271 -# confdefs.h avoids OS command line length limits that DEFS can exceed.
15272 -rm -f -r conftest* confdefs.h
15273 -
15274 -# Predefined preprocessor variables.
15275 -
15276 -cat >>confdefs.h <<_ACEOF
15277 -#define PACKAGE_NAME "$PACKAGE_NAME"
15278 -_ACEOF
15279 -
15280 -
15281 -cat >>confdefs.h <<_ACEOF
15282 -#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
15283 -_ACEOF
15284 -
15285 -
15286 -cat >>confdefs.h <<_ACEOF
15287 -#define PACKAGE_VERSION "$PACKAGE_VERSION"
15288 -_ACEOF
15289 -
15290 -
15291 -cat >>confdefs.h <<_ACEOF
15292 -#define PACKAGE_STRING "$PACKAGE_STRING"
15293 -_ACEOF
15294 -
15295 -
15296 -cat >>confdefs.h <<_ACEOF
15297 -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
15298 -_ACEOF
15299 -
15300 -
15301 -# Let the site file select an alternate cache file if it wants to.
15302 -# Prefer an explicitly selected file to automatically selected ones.
15303 -ac_site_file1=NONE
15304 -ac_site_file2=NONE
15305 -if test -n "$CONFIG_SITE"; then
15306 - ac_site_file1=$CONFIG_SITE
15307 -elif test "x$prefix" != xNONE; then
15308 - ac_site_file1=$prefix/share/config.site
15309 - ac_site_file2=$prefix/etc/config.site
15310 -else
15311 - ac_site_file1=$ac_default_prefix/share/config.site
15312 - ac_site_file2=$ac_default_prefix/etc/config.site
15313 -fi
15314 -for ac_site_file in "$ac_site_file1" "$ac_site_file2"
15315 -do
15316 - test "x$ac_site_file" = xNONE && continue
15317 - if test -r "$ac_site_file"; then
15318 - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
15319 -$as_echo "$as_me: loading site script $ac_site_file" >&6;}
15320 - sed 's/^/| /' "$ac_site_file" >&5
15321 - . "$ac_site_file"
15322 - fi
15323 -done
15324 -
15325 -if test -r "$cache_file"; then
15326 - # Some versions of bash will fail to source /dev/null (special
15327 - # files actually), so we avoid doing that.
15328 - if test -f "$cache_file"; then
15329 - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
15330 -$as_echo "$as_me: loading cache $cache_file" >&6;}
15331 - case $cache_file in
15332 - [\\/]* | ?:[\\/]* ) . "$cache_file";;
15333 - *) . "./$cache_file";;
15334 - esac
15335 - fi
15336 -else
15337 - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
15338 -$as_echo "$as_me: creating cache $cache_file" >&6;}
15339 - >$cache_file
15340 -fi
15341 -
15342 -# Check that the precious variables saved in the cache have kept the same
15343 -# value.
15344 -ac_cache_corrupted=false
15345 -for ac_var in $ac_precious_vars; do
15346 - eval ac_old_set=\$ac_cv_env_${ac_var}_set
15347 - eval ac_new_set=\$ac_env_${ac_var}_set
15348 - eval ac_old_val=\$ac_cv_env_${ac_var}_value
15349 - eval ac_new_val=\$ac_env_${ac_var}_value
15350 - case $ac_old_set,$ac_new_set in
15351 - set,)
15352 - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
15353 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
15354 - ac_cache_corrupted=: ;;
15355 - ,set)
15356 - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
15357 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
15358 - ac_cache_corrupted=: ;;
15359 - ,);;
15360 - *)
15361 - if test "x$ac_old_val" != "x$ac_new_val"; then
15362 - # differences in whitespace do not lead to failure.
15363 - ac_old_val_w=`echo x $ac_old_val`
15364 - ac_new_val_w=`echo x $ac_new_val`
15365 - if test "$ac_old_val_w" != "$ac_new_val_w"; then
15366 - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
15367 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
15368 - ac_cache_corrupted=:
15369 - else
15370 - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
15371 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
15372 - eval $ac_var=\$ac_old_val
15373 - fi
15374 - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
15375 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
15376 - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
15377 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
15378 - fi;;
15379 - esac
15380 - # Pass precious variables to config.status.
15381 - if test "$ac_new_set" = set; then
15382 - case $ac_new_val in
15383 - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
15384 - *) ac_arg=$ac_var=$ac_new_val ;;
15385 - esac
15386 - case " $ac_configure_args " in
15387 - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
15388 - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
15389 - esac
15390 - fi
15391 -done
15392 -if $ac_cache_corrupted; then
15393 - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
15394 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
15395 - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
15396 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
15397 - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
15398 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
15399 - { (exit 1); exit 1; }; }
15400 -fi
15401 -
15402 -
15403 -
15404 -
15405 -
15406 -
15407 -
15408 -
15409 -
15410 -
15411 -
15412 -
15413 -
15414 -
15415 -
15416 -
15417 -
15418 -ac_ext=c
15419 -ac_cpp='$CPP $CPPFLAGS'
15420 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
15421 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
15422 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
15423 -
15424 -
15425 -
15426 -ac_aux_dir=
15427 -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
15428 - if test -f "$ac_dir/install-sh"; then
15429 - ac_aux_dir=$ac_dir
15430 - ac_install_sh="$ac_aux_dir/install-sh -c"
15431 - break
15432 - elif test -f "$ac_dir/install.sh"; then
15433 - ac_aux_dir=$ac_dir
15434 - ac_install_sh="$ac_aux_dir/install.sh -c"
15435 - break
15436 - elif test -f "$ac_dir/shtool"; then
15437 - ac_aux_dir=$ac_dir
15438 - ac_install_sh="$ac_aux_dir/shtool install -c"
15439 - break
15440 - fi
15441 -done
15442 -if test -z "$ac_aux_dir"; then
15443 - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
15444 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
15445 - { (exit 1); exit 1; }; }
15446 -fi
15447 -
15448 -# These three variables are undocumented and unsupported,
15449 -# and are intended to be withdrawn in a future Autoconf release.
15450 -# They can cause serious problems if a builder's source tree is in a directory
15451 -# whose full name contains unusual characters.
15452 -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
15453 -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
15454 -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
15455 -
15456 -
15457 -# Make sure we can run config.sub.
15458 -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
15459 - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
15460 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
15461 - { (exit 1); exit 1; }; }
15462 -
15463 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5
15464 -$as_echo_n "checking build system type... " >&6; }
15465 -if test "${ac_cv_build+set}" = set; then
15466 - $as_echo_n "(cached) " >&6
15467 -else
15468 - ac_build_alias=$build_alias
15469 -test "x$ac_build_alias" = x &&
15470 - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
15471 -test "x$ac_build_alias" = x &&
15472 - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
15473 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
15474 - { (exit 1); exit 1; }; }
15475 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
15476 - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
15477 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
15478 - { (exit 1); exit 1; }; }
15479 -
15480 -fi
15481 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
15482 -$as_echo "$ac_cv_build" >&6; }
15483 -case $ac_cv_build in
15484 -*-*-*) ;;
15485 -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
15486 -$as_echo "$as_me: error: invalid value of canonical build" >&2;}
15487 - { (exit 1); exit 1; }; };;
15488 -esac
15489 -build=$ac_cv_build
15490 -ac_save_IFS=$IFS; IFS='-'
15491 -set x $ac_cv_build
15492 -shift
15493 -build_cpu=$1
15494 -build_vendor=$2
15495 -shift; shift
15496 -# Remember, the first character of IFS is used to create $*,
15497 -# except with old shells:
15498 -build_os=$*
15499 -IFS=$ac_save_IFS
15500 -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
15501 -
15502 -
15503 -{ $as_echo "$as_me:$LINENO: checking host system type" >&5
15504 -$as_echo_n "checking host system type... " >&6; }
15505 -if test "${ac_cv_host+set}" = set; then
15506 - $as_echo_n "(cached) " >&6
15507 -else
15508 - if test "x$host_alias" = x; then
15509 - ac_cv_host=$ac_cv_build
15510 -else
15511 - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
15512 - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
15513 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
15514 - { (exit 1); exit 1; }; }
15515 -fi
15516 -
15517 -fi
15518 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
15519 -$as_echo "$ac_cv_host" >&6; }
15520 -case $ac_cv_host in
15521 -*-*-*) ;;
15522 -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
15523 -$as_echo "$as_me: error: invalid value of canonical host" >&2;}
15524 - { (exit 1); exit 1; }; };;
15525 -esac
15526 -host=$ac_cv_host
15527 -ac_save_IFS=$IFS; IFS='-'
15528 -set x $ac_cv_host
15529 -shift
15530 -host_cpu=$1
15531 -host_vendor=$2
15532 -shift; shift
15533 -# Remember, the first character of IFS is used to create $*,
15534 -# except with old shells:
15535 -host_os=$*
15536 -IFS=$ac_save_IFS
15537 -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
15538 -
15539 -
15540 -{ $as_echo "$as_me:$LINENO: checking target system type" >&5
15541 -$as_echo_n "checking target system type... " >&6; }
15542 -if test "${ac_cv_target+set}" = set; then
15543 - $as_echo_n "(cached) " >&6
15544 -else
15545 - if test "x$target_alias" = x; then
15546 - ac_cv_target=$ac_cv_host
15547 -else
15548 - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
15549 - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
15550 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
15551 - { (exit 1); exit 1; }; }
15552 -fi
15553 -
15554 -fi
15555 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
15556 -$as_echo "$ac_cv_target" >&6; }
15557 -case $ac_cv_target in
15558 -*-*-*) ;;
15559 -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
15560 -$as_echo "$as_me: error: invalid value of canonical target" >&2;}
15561 - { (exit 1); exit 1; }; };;
15562 -esac
15563 -target=$ac_cv_target
15564 -ac_save_IFS=$IFS; IFS='-'
15565 -set x $ac_cv_target
15566 -shift
15567 -target_cpu=$1
15568 -target_vendor=$2
15569 -shift; shift
15570 -# Remember, the first character of IFS is used to create $*,
15571 -# except with old shells:
15572 -target_os=$*
15573 -IFS=$ac_save_IFS
15574 -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
15575 -
15576 -
15577 -# The aliases save the names the user supplied, while $host etc.
15578 -# will get canonicalized.
15579 -test -n "$target_alias" &&
15580 - test "$program_prefix$program_suffix$program_transform_name" = \
15581 - NONENONEs,x,x, &&
15582 - program_prefix=${target_alias}-
15583 -am__api_version='1.10'
15584 -
15585 -# Find a good install program. We prefer a C program (faster),
15586 -# so one script is as good as another. But avoid the broken or
15587 -# incompatible versions:
15588 -# SysV /etc/install, /usr/sbin/install
15589 -# SunOS /usr/etc/install
15590 -# IRIX /sbin/install
15591 -# AIX /bin/install
15592 -# AmigaOS /C/install, which installs bootblocks on floppy discs
15593 -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
15594 -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
15595 -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
15596 -# OS/2's system install, which has a completely different semantic
15597 -# ./install, which can be erroneously created by make from ./install.sh.
15598 -# Reject install programs that cannot install multiple files.
15599 -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
15600 -$as_echo_n "checking for a BSD-compatible install... " >&6; }
15601 -if test -z "$INSTALL"; then
15602 -if test "${ac_cv_path_install+set}" = set; then
15603 - $as_echo_n "(cached) " >&6
15604 -else
15605 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15606 -for as_dir in $PATH
15607 -do
15608 - IFS=$as_save_IFS
15609 - test -z "$as_dir" && as_dir=.
15610 - # Account for people who put trailing slashes in PATH elements.
15611 -case $as_dir/ in
15612 - ./ | .// | /cC/* | \
15613 - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
15614 - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
15615 - /usr/ucb/* ) ;;
15616 - *)
15617 - # OSF1 and SCO ODT 3.0 have their own names for install.
15618 - # Don't use installbsd from OSF since it installs stuff as root
15619 - # by default.
15620 - for ac_prog in ginstall scoinst install; do
15621 - for ac_exec_ext in '' $ac_executable_extensions; do
15622 - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
15623 - if test $ac_prog = install &&
15624 - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
15625 - # AIX install. It has an incompatible calling convention.
15626 - :
15627 - elif test $ac_prog = install &&
15628 - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
15629 - # program-specific install script used by HP pwplus--don't use.
15630 - :
15631 - else
15632 - rm -rf conftest.one conftest.two conftest.dir
15633 - echo one > conftest.one
15634 - echo two > conftest.two
15635 - mkdir conftest.dir
15636 - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
15637 - test -s conftest.one && test -s conftest.two &&
15638 - test -s conftest.dir/conftest.one &&
15639 - test -s conftest.dir/conftest.two
15640 - then
15641 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
15642 - break 3
15643 - fi
15644 - fi
15645 - fi
15646 - done
15647 - done
15648 - ;;
15649 -esac
15650 -
15651 -done
15652 -IFS=$as_save_IFS
15653 -
15654 -rm -rf conftest.one conftest.two conftest.dir
15655 -
15656 -fi
15657 - if test "${ac_cv_path_install+set}" = set; then
15658 - INSTALL=$ac_cv_path_install
15659 - else
15660 - # As a last resort, use the slow shell script. Don't cache a
15661 - # value for INSTALL within a source directory, because that will
15662 - # break other packages using the cache if that directory is
15663 - # removed, or if the value is a relative name.
15664 - INSTALL=$ac_install_sh
15665 - fi
15666 -fi
15667 -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
15668 -$as_echo "$INSTALL" >&6; }
15669 -
15670 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
15671 -# It thinks the first close brace ends the variable substitution.
15672 -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
15673 -
15674 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
15675 -
15676 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
15677 -
15678 -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
15679 -$as_echo_n "checking whether build environment is sane... " >&6; }
15680 -# Just in case
15681 -sleep 1
15682 -echo timestamp > conftest.file
15683 -# Do `set' in a subshell so we don't clobber the current shell's
15684 -# arguments. Must try -L first in case configure is actually a
15685 -# symlink; some systems play weird games with the mod time of symlinks
15686 -# (eg FreeBSD returns the mod time of the symlink's containing
15687 -# directory).
15688 -if (
15689 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
15690 - if test "$*" = "X"; then
15691 - # -L didn't work.
15692 - set X `ls -t $srcdir/configure conftest.file`
15693 - fi
15694 - rm -f conftest.file
15695 - if test "$*" != "X $srcdir/configure conftest.file" \
15696 - && test "$*" != "X conftest.file $srcdir/configure"; then
15697 -
15698 - # If neither matched, then we have a broken ls. This can happen
15699 - # if, for instance, CONFIG_SHELL is bash and it inherits a
15700 - # broken ls alias from the environment. This has actually
15701 - # happened. Such a system could not be considered "sane".
15702 - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
15703 -alias in your environment" >&5
15704 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
15705 -alias in your environment" >&2;}
15706 - { (exit 1); exit 1; }; }
15707 - fi
15708 -
15709 - test "$2" = conftest.file
15710 - )
15711 -then
15712 - # Ok.
15713 - :
15714 -else
15715 - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
15716 -Check your system clock" >&5
15717 -$as_echo "$as_me: error: newly created file is older than distributed files!
15718 -Check your system clock" >&2;}
15719 - { (exit 1); exit 1; }; }
15720 -fi
15721 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
15722 -$as_echo "yes" >&6; }
15723 -test "$program_prefix" != NONE &&
15724 - program_transform_name="s&^&$program_prefix&;$program_transform_name"
15725 -# Use a double $ so make ignores it.
15726 -test "$program_suffix" != NONE &&
15727 - program_transform_name="s&\$&$program_suffix&;$program_transform_name"
15728 -# Double any \ or $.
15729 -# By default was `s,x,x', remove it if useless.
15730 -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
15731 -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
15732 -
15733 -# expand $ac_aux_dir to an absolute path
15734 -am_aux_dir=`cd $ac_aux_dir && pwd`
15735 -
15736 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
15737 -# Use eval to expand $SHELL
15738 -if eval "$MISSING --run true"; then
15739 - am_missing_run="$MISSING --run "
15740 -else
15741 - am_missing_run=
15742 - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
15743 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
15744 -fi
15745 -
15746 -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
15747 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
15748 -if test -z "$MKDIR_P"; then
15749 - if test "${ac_cv_path_mkdir+set}" = set; then
15750 - $as_echo_n "(cached) " >&6
15751 -else
15752 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15753 -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
15754 -do
15755 - IFS=$as_save_IFS
15756 - test -z "$as_dir" && as_dir=.
15757 - for ac_prog in mkdir gmkdir; do
15758 - for ac_exec_ext in '' $ac_executable_extensions; do
15759 - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
15760 - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
15761 - 'mkdir (GNU coreutils) '* | \
15762 - 'mkdir (coreutils) '* | \
15763 - 'mkdir (fileutils) '4.1*)
15764 - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
15765 - break 3;;
15766 - esac
15767 - done
15768 - done
15769 -done
15770 -IFS=$as_save_IFS
15771 -
15772 -fi
15773 -
15774 - if test "${ac_cv_path_mkdir+set}" = set; then
15775 - MKDIR_P="$ac_cv_path_mkdir -p"
15776 - else
15777 - # As a last resort, use the slow shell script. Don't cache a
15778 - # value for MKDIR_P within a source directory, because that will
15779 - # break other packages using the cache if that directory is
15780 - # removed, or if the value is a relative name.
15781 - test -d ./--version && rmdir ./--version
15782 - MKDIR_P="$ac_install_sh -d"
15783 - fi
15784 -fi
15785 -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
15786 -$as_echo "$MKDIR_P" >&6; }
15787 -
15788 -mkdir_p="$MKDIR_P"
15789 -case $mkdir_p in
15790 - [\\/$]* | ?:[\\/]*) ;;
15791 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
15792 -esac
15793 -
15794 -for ac_prog in gawk mawk nawk awk
15795 -do
15796 - # Extract the first word of "$ac_prog", so it can be a program name with args.
15797 -set dummy $ac_prog; ac_word=$2
15798 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
15799 -$as_echo_n "checking for $ac_word... " >&6; }
15800 -if test "${ac_cv_prog_AWK+set}" = set; then
15801 - $as_echo_n "(cached) " >&6
15802 -else
15803 - if test -n "$AWK"; then
15804 - ac_cv_prog_AWK="$AWK" # Let the user override the test.
15805 -else
15806 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15807 -for as_dir in $PATH
15808 -do
15809 - IFS=$as_save_IFS
15810 - test -z "$as_dir" && as_dir=.
15811 - for ac_exec_ext in '' $ac_executable_extensions; do
15812 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15813 - ac_cv_prog_AWK="$ac_prog"
15814 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15815 - break 2
15816 - fi
15817 -done
15818 -done
15819 -IFS=$as_save_IFS
15820 -
15821 -fi
15822 -fi
15823 -AWK=$ac_cv_prog_AWK
15824 -if test -n "$AWK"; then
15825 - { $as_echo "$as_me:$LINENO: result: $AWK" >&5
15826 -$as_echo "$AWK" >&6; }
15827 -else
15828 - { $as_echo "$as_me:$LINENO: result: no" >&5
15829 -$as_echo "no" >&6; }
15830 -fi
15831 -
15832 -
15833 - test -n "$AWK" && break
15834 -done
15835 -
15836 -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
15837 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
15838 -set x ${MAKE-make}
15839 -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
15840 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
15841 - $as_echo_n "(cached) " >&6
15842 -else
15843 - cat >conftest.make <<\_ACEOF
15844 -SHELL = /bin/sh
15845 -all:
15846 - @echo '@@@%%%=$(MAKE)=@@@%%%'
15847 -_ACEOF
15848 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
15849 -case `${MAKE-make} -f conftest.make 2>/dev/null` in
15850 - *@@@%%%=?*=@@@%%%*)
15851 - eval ac_cv_prog_make_${ac_make}_set=yes;;
15852 - *)
15853 - eval ac_cv_prog_make_${ac_make}_set=no;;
15854 -esac
15855 -rm -f conftest.make
15856 -fi
15857 -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
15858 - { $as_echo "$as_me:$LINENO: result: yes" >&5
15859 -$as_echo "yes" >&6; }
15860 - SET_MAKE=
15861 -else
15862 - { $as_echo "$as_me:$LINENO: result: no" >&5
15863 -$as_echo "no" >&6; }
15864 - SET_MAKE="MAKE=${MAKE-make}"
15865 -fi
15866 -
15867 -rm -rf .tst 2>/dev/null
15868 -mkdir .tst 2>/dev/null
15869 -if test -d .tst; then
15870 - am__leading_dot=.
15871 -else
15872 - am__leading_dot=_
15873 -fi
15874 -rmdir .tst 2>/dev/null
15875 -
15876 -if test "`cd $srcdir && pwd`" != "`pwd`"; then
15877 - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
15878 - # is not polluted with repeated "-I."
15879 - am__isrc=' -I$(srcdir)'
15880 - # test to see if srcdir already configured
15881 - if test -f $srcdir/config.status; then
15882 - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
15883 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
15884 - { (exit 1); exit 1; }; }
15885 - fi
15886 -fi
15887 -
15888 -# test whether we have cygpath
15889 -if test -z "$CYGPATH_W"; then
15890 - if (cygpath --version) >/dev/null 2>/dev/null; then
15891 - CYGPATH_W='cygpath -w'
15892 - else
15893 - CYGPATH_W=echo
15894 - fi
15895 -fi
15896 -
15897 -
15898 -# Define the identity of the package.
15899 - PACKAGE=pcsx-df
15900 - VERSION=1.10
15901 -
15902 -
15903 -cat >>confdefs.h <<_ACEOF
15904 -#define PACKAGE "$PACKAGE"
15905 -_ACEOF
15906 -
15907 -
15908 -cat >>confdefs.h <<_ACEOF
15909 -#define VERSION "$VERSION"
15910 -_ACEOF
15911 -
15912 -# Some tools Automake needs.
15913 -
15914 -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
15915 -
15916 -
15917 -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
15918 -
15919 -
15920 -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
15921 -
15922 -
15923 -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
15924 -
15925 -
15926 -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
15927 -
15928 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
15929 -
15930 -# Installed binaries are usually stripped using `strip' when the user
15931 -# run `make install-strip'. However `strip' might not be the right
15932 -# tool to use in cross-compilation environments, therefore Automake
15933 -# will honor the `STRIP' environment variable to overrule this program.
15934 -if test "$cross_compiling" != no; then
15935 - if test -n "$ac_tool_prefix"; then
15936 - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
15937 -set dummy ${ac_tool_prefix}strip; ac_word=$2
15938 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
15939 -$as_echo_n "checking for $ac_word... " >&6; }
15940 -if test "${ac_cv_prog_STRIP+set}" = set; then
15941 - $as_echo_n "(cached) " >&6
15942 -else
15943 - if test -n "$STRIP"; then
15944 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
15945 -else
15946 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15947 -for as_dir in $PATH
15948 -do
15949 - IFS=$as_save_IFS
15950 - test -z "$as_dir" && as_dir=.
15951 - for ac_exec_ext in '' $ac_executable_extensions; do
15952 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15953 - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
15954 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15955 - break 2
15956 - fi
15957 -done
15958 -done
15959 -IFS=$as_save_IFS
15960 -
15961 -fi
15962 -fi
15963 -STRIP=$ac_cv_prog_STRIP
15964 -if test -n "$STRIP"; then
15965 - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
15966 -$as_echo "$STRIP" >&6; }
15967 -else
15968 - { $as_echo "$as_me:$LINENO: result: no" >&5
15969 -$as_echo "no" >&6; }
15970 -fi
15971 -
15972 -
15973 -fi
15974 -if test -z "$ac_cv_prog_STRIP"; then
15975 - ac_ct_STRIP=$STRIP
15976 - # Extract the first word of "strip", so it can be a program name with args.
15977 -set dummy strip; ac_word=$2
15978 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
15979 -$as_echo_n "checking for $ac_word... " >&6; }
15980 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
15981 - $as_echo_n "(cached) " >&6
15982 -else
15983 - if test -n "$ac_ct_STRIP"; then
15984 - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
15985 -else
15986 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15987 -for as_dir in $PATH
15988 -do
15989 - IFS=$as_save_IFS
15990 - test -z "$as_dir" && as_dir=.
15991 - for ac_exec_ext in '' $ac_executable_extensions; do
15992 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15993 - ac_cv_prog_ac_ct_STRIP="strip"
15994 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15995 - break 2
15996 - fi
15997 -done
15998 -done
15999 -IFS=$as_save_IFS
16000 -
16001 -fi
16002 -fi
16003 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
16004 -if test -n "$ac_ct_STRIP"; then
16005 - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
16006 -$as_echo "$ac_ct_STRIP" >&6; }
16007 -else
16008 - { $as_echo "$as_me:$LINENO: result: no" >&5
16009 -$as_echo "no" >&6; }
16010 -fi
16011 -
16012 - if test "x$ac_ct_STRIP" = x; then
16013 - STRIP=":"
16014 - else
16015 - case $cross_compiling:$ac_tool_warned in
16016 -yes:)
16017 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
16018 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
16019 -ac_tool_warned=yes ;;
16020 -esac
16021 - STRIP=$ac_ct_STRIP
16022 - fi
16023 -else
16024 - STRIP="$ac_cv_prog_STRIP"
16025 -fi
16026 -
16027 -fi
16028 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
16029 -
16030 -# We need awk for the "check" target. The system "awk" is bad on
16031 -# some platforms.
16032 -# Always define AMTAR for backward compatibility.
16033 -
16034 -AMTAR=${AMTAR-"${am_missing_run}tar"}
16035 -
16036 -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
16037 -
16038 -
16039 -
16040 -
16041 -
16042 -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
16043 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
16044 - # Check whether --enable-maintainer-mode was given.
16045 -if test "${enable_maintainer_mode+set}" = set; then
16046 - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
16047 -else
16048 - USE_MAINTAINER_MODE=no
16049 -fi
16050 -
16051 - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
16052 -$as_echo "$USE_MAINTAINER_MODE" >&6; }
16053 - if test $USE_MAINTAINER_MODE = yes; then
16054 - MAINTAINER_MODE_TRUE=
16055 - MAINTAINER_MODE_FALSE='#'
16056 -else
16057 - MAINTAINER_MODE_TRUE='#'
16058 - MAINTAINER_MODE_FALSE=
16059 -fi
16060 -
16061 - MAINT=$MAINTAINER_MODE_TRUE
16062 -
16063 -
16064 -
16065 -ac_config_headers="$ac_config_headers include/config.h:include/config.h.in"
16066 -
16067 -
16068 -ac_ext=c
16069 -ac_cpp='$CPP $CPPFLAGS'
16070 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
16071 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
16072 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
16073 -if test -n "$ac_tool_prefix"; then
16074 - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
16075 -set dummy ${ac_tool_prefix}gcc; ac_word=$2
16076 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16077 -$as_echo_n "checking for $ac_word... " >&6; }
16078 -if test "${ac_cv_prog_CC+set}" = set; then
16079 - $as_echo_n "(cached) " >&6
16080 -else
16081 - if test -n "$CC"; then
16082 - ac_cv_prog_CC="$CC" # Let the user override the test.
16083 -else
16084 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16085 -for as_dir in $PATH
16086 -do
16087 - IFS=$as_save_IFS
16088 - test -z "$as_dir" && as_dir=.
16089 - for ac_exec_ext in '' $ac_executable_extensions; do
16090 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16091 - ac_cv_prog_CC="${ac_tool_prefix}gcc"
16092 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16093 - break 2
16094 - fi
16095 -done
16096 -done
16097 -IFS=$as_save_IFS
16098 -
16099 -fi
16100 -fi
16101 -CC=$ac_cv_prog_CC
16102 -if test -n "$CC"; then
16103 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
16104 -$as_echo "$CC" >&6; }
16105 -else
16106 - { $as_echo "$as_me:$LINENO: result: no" >&5
16107 -$as_echo "no" >&6; }
16108 -fi
16109 -
16110 -
16111 -fi
16112 -if test -z "$ac_cv_prog_CC"; then
16113 - ac_ct_CC=$CC
16114 - # Extract the first word of "gcc", so it can be a program name with args.
16115 -set dummy gcc; ac_word=$2
16116 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16117 -$as_echo_n "checking for $ac_word... " >&6; }
16118 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
16119 - $as_echo_n "(cached) " >&6
16120 -else
16121 - if test -n "$ac_ct_CC"; then
16122 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
16123 -else
16124 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16125 -for as_dir in $PATH
16126 -do
16127 - IFS=$as_save_IFS
16128 - test -z "$as_dir" && as_dir=.
16129 - for ac_exec_ext in '' $ac_executable_extensions; do
16130 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16131 - ac_cv_prog_ac_ct_CC="gcc"
16132 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16133 - break 2
16134 - fi
16135 -done
16136 -done
16137 -IFS=$as_save_IFS
16138 -
16139 -fi
16140 -fi
16141 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
16142 -if test -n "$ac_ct_CC"; then
16143 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
16144 -$as_echo "$ac_ct_CC" >&6; }
16145 -else
16146 - { $as_echo "$as_me:$LINENO: result: no" >&5
16147 -$as_echo "no" >&6; }
16148 -fi
16149 -
16150 - if test "x$ac_ct_CC" = x; then
16151 - CC=""
16152 - else
16153 - case $cross_compiling:$ac_tool_warned in
16154 -yes:)
16155 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
16156 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
16157 -ac_tool_warned=yes ;;
16158 -esac
16159 - CC=$ac_ct_CC
16160 - fi
16161 -else
16162 - CC="$ac_cv_prog_CC"
16163 -fi
16164 -
16165 -if test -z "$CC"; then
16166 - if test -n "$ac_tool_prefix"; then
16167 - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
16168 -set dummy ${ac_tool_prefix}cc; ac_word=$2
16169 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16170 -$as_echo_n "checking for $ac_word... " >&6; }
16171 -if test "${ac_cv_prog_CC+set}" = set; then
16172 - $as_echo_n "(cached) " >&6
16173 -else
16174 - if test -n "$CC"; then
16175 - ac_cv_prog_CC="$CC" # Let the user override the test.
16176 -else
16177 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16178 -for as_dir in $PATH
16179 -do
16180 - IFS=$as_save_IFS
16181 - test -z "$as_dir" && as_dir=.
16182 - for ac_exec_ext in '' $ac_executable_extensions; do
16183 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16184 - ac_cv_prog_CC="${ac_tool_prefix}cc"
16185 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16186 - break 2
16187 - fi
16188 -done
16189 -done
16190 -IFS=$as_save_IFS
16191 -
16192 -fi
16193 -fi
16194 -CC=$ac_cv_prog_CC
16195 -if test -n "$CC"; then
16196 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
16197 -$as_echo "$CC" >&6; }
16198 -else
16199 - { $as_echo "$as_me:$LINENO: result: no" >&5
16200 -$as_echo "no" >&6; }
16201 -fi
16202 -
16203 -
16204 - fi
16205 -fi
16206 -if test -z "$CC"; then
16207 - # Extract the first word of "cc", so it can be a program name with args.
16208 -set dummy cc; ac_word=$2
16209 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16210 -$as_echo_n "checking for $ac_word... " >&6; }
16211 -if test "${ac_cv_prog_CC+set}" = set; then
16212 - $as_echo_n "(cached) " >&6
16213 -else
16214 - if test -n "$CC"; then
16215 - ac_cv_prog_CC="$CC" # Let the user override the test.
16216 -else
16217 - ac_prog_rejected=no
16218 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16219 -for as_dir in $PATH
16220 -do
16221 - IFS=$as_save_IFS
16222 - test -z "$as_dir" && as_dir=.
16223 - for ac_exec_ext in '' $ac_executable_extensions; do
16224 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16225 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
16226 - ac_prog_rejected=yes
16227 - continue
16228 - fi
16229 - ac_cv_prog_CC="cc"
16230 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16231 - break 2
16232 - fi
16233 -done
16234 -done
16235 -IFS=$as_save_IFS
16236 -
16237 -if test $ac_prog_rejected = yes; then
16238 - # We found a bogon in the path, so make sure we never use it.
16239 - set dummy $ac_cv_prog_CC
16240 - shift
16241 - if test $# != 0; then
16242 - # We chose a different compiler from the bogus one.
16243 - # However, it has the same basename, so the bogon will be chosen
16244 - # first if we set CC to just the basename; use the full file name.
16245 - shift
16246 - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
16247 - fi
16248 -fi
16249 -fi
16250 -fi
16251 -CC=$ac_cv_prog_CC
16252 -if test -n "$CC"; then
16253 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
16254 -$as_echo "$CC" >&6; }
16255 -else
16256 - { $as_echo "$as_me:$LINENO: result: no" >&5
16257 -$as_echo "no" >&6; }
16258 -fi
16259 -
16260 -
16261 -fi
16262 -if test -z "$CC"; then
16263 - if test -n "$ac_tool_prefix"; then
16264 - for ac_prog in cl.exe
16265 - do
16266 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
16267 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
16268 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16269 -$as_echo_n "checking for $ac_word... " >&6; }
16270 -if test "${ac_cv_prog_CC+set}" = set; then
16271 - $as_echo_n "(cached) " >&6
16272 -else
16273 - if test -n "$CC"; then
16274 - ac_cv_prog_CC="$CC" # Let the user override the test.
16275 -else
16276 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16277 -for as_dir in $PATH
16278 -do
16279 - IFS=$as_save_IFS
16280 - test -z "$as_dir" && as_dir=.
16281 - for ac_exec_ext in '' $ac_executable_extensions; do
16282 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16283 - ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
16284 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16285 - break 2
16286 - fi
16287 -done
16288 -done
16289 -IFS=$as_save_IFS
16290 -
16291 -fi
16292 -fi
16293 -CC=$ac_cv_prog_CC
16294 -if test -n "$CC"; then
16295 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
16296 -$as_echo "$CC" >&6; }
16297 -else
16298 - { $as_echo "$as_me:$LINENO: result: no" >&5
16299 -$as_echo "no" >&6; }
16300 -fi
16301 -
16302 -
16303 - test -n "$CC" && break
16304 - done
16305 -fi
16306 -if test -z "$CC"; then
16307 - ac_ct_CC=$CC
16308 - for ac_prog in cl.exe
16309 -do
16310 - # Extract the first word of "$ac_prog", so it can be a program name with args.
16311 -set dummy $ac_prog; ac_word=$2
16312 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16313 -$as_echo_n "checking for $ac_word... " >&6; }
16314 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
16315 - $as_echo_n "(cached) " >&6
16316 -else
16317 - if test -n "$ac_ct_CC"; then
16318 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
16319 -else
16320 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16321 -for as_dir in $PATH
16322 -do
16323 - IFS=$as_save_IFS
16324 - test -z "$as_dir" && as_dir=.
16325 - for ac_exec_ext in '' $ac_executable_extensions; do
16326 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16327 - ac_cv_prog_ac_ct_CC="$ac_prog"
16328 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16329 - break 2
16330 - fi
16331 -done
16332 -done
16333 -IFS=$as_save_IFS
16334 -
16335 -fi
16336 -fi
16337 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
16338 -if test -n "$ac_ct_CC"; then
16339 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
16340 -$as_echo "$ac_ct_CC" >&6; }
16341 -else
16342 - { $as_echo "$as_me:$LINENO: result: no" >&5
16343 -$as_echo "no" >&6; }
16344 -fi
16345 -
16346 -
16347 - test -n "$ac_ct_CC" && break
16348 -done
16349 -
16350 - if test "x$ac_ct_CC" = x; then
16351 - CC=""
16352 - else
16353 - case $cross_compiling:$ac_tool_warned in
16354 -yes:)
16355 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
16356 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
16357 -ac_tool_warned=yes ;;
16358 -esac
16359 - CC=$ac_ct_CC
16360 - fi
16361 -fi
16362 -
16363 -fi
16364 -
16365 -
16366 -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
16367 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16368 -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
16369 -See \`config.log' for more details." >&5
16370 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
16371 -See \`config.log' for more details." >&2;}
16372 - { (exit 1); exit 1; }; }; }
16373 -
16374 -# Provide some information about the compiler.
16375 -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
16376 -set X $ac_compile
16377 -ac_compiler=$2
16378 -{ (ac_try="$ac_compiler --version >&5"
16379 -case "(($ac_try" in
16380 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16381 - *) ac_try_echo=$ac_try;;
16382 -esac
16383 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16384 -$as_echo "$ac_try_echo") >&5
16385 - (eval "$ac_compiler --version >&5") 2>&5
16386 - ac_status=$?
16387 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16388 - (exit $ac_status); }
16389 -{ (ac_try="$ac_compiler -v >&5"
16390 -case "(($ac_try" in
16391 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16392 - *) ac_try_echo=$ac_try;;
16393 -esac
16394 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16395 -$as_echo "$ac_try_echo") >&5
16396 - (eval "$ac_compiler -v >&5") 2>&5
16397 - ac_status=$?
16398 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16399 - (exit $ac_status); }
16400 -{ (ac_try="$ac_compiler -V >&5"
16401 -case "(($ac_try" in
16402 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16403 - *) ac_try_echo=$ac_try;;
16404 -esac
16405 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16406 -$as_echo "$ac_try_echo") >&5
16407 - (eval "$ac_compiler -V >&5") 2>&5
16408 - ac_status=$?
16409 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16410 - (exit $ac_status); }
16411 -
16412 -cat >conftest.$ac_ext <<_ACEOF
16413 -/* confdefs.h. */
16414 -_ACEOF
16415 -cat confdefs.h >>conftest.$ac_ext
16416 -cat >>conftest.$ac_ext <<_ACEOF
16417 -/* end confdefs.h. */
16418 -
16419 -int
16420 -main ()
16421 -{
16422 -
16423 - ;
16424 - return 0;
16425 -}
16426 -_ACEOF
16427 -ac_clean_files_save=$ac_clean_files
16428 -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
16429 -# Try to create an executable without -o first, disregard a.out.
16430 -# It will help us diagnose broken compilers, and finding out an intuition
16431 -# of exeext.
16432 -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
16433 -$as_echo_n "checking for C compiler default output file name... " >&6; }
16434 -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
16435 -
16436 -# The possible output files:
16437 -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
16438 -
16439 -ac_rmfiles=
16440 -for ac_file in $ac_files
16441 -do
16442 - case $ac_file in
16443 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
16444 - * ) ac_rmfiles="$ac_rmfiles $ac_file";;
16445 - esac
16446 -done
16447 -rm -f $ac_rmfiles
16448 -
16449 -if { (ac_try="$ac_link_default"
16450 -case "(($ac_try" in
16451 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16452 - *) ac_try_echo=$ac_try;;
16453 -esac
16454 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16455 -$as_echo "$ac_try_echo") >&5
16456 - (eval "$ac_link_default") 2>&5
16457 - ac_status=$?
16458 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16459 - (exit $ac_status); }; then
16460 - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
16461 -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
16462 -# in a Makefile. We should not override ac_cv_exeext if it was cached,
16463 -# so that the user can short-circuit this test for compilers unknown to
16464 -# Autoconf.
16465 -for ac_file in $ac_files ''
16466 -do
16467 - test -f "$ac_file" || continue
16468 - case $ac_file in
16469 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
16470 - ;;
16471 - [ab].out )
16472 - # We found the default executable, but exeext='' is most
16473 - # certainly right.
16474 - break;;
16475 - *.* )
16476 - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
16477 - then :; else
16478 - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
16479 - fi
16480 - # We set ac_cv_exeext here because the later test for it is not
16481 - # safe: cross compilers may not add the suffix if given an `-o'
16482 - # argument, so we may need to know it at that point already.
16483 - # Even if this section looks crufty: it has the advantage of
16484 - # actually working.
16485 - break;;
16486 - * )
16487 - break;;
16488 - esac
16489 -done
16490 -test "$ac_cv_exeext" = no && ac_cv_exeext=
16491 -
16492 -else
16493 - ac_file=''
16494 -fi
16495 -
16496 -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
16497 -$as_echo "$ac_file" >&6; }
16498 -if test -z "$ac_file"; then
16499 - $as_echo "$as_me: failed program was:" >&5
16500 -sed 's/^/| /' conftest.$ac_ext >&5
16501 -
16502 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
16503 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16504 -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
16505 -See \`config.log' for more details." >&5
16506 -$as_echo "$as_me: error: C compiler cannot create executables
16507 -See \`config.log' for more details." >&2;}
16508 - { (exit 77); exit 77; }; }; }
16509 -fi
16510 -
16511 -ac_exeext=$ac_cv_exeext
16512 -
16513 -# Check that the compiler produces executables we can run. If not, either
16514 -# the compiler is broken, or we cross compile.
16515 -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
16516 -$as_echo_n "checking whether the C compiler works... " >&6; }
16517 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
16518 -# If not cross compiling, check that we can run a simple program.
16519 -if test "$cross_compiling" != yes; then
16520 - if { ac_try='./$ac_file'
16521 - { (case "(($ac_try" in
16522 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16523 - *) ac_try_echo=$ac_try;;
16524 -esac
16525 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16526 -$as_echo "$ac_try_echo") >&5
16527 - (eval "$ac_try") 2>&5
16528 - ac_status=$?
16529 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16530 - (exit $ac_status); }; }; then
16531 - cross_compiling=no
16532 - else
16533 - if test "$cross_compiling" = maybe; then
16534 - cross_compiling=yes
16535 - else
16536 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
16537 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16538 -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
16539 -If you meant to cross compile, use \`--host'.
16540 -See \`config.log' for more details." >&5
16541 -$as_echo "$as_me: error: cannot run C compiled programs.
16542 -If you meant to cross compile, use \`--host'.
16543 -See \`config.log' for more details." >&2;}
16544 - { (exit 1); exit 1; }; }; }
16545 - fi
16546 - fi
16547 -fi
16548 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
16549 -$as_echo "yes" >&6; }
16550 -
16551 -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
16552 -ac_clean_files=$ac_clean_files_save
16553 -# Check that the compiler produces executables we can run. If not, either
16554 -# the compiler is broken, or we cross compile.
16555 -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
16556 -$as_echo_n "checking whether we are cross compiling... " >&6; }
16557 -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
16558 -$as_echo "$cross_compiling" >&6; }
16559 -
16560 -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
16561 -$as_echo_n "checking for suffix of executables... " >&6; }
16562 -if { (ac_try="$ac_link"
16563 -case "(($ac_try" in
16564 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16565 - *) ac_try_echo=$ac_try;;
16566 -esac
16567 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16568 -$as_echo "$ac_try_echo") >&5
16569 - (eval "$ac_link") 2>&5
16570 - ac_status=$?
16571 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16572 - (exit $ac_status); }; then
16573 - # If both `conftest.exe' and `conftest' are `present' (well, observable)
16574 -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
16575 -# work properly (i.e., refer to `conftest.exe'), while it won't with
16576 -# `rm'.
16577 -for ac_file in conftest.exe conftest conftest.*; do
16578 - test -f "$ac_file" || continue
16579 - case $ac_file in
16580 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
16581 - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
16582 - break;;
16583 - * ) break;;
16584 - esac
16585 -done
16586 -else
16587 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
16588 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16589 -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
16590 -See \`config.log' for more details." >&5
16591 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
16592 -See \`config.log' for more details." >&2;}
16593 - { (exit 1); exit 1; }; }; }
16594 -fi
16595 -
16596 -rm -f conftest$ac_cv_exeext
16597 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
16598 -$as_echo "$ac_cv_exeext" >&6; }
16599 -
16600 -rm -f conftest.$ac_ext
16601 -EXEEXT=$ac_cv_exeext
16602 -ac_exeext=$EXEEXT
16603 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
16604 -$as_echo_n "checking for suffix of object files... " >&6; }
16605 -if test "${ac_cv_objext+set}" = set; then
16606 - $as_echo_n "(cached) " >&6
16607 -else
16608 - cat >conftest.$ac_ext <<_ACEOF
16609 -/* confdefs.h. */
16610 -_ACEOF
16611 -cat confdefs.h >>conftest.$ac_ext
16612 -cat >>conftest.$ac_ext <<_ACEOF
16613 -/* end confdefs.h. */
16614 -
16615 -int
16616 -main ()
16617 -{
16618 -
16619 - ;
16620 - return 0;
16621 -}
16622 -_ACEOF
16623 -rm -f conftest.o conftest.obj
16624 -if { (ac_try="$ac_compile"
16625 -case "(($ac_try" in
16626 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16627 - *) ac_try_echo=$ac_try;;
16628 -esac
16629 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16630 -$as_echo "$ac_try_echo") >&5
16631 - (eval "$ac_compile") 2>&5
16632 - ac_status=$?
16633 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16634 - (exit $ac_status); }; then
16635 - for ac_file in conftest.o conftest.obj conftest.*; do
16636 - test -f "$ac_file" || continue;
16637 - case $ac_file in
16638 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
16639 - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
16640 - break;;
16641 - esac
16642 -done
16643 -else
16644 - $as_echo "$as_me: failed program was:" >&5
16645 -sed 's/^/| /' conftest.$ac_ext >&5
16646 -
16647 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
16648 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16649 -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
16650 -See \`config.log' for more details." >&5
16651 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
16652 -See \`config.log' for more details." >&2;}
16653 - { (exit 1); exit 1; }; }; }
16654 -fi
16655 -
16656 -rm -f conftest.$ac_cv_objext conftest.$ac_ext
16657 -fi
16658 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
16659 -$as_echo "$ac_cv_objext" >&6; }
16660 -OBJEXT=$ac_cv_objext
16661 -ac_objext=$OBJEXT
16662 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
16663 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
16664 -if test "${ac_cv_c_compiler_gnu+set}" = set; then
16665 - $as_echo_n "(cached) " >&6
16666 -else
16667 - cat >conftest.$ac_ext <<_ACEOF
16668 -/* confdefs.h. */
16669 -_ACEOF
16670 -cat confdefs.h >>conftest.$ac_ext
16671 -cat >>conftest.$ac_ext <<_ACEOF
16672 -/* end confdefs.h. */
16673 -
16674 -int
16675 -main ()
16676 -{
16677 -#ifndef __GNUC__
16678 - choke me
16679 -#endif
16680 -
16681 - ;
16682 - return 0;
16683 -}
16684 -_ACEOF
16685 -rm -f conftest.$ac_objext
16686 -if { (ac_try="$ac_compile"
16687 -case "(($ac_try" in
16688 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16689 - *) ac_try_echo=$ac_try;;
16690 -esac
16691 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16692 -$as_echo "$ac_try_echo") >&5
16693 - (eval "$ac_compile") 2>conftest.er1
16694 - ac_status=$?
16695 - grep -v '^ *+' conftest.er1 >conftest.err
16696 - rm -f conftest.er1
16697 - cat conftest.err >&5
16698 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16699 - (exit $ac_status); } && {
16700 - test -z "$ac_c_werror_flag" ||
16701 - test ! -s conftest.err
16702 - } && test -s conftest.$ac_objext; then
16703 - ac_compiler_gnu=yes
16704 -else
16705 - $as_echo "$as_me: failed program was:" >&5
16706 -sed 's/^/| /' conftest.$ac_ext >&5
16707 -
16708 - ac_compiler_gnu=no
16709 -fi
16710 -
16711 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16712 -ac_cv_c_compiler_gnu=$ac_compiler_gnu
16713 -
16714 -fi
16715 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
16716 -$as_echo "$ac_cv_c_compiler_gnu" >&6; }
16717 -if test $ac_compiler_gnu = yes; then
16718 - GCC=yes
16719 -else
16720 - GCC=
16721 -fi
16722 -ac_test_CFLAGS=${CFLAGS+set}
16723 -ac_save_CFLAGS=$CFLAGS
16724 -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
16725 -$as_echo_n "checking whether $CC accepts -g... " >&6; }
16726 -if test "${ac_cv_prog_cc_g+set}" = set; then
16727 - $as_echo_n "(cached) " >&6
16728 -else
16729 - ac_save_c_werror_flag=$ac_c_werror_flag
16730 - ac_c_werror_flag=yes
16731 - ac_cv_prog_cc_g=no
16732 - CFLAGS="-g"
16733 - cat >conftest.$ac_ext <<_ACEOF
16734 -/* confdefs.h. */
16735 -_ACEOF
16736 -cat confdefs.h >>conftest.$ac_ext
16737 -cat >>conftest.$ac_ext <<_ACEOF
16738 -/* end confdefs.h. */
16739 -
16740 -int
16741 -main ()
16742 -{
16743 -
16744 - ;
16745 - return 0;
16746 -}
16747 -_ACEOF
16748 -rm -f conftest.$ac_objext
16749 -if { (ac_try="$ac_compile"
16750 -case "(($ac_try" in
16751 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16752 - *) ac_try_echo=$ac_try;;
16753 -esac
16754 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16755 -$as_echo "$ac_try_echo") >&5
16756 - (eval "$ac_compile") 2>conftest.er1
16757 - ac_status=$?
16758 - grep -v '^ *+' conftest.er1 >conftest.err
16759 - rm -f conftest.er1
16760 - cat conftest.err >&5
16761 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16762 - (exit $ac_status); } && {
16763 - test -z "$ac_c_werror_flag" ||
16764 - test ! -s conftest.err
16765 - } && test -s conftest.$ac_objext; then
16766 - ac_cv_prog_cc_g=yes
16767 -else
16768 - $as_echo "$as_me: failed program was:" >&5
16769 -sed 's/^/| /' conftest.$ac_ext >&5
16770 -
16771 - CFLAGS=""
16772 - cat >conftest.$ac_ext <<_ACEOF
16773 -/* confdefs.h. */
16774 -_ACEOF
16775 -cat confdefs.h >>conftest.$ac_ext
16776 -cat >>conftest.$ac_ext <<_ACEOF
16777 -/* end confdefs.h. */
16778 -
16779 -int
16780 -main ()
16781 -{
16782 -
16783 - ;
16784 - return 0;
16785 -}
16786 -_ACEOF
16787 -rm -f conftest.$ac_objext
16788 -if { (ac_try="$ac_compile"
16789 -case "(($ac_try" in
16790 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16791 - *) ac_try_echo=$ac_try;;
16792 -esac
16793 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16794 -$as_echo "$ac_try_echo") >&5
16795 - (eval "$ac_compile") 2>conftest.er1
16796 - ac_status=$?
16797 - grep -v '^ *+' conftest.er1 >conftest.err
16798 - rm -f conftest.er1
16799 - cat conftest.err >&5
16800 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16801 - (exit $ac_status); } && {
16802 - test -z "$ac_c_werror_flag" ||
16803 - test ! -s conftest.err
16804 - } && test -s conftest.$ac_objext; then
16805 - :
16806 -else
16807 - $as_echo "$as_me: failed program was:" >&5
16808 -sed 's/^/| /' conftest.$ac_ext >&5
16809 -
16810 - ac_c_werror_flag=$ac_save_c_werror_flag
16811 - CFLAGS="-g"
16812 - cat >conftest.$ac_ext <<_ACEOF
16813 -/* confdefs.h. */
16814 -_ACEOF
16815 -cat confdefs.h >>conftest.$ac_ext
16816 -cat >>conftest.$ac_ext <<_ACEOF
16817 -/* end confdefs.h. */
16818 -
16819 -int
16820 -main ()
16821 -{
16822 -
16823 - ;
16824 - return 0;
16825 -}
16826 -_ACEOF
16827 -rm -f conftest.$ac_objext
16828 -if { (ac_try="$ac_compile"
16829 -case "(($ac_try" in
16830 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16831 - *) ac_try_echo=$ac_try;;
16832 -esac
16833 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16834 -$as_echo "$ac_try_echo") >&5
16835 - (eval "$ac_compile") 2>conftest.er1
16836 - ac_status=$?
16837 - grep -v '^ *+' conftest.er1 >conftest.err
16838 - rm -f conftest.er1
16839 - cat conftest.err >&5
16840 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16841 - (exit $ac_status); } && {
16842 - test -z "$ac_c_werror_flag" ||
16843 - test ! -s conftest.err
16844 - } && test -s conftest.$ac_objext; then
16845 - ac_cv_prog_cc_g=yes
16846 -else
16847 - $as_echo "$as_me: failed program was:" >&5
16848 -sed 's/^/| /' conftest.$ac_ext >&5
16849 -
16850 -
16851 -fi
16852 -
16853 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16854 -fi
16855 -
16856 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16857 -fi
16858 -
16859 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16860 - ac_c_werror_flag=$ac_save_c_werror_flag
16861 -fi
16862 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
16863 -$as_echo "$ac_cv_prog_cc_g" >&6; }
16864 -if test "$ac_test_CFLAGS" = set; then
16865 - CFLAGS=$ac_save_CFLAGS
16866 -elif test $ac_cv_prog_cc_g = yes; then
16867 - if test "$GCC" = yes; then
16868 - CFLAGS="-g -O2"
16869 - else
16870 - CFLAGS="-g"
16871 - fi
16872 -else
16873 - if test "$GCC" = yes; then
16874 - CFLAGS="-O2"
16875 - else
16876 - CFLAGS=
16877 - fi
16878 -fi
16879 -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
16880 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
16881 -if test "${ac_cv_prog_cc_c89+set}" = set; then
16882 - $as_echo_n "(cached) " >&6
16883 -else
16884 - ac_cv_prog_cc_c89=no
16885 -ac_save_CC=$CC
16886 -cat >conftest.$ac_ext <<_ACEOF
16887 -/* confdefs.h. */
16888 -_ACEOF
16889 -cat confdefs.h >>conftest.$ac_ext
16890 -cat >>conftest.$ac_ext <<_ACEOF
16891 -/* end confdefs.h. */
16892 -#include <stdarg.h>
16893 -#include <stdio.h>
16894 -#include <sys/types.h>
16895 -#include <sys/stat.h>
16896 -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
16897 -struct buf { int x; };
16898 -FILE * (*rcsopen) (struct buf *, struct stat *, int);
16899 -static char *e (p, i)
16900 - char **p;
16901 - int i;
16902 -{
16903 - return p[i];
16904 -}
16905 -static char *f (char * (*g) (char **, int), char **p, ...)
16906 -{
16907 - char *s;
16908 - va_list v;
16909 - va_start (v,p);
16910 - s = g (p, va_arg (v,int));
16911 - va_end (v);
16912 - return s;
16913 -}
16914 -
16915 -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
16916 - function prototypes and stuff, but not '\xHH' hex character constants.
16917 - These don't provoke an error unfortunately, instead are silently treated
16918 - as 'x'. The following induces an error, until -std is added to get
16919 - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
16920 - array size at least. It's necessary to write '\x00'==0 to get something
16921 - that's true only with -std. */
16922 -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
16923 -
16924 -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
16925 - inside strings and character constants. */
16926 -#define FOO(x) 'x'
16927 -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
16928 -
16929 -int test (int i, double x);
16930 -struct s1 {int (*f) (int a);};
16931 -struct s2 {int (*f) (double a);};
16932 -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
16933 -int argc;
16934 -char **argv;
16935 -int
16936 -main ()
16937 -{
16938 -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
16939 - ;
16940 - return 0;
16941 -}
16942 -_ACEOF
16943 -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
16944 - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
16945 -do
16946 - CC="$ac_save_CC $ac_arg"
16947 - rm -f conftest.$ac_objext
16948 -if { (ac_try="$ac_compile"
16949 -case "(($ac_try" in
16950 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16951 - *) ac_try_echo=$ac_try;;
16952 -esac
16953 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16954 -$as_echo "$ac_try_echo") >&5
16955 - (eval "$ac_compile") 2>conftest.er1
16956 - ac_status=$?
16957 - grep -v '^ *+' conftest.er1 >conftest.err
16958 - rm -f conftest.er1
16959 - cat conftest.err >&5
16960 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16961 - (exit $ac_status); } && {
16962 - test -z "$ac_c_werror_flag" ||
16963 - test ! -s conftest.err
16964 - } && test -s conftest.$ac_objext; then
16965 - ac_cv_prog_cc_c89=$ac_arg
16966 -else
16967 - $as_echo "$as_me: failed program was:" >&5
16968 -sed 's/^/| /' conftest.$ac_ext >&5
16969 -
16970 -
16971 -fi
16972 -
16973 -rm -f core conftest.err conftest.$ac_objext
16974 - test "x$ac_cv_prog_cc_c89" != "xno" && break
16975 -done
16976 -rm -f conftest.$ac_ext
16977 -CC=$ac_save_CC
16978 -
16979 -fi
16980 -# AC_CACHE_VAL
16981 -case "x$ac_cv_prog_cc_c89" in
16982 - x)
16983 - { $as_echo "$as_me:$LINENO: result: none needed" >&5
16984 -$as_echo "none needed" >&6; } ;;
16985 - xno)
16986 - { $as_echo "$as_me:$LINENO: result: unsupported" >&5
16987 -$as_echo "unsupported" >&6; } ;;
16988 - *)
16989 - CC="$CC $ac_cv_prog_cc_c89"
16990 - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
16991 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
16992 -esac
16993 -
16994 -
16995 -ac_ext=c
16996 -ac_cpp='$CPP $CPPFLAGS'
16997 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
16998 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
16999 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
17000 -DEPDIR="${am__leading_dot}deps"
17001 -
17002 -ac_config_commands="$ac_config_commands depfiles"
17003 -
17004 -
17005 -am_make=${MAKE-make}
17006 -cat > confinc << 'END'
17007 -am__doit:
17008 - @echo done
17009 -.PHONY: am__doit
17010 -END
17011 -# If we don't find an include directive, just comment out the code.
17012 -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
17013 -$as_echo_n "checking for style of include used by $am_make... " >&6; }
17014 -am__include="#"
17015 -am__quote=
17016 -_am_result=none
17017 -# First try GNU make style include.
17018 -echo "include confinc" > confmf
17019 -# We grep out `Entering directory' and `Leaving directory'
17020 -# messages which can occur if `w' ends up in MAKEFLAGS.
17021 -# In particular we don't look at `^make:' because GNU make might
17022 -# be invoked under some other name (usually "gmake"), in which
17023 -# case it prints its new name instead of `make'.
17024 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
17025 - am__include=include
17026 - am__quote=
17027 - _am_result=GNU
17028 -fi
17029 -# Now try BSD make style include.
17030 -if test "$am__include" = "#"; then
17031 - echo '.include "confinc"' > confmf
17032 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
17033 - am__include=.include
17034 - am__quote="\""
17035 - _am_result=BSD
17036 - fi
17037 -fi
17038 -
17039 -
17040 -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
17041 -$as_echo "$_am_result" >&6; }
17042 -rm -f confinc confmf
17043 -
17044 -# Check whether --enable-dependency-tracking was given.
17045 -if test "${enable_dependency_tracking+set}" = set; then
17046 - enableval=$enable_dependency_tracking;
17047 -fi
17048 -
17049 -if test "x$enable_dependency_tracking" != xno; then
17050 - am_depcomp="$ac_aux_dir/depcomp"
17051 - AMDEPBACKSLASH='\'
17052 -fi
17053 - if test "x$enable_dependency_tracking" != xno; then
17054 - AMDEP_TRUE=
17055 - AMDEP_FALSE='#'
17056 -else
17057 - AMDEP_TRUE='#'
17058 - AMDEP_FALSE=
17059 -fi
17060 -
17061 -
17062 -
17063 -depcc="$CC" am_compiler_list=
17064 -
17065 -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
17066 -$as_echo_n "checking dependency style of $depcc... " >&6; }
17067 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
17068 - $as_echo_n "(cached) " >&6
17069 -else
17070 - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
17071 - # We make a subdir and do the tests there. Otherwise we can end up
17072 - # making bogus files that we don't know about and never remove. For
17073 - # instance it was reported that on HP-UX the gcc test will end up
17074 - # making a dummy file named `D' -- because `-MD' means `put the output
17075 - # in D'.
17076 - mkdir conftest.dir
17077 - # Copy depcomp to subdir because otherwise we won't find it if we're
17078 - # using a relative directory.
17079 - cp "$am_depcomp" conftest.dir
17080 - cd conftest.dir
17081 - # We will build objects and dependencies in a subdirectory because
17082 - # it helps to detect inapplicable dependency modes. For instance
17083 - # both Tru64's cc and ICC support -MD to output dependencies as a
17084 - # side effect of compilation, but ICC will put the dependencies in
17085 - # the current directory while Tru64 will put them in the object
17086 - # directory.
17087 - mkdir sub
17088 -
17089 - am_cv_CC_dependencies_compiler_type=none
17090 - if test "$am_compiler_list" = ""; then
17091 - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
17092 - fi
17093 - for depmode in $am_compiler_list; do
17094 - # Setup a source with many dependencies, because some compilers
17095 - # like to wrap large dependency lists on column 80 (with \), and
17096 - # we should not choose a depcomp mode which is confused by this.
17097 - #
17098 - # We need to recreate these files for each test, as the compiler may
17099 - # overwrite some of them when testing with obscure command lines.
17100 - # This happens at least with the AIX C compiler.
17101 - : > sub/conftest.c
17102 - for i in 1 2 3 4 5 6; do
17103 - echo '#include "conftst'$i'.h"' >> sub/conftest.c
17104 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
17105 - # Solaris 8's {/usr,}/bin/sh.
17106 - touch sub/conftst$i.h
17107 - done
17108 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
17109 -
17110 - case $depmode in
17111 - nosideeffect)
17112 - # after this tag, mechanisms are not by side-effect, so they'll
17113 - # only be used when explicitly requested
17114 - if test "x$enable_dependency_tracking" = xyes; then
17115 - continue
17116 - else
17117 - break
17118 - fi
17119 - ;;
17120 - none) break ;;
17121 - esac
17122 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
17123 - # mode. It turns out that the SunPro C++ compiler does not properly
17124 - # handle `-M -o', and we need to detect this.
17125 - if depmode=$depmode \
17126 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
17127 - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
17128 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
17129 - >/dev/null 2>conftest.err &&
17130 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
17131 - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
17132 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
17133 - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
17134 - # icc doesn't choke on unknown options, it will just issue warnings
17135 - # or remarks (even with -Werror). So we grep stderr for any message
17136 - # that says an option was ignored or not supported.
17137 - # When given -MP, icc 7.0 and 7.1 complain thusly:
17138 - # icc: Command line warning: ignoring option '-M'; no argument required
17139 - # The diagnosis changed in icc 8.0:
17140 - # icc: Command line remark: option '-MP' not supported
17141 - if (grep 'ignoring option' conftest.err ||
17142 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
17143 - am_cv_CC_dependencies_compiler_type=$depmode
17144 - break
17145 - fi
17146 - fi
17147 - done
17148 -
17149 - cd ..
17150 - rm -rf conftest.dir
17151 -else
17152 - am_cv_CC_dependencies_compiler_type=none
17153 -fi
17154 -
17155 -fi
17156 -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
17157 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
17158 -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
17159 -
17160 - if
17161 - test "x$enable_dependency_tracking" != xno \
17162 - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
17163 - am__fastdepCC_TRUE=
17164 - am__fastdepCC_FALSE='#'
17165 -else
17166 - am__fastdepCC_TRUE='#'
17167 - am__fastdepCC_FALSE=
17168 -fi
17169 -
17170 -
17171 -ac_ext=cpp
17172 -ac_cpp='$CXXCPP $CPPFLAGS'
17173 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
17174 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
17175 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
17176 -if test -z "$CXX"; then
17177 - if test -n "$CCC"; then
17178 - CXX=$CCC
17179 - else
17180 - if test -n "$ac_tool_prefix"; then
17181 - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
17182 - do
17183 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17184 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17185 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
17186 -$as_echo_n "checking for $ac_word... " >&6; }
17187 -if test "${ac_cv_prog_CXX+set}" = set; then
17188 - $as_echo_n "(cached) " >&6
17189 -else
17190 - if test -n "$CXX"; then
17191 - ac_cv_prog_CXX="$CXX" # Let the user override the test.
17192 -else
17193 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17194 -for as_dir in $PATH
17195 -do
17196 - IFS=$as_save_IFS
17197 - test -z "$as_dir" && as_dir=.
17198 - for ac_exec_ext in '' $ac_executable_extensions; do
17199 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17200 - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
17201 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17202 - break 2
17203 - fi
17204 -done
17205 -done
17206 -IFS=$as_save_IFS
17207 -
17208 -fi
17209 -fi
17210 -CXX=$ac_cv_prog_CXX
17211 -if test -n "$CXX"; then
17212 - { $as_echo "$as_me:$LINENO: result: $CXX" >&5
17213 -$as_echo "$CXX" >&6; }
17214 -else
17215 - { $as_echo "$as_me:$LINENO: result: no" >&5
17216 -$as_echo "no" >&6; }
17217 -fi
17218 -
17219 -
17220 - test -n "$CXX" && break
17221 - done
17222 -fi
17223 -if test -z "$CXX"; then
17224 - ac_ct_CXX=$CXX
17225 - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
17226 -do
17227 - # Extract the first word of "$ac_prog", so it can be a program name with args.
17228 -set dummy $ac_prog; ac_word=$2
17229 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
17230 -$as_echo_n "checking for $ac_word... " >&6; }
17231 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
17232 - $as_echo_n "(cached) " >&6
17233 -else
17234 - if test -n "$ac_ct_CXX"; then
17235 - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
17236 -else
17237 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17238 -for as_dir in $PATH
17239 -do
17240 - IFS=$as_save_IFS
17241 - test -z "$as_dir" && as_dir=.
17242 - for ac_exec_ext in '' $ac_executable_extensions; do
17243 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17244 - ac_cv_prog_ac_ct_CXX="$ac_prog"
17245 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17246 - break 2
17247 - fi
17248 -done
17249 -done
17250 -IFS=$as_save_IFS
17251 -
17252 -fi
17253 -fi
17254 -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
17255 -if test -n "$ac_ct_CXX"; then
17256 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
17257 -$as_echo "$ac_ct_CXX" >&6; }
17258 -else
17259 - { $as_echo "$as_me:$LINENO: result: no" >&5
17260 -$as_echo "no" >&6; }
17261 -fi
17262 -
17263 -
17264 - test -n "$ac_ct_CXX" && break
17265 -done
17266 -
17267 - if test "x$ac_ct_CXX" = x; then
17268 - CXX="g++"
17269 - else
17270 - case $cross_compiling:$ac_tool_warned in
17271 -yes:)
17272 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
17273 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17274 -ac_tool_warned=yes ;;
17275 -esac
17276 - CXX=$ac_ct_CXX
17277 - fi
17278 -fi
17279 -
17280 - fi
17281 -fi
17282 -# Provide some information about the compiler.
17283 -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
17284 -set X $ac_compile
17285 -ac_compiler=$2
17286 -{ (ac_try="$ac_compiler --version >&5"
17287 -case "(($ac_try" in
17288 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17289 - *) ac_try_echo=$ac_try;;
17290 -esac
17291 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17292 -$as_echo "$ac_try_echo") >&5
17293 - (eval "$ac_compiler --version >&5") 2>&5
17294 - ac_status=$?
17295 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17296 - (exit $ac_status); }
17297 -{ (ac_try="$ac_compiler -v >&5"
17298 -case "(($ac_try" in
17299 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17300 - *) ac_try_echo=$ac_try;;
17301 -esac
17302 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17303 -$as_echo "$ac_try_echo") >&5
17304 - (eval "$ac_compiler -v >&5") 2>&5
17305 - ac_status=$?
17306 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17307 - (exit $ac_status); }
17308 -{ (ac_try="$ac_compiler -V >&5"
17309 -case "(($ac_try" in
17310 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17311 - *) ac_try_echo=$ac_try;;
17312 -esac
17313 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17314 -$as_echo "$ac_try_echo") >&5
17315 - (eval "$ac_compiler -V >&5") 2>&5
17316 - ac_status=$?
17317 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17318 - (exit $ac_status); }
17319 -
17320 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
17321 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
17322 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
17323 - $as_echo_n "(cached) " >&6
17324 -else
17325 - cat >conftest.$ac_ext <<_ACEOF
17326 -/* confdefs.h. */
17327 -_ACEOF
17328 -cat confdefs.h >>conftest.$ac_ext
17329 -cat >>conftest.$ac_ext <<_ACEOF
17330 -/* end confdefs.h. */
17331 -
17332 -int
17333 -main ()
17334 -{
17335 -#ifndef __GNUC__
17336 - choke me
17337 -#endif
17338 -
17339 - ;
17340 - return 0;
17341 -}
17342 -_ACEOF
17343 -rm -f conftest.$ac_objext
17344 -if { (ac_try="$ac_compile"
17345 -case "(($ac_try" in
17346 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17347 - *) ac_try_echo=$ac_try;;
17348 -esac
17349 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17350 -$as_echo "$ac_try_echo") >&5
17351 - (eval "$ac_compile") 2>conftest.er1
17352 - ac_status=$?
17353 - grep -v '^ *+' conftest.er1 >conftest.err
17354 - rm -f conftest.er1
17355 - cat conftest.err >&5
17356 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17357 - (exit $ac_status); } && {
17358 - test -z "$ac_cxx_werror_flag" ||
17359 - test ! -s conftest.err
17360 - } && test -s conftest.$ac_objext; then
17361 - ac_compiler_gnu=yes
17362 -else
17363 - $as_echo "$as_me: failed program was:" >&5
17364 -sed 's/^/| /' conftest.$ac_ext >&5
17365 -
17366 - ac_compiler_gnu=no
17367 -fi
17368 -
17369 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17370 -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
17371 -
17372 -fi
17373 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
17374 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
17375 -if test $ac_compiler_gnu = yes; then
17376 - GXX=yes
17377 -else
17378 - GXX=
17379 -fi
17380 -ac_test_CXXFLAGS=${CXXFLAGS+set}
17381 -ac_save_CXXFLAGS=$CXXFLAGS
17382 -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
17383 -$as_echo_n "checking whether $CXX accepts -g... " >&6; }
17384 -if test "${ac_cv_prog_cxx_g+set}" = set; then
17385 - $as_echo_n "(cached) " >&6
17386 -else
17387 - ac_save_cxx_werror_flag=$ac_cxx_werror_flag
17388 - ac_cxx_werror_flag=yes
17389 - ac_cv_prog_cxx_g=no
17390 - CXXFLAGS="-g"
17391 - cat >conftest.$ac_ext <<_ACEOF
17392 -/* confdefs.h. */
17393 -_ACEOF
17394 -cat confdefs.h >>conftest.$ac_ext
17395 -cat >>conftest.$ac_ext <<_ACEOF
17396 -/* end confdefs.h. */
17397 -
17398 -int
17399 -main ()
17400 -{
17401 -
17402 - ;
17403 - return 0;
17404 -}
17405 -_ACEOF
17406 -rm -f conftest.$ac_objext
17407 -if { (ac_try="$ac_compile"
17408 -case "(($ac_try" in
17409 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17410 - *) ac_try_echo=$ac_try;;
17411 -esac
17412 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17413 -$as_echo "$ac_try_echo") >&5
17414 - (eval "$ac_compile") 2>conftest.er1
17415 - ac_status=$?
17416 - grep -v '^ *+' conftest.er1 >conftest.err
17417 - rm -f conftest.er1
17418 - cat conftest.err >&5
17419 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17420 - (exit $ac_status); } && {
17421 - test -z "$ac_cxx_werror_flag" ||
17422 - test ! -s conftest.err
17423 - } && test -s conftest.$ac_objext; then
17424 - ac_cv_prog_cxx_g=yes
17425 -else
17426 - $as_echo "$as_me: failed program was:" >&5
17427 -sed 's/^/| /' conftest.$ac_ext >&5
17428 -
17429 - CXXFLAGS=""
17430 - cat >conftest.$ac_ext <<_ACEOF
17431 -/* confdefs.h. */
17432 -_ACEOF
17433 -cat confdefs.h >>conftest.$ac_ext
17434 -cat >>conftest.$ac_ext <<_ACEOF
17435 -/* end confdefs.h. */
17436 -
17437 -int
17438 -main ()
17439 -{
17440 -
17441 - ;
17442 - return 0;
17443 -}
17444 -_ACEOF
17445 -rm -f conftest.$ac_objext
17446 -if { (ac_try="$ac_compile"
17447 -case "(($ac_try" in
17448 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17449 - *) ac_try_echo=$ac_try;;
17450 -esac
17451 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17452 -$as_echo "$ac_try_echo") >&5
17453 - (eval "$ac_compile") 2>conftest.er1
17454 - ac_status=$?
17455 - grep -v '^ *+' conftest.er1 >conftest.err
17456 - rm -f conftest.er1
17457 - cat conftest.err >&5
17458 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17459 - (exit $ac_status); } && {
17460 - test -z "$ac_cxx_werror_flag" ||
17461 - test ! -s conftest.err
17462 - } && test -s conftest.$ac_objext; then
17463 - :
17464 -else
17465 - $as_echo "$as_me: failed program was:" >&5
17466 -sed 's/^/| /' conftest.$ac_ext >&5
17467 -
17468 - ac_cxx_werror_flag=$ac_save_cxx_werror_flag
17469 - CXXFLAGS="-g"
17470 - cat >conftest.$ac_ext <<_ACEOF
17471 -/* confdefs.h. */
17472 -_ACEOF
17473 -cat confdefs.h >>conftest.$ac_ext
17474 -cat >>conftest.$ac_ext <<_ACEOF
17475 -/* end confdefs.h. */
17476 -
17477 -int
17478 -main ()
17479 -{
17480 -
17481 - ;
17482 - return 0;
17483 -}
17484 -_ACEOF
17485 -rm -f conftest.$ac_objext
17486 -if { (ac_try="$ac_compile"
17487 -case "(($ac_try" in
17488 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17489 - *) ac_try_echo=$ac_try;;
17490 -esac
17491 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17492 -$as_echo "$ac_try_echo") >&5
17493 - (eval "$ac_compile") 2>conftest.er1
17494 - ac_status=$?
17495 - grep -v '^ *+' conftest.er1 >conftest.err
17496 - rm -f conftest.er1
17497 - cat conftest.err >&5
17498 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17499 - (exit $ac_status); } && {
17500 - test -z "$ac_cxx_werror_flag" ||
17501 - test ! -s conftest.err
17502 - } && test -s conftest.$ac_objext; then
17503 - ac_cv_prog_cxx_g=yes
17504 -else
17505 - $as_echo "$as_me: failed program was:" >&5
17506 -sed 's/^/| /' conftest.$ac_ext >&5
17507 -
17508 -
17509 -fi
17510 -
17511 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17512 -fi
17513 -
17514 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17515 -fi
17516 -
17517 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17518 - ac_cxx_werror_flag=$ac_save_cxx_werror_flag
17519 -fi
17520 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
17521 -$as_echo "$ac_cv_prog_cxx_g" >&6; }
17522 -if test "$ac_test_CXXFLAGS" = set; then
17523 - CXXFLAGS=$ac_save_CXXFLAGS
17524 -elif test $ac_cv_prog_cxx_g = yes; then
17525 - if test "$GXX" = yes; then
17526 - CXXFLAGS="-g -O2"
17527 - else
17528 - CXXFLAGS="-g"
17529 - fi
17530 -else
17531 - if test "$GXX" = yes; then
17532 - CXXFLAGS="-O2"
17533 - else
17534 - CXXFLAGS=
17535 - fi
17536 -fi
17537 -ac_ext=c
17538 -ac_cpp='$CPP $CPPFLAGS'
17539 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
17540 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
17541 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
17542 -
17543 -depcc="$CXX" am_compiler_list=
17544 -
17545 -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
17546 -$as_echo_n "checking dependency style of $depcc... " >&6; }
17547 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
17548 - $as_echo_n "(cached) " >&6
17549 -else
17550 - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
17551 - # We make a subdir and do the tests there. Otherwise we can end up
17552 - # making bogus files that we don't know about and never remove. For
17553 - # instance it was reported that on HP-UX the gcc test will end up
17554 - # making a dummy file named `D' -- because `-MD' means `put the output
17555 - # in D'.
17556 - mkdir conftest.dir
17557 - # Copy depcomp to subdir because otherwise we won't find it if we're
17558 - # using a relative directory.
17559 - cp "$am_depcomp" conftest.dir
17560 - cd conftest.dir
17561 - # We will build objects and dependencies in a subdirectory because
17562 - # it helps to detect inapplicable dependency modes. For instance
17563 - # both Tru64's cc and ICC support -MD to output dependencies as a
17564 - # side effect of compilation, but ICC will put the dependencies in
17565 - # the current directory while Tru64 will put them in the object
17566 - # directory.
17567 - mkdir sub
17568 -
17569 - am_cv_CXX_dependencies_compiler_type=none
17570 - if test "$am_compiler_list" = ""; then
17571 - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
17572 - fi
17573 - for depmode in $am_compiler_list; do
17574 - # Setup a source with many dependencies, because some compilers
17575 - # like to wrap large dependency lists on column 80 (with \), and
17576 - # we should not choose a depcomp mode which is confused by this.
17577 - #
17578 - # We need to recreate these files for each test, as the compiler may
17579 - # overwrite some of them when testing with obscure command lines.
17580 - # This happens at least with the AIX C compiler.
17581 - : > sub/conftest.c
17582 - for i in 1 2 3 4 5 6; do
17583 - echo '#include "conftst'$i'.h"' >> sub/conftest.c
17584 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
17585 - # Solaris 8's {/usr,}/bin/sh.
17586 - touch sub/conftst$i.h
17587 - done
17588 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
17589 -
17590 - case $depmode in
17591 - nosideeffect)
17592 - # after this tag, mechanisms are not by side-effect, so they'll
17593 - # only be used when explicitly requested
17594 - if test "x$enable_dependency_tracking" = xyes; then
17595 - continue
17596 - else
17597 - break
17598 - fi
17599 - ;;
17600 - none) break ;;
17601 - esac
17602 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
17603 - # mode. It turns out that the SunPro C++ compiler does not properly
17604 - # handle `-M -o', and we need to detect this.
17605 - if depmode=$depmode \
17606 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
17607 - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
17608 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
17609 - >/dev/null 2>conftest.err &&
17610 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
17611 - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
17612 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
17613 - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
17614 - # icc doesn't choke on unknown options, it will just issue warnings
17615 - # or remarks (even with -Werror). So we grep stderr for any message
17616 - # that says an option was ignored or not supported.
17617 - # When given -MP, icc 7.0 and 7.1 complain thusly:
17618 - # icc: Command line warning: ignoring option '-M'; no argument required
17619 - # The diagnosis changed in icc 8.0:
17620 - # icc: Command line remark: option '-MP' not supported
17621 - if (grep 'ignoring option' conftest.err ||
17622 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
17623 - am_cv_CXX_dependencies_compiler_type=$depmode
17624 - break
17625 - fi
17626 - fi
17627 - done
17628 -
17629 - cd ..
17630 - rm -rf conftest.dir
17631 -else
17632 - am_cv_CXX_dependencies_compiler_type=none
17633 -fi
17634 -
17635 -fi
17636 -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
17637 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
17638 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
17639 -
17640 - if
17641 - test "x$enable_dependency_tracking" != xno \
17642 - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
17643 - am__fastdepCXX_TRUE=
17644 - am__fastdepCXX_FALSE='#'
17645 -else
17646 - am__fastdepCXX_TRUE='#'
17647 - am__fastdepCXX_FALSE=
17648 -fi
17649 -
17650 -
17651 -if test "x$CC" != xcc; then
17652 - { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
17653 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
17654 -else
17655 - { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
17656 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
17657 -fi
17658 -set dummy $CC; ac_cc=`$as_echo "$2" |
17659 - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
17660 -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
17661 - $as_echo_n "(cached) " >&6
17662 -else
17663 - cat >conftest.$ac_ext <<_ACEOF
17664 -/* confdefs.h. */
17665 -_ACEOF
17666 -cat confdefs.h >>conftest.$ac_ext
17667 -cat >>conftest.$ac_ext <<_ACEOF
17668 -/* end confdefs.h. */
17669 -
17670 -int
17671 -main ()
17672 -{
17673 -
17674 - ;
17675 - return 0;
17676 -}
17677 -_ACEOF
17678 -# Make sure it works both with $CC and with simple cc.
17679 -# We do the test twice because some compilers refuse to overwrite an
17680 -# existing .o file with -o, though they will create one.
17681 -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
17682 -rm -f conftest2.*
17683 -if { (case "(($ac_try" in
17684 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17685 - *) ac_try_echo=$ac_try;;
17686 -esac
17687 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17688 -$as_echo "$ac_try_echo") >&5
17689 - (eval "$ac_try") 2>&5
17690 - ac_status=$?
17691 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17692 - (exit $ac_status); } &&
17693 - test -f conftest2.$ac_objext && { (case "(($ac_try" in
17694 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17695 - *) ac_try_echo=$ac_try;;
17696 -esac
17697 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17698 -$as_echo "$ac_try_echo") >&5
17699 - (eval "$ac_try") 2>&5
17700 - ac_status=$?
17701 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17702 - (exit $ac_status); };
17703 -then
17704 - eval ac_cv_prog_cc_${ac_cc}_c_o=yes
17705 - if test "x$CC" != xcc; then
17706 - # Test first that cc exists at all.
17707 - if { ac_try='cc -c conftest.$ac_ext >&5'
17708 - { (case "(($ac_try" in
17709 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17710 - *) ac_try_echo=$ac_try;;
17711 -esac
17712 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17713 -$as_echo "$ac_try_echo") >&5
17714 - (eval "$ac_try") 2>&5
17715 - ac_status=$?
17716 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17717 - (exit $ac_status); }; }; then
17718 - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
17719 - rm -f conftest2.*
17720 - if { (case "(($ac_try" in
17721 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17722 - *) ac_try_echo=$ac_try;;
17723 -esac
17724 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17725 -$as_echo "$ac_try_echo") >&5
17726 - (eval "$ac_try") 2>&5
17727 - ac_status=$?
17728 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17729 - (exit $ac_status); } &&
17730 - test -f conftest2.$ac_objext && { (case "(($ac_try" in
17731 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17732 - *) ac_try_echo=$ac_try;;
17733 -esac
17734 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17735 -$as_echo "$ac_try_echo") >&5
17736 - (eval "$ac_try") 2>&5
17737 - ac_status=$?
17738 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17739 - (exit $ac_status); };
17740 - then
17741 - # cc works too.
17742 - :
17743 - else
17744 - # cc exists but doesn't like -o.
17745 - eval ac_cv_prog_cc_${ac_cc}_c_o=no
17746 - fi
17747 - fi
17748 - fi
17749 -else
17750 - eval ac_cv_prog_cc_${ac_cc}_c_o=no
17751 -fi
17752 -rm -f core conftest*
17753 -
17754 -fi
17755 -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
17756 - { $as_echo "$as_me:$LINENO: result: yes" >&5
17757 -$as_echo "yes" >&6; }
17758 -else
17759 - { $as_echo "$as_me:$LINENO: result: no" >&5
17760 -$as_echo "no" >&6; }
17761 -
17762 -cat >>confdefs.h <<\_ACEOF
17763 -#define NO_MINUS_C_MINUS_O 1
17764 -_ACEOF
17765 -
17766 -fi
17767 -
17768 -# FIXME: we rely on the cache variable name because
17769 -# there is no other way.
17770 -set dummy $CC
17771 -ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
17772 -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
17773 - # Losing compiler, so override with the script.
17774 - # FIXME: It is wrong to rewrite CC.
17775 - # But if we don't then we get into trouble of one sort or another.
17776 - # A longer-term fix would be to have automake use am__CC in this case,
17777 - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
17778 - CC="$am_aux_dir/compile $CC"
17779 -fi
17780 -
17781 -
17782 -# Check whether --enable-shared was given.
17783 -if test "${enable_shared+set}" = set; then
17784 - enableval=$enable_shared; p=${PACKAGE-default}
17785 - case $enableval in
17786 - yes) enable_shared=yes ;;
17787 - no) enable_shared=no ;;
17788 - *)
17789 - enable_shared=no
17790 - # Look at the argument we got. We use all the common list separators.
17791 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
17792 - for pkg in $enableval; do
17793 - IFS="$lt_save_ifs"
17794 - if test "X$pkg" = "X$p"; then
17795 - enable_shared=yes
17796 - fi
17797 - done
17798 - IFS="$lt_save_ifs"
17799 - ;;
17800 - esac
17801 -else
17802 - enable_shared=yes
17803 -fi
17804 -
17805 -
17806 -# Check whether --enable-static was given.
17807 -if test "${enable_static+set}" = set; then
17808 - enableval=$enable_static; p=${PACKAGE-default}
17809 - case $enableval in
17810 - yes) enable_static=yes ;;
17811 - no) enable_static=no ;;
17812 - *)
17813 - enable_static=no
17814 - # Look at the argument we got. We use all the common list separators.
17815 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
17816 - for pkg in $enableval; do
17817 - IFS="$lt_save_ifs"
17818 - if test "X$pkg" = "X$p"; then
17819 - enable_static=yes
17820 - fi
17821 - done
17822 - IFS="$lt_save_ifs"
17823 - ;;
17824 - esac
17825 -else
17826 - enable_static=yes
17827 -fi
17828 -
17829 -
17830 -# Check whether --enable-fast-install was given.
17831 -if test "${enable_fast_install+set}" = set; then
17832 - enableval=$enable_fast_install; p=${PACKAGE-default}
17833 - case $enableval in
17834 - yes) enable_fast_install=yes ;;
17835 - no) enable_fast_install=no ;;
17836 - *)
17837 - enable_fast_install=no
17838 - # Look at the argument we got. We use all the common list separators.
17839 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
17840 - for pkg in $enableval; do
17841 - IFS="$lt_save_ifs"
17842 - if test "X$pkg" = "X$p"; then
17843 - enable_fast_install=yes
17844 - fi
17845 - done
17846 - IFS="$lt_save_ifs"
17847 - ;;
17848 - esac
17849 -else
17850 - enable_fast_install=yes
17851 -fi
17852 -
17853 -
17854 -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
17855 -$as_echo_n "checking for a sed that does not truncate output... " >&6; }
17856 -if test "${lt_cv_path_SED+set}" = set; then
17857 - $as_echo_n "(cached) " >&6
17858 -else
17859 - # Loop through the user's path and test for sed and gsed.
17860 -# Then use that list of sed's as ones to test for truncation.
17861 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17862 -for as_dir in $PATH
17863 -do
17864 - IFS=$as_save_IFS
17865 - test -z "$as_dir" && as_dir=.
17866 - for lt_ac_prog in sed gsed; do
17867 - for ac_exec_ext in '' $ac_executable_extensions; do
17868 - if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
17869 - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
17870 - fi
17871 - done
17872 - done
17873 -done
17874 -IFS=$as_save_IFS
17875 -lt_ac_max=0
17876 -lt_ac_count=0
17877 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris
17878 -# along with /bin/sed that truncates output.
17879 -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
17880 - test ! -f $lt_ac_sed && continue
17881 - cat /dev/null > conftest.in
17882 - lt_ac_count=0
17883 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in
17884 - # Check for GNU sed and select it if it is found.
17885 - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
17886 - lt_cv_path_SED=$lt_ac_sed
17887 - break
17888 - fi
17889 - while true; do
17890 - cat conftest.in conftest.in >conftest.tmp
17891 - mv conftest.tmp conftest.in
17892 - cp conftest.in conftest.nl
17893 - echo >>conftest.nl
17894 - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
17895 - cmp -s conftest.out conftest.nl || break
17896 - # 10000 chars as input seems more than enough
17897 - test $lt_ac_count -gt 10 && break
17898 - lt_ac_count=`expr $lt_ac_count + 1`
17899 - if test $lt_ac_count -gt $lt_ac_max; then
17900 - lt_ac_max=$lt_ac_count
17901 - lt_cv_path_SED=$lt_ac_sed
17902 - fi
17903 - done
17904 -done
17905 -
17906 -fi
17907 -
17908 -SED=$lt_cv_path_SED
17909 -
17910 -{ $as_echo "$as_me:$LINENO: result: $SED" >&5
17911 -$as_echo "$SED" >&6; }
17912 -
17913 -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
17914 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
17915 -if test "${ac_cv_path_GREP+set}" = set; then
17916 - $as_echo_n "(cached) " >&6
17917 -else
17918 - if test -z "$GREP"; then
17919 - ac_path_GREP_found=false
17920 - # Loop through the user's path and test for each of PROGNAME-LIST
17921 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17922 -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
17923 -do
17924 - IFS=$as_save_IFS
17925 - test -z "$as_dir" && as_dir=.
17926 - for ac_prog in grep ggrep; do
17927 - for ac_exec_ext in '' $ac_executable_extensions; do
17928 - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
17929 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
17930 -# Check for GNU ac_path_GREP and select it if it is found.
17931 - # Check for GNU $ac_path_GREP
17932 -case `"$ac_path_GREP" --version 2>&1` in
17933 -*GNU*)
17934 - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
17935 -*)
17936 - ac_count=0
17937 - $as_echo_n 0123456789 >"conftest.in"
17938 - while :
17939 - do
17940 - cat "conftest.in" "conftest.in" >"conftest.tmp"
17941 - mv "conftest.tmp" "conftest.in"
17942 - cp "conftest.in" "conftest.nl"
17943 - $as_echo 'GREP' >> "conftest.nl"
17944 - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
17945 - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
17946 - ac_count=`expr $ac_count + 1`
17947 - if test $ac_count -gt ${ac_path_GREP_max-0}; then
17948 - # Best one so far, save it but keep looking for a better one
17949 - ac_cv_path_GREP="$ac_path_GREP"
17950 - ac_path_GREP_max=$ac_count
17951 - fi
17952 - # 10*(2^10) chars as input seems more than enough
17953 - test $ac_count -gt 10 && break
17954 - done
17955 - rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
17956 -esac
17957 -
17958 - $ac_path_GREP_found && break 3
17959 - done
17960 - done
17961 -done
17962 -IFS=$as_save_IFS
17963 - if test -z "$ac_cv_path_GREP"; then
17964 - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
17965 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
17966 - { (exit 1); exit 1; }; }
17967 - fi
17968 -else
17969 - ac_cv_path_GREP=$GREP
17970 -fi
17971 -
17972 -fi
17973 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
17974 -$as_echo "$ac_cv_path_GREP" >&6; }
17975 - GREP="$ac_cv_path_GREP"
17976 -
17977 -
17978 -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
17979 -$as_echo_n "checking for egrep... " >&6; }
17980 -if test "${ac_cv_path_EGREP+set}" = set; then
17981 - $as_echo_n "(cached) " >&6
17982 -else
17983 - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
17984 - then ac_cv_path_EGREP="$GREP -E"
17985 - else
17986 - if test -z "$EGREP"; then
17987 - ac_path_EGREP_found=false
17988 - # Loop through the user's path and test for each of PROGNAME-LIST
17989 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17990 -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
17991 -do
17992 - IFS=$as_save_IFS
17993 - test -z "$as_dir" && as_dir=.
17994 - for ac_prog in egrep; do
17995 - for ac_exec_ext in '' $ac_executable_extensions; do
17996 - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
17997 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
17998 -# Check for GNU ac_path_EGREP and select it if it is found.
17999 - # Check for GNU $ac_path_EGREP
18000 -case `"$ac_path_EGREP" --version 2>&1` in
18001 -*GNU*)
18002 - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
18003 -*)
18004 - ac_count=0
18005 - $as_echo_n 0123456789 >"conftest.in"
18006 - while :
18007 - do
18008 - cat "conftest.in" "conftest.in" >"conftest.tmp"
18009 - mv "conftest.tmp" "conftest.in"
18010 - cp "conftest.in" "conftest.nl"
18011 - $as_echo 'EGREP' >> "conftest.nl"
18012 - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
18013 - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
18014 - ac_count=`expr $ac_count + 1`
18015 - if test $ac_count -gt ${ac_path_EGREP_max-0}; then
18016 - # Best one so far, save it but keep looking for a better one
18017 - ac_cv_path_EGREP="$ac_path_EGREP"
18018 - ac_path_EGREP_max=$ac_count
18019 - fi
18020 - # 10*(2^10) chars as input seems more than enough
18021 - test $ac_count -gt 10 && break
18022 - done
18023 - rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
18024 -esac
18025 -
18026 - $ac_path_EGREP_found && break 3
18027 - done
18028 - done
18029 -done
18030 -IFS=$as_save_IFS
18031 - if test -z "$ac_cv_path_EGREP"; then
18032 - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
18033 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
18034 - { (exit 1); exit 1; }; }
18035 - fi
18036 -else
18037 - ac_cv_path_EGREP=$EGREP
18038 -fi
18039 -
18040 - fi
18041 -fi
18042 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
18043 -$as_echo "$ac_cv_path_EGREP" >&6; }
18044 - EGREP="$ac_cv_path_EGREP"
18045 -
18046 -
18047 -
18048 -# Check whether --with-gnu-ld was given.
18049 -if test "${with_gnu_ld+set}" = set; then
18050 - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
18051 -else
18052 - with_gnu_ld=no
18053 -fi
18054 -
18055 -ac_prog=ld
18056 -if test "$GCC" = yes; then
18057 - # Check if gcc -print-prog-name=ld gives a path.
18058 - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
18059 -$as_echo_n "checking for ld used by $CC... " >&6; }
18060 - case $host in
18061 - *-*-mingw*)
18062 - # gcc leaves a trailing carriage return which upsets mingw
18063 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
18064 - *)
18065 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
18066 - esac
18067 - case $ac_prog in
18068 - # Accept absolute paths.
18069 - [\\/]* | ?:[\\/]*)
18070 - re_direlt='/[^/][^/]*/\.\./'
18071 - # Canonicalize the pathname of ld
18072 - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
18073 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
18074 - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
18075 - done
18076 - test -z "$LD" && LD="$ac_prog"
18077 - ;;
18078 - "")
18079 - # If it fails, then pretend we aren't using GCC.
18080 - ac_prog=ld
18081 - ;;
18082 - *)
18083 - # If it is relative, then search for the first ld in PATH.
18084 - with_gnu_ld=unknown
18085 - ;;
18086 - esac
18087 -elif test "$with_gnu_ld" = yes; then
18088 - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
18089 -$as_echo_n "checking for GNU ld... " >&6; }
18090 -else
18091 - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
18092 -$as_echo_n "checking for non-GNU ld... " >&6; }
18093 -fi
18094 -if test "${lt_cv_path_LD+set}" = set; then
18095 - $as_echo_n "(cached) " >&6
18096 -else
18097 - if test -z "$LD"; then
18098 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
18099 - for ac_dir in $PATH; do
18100 - IFS="$lt_save_ifs"
18101 - test -z "$ac_dir" && ac_dir=.
18102 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
18103 - lt_cv_path_LD="$ac_dir/$ac_prog"
18104 - # Check to see if the program is GNU ld. I'd rather use --version,
18105 - # but apparently some variants of GNU ld only accept -v.
18106 - # Break only if it was the GNU/non-GNU ld that we prefer.
18107 - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
18108 - *GNU* | *'with BFD'*)
18109 - test "$with_gnu_ld" != no && break
18110 - ;;
18111 - *)
18112 - test "$with_gnu_ld" != yes && break
18113 - ;;
18114 - esac
18115 - fi
18116 - done
18117 - IFS="$lt_save_ifs"
18118 -else
18119 - lt_cv_path_LD="$LD" # Let the user override the test with a path.
18120 -fi
18121 -fi
18122 -
18123 -LD="$lt_cv_path_LD"
18124 -if test -n "$LD"; then
18125 - { $as_echo "$as_me:$LINENO: result: $LD" >&5
18126 -$as_echo "$LD" >&6; }
18127 -else
18128 - { $as_echo "$as_me:$LINENO: result: no" >&5
18129 -$as_echo "no" >&6; }
18130 -fi
18131 -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
18132 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
18133 - { (exit 1); exit 1; }; }
18134 -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
18135 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
18136 -if test "${lt_cv_prog_gnu_ld+set}" = set; then
18137 - $as_echo_n "(cached) " >&6
18138 -else
18139 - # I'd rather use --version here, but apparently some GNU lds only accept -v.
18140 -case `$LD -v 2>&1 </dev/null` in
18141 -*GNU* | *'with BFD'*)
18142 - lt_cv_prog_gnu_ld=yes
18143 - ;;
18144 -*)
18145 - lt_cv_prog_gnu_ld=no
18146 - ;;
18147 -esac
18148 -fi
18149 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
18150 -$as_echo "$lt_cv_prog_gnu_ld" >&6; }
18151 -with_gnu_ld=$lt_cv_prog_gnu_ld
18152 -
18153 -
18154 -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
18155 -$as_echo_n "checking for $LD option to reload object files... " >&6; }
18156 -if test "${lt_cv_ld_reload_flag+set}" = set; then
18157 - $as_echo_n "(cached) " >&6
18158 -else
18159 - lt_cv_ld_reload_flag='-r'
18160 -fi
18161 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
18162 -$as_echo "$lt_cv_ld_reload_flag" >&6; }
18163 -reload_flag=$lt_cv_ld_reload_flag
18164 -case $reload_flag in
18165 -"" | " "*) ;;
18166 -*) reload_flag=" $reload_flag" ;;
18167 -esac
18168 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
18169 -case $host_os in
18170 - darwin*)
18171 - if test "$GCC" = yes; then
18172 - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
18173 - else
18174 - reload_cmds='$LD$reload_flag -o $output$reload_objs'
18175 - fi
18176 - ;;
18177 -esac
18178 -
18179 -{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
18180 -$as_echo_n "checking for BSD-compatible nm... " >&6; }
18181 -if test "${lt_cv_path_NM+set}" = set; then
18182 - $as_echo_n "(cached) " >&6
18183 -else
18184 - if test -n "$NM"; then
18185 - # Let the user override the test.
18186 - lt_cv_path_NM="$NM"
18187 -else
18188 - lt_nm_to_check="${ac_tool_prefix}nm"
18189 - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
18190 - lt_nm_to_check="$lt_nm_to_check nm"
18191 - fi
18192 - for lt_tmp_nm in $lt_nm_to_check; do
18193 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
18194 - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
18195 - IFS="$lt_save_ifs"
18196 - test -z "$ac_dir" && ac_dir=.
18197 - tmp_nm="$ac_dir/$lt_tmp_nm"
18198 - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
18199 - # Check to see if the nm accepts a BSD-compat flag.
18200 - # Adding the `sed 1q' prevents false positives on HP-UX, which says:
18201 - # nm: unknown option "B" ignored
18202 - # Tru64's nm complains that /dev/null is an invalid object file
18203 - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
18204 - */dev/null* | *'Invalid file or object type'*)
18205 - lt_cv_path_NM="$tmp_nm -B"
18206 - break
18207 - ;;
18208 - *)
18209 - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
18210 - */dev/null*)
18211 - lt_cv_path_NM="$tmp_nm -p"
18212 - break
18213 - ;;
18214 - *)
18215 - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
18216 - continue # so that we can try to find one that supports BSD flags
18217 - ;;
18218 - esac
18219 - ;;
18220 - esac
18221 - fi
18222 - done
18223 - IFS="$lt_save_ifs"
18224 - done
18225 - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
18226 -fi
18227 -fi
18228 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
18229 -$as_echo "$lt_cv_path_NM" >&6; }
18230 -NM="$lt_cv_path_NM"
18231 -
18232 -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
18233 -$as_echo_n "checking whether ln -s works... " >&6; }
18234 -LN_S=$as_ln_s
18235 -if test "$LN_S" = "ln -s"; then
18236 - { $as_echo "$as_me:$LINENO: result: yes" >&5
18237 -$as_echo "yes" >&6; }
18238 -else
18239 - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
18240 -$as_echo "no, using $LN_S" >&6; }
18241 -fi
18242 -
18243 -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
18244 -$as_echo_n "checking how to recognize dependent libraries... " >&6; }
18245 -if test "${lt_cv_deplibs_check_method+set}" = set; then
18246 - $as_echo_n "(cached) " >&6
18247 -else
18248 - lt_cv_file_magic_cmd='$MAGIC_CMD'
18249 -lt_cv_file_magic_test_file=
18250 -lt_cv_deplibs_check_method='unknown'
18251 -# Need to set the preceding variable on all platforms that support
18252 -# interlibrary dependencies.
18253 -# 'none' -- dependencies not supported.
18254 -# `unknown' -- same as none, but documents that we really don't know.
18255 -# 'pass_all' -- all dependencies passed with no checks.
18256 -# 'test_compile' -- check by making test program.
18257 -# 'file_magic [[regex]]' -- check by looking for files in library path
18258 -# which responds to the $file_magic_cmd with a given extended regex.
18259 -# If you have `file' or equivalent on your system and you're not sure
18260 -# whether `pass_all' will *always* work, you probably want this one.
18261 -
18262 -case $host_os in
18263 -aix[4-9]*)
18264 - lt_cv_deplibs_check_method=pass_all
18265 - ;;
18266 -
18267 -beos*)
18268 - lt_cv_deplibs_check_method=pass_all
18269 - ;;
18270 -
18271 -bsdi[45]*)
18272 - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
18273 - lt_cv_file_magic_cmd='/usr/bin/file -L'
18274 - lt_cv_file_magic_test_file=/shlib/libc.so
18275 - ;;
18276 -
18277 -cygwin*)
18278 - # func_win32_libid is a shell function defined in ltmain.sh
18279 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
18280 - lt_cv_file_magic_cmd='func_win32_libid'
18281 - ;;
18282 -
18283 -mingw* | pw32*)
18284 - # Base MSYS/MinGW do not provide the 'file' command needed by
18285 - # func_win32_libid shell function, so use a weaker test based on 'objdump',
18286 - # unless we find 'file', for example because we are cross-compiling.
18287 - if ( file / ) >/dev/null 2>&1; then
18288 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
18289 - lt_cv_file_magic_cmd='func_win32_libid'
18290 - else
18291 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
18292 - lt_cv_file_magic_cmd='$OBJDUMP -f'
18293 - fi
18294 - ;;
18295 -
18296 -darwin* | rhapsody*)
18297 - lt_cv_deplibs_check_method=pass_all
18298 - ;;
18299 -
18300 -freebsd* | dragonfly*)
18301 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
18302 - case $host_cpu in
18303 - i*86 )
18304 - # Not sure whether the presence of OpenBSD here was a mistake.
18305 - # Let's accept both of them until this is cleared up.
18306 - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
18307 - lt_cv_file_magic_cmd=/usr/bin/file
18308 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
18309 - ;;
18310 - esac
18311 - else
18312 - lt_cv_deplibs_check_method=pass_all
18313 - fi
18314 - ;;
18315 -
18316 -gnu*)
18317 - lt_cv_deplibs_check_method=pass_all
18318 - ;;
18319 -
18320 -hpux10.20* | hpux11*)
18321 - lt_cv_file_magic_cmd=/usr/bin/file
18322 - case $host_cpu in
18323 - ia64*)
18324 - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
18325 - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
18326 - ;;
18327 - hppa*64*)
18328 - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
18329 - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
18330 - ;;
18331 - *)
18332 - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
18333 - lt_cv_file_magic_test_file=/usr/lib/libc.sl
18334 - ;;
18335 - esac
18336 - ;;
18337 -
18338 -interix[3-9]*)
18339 - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
18340 - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
18341 - ;;
18342 -
18343 -irix5* | irix6* | nonstopux*)
18344 - case $LD in
18345 - *-32|*"-32 ") libmagic=32-bit;;
18346 - *-n32|*"-n32 ") libmagic=N32;;
18347 - *-64|*"-64 ") libmagic=64-bit;;
18348 - *) libmagic=never-match;;
18349 - esac
18350 - lt_cv_deplibs_check_method=pass_all
18351 - ;;
18352 -
18353 -# This must be Linux ELF.
18354 -linux* | k*bsd*-gnu)
18355 - lt_cv_deplibs_check_method=pass_all
18356 - ;;
18357 -
18358 -netbsd* | netbsdelf*-gnu)
18359 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
18360 - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
18361 - else
18362 - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
18363 - fi
18364 - ;;
18365 -
18366 -newos6*)
18367 - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
18368 - lt_cv_file_magic_cmd=/usr/bin/file
18369 - lt_cv_file_magic_test_file=/usr/lib/libnls.so
18370 - ;;
18371 -
18372 -nto-qnx*)
18373 - lt_cv_deplibs_check_method=unknown
18374 - ;;
18375 -
18376 -openbsd*)
18377 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
18378 - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
18379 - else
18380 - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
18381 - fi
18382 - ;;
18383 -
18384 -osf3* | osf4* | osf5*)
18385 - lt_cv_deplibs_check_method=pass_all
18386 - ;;
18387 -
18388 -rdos*)
18389 - lt_cv_deplibs_check_method=pass_all
18390 - ;;
18391 -
18392 -solaris*)
18393 - lt_cv_deplibs_check_method=pass_all
18394 - ;;
18395 -
18396 -sysv4 | sysv4.3*)
18397 - case $host_vendor in
18398 - motorola)
18399 - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
18400 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
18401 - ;;
18402 - ncr)
18403 - lt_cv_deplibs_check_method=pass_all
18404 - ;;
18405 - sequent)
18406 - lt_cv_file_magic_cmd='/bin/file'
18407 - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
18408 - ;;
18409 - sni)
18410 - lt_cv_file_magic_cmd='/bin/file'
18411 - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
18412 - lt_cv_file_magic_test_file=/lib/libc.so
18413 - ;;
18414 - siemens)
18415 - lt_cv_deplibs_check_method=pass_all
18416 - ;;
18417 - pc)
18418 - lt_cv_deplibs_check_method=pass_all
18419 - ;;
18420 - esac
18421 - ;;
18422 -
18423 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
18424 - lt_cv_deplibs_check_method=pass_all
18425 - ;;
18426 -esac
18427 -
18428 -fi
18429 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
18430 -$as_echo "$lt_cv_deplibs_check_method" >&6; }
18431 -file_magic_cmd=$lt_cv_file_magic_cmd
18432 -deplibs_check_method=$lt_cv_deplibs_check_method
18433 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
18434 -
18435 -
18436 -
18437 -
18438 -# If no C compiler was specified, use CC.
18439 -LTCC=${LTCC-"$CC"}
18440 -
18441 -# If no C compiler flags were specified, use CFLAGS.
18442 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
18443 -
18444 -# Allow CC to be a program name with arguments.
18445 -compiler=$CC
18446 -
18447 -
18448 -# Check whether --enable-libtool-lock was given.
18449 -if test "${enable_libtool_lock+set}" = set; then
18450 - enableval=$enable_libtool_lock;
18451 -fi
18452 -
18453 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
18454 -
18455 -# Some flags need to be propagated to the compiler or linker for good
18456 -# libtool support.
18457 -case $host in
18458 -ia64-*-hpux*)
18459 - # Find out which ABI we are using.
18460 - echo 'int i;' > conftest.$ac_ext
18461 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18462 - (eval $ac_compile) 2>&5
18463 - ac_status=$?
18464 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18465 - (exit $ac_status); }; then
18466 - case `/usr/bin/file conftest.$ac_objext` in
18467 - *ELF-32*)
18468 - HPUX_IA64_MODE="32"
18469 - ;;
18470 - *ELF-64*)
18471 - HPUX_IA64_MODE="64"
18472 - ;;
18473 - esac
18474 - fi
18475 - rm -rf conftest*
18476 - ;;
18477 -*-*-irix6*)
18478 - # Find out which ABI we are using.
18479 - echo '#line 5218 "configure"' > conftest.$ac_ext
18480 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18481 - (eval $ac_compile) 2>&5
18482 - ac_status=$?
18483 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18484 - (exit $ac_status); }; then
18485 - if test "$lt_cv_prog_gnu_ld" = yes; then
18486 - case `/usr/bin/file conftest.$ac_objext` in
18487 - *32-bit*)
18488 - LD="${LD-ld} -melf32bsmip"
18489 - ;;
18490 - *N32*)
18491 - LD="${LD-ld} -melf32bmipn32"
18492 - ;;
18493 - *64-bit*)
18494 - LD="${LD-ld} -melf64bmip"
18495 - ;;
18496 - esac
18497 - else
18498 - case `/usr/bin/file conftest.$ac_objext` in
18499 - *32-bit*)
18500 - LD="${LD-ld} -32"
18501 - ;;
18502 - *N32*)
18503 - LD="${LD-ld} -n32"
18504 - ;;
18505 - *64-bit*)
18506 - LD="${LD-ld} -64"
18507 - ;;
18508 - esac
18509 - fi
18510 - fi
18511 - rm -rf conftest*
18512 - ;;
18513 -
18514 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
18515 -s390*-*linux*|sparc*-*linux*)
18516 - # Find out which ABI we are using.
18517 - echo 'int i;' > conftest.$ac_ext
18518 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18519 - (eval $ac_compile) 2>&5
18520 - ac_status=$?
18521 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18522 - (exit $ac_status); }; then
18523 - case `/usr/bin/file conftest.o` in
18524 - *32-bit*)
18525 - case $host in
18526 - x86_64-*kfreebsd*-gnu)
18527 - LD="${LD-ld} -m elf_i386_fbsd"
18528 - ;;
18529 - x86_64-*linux*)
18530 - LD="${LD-ld} -m elf_i386"
18531 - ;;
18532 - ppc64-*linux*|powerpc64-*linux*)
18533 - LD="${LD-ld} -m elf32ppclinux"
18534 - ;;
18535 - s390x-*linux*)
18536 - LD="${LD-ld} -m elf_s390"
18537 - ;;
18538 - sparc64-*linux*)
18539 - LD="${LD-ld} -m elf32_sparc"
18540 - ;;
18541 - esac
18542 - ;;
18543 - *64-bit*)
18544 - case $host in
18545 - x86_64-*kfreebsd*-gnu)
18546 - LD="${LD-ld} -m elf_x86_64_fbsd"
18547 - ;;
18548 - x86_64-*linux*)
18549 - LD="${LD-ld} -m elf_x86_64"
18550 - ;;
18551 - ppc*-*linux*|powerpc*-*linux*)
18552 - LD="${LD-ld} -m elf64ppc"
18553 - ;;
18554 - s390*-*linux*)
18555 - LD="${LD-ld} -m elf64_s390"
18556 - ;;
18557 - sparc*-*linux*)
18558 - LD="${LD-ld} -m elf64_sparc"
18559 - ;;
18560 - esac
18561 - ;;
18562 - esac
18563 - fi
18564 - rm -rf conftest*
18565 - ;;
18566 -
18567 -*-*-sco3.2v5*)
18568 - # On SCO OpenServer 5, we need -belf to get full-featured binaries.
18569 - SAVE_CFLAGS="$CFLAGS"
18570 - CFLAGS="$CFLAGS -belf"
18571 - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
18572 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
18573 -if test "${lt_cv_cc_needs_belf+set}" = set; then
18574 - $as_echo_n "(cached) " >&6
18575 -else
18576 - ac_ext=c
18577 -ac_cpp='$CPP $CPPFLAGS'
18578 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
18579 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
18580 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
18581 -
18582 - cat >conftest.$ac_ext <<_ACEOF
18583 -/* confdefs.h. */
18584 -_ACEOF
18585 -cat confdefs.h >>conftest.$ac_ext
18586 -cat >>conftest.$ac_ext <<_ACEOF
18587 -/* end confdefs.h. */
18588 -
18589 -int
18590 -main ()
18591 -{
18592 -
18593 - ;
18594 - return 0;
18595 -}
18596 -_ACEOF
18597 -rm -f conftest.$ac_objext conftest$ac_exeext
18598 -if { (ac_try="$ac_link"
18599 -case "(($ac_try" in
18600 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18601 - *) ac_try_echo=$ac_try;;
18602 -esac
18603 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
18604 -$as_echo "$ac_try_echo") >&5
18605 - (eval "$ac_link") 2>conftest.er1
18606 - ac_status=$?
18607 - grep -v '^ *+' conftest.er1 >conftest.err
18608 - rm -f conftest.er1
18609 - cat conftest.err >&5
18610 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18611 - (exit $ac_status); } && {
18612 - test -z "$ac_c_werror_flag" ||
18613 - test ! -s conftest.err
18614 - } && test -s conftest$ac_exeext && {
18615 - test "$cross_compiling" = yes ||
18616 - $as_test_x conftest$ac_exeext
18617 - }; then
18618 - lt_cv_cc_needs_belf=yes
18619 -else
18620 - $as_echo "$as_me: failed program was:" >&5
18621 -sed 's/^/| /' conftest.$ac_ext >&5
18622 -
18623 - lt_cv_cc_needs_belf=no
18624 -fi
18625 -
18626 -rm -rf conftest.dSYM
18627 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18628 - conftest$ac_exeext conftest.$ac_ext
18629 - ac_ext=c
18630 -ac_cpp='$CPP $CPPFLAGS'
18631 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
18632 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
18633 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
18634 -
18635 -fi
18636 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
18637 -$as_echo "$lt_cv_cc_needs_belf" >&6; }
18638 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
18639 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
18640 - CFLAGS="$SAVE_CFLAGS"
18641 - fi
18642 - ;;
18643 -sparc*-*solaris*)
18644 - # Find out which ABI we are using.
18645 - echo 'int i;' > conftest.$ac_ext
18646 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18647 - (eval $ac_compile) 2>&5
18648 - ac_status=$?
18649 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18650 - (exit $ac_status); }; then
18651 - case `/usr/bin/file conftest.o` in
18652 - *64-bit*)
18653 - case $lt_cv_prog_gnu_ld in
18654 - yes*) LD="${LD-ld} -m elf64_sparc" ;;
18655 - *)
18656 - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
18657 - LD="${LD-ld} -64"
18658 - fi
18659 - ;;
18660 - esac
18661 - ;;
18662 - esac
18663 - fi
18664 - rm -rf conftest*
18665 - ;;
18666 -
18667 -
18668 -esac
18669 -
18670 -need_locks="$enable_libtool_lock"
18671 -
18672 -
18673 -ac_ext=c
18674 -ac_cpp='$CPP $CPPFLAGS'
18675 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
18676 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
18677 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
18678 -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
18679 -$as_echo_n "checking how to run the C preprocessor... " >&6; }
18680 -# On Suns, sometimes $CPP names a directory.
18681 -if test -n "$CPP" && test -d "$CPP"; then
18682 - CPP=
18683 -fi
18684 -if test -z "$CPP"; then
18685 - if test "${ac_cv_prog_CPP+set}" = set; then
18686 - $as_echo_n "(cached) " >&6
18687 -else
18688 - # Double quotes because CPP needs to be expanded
18689 - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
18690 - do
18691 - ac_preproc_ok=false
18692 -for ac_c_preproc_warn_flag in '' yes
18693 -do
18694 - # Use a header file that comes with gcc, so configuring glibc
18695 - # with a fresh cross-compiler works.
18696 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
18697 - # <limits.h> exists even on freestanding compilers.
18698 - # On the NeXT, cc -E runs the code through the compiler's parser,
18699 - # not just through cpp. "Syntax error" is here to catch this case.
18700 - cat >conftest.$ac_ext <<_ACEOF
18701 -/* confdefs.h. */
18702 -_ACEOF
18703 -cat confdefs.h >>conftest.$ac_ext
18704 -cat >>conftest.$ac_ext <<_ACEOF
18705 -/* end confdefs.h. */
18706 -#ifdef __STDC__
18707 -# include <limits.h>
18708 -#else
18709 -# include <assert.h>
18710 -#endif
18711 - Syntax error
18712 -_ACEOF
18713 -if { (ac_try="$ac_cpp conftest.$ac_ext"
18714 -case "(($ac_try" in
18715 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18716 - *) ac_try_echo=$ac_try;;
18717 -esac
18718 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
18719 -$as_echo "$ac_try_echo") >&5
18720 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
18721 - ac_status=$?
18722 - grep -v '^ *+' conftest.er1 >conftest.err
18723 - rm -f conftest.er1
18724 - cat conftest.err >&5
18725 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18726 - (exit $ac_status); } >/dev/null && {
18727 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
18728 - test ! -s conftest.err
18729 - }; then
18730 - :
18731 -else
18732 - $as_echo "$as_me: failed program was:" >&5
18733 -sed 's/^/| /' conftest.$ac_ext >&5
18734 -
18735 - # Broken: fails on valid input.
18736 -continue
18737 -fi
18738 -
18739 -rm -f conftest.err conftest.$ac_ext
18740 -
18741 - # OK, works on sane cases. Now check whether nonexistent headers
18742 - # can be detected and how.
18743 - cat >conftest.$ac_ext <<_ACEOF
18744 -/* confdefs.h. */
18745 -_ACEOF
18746 -cat confdefs.h >>conftest.$ac_ext
18747 -cat >>conftest.$ac_ext <<_ACEOF
18748 -/* end confdefs.h. */
18749 -#include <ac_nonexistent.h>
18750 -_ACEOF
18751 -if { (ac_try="$ac_cpp conftest.$ac_ext"
18752 -case "(($ac_try" in
18753 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18754 - *) ac_try_echo=$ac_try;;
18755 -esac
18756 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
18757 -$as_echo "$ac_try_echo") >&5
18758 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
18759 - ac_status=$?
18760 - grep -v '^ *+' conftest.er1 >conftest.err
18761 - rm -f conftest.er1
18762 - cat conftest.err >&5
18763 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18764 - (exit $ac_status); } >/dev/null && {
18765 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
18766 - test ! -s conftest.err
18767 - }; then
18768 - # Broken: success on invalid input.
18769 -continue
18770 -else
18771 - $as_echo "$as_me: failed program was:" >&5
18772 -sed 's/^/| /' conftest.$ac_ext >&5
18773 -
18774 - # Passes both tests.
18775 -ac_preproc_ok=:
18776 -break
18777 -fi
18778 -
18779 -rm -f conftest.err conftest.$ac_ext
18780 -
18781 -done
18782 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
18783 -rm -f conftest.err conftest.$ac_ext
18784 -if $ac_preproc_ok; then
18785 - break
18786 -fi
18787 -
18788 - done
18789 - ac_cv_prog_CPP=$CPP
18790 -
18791 -fi
18792 - CPP=$ac_cv_prog_CPP
18793 -else
18794 - ac_cv_prog_CPP=$CPP
18795 -fi
18796 -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
18797 -$as_echo "$CPP" >&6; }
18798 -ac_preproc_ok=false
18799 -for ac_c_preproc_warn_flag in '' yes
18800 -do
18801 - # Use a header file that comes with gcc, so configuring glibc
18802 - # with a fresh cross-compiler works.
18803 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
18804 - # <limits.h> exists even on freestanding compilers.
18805 - # On the NeXT, cc -E runs the code through the compiler's parser,
18806 - # not just through cpp. "Syntax error" is here to catch this case.
18807 - cat >conftest.$ac_ext <<_ACEOF
18808 -/* confdefs.h. */
18809 -_ACEOF
18810 -cat confdefs.h >>conftest.$ac_ext
18811 -cat >>conftest.$ac_ext <<_ACEOF
18812 -/* end confdefs.h. */
18813 -#ifdef __STDC__
18814 -# include <limits.h>
18815 -#else
18816 -# include <assert.h>
18817 -#endif
18818 - Syntax error
18819 -_ACEOF
18820 -if { (ac_try="$ac_cpp conftest.$ac_ext"
18821 -case "(($ac_try" in
18822 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18823 - *) ac_try_echo=$ac_try;;
18824 -esac
18825 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
18826 -$as_echo "$ac_try_echo") >&5
18827 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
18828 - ac_status=$?
18829 - grep -v '^ *+' conftest.er1 >conftest.err
18830 - rm -f conftest.er1
18831 - cat conftest.err >&5
18832 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18833 - (exit $ac_status); } >/dev/null && {
18834 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
18835 - test ! -s conftest.err
18836 - }; then
18837 - :
18838 -else
18839 - $as_echo "$as_me: failed program was:" >&5
18840 -sed 's/^/| /' conftest.$ac_ext >&5
18841 -
18842 - # Broken: fails on valid input.
18843 -continue
18844 -fi
18845 -
18846 -rm -f conftest.err conftest.$ac_ext
18847 -
18848 - # OK, works on sane cases. Now check whether nonexistent headers
18849 - # can be detected and how.
18850 - cat >conftest.$ac_ext <<_ACEOF
18851 -/* confdefs.h. */
18852 -_ACEOF
18853 -cat confdefs.h >>conftest.$ac_ext
18854 -cat >>conftest.$ac_ext <<_ACEOF
18855 -/* end confdefs.h. */
18856 -#include <ac_nonexistent.h>
18857 -_ACEOF
18858 -if { (ac_try="$ac_cpp conftest.$ac_ext"
18859 -case "(($ac_try" in
18860 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18861 - *) ac_try_echo=$ac_try;;
18862 -esac
18863 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
18864 -$as_echo "$ac_try_echo") >&5
18865 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
18866 - ac_status=$?
18867 - grep -v '^ *+' conftest.er1 >conftest.err
18868 - rm -f conftest.er1
18869 - cat conftest.err >&5
18870 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18871 - (exit $ac_status); } >/dev/null && {
18872 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
18873 - test ! -s conftest.err
18874 - }; then
18875 - # Broken: success on invalid input.
18876 -continue
18877 -else
18878 - $as_echo "$as_me: failed program was:" >&5
18879 -sed 's/^/| /' conftest.$ac_ext >&5
18880 -
18881 - # Passes both tests.
18882 -ac_preproc_ok=:
18883 -break
18884 -fi
18885 -
18886 -rm -f conftest.err conftest.$ac_ext
18887 -
18888 -done
18889 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
18890 -rm -f conftest.err conftest.$ac_ext
18891 -if $ac_preproc_ok; then
18892 - :
18893 -else
18894 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
18895 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
18896 -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
18897 -See \`config.log' for more details." >&5
18898 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
18899 -See \`config.log' for more details." >&2;}
18900 - { (exit 1); exit 1; }; }; }
18901 -fi
18902 -
18903 -ac_ext=c
18904 -ac_cpp='$CPP $CPPFLAGS'
18905 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
18906 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
18907 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
18908 -
18909 -
18910 -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
18911 -$as_echo_n "checking for ANSI C header files... " >&6; }
18912 -if test "${ac_cv_header_stdc+set}" = set; then
18913 - $as_echo_n "(cached) " >&6
18914 -else
18915 - cat >conftest.$ac_ext <<_ACEOF
18916 -/* confdefs.h. */
18917 -_ACEOF
18918 -cat confdefs.h >>conftest.$ac_ext
18919 -cat >>conftest.$ac_ext <<_ACEOF
18920 -/* end confdefs.h. */
18921 -#include <stdlib.h>
18922 -#include <stdarg.h>
18923 -#include <string.h>
18924 -#include <float.h>
18925 -
18926 -int
18927 -main ()
18928 -{
18929 -
18930 - ;
18931 - return 0;
18932 -}
18933 -_ACEOF
18934 -rm -f conftest.$ac_objext
18935 -if { (ac_try="$ac_compile"
18936 -case "(($ac_try" in
18937 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18938 - *) ac_try_echo=$ac_try;;
18939 -esac
18940 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
18941 -$as_echo "$ac_try_echo") >&5
18942 - (eval "$ac_compile") 2>conftest.er1
18943 - ac_status=$?
18944 - grep -v '^ *+' conftest.er1 >conftest.err
18945 - rm -f conftest.er1
18946 - cat conftest.err >&5
18947 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
18948 - (exit $ac_status); } && {
18949 - test -z "$ac_c_werror_flag" ||
18950 - test ! -s conftest.err
18951 - } && test -s conftest.$ac_objext; then
18952 - ac_cv_header_stdc=yes
18953 -else
18954 - $as_echo "$as_me: failed program was:" >&5
18955 -sed 's/^/| /' conftest.$ac_ext >&5
18956 -
18957 - ac_cv_header_stdc=no
18958 -fi
18959 -
18960 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
18961 -
18962 -if test $ac_cv_header_stdc = yes; then
18963 - # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
18964 - cat >conftest.$ac_ext <<_ACEOF
18965 -/* confdefs.h. */
18966 -_ACEOF
18967 -cat confdefs.h >>conftest.$ac_ext
18968 -cat >>conftest.$ac_ext <<_ACEOF
18969 -/* end confdefs.h. */
18970 -#include <string.h>
18971 -
18972 -_ACEOF
18973 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
18974 - $EGREP "memchr" >/dev/null 2>&1; then
18975 - :
18976 -else
18977 - ac_cv_header_stdc=no
18978 -fi
18979 -rm -f conftest*
18980 -
18981 -fi
18982 -
18983 -if test $ac_cv_header_stdc = yes; then
18984 - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
18985 - cat >conftest.$ac_ext <<_ACEOF
18986 -/* confdefs.h. */
18987 -_ACEOF
18988 -cat confdefs.h >>conftest.$ac_ext
18989 -cat >>conftest.$ac_ext <<_ACEOF
18990 -/* end confdefs.h. */
18991 -#include <stdlib.h>
18992 -
18993 -_ACEOF
18994 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
18995 - $EGREP "free" >/dev/null 2>&1; then
18996 - :
18997 -else
18998 - ac_cv_header_stdc=no
18999 -fi
19000 -rm -f conftest*
19001 -
19002 -fi
19003 -
19004 -if test $ac_cv_header_stdc = yes; then
19005 - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
19006 - if test "$cross_compiling" = yes; then
19007 - :
19008 -else
19009 - cat >conftest.$ac_ext <<_ACEOF
19010 -/* confdefs.h. */
19011 -_ACEOF
19012 -cat confdefs.h >>conftest.$ac_ext
19013 -cat >>conftest.$ac_ext <<_ACEOF
19014 -/* end confdefs.h. */
19015 -#include <ctype.h>
19016 -#include <stdlib.h>
19017 -#if ((' ' & 0x0FF) == 0x020)
19018 -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
19019 -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
19020 -#else
19021 -# define ISLOWER(c) \
19022 - (('a' <= (c) && (c) <= 'i') \
19023 - || ('j' <= (c) && (c) <= 'r') \
19024 - || ('s' <= (c) && (c) <= 'z'))
19025 -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
19026 -#endif
19027 -
19028 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
19029 -int
19030 -main ()
19031 -{
19032 - int i;
19033 - for (i = 0; i < 256; i++)
19034 - if (XOR (islower (i), ISLOWER (i))
19035 - || toupper (i) != TOUPPER (i))
19036 - return 2;
19037 - return 0;
19038 -}
19039 -_ACEOF
19040 -rm -f conftest$ac_exeext
19041 -if { (ac_try="$ac_link"
19042 -case "(($ac_try" in
19043 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19044 - *) ac_try_echo=$ac_try;;
19045 -esac
19046 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19047 -$as_echo "$ac_try_echo") >&5
19048 - (eval "$ac_link") 2>&5
19049 - ac_status=$?
19050 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19051 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
19052 - { (case "(($ac_try" in
19053 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19054 - *) ac_try_echo=$ac_try;;
19055 -esac
19056 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19057 -$as_echo "$ac_try_echo") >&5
19058 - (eval "$ac_try") 2>&5
19059 - ac_status=$?
19060 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19061 - (exit $ac_status); }; }; then
19062 - :
19063 -else
19064 - $as_echo "$as_me: program exited with status $ac_status" >&5
19065 -$as_echo "$as_me: failed program was:" >&5
19066 -sed 's/^/| /' conftest.$ac_ext >&5
19067 -
19068 -( exit $ac_status )
19069 -ac_cv_header_stdc=no
19070 -fi
19071 -rm -rf conftest.dSYM
19072 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
19073 -fi
19074 -
19075 -
19076 -fi
19077 -fi
19078 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
19079 -$as_echo "$ac_cv_header_stdc" >&6; }
19080 -if test $ac_cv_header_stdc = yes; then
19081 -
19082 -cat >>confdefs.h <<\_ACEOF
19083 -#define STDC_HEADERS 1
19084 -_ACEOF
19085 -
19086 -fi
19087 -
19088 -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
19089 -
19090 -
19091 -
19092 -
19093 -
19094 -
19095 -
19096 -
19097 -
19098 -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
19099 - inttypes.h stdint.h unistd.h
19100 -do
19101 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
19102 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
19103 -$as_echo_n "checking for $ac_header... " >&6; }
19104 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19105 - $as_echo_n "(cached) " >&6
19106 -else
19107 - cat >conftest.$ac_ext <<_ACEOF
19108 -/* confdefs.h. */
19109 -_ACEOF
19110 -cat confdefs.h >>conftest.$ac_ext
19111 -cat >>conftest.$ac_ext <<_ACEOF
19112 -/* end confdefs.h. */
19113 -$ac_includes_default
19114 -
19115 -#include <$ac_header>
19116 -_ACEOF
19117 -rm -f conftest.$ac_objext
19118 -if { (ac_try="$ac_compile"
19119 -case "(($ac_try" in
19120 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19121 - *) ac_try_echo=$ac_try;;
19122 -esac
19123 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19124 -$as_echo "$ac_try_echo") >&5
19125 - (eval "$ac_compile") 2>conftest.er1
19126 - ac_status=$?
19127 - grep -v '^ *+' conftest.er1 >conftest.err
19128 - rm -f conftest.er1
19129 - cat conftest.err >&5
19130 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19131 - (exit $ac_status); } && {
19132 - test -z "$ac_c_werror_flag" ||
19133 - test ! -s conftest.err
19134 - } && test -s conftest.$ac_objext; then
19135 - eval "$as_ac_Header=yes"
19136 -else
19137 - $as_echo "$as_me: failed program was:" >&5
19138 -sed 's/^/| /' conftest.$ac_ext >&5
19139 -
19140 - eval "$as_ac_Header=no"
19141 -fi
19142 -
19143 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19144 -fi
19145 -ac_res=`eval 'as_val=${'$as_ac_Header'}
19146 - $as_echo "$as_val"'`
19147 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
19148 -$as_echo "$ac_res" >&6; }
19149 -as_val=`eval 'as_val=${'$as_ac_Header'}
19150 - $as_echo "$as_val"'`
19151 - if test "x$as_val" = x""yes; then
19152 - cat >>confdefs.h <<_ACEOF
19153 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
19154 -_ACEOF
19155 -
19156 -fi
19157 -
19158 -done
19159 -
19160 -
19161 -
19162 -for ac_header in dlfcn.h
19163 -do
19164 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
19165 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19166 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
19167 -$as_echo_n "checking for $ac_header... " >&6; }
19168 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19169 - $as_echo_n "(cached) " >&6
19170 -fi
19171 -ac_res=`eval 'as_val=${'$as_ac_Header'}
19172 - $as_echo "$as_val"'`
19173 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
19174 -$as_echo "$ac_res" >&6; }
19175 -else
19176 - # Is the header compilable?
19177 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
19178 -$as_echo_n "checking $ac_header usability... " >&6; }
19179 -cat >conftest.$ac_ext <<_ACEOF
19180 -/* confdefs.h. */
19181 -_ACEOF
19182 -cat confdefs.h >>conftest.$ac_ext
19183 -cat >>conftest.$ac_ext <<_ACEOF
19184 -/* end confdefs.h. */
19185 -$ac_includes_default
19186 -#include <$ac_header>
19187 -_ACEOF
19188 -rm -f conftest.$ac_objext
19189 -if { (ac_try="$ac_compile"
19190 -case "(($ac_try" in
19191 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19192 - *) ac_try_echo=$ac_try;;
19193 -esac
19194 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19195 -$as_echo "$ac_try_echo") >&5
19196 - (eval "$ac_compile") 2>conftest.er1
19197 - ac_status=$?
19198 - grep -v '^ *+' conftest.er1 >conftest.err
19199 - rm -f conftest.er1
19200 - cat conftest.err >&5
19201 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19202 - (exit $ac_status); } && {
19203 - test -z "$ac_c_werror_flag" ||
19204 - test ! -s conftest.err
19205 - } && test -s conftest.$ac_objext; then
19206 - ac_header_compiler=yes
19207 -else
19208 - $as_echo "$as_me: failed program was:" >&5
19209 -sed 's/^/| /' conftest.$ac_ext >&5
19210 -
19211 - ac_header_compiler=no
19212 -fi
19213 -
19214 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19215 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
19216 -$as_echo "$ac_header_compiler" >&6; }
19217 -
19218 -# Is the header present?
19219 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
19220 -$as_echo_n "checking $ac_header presence... " >&6; }
19221 -cat >conftest.$ac_ext <<_ACEOF
19222 -/* confdefs.h. */
19223 -_ACEOF
19224 -cat confdefs.h >>conftest.$ac_ext
19225 -cat >>conftest.$ac_ext <<_ACEOF
19226 -/* end confdefs.h. */
19227 -#include <$ac_header>
19228 -_ACEOF
19229 -if { (ac_try="$ac_cpp conftest.$ac_ext"
19230 -case "(($ac_try" in
19231 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19232 - *) ac_try_echo=$ac_try;;
19233 -esac
19234 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19235 -$as_echo "$ac_try_echo") >&5
19236 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
19237 - ac_status=$?
19238 - grep -v '^ *+' conftest.er1 >conftest.err
19239 - rm -f conftest.er1
19240 - cat conftest.err >&5
19241 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19242 - (exit $ac_status); } >/dev/null && {
19243 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
19244 - test ! -s conftest.err
19245 - }; then
19246 - ac_header_preproc=yes
19247 -else
19248 - $as_echo "$as_me: failed program was:" >&5
19249 -sed 's/^/| /' conftest.$ac_ext >&5
19250 -
19251 - ac_header_preproc=no
19252 -fi
19253 -
19254 -rm -f conftest.err conftest.$ac_ext
19255 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
19256 -$as_echo "$ac_header_preproc" >&6; }
19257 -
19258 -# So? What about this header?
19259 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
19260 - yes:no: )
19261 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
19262 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
19263 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
19264 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
19265 - ac_header_preproc=yes
19266 - ;;
19267 - no:yes:* )
19268 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
19269 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
19270 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
19271 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
19272 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
19273 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
19274 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
19275 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
19276 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
19277 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
19278 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
19279 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
19280 -
19281 - ;;
19282 -esac
19283 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
19284 -$as_echo_n "checking for $ac_header... " >&6; }
19285 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19286 - $as_echo_n "(cached) " >&6
19287 -else
19288 - eval "$as_ac_Header=\$ac_header_preproc"
19289 -fi
19290 -ac_res=`eval 'as_val=${'$as_ac_Header'}
19291 - $as_echo "$as_val"'`
19292 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
19293 -$as_echo "$ac_res" >&6; }
19294 -
19295 -fi
19296 -as_val=`eval 'as_val=${'$as_ac_Header'}
19297 - $as_echo "$as_val"'`
19298 - if test "x$as_val" = x""yes; then
19299 - cat >>confdefs.h <<_ACEOF
19300 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
19301 -_ACEOF
19302 -
19303 -fi
19304 -
19305 -done
19306 -
19307 -
19308 -
19309 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
19310 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
19311 - (test "X$CXX" != "Xg++"))) ; then
19312 - ac_ext=cpp
19313 -ac_cpp='$CXXCPP $CPPFLAGS'
19314 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19315 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
19316 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
19317 -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
19318 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
19319 -if test -z "$CXXCPP"; then
19320 - if test "${ac_cv_prog_CXXCPP+set}" = set; then
19321 - $as_echo_n "(cached) " >&6
19322 -else
19323 - # Double quotes because CXXCPP needs to be expanded
19324 - for CXXCPP in "$CXX -E" "/lib/cpp"
19325 - do
19326 - ac_preproc_ok=false
19327 -for ac_cxx_preproc_warn_flag in '' yes
19328 -do
19329 - # Use a header file that comes with gcc, so configuring glibc
19330 - # with a fresh cross-compiler works.
19331 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
19332 - # <limits.h> exists even on freestanding compilers.
19333 - # On the NeXT, cc -E runs the code through the compiler's parser,
19334 - # not just through cpp. "Syntax error" is here to catch this case.
19335 - cat >conftest.$ac_ext <<_ACEOF
19336 -/* confdefs.h. */
19337 -_ACEOF
19338 -cat confdefs.h >>conftest.$ac_ext
19339 -cat >>conftest.$ac_ext <<_ACEOF
19340 -/* end confdefs.h. */
19341 -#ifdef __STDC__
19342 -# include <limits.h>
19343 -#else
19344 -# include <assert.h>
19345 -#endif
19346 - Syntax error
19347 -_ACEOF
19348 -if { (ac_try="$ac_cpp conftest.$ac_ext"
19349 -case "(($ac_try" in
19350 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19351 - *) ac_try_echo=$ac_try;;
19352 -esac
19353 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19354 -$as_echo "$ac_try_echo") >&5
19355 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
19356 - ac_status=$?
19357 - grep -v '^ *+' conftest.er1 >conftest.err
19358 - rm -f conftest.er1
19359 - cat conftest.err >&5
19360 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19361 - (exit $ac_status); } >/dev/null && {
19362 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
19363 - test ! -s conftest.err
19364 - }; then
19365 - :
19366 -else
19367 - $as_echo "$as_me: failed program was:" >&5
19368 -sed 's/^/| /' conftest.$ac_ext >&5
19369 -
19370 - # Broken: fails on valid input.
19371 -continue
19372 -fi
19373 -
19374 -rm -f conftest.err conftest.$ac_ext
19375 -
19376 - # OK, works on sane cases. Now check whether nonexistent headers
19377 - # can be detected and how.
19378 - cat >conftest.$ac_ext <<_ACEOF
19379 -/* confdefs.h. */
19380 -_ACEOF
19381 -cat confdefs.h >>conftest.$ac_ext
19382 -cat >>conftest.$ac_ext <<_ACEOF
19383 -/* end confdefs.h. */
19384 -#include <ac_nonexistent.h>
19385 -_ACEOF
19386 -if { (ac_try="$ac_cpp conftest.$ac_ext"
19387 -case "(($ac_try" in
19388 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19389 - *) ac_try_echo=$ac_try;;
19390 -esac
19391 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19392 -$as_echo "$ac_try_echo") >&5
19393 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
19394 - ac_status=$?
19395 - grep -v '^ *+' conftest.er1 >conftest.err
19396 - rm -f conftest.er1
19397 - cat conftest.err >&5
19398 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19399 - (exit $ac_status); } >/dev/null && {
19400 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
19401 - test ! -s conftest.err
19402 - }; then
19403 - # Broken: success on invalid input.
19404 -continue
19405 -else
19406 - $as_echo "$as_me: failed program was:" >&5
19407 -sed 's/^/| /' conftest.$ac_ext >&5
19408 -
19409 - # Passes both tests.
19410 -ac_preproc_ok=:
19411 -break
19412 -fi
19413 -
19414 -rm -f conftest.err conftest.$ac_ext
19415 -
19416 -done
19417 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
19418 -rm -f conftest.err conftest.$ac_ext
19419 -if $ac_preproc_ok; then
19420 - break
19421 -fi
19422 -
19423 - done
19424 - ac_cv_prog_CXXCPP=$CXXCPP
19425 -
19426 -fi
19427 - CXXCPP=$ac_cv_prog_CXXCPP
19428 -else
19429 - ac_cv_prog_CXXCPP=$CXXCPP
19430 -fi
19431 -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
19432 -$as_echo "$CXXCPP" >&6; }
19433 -ac_preproc_ok=false
19434 -for ac_cxx_preproc_warn_flag in '' yes
19435 -do
19436 - # Use a header file that comes with gcc, so configuring glibc
19437 - # with a fresh cross-compiler works.
19438 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
19439 - # <limits.h> exists even on freestanding compilers.
19440 - # On the NeXT, cc -E runs the code through the compiler's parser,
19441 - # not just through cpp. "Syntax error" is here to catch this case.
19442 - cat >conftest.$ac_ext <<_ACEOF
19443 -/* confdefs.h. */
19444 -_ACEOF
19445 -cat confdefs.h >>conftest.$ac_ext
19446 -cat >>conftest.$ac_ext <<_ACEOF
19447 -/* end confdefs.h. */
19448 -#ifdef __STDC__
19449 -# include <limits.h>
19450 -#else
19451 -# include <assert.h>
19452 -#endif
19453 - Syntax error
19454 -_ACEOF
19455 -if { (ac_try="$ac_cpp conftest.$ac_ext"
19456 -case "(($ac_try" in
19457 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19458 - *) ac_try_echo=$ac_try;;
19459 -esac
19460 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19461 -$as_echo "$ac_try_echo") >&5
19462 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
19463 - ac_status=$?
19464 - grep -v '^ *+' conftest.er1 >conftest.err
19465 - rm -f conftest.er1
19466 - cat conftest.err >&5
19467 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19468 - (exit $ac_status); } >/dev/null && {
19469 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
19470 - test ! -s conftest.err
19471 - }; then
19472 - :
19473 -else
19474 - $as_echo "$as_me: failed program was:" >&5
19475 -sed 's/^/| /' conftest.$ac_ext >&5
19476 -
19477 - # Broken: fails on valid input.
19478 -continue
19479 -fi
19480 -
19481 -rm -f conftest.err conftest.$ac_ext
19482 -
19483 - # OK, works on sane cases. Now check whether nonexistent headers
19484 - # can be detected and how.
19485 - cat >conftest.$ac_ext <<_ACEOF
19486 -/* confdefs.h. */
19487 -_ACEOF
19488 -cat confdefs.h >>conftest.$ac_ext
19489 -cat >>conftest.$ac_ext <<_ACEOF
19490 -/* end confdefs.h. */
19491 -#include <ac_nonexistent.h>
19492 -_ACEOF
19493 -if { (ac_try="$ac_cpp conftest.$ac_ext"
19494 -case "(($ac_try" in
19495 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19496 - *) ac_try_echo=$ac_try;;
19497 -esac
19498 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19499 -$as_echo "$ac_try_echo") >&5
19500 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
19501 - ac_status=$?
19502 - grep -v '^ *+' conftest.er1 >conftest.err
19503 - rm -f conftest.er1
19504 - cat conftest.err >&5
19505 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19506 - (exit $ac_status); } >/dev/null && {
19507 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
19508 - test ! -s conftest.err
19509 - }; then
19510 - # Broken: success on invalid input.
19511 -continue
19512 -else
19513 - $as_echo "$as_me: failed program was:" >&5
19514 -sed 's/^/| /' conftest.$ac_ext >&5
19515 -
19516 - # Passes both tests.
19517 -ac_preproc_ok=:
19518 -break
19519 -fi
19520 -
19521 -rm -f conftest.err conftest.$ac_ext
19522 -
19523 -done
19524 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
19525 -rm -f conftest.err conftest.$ac_ext
19526 -if $ac_preproc_ok; then
19527 - :
19528 -else
19529 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
19530 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
19531 -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
19532 -See \`config.log' for more details." >&5
19533 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
19534 -See \`config.log' for more details." >&2;}
19535 - { (exit 1); exit 1; }; }; }
19536 -fi
19537 -
19538 -ac_ext=cpp
19539 -ac_cpp='$CXXCPP $CPPFLAGS'
19540 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19541 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
19542 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
19543 -
19544 -fi
19545 -
19546 -
19547 -ac_ext=f
19548 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
19549 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
19550 -ac_compiler_gnu=$ac_cv_f77_compiler_gnu
19551 -if test -n "$ac_tool_prefix"; then
19552 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
19553 - do
19554 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19555 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19556 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
19557 -$as_echo_n "checking for $ac_word... " >&6; }
19558 -if test "${ac_cv_prog_F77+set}" = set; then
19559 - $as_echo_n "(cached) " >&6
19560 -else
19561 - if test -n "$F77"; then
19562 - ac_cv_prog_F77="$F77" # Let the user override the test.
19563 -else
19564 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19565 -for as_dir in $PATH
19566 -do
19567 - IFS=$as_save_IFS
19568 - test -z "$as_dir" && as_dir=.
19569 - for ac_exec_ext in '' $ac_executable_extensions; do
19570 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19571 - ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
19572 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
19573 - break 2
19574 - fi
19575 -done
19576 -done
19577 -IFS=$as_save_IFS
19578 -
19579 -fi
19580 -fi
19581 -F77=$ac_cv_prog_F77
19582 -if test -n "$F77"; then
19583 - { $as_echo "$as_me:$LINENO: result: $F77" >&5
19584 -$as_echo "$F77" >&6; }
19585 -else
19586 - { $as_echo "$as_me:$LINENO: result: no" >&5
19587 -$as_echo "no" >&6; }
19588 -fi
19589 -
19590 -
19591 - test -n "$F77" && break
19592 - done
19593 -fi
19594 -if test -z "$F77"; then
19595 - ac_ct_F77=$F77
19596 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
19597 -do
19598 - # Extract the first word of "$ac_prog", so it can be a program name with args.
19599 -set dummy $ac_prog; ac_word=$2
19600 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
19601 -$as_echo_n "checking for $ac_word... " >&6; }
19602 -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
19603 - $as_echo_n "(cached) " >&6
19604 -else
19605 - if test -n "$ac_ct_F77"; then
19606 - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
19607 -else
19608 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19609 -for as_dir in $PATH
19610 -do
19611 - IFS=$as_save_IFS
19612 - test -z "$as_dir" && as_dir=.
19613 - for ac_exec_ext in '' $ac_executable_extensions; do
19614 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19615 - ac_cv_prog_ac_ct_F77="$ac_prog"
19616 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
19617 - break 2
19618 - fi
19619 -done
19620 -done
19621 -IFS=$as_save_IFS
19622 -
19623 -fi
19624 -fi
19625 -ac_ct_F77=$ac_cv_prog_ac_ct_F77
19626 -if test -n "$ac_ct_F77"; then
19627 - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
19628 -$as_echo "$ac_ct_F77" >&6; }
19629 -else
19630 - { $as_echo "$as_me:$LINENO: result: no" >&5
19631 -$as_echo "no" >&6; }
19632 -fi
19633 -
19634 -
19635 - test -n "$ac_ct_F77" && break
19636 -done
19637 -
19638 - if test "x$ac_ct_F77" = x; then
19639 - F77=""
19640 - else
19641 - case $cross_compiling:$ac_tool_warned in
19642 -yes:)
19643 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
19644 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19645 -ac_tool_warned=yes ;;
19646 -esac
19647 - F77=$ac_ct_F77
19648 - fi
19649 -fi
19650 -
19651 -
19652 -# Provide some information about the compiler.
19653 -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
19654 -set X $ac_compile
19655 -ac_compiler=$2
19656 -{ (ac_try="$ac_compiler --version >&5"
19657 -case "(($ac_try" in
19658 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19659 - *) ac_try_echo=$ac_try;;
19660 -esac
19661 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19662 -$as_echo "$ac_try_echo") >&5
19663 - (eval "$ac_compiler --version >&5") 2>&5
19664 - ac_status=$?
19665 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19666 - (exit $ac_status); }
19667 -{ (ac_try="$ac_compiler -v >&5"
19668 -case "(($ac_try" in
19669 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19670 - *) ac_try_echo=$ac_try;;
19671 -esac
19672 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19673 -$as_echo "$ac_try_echo") >&5
19674 - (eval "$ac_compiler -v >&5") 2>&5
19675 - ac_status=$?
19676 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19677 - (exit $ac_status); }
19678 -{ (ac_try="$ac_compiler -V >&5"
19679 -case "(($ac_try" in
19680 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19681 - *) ac_try_echo=$ac_try;;
19682 -esac
19683 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19684 -$as_echo "$ac_try_echo") >&5
19685 - (eval "$ac_compiler -V >&5") 2>&5
19686 - ac_status=$?
19687 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19688 - (exit $ac_status); }
19689 -rm -f a.out
19690 -
19691 -# If we don't use `.F' as extension, the preprocessor is not run on the
19692 -# input file. (Note that this only needs to work for GNU compilers.)
19693 -ac_save_ext=$ac_ext
19694 -ac_ext=F
19695 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
19696 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
19697 -if test "${ac_cv_f77_compiler_gnu+set}" = set; then
19698 - $as_echo_n "(cached) " >&6
19699 -else
19700 - cat >conftest.$ac_ext <<_ACEOF
19701 - program main
19702 -#ifndef __GNUC__
19703 - choke me
19704 -#endif
19705 -
19706 - end
19707 -_ACEOF
19708 -rm -f conftest.$ac_objext
19709 -if { (ac_try="$ac_compile"
19710 -case "(($ac_try" in
19711 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19712 - *) ac_try_echo=$ac_try;;
19713 -esac
19714 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19715 -$as_echo "$ac_try_echo") >&5
19716 - (eval "$ac_compile") 2>conftest.er1
19717 - ac_status=$?
19718 - grep -v '^ *+' conftest.er1 >conftest.err
19719 - rm -f conftest.er1
19720 - cat conftest.err >&5
19721 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19722 - (exit $ac_status); } && {
19723 - test -z "$ac_f77_werror_flag" ||
19724 - test ! -s conftest.err
19725 - } && test -s conftest.$ac_objext; then
19726 - ac_compiler_gnu=yes
19727 -else
19728 - $as_echo "$as_me: failed program was:" >&5
19729 -sed 's/^/| /' conftest.$ac_ext >&5
19730 -
19731 - ac_compiler_gnu=no
19732 -fi
19733 -
19734 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19735 -ac_cv_f77_compiler_gnu=$ac_compiler_gnu
19736 -
19737 -fi
19738 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
19739 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
19740 -ac_ext=$ac_save_ext
19741 -ac_test_FFLAGS=${FFLAGS+set}
19742 -ac_save_FFLAGS=$FFLAGS
19743 -FFLAGS=
19744 -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
19745 -$as_echo_n "checking whether $F77 accepts -g... " >&6; }
19746 -if test "${ac_cv_prog_f77_g+set}" = set; then
19747 - $as_echo_n "(cached) " >&6
19748 -else
19749 - FFLAGS=-g
19750 -cat >conftest.$ac_ext <<_ACEOF
19751 - program main
19752 -
19753 - end
19754 -_ACEOF
19755 -rm -f conftest.$ac_objext
19756 -if { (ac_try="$ac_compile"
19757 -case "(($ac_try" in
19758 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19759 - *) ac_try_echo=$ac_try;;
19760 -esac
19761 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
19762 -$as_echo "$ac_try_echo") >&5
19763 - (eval "$ac_compile") 2>conftest.er1
19764 - ac_status=$?
19765 - grep -v '^ *+' conftest.er1 >conftest.err
19766 - rm -f conftest.er1
19767 - cat conftest.err >&5
19768 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
19769 - (exit $ac_status); } && {
19770 - test -z "$ac_f77_werror_flag" ||
19771 - test ! -s conftest.err
19772 - } && test -s conftest.$ac_objext; then
19773 - ac_cv_prog_f77_g=yes
19774 -else
19775 - $as_echo "$as_me: failed program was:" >&5
19776 -sed 's/^/| /' conftest.$ac_ext >&5
19777 -
19778 - ac_cv_prog_f77_g=no
19779 -fi
19780 -
19781 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19782 -
19783 -fi
19784 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
19785 -$as_echo "$ac_cv_prog_f77_g" >&6; }
19786 -if test "$ac_test_FFLAGS" = set; then
19787 - FFLAGS=$ac_save_FFLAGS
19788 -elif test $ac_cv_prog_f77_g = yes; then
19789 - if test "x$ac_cv_f77_compiler_gnu" = xyes; then
19790 - FFLAGS="-g -O2"
19791 - else
19792 - FFLAGS="-g"
19793 - fi
19794 -else
19795 - if test "x$ac_cv_f77_compiler_gnu" = xyes; then
19796 - FFLAGS="-O2"
19797 - else
19798 - FFLAGS=
19799 - fi
19800 -fi
19801 -
19802 -if test $ac_compiler_gnu = yes; then
19803 - G77=yes
19804 -else
19805 - G77=
19806 -fi
19807 -ac_ext=c
19808 -ac_cpp='$CPP $CPPFLAGS'
19809 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19810 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
19811 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
19812 -
19813 -
19814 -
19815 -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
19816 -# find the maximum length of command line arguments
19817 -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
19818 -$as_echo_n "checking the maximum length of command line arguments... " >&6; }
19819 -if test "${lt_cv_sys_max_cmd_len+set}" = set; then
19820 - $as_echo_n "(cached) " >&6
19821 -else
19822 - i=0
19823 - teststring="ABCD"
19824 -
19825 - case $build_os in
19826 - msdosdjgpp*)
19827 - # On DJGPP, this test can blow up pretty badly due to problems in libc
19828 - # (any single argument exceeding 2000 bytes causes a buffer overrun
19829 - # during glob expansion). Even if it were fixed, the result of this
19830 - # check would be larger than it should be.
19831 - lt_cv_sys_max_cmd_len=12288; # 12K is about right
19832 - ;;
19833 -
19834 - gnu*)
19835 - # Under GNU Hurd, this test is not required because there is
19836 - # no limit to the length of command line arguments.
19837 - # Libtool will interpret -1 as no limit whatsoever
19838 - lt_cv_sys_max_cmd_len=-1;
19839 - ;;
19840 -
19841 - cygwin* | mingw*)
19842 - # On Win9x/ME, this test blows up -- it succeeds, but takes
19843 - # about 5 minutes as the teststring grows exponentially.
19844 - # Worse, since 9x/ME are not pre-emptively multitasking,
19845 - # you end up with a "frozen" computer, even though with patience
19846 - # the test eventually succeeds (with a max line length of 256k).
19847 - # Instead, let's just punt: use the minimum linelength reported by
19848 - # all of the supported platforms: 8192 (on NT/2K/XP).
19849 - lt_cv_sys_max_cmd_len=8192;
19850 - ;;
19851 -
19852 - amigaos*)
19853 - # On AmigaOS with pdksh, this test takes hours, literally.
19854 - # So we just punt and use a minimum line length of 8192.
19855 - lt_cv_sys_max_cmd_len=8192;
19856 - ;;
19857 -
19858 - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
19859 - # This has been around since 386BSD, at least. Likely further.
19860 - if test -x /sbin/sysctl; then
19861 - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
19862 - elif test -x /usr/sbin/sysctl; then
19863 - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
19864 - else
19865 - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
19866 - fi
19867 - # And add a safety zone
19868 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
19869 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
19870 - ;;
19871 -
19872 - interix*)
19873 - # We know the value 262144 and hardcode it with a safety zone (like BSD)
19874 - lt_cv_sys_max_cmd_len=196608
19875 - ;;
19876 -
19877 - osf*)
19878 - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
19879 - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
19880 - # nice to cause kernel panics so lets avoid the loop below.
19881 - # First set a reasonable default.
19882 - lt_cv_sys_max_cmd_len=16384
19883 - #
19884 - if test -x /sbin/sysconfig; then
19885 - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
19886 - *1*) lt_cv_sys_max_cmd_len=-1 ;;
19887 - esac
19888 - fi
19889 - ;;
19890 - sco3.2v5*)
19891 - lt_cv_sys_max_cmd_len=102400
19892 - ;;
19893 - sysv5* | sco5v6* | sysv4.2uw2*)
19894 - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
19895 - if test -n "$kargmax"; then
19896 - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
19897 - else
19898 - lt_cv_sys_max_cmd_len=32768
19899 - fi
19900 - ;;
19901 - *)
19902 - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
19903 - if test -n "$lt_cv_sys_max_cmd_len"; then
19904 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
19905 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
19906 - else
19907 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
19908 - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
19909 - = "XX$teststring") >/dev/null 2>&1 &&
19910 - new_result=`expr "X$teststring" : ".*" 2>&1` &&
19911 - lt_cv_sys_max_cmd_len=$new_result &&
19912 - test $i != 17 # 1/2 MB should be enough
19913 - do
19914 - i=`expr $i + 1`
19915 - teststring=$teststring$teststring
19916 - done
19917 - teststring=
19918 - # Add a significant safety factor because C++ compilers can tack on massive
19919 - # amounts of additional arguments before passing them to the linker.
19920 - # It appears as though 1/2 is a usable value.
19921 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
19922 - fi
19923 - ;;
19924 - esac
19925 -
19926 -fi
19927 -
19928 -if test -n $lt_cv_sys_max_cmd_len ; then
19929 - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
19930 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
19931 -else
19932 - { $as_echo "$as_me:$LINENO: result: none" >&5
19933 -$as_echo "none" >&6; }
19934 -fi
19935 -
19936 -
19937 -
19938 -
19939 -
19940 -# Check for command to grab the raw symbol name followed by C symbol from nm.
19941 -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
19942 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
19943 -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
19944 - $as_echo_n "(cached) " >&6
19945 -else
19946 -
19947 -# These are sane defaults that work on at least a few old systems.
19948 -# [They come from Ultrix. What could be older than Ultrix?!! ;)]
19949 -
19950 -# Character class describing NM global symbol codes.
19951 -symcode='[BCDEGRST]'
19952 -
19953 -# Regexp to match symbols that can be accessed directly from C.
19954 -sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
19955 -
19956 -# Transform an extracted symbol line into a proper C declaration
19957 -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
19958 -
19959 -# Transform an extracted symbol line into symbol name and symbol address
19960 -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
19961 -
19962 -# Define system-specific variables.
19963 -case $host_os in
19964 -aix*)
19965 - symcode='[BCDT]'
19966 - ;;
19967 -cygwin* | mingw* | pw32*)
19968 - symcode='[ABCDGISTW]'
19969 - ;;
19970 -hpux*) # Its linker distinguishes data from code symbols
19971 - if test "$host_cpu" = ia64; then
19972 - symcode='[ABCDEGRST]'
19973 - fi
19974 - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19975 - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
19976 - ;;
19977 -linux* | k*bsd*-gnu)
19978 - if test "$host_cpu" = ia64; then
19979 - symcode='[ABCDGIRSTW]'
19980 - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19981 - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
19982 - fi
19983 - ;;
19984 -irix* | nonstopux*)
19985 - symcode='[BCDEGRST]'
19986 - ;;
19987 -osf*)
19988 - symcode='[BCDEGQRST]'
19989 - ;;
19990 -solaris*)
19991 - symcode='[BDRT]'
19992 - ;;
19993 -sco3.2v5*)
19994 - symcode='[DT]'
19995 - ;;
19996 -sysv4.2uw2*)
19997 - symcode='[DT]'
19998 - ;;
19999 -sysv5* | sco5v6* | unixware* | OpenUNIX*)
20000 - symcode='[ABDT]'
20001 - ;;
20002 -sysv4)
20003 - symcode='[DFNSTU]'
20004 - ;;
20005 -esac
20006 -
20007 -# Handle CRLF in mingw tool chain
20008 -opt_cr=
20009 -case $build_os in
20010 -mingw*)
20011 - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
20012 - ;;
20013 -esac
20014 -
20015 -# If we're using GNU nm, then use its standard symbol codes.
20016 -case `$NM -V 2>&1` in
20017 -*GNU* | *'with BFD'*)
20018 - symcode='[ABCDGIRSTW]' ;;
20019 -esac
20020 -
20021 -# Try without a prefix undercore, then with it.
20022 -for ac_symprfx in "" "_"; do
20023 -
20024 - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
20025 - symxfrm="\\1 $ac_symprfx\\2 \\2"
20026 -
20027 - # Write the raw and C identifiers.
20028 - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
20029 -
20030 - # Check to see that the pipe works correctly.
20031 - pipe_works=no
20032 -
20033 - rm -f conftest*
20034 - cat > conftest.$ac_ext <<EOF
20035 -#ifdef __cplusplus
20036 -extern "C" {
20037 -#endif
20038 -char nm_test_var;
20039 -void nm_test_func(){}
20040 -#ifdef __cplusplus
20041 -}
20042 -#endif
20043 -int main(){nm_test_var='a';nm_test_func();return(0);}
20044 -EOF
20045 -
20046 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
20047 - (eval $ac_compile) 2>&5
20048 - ac_status=$?
20049 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
20050 - (exit $ac_status); }; then
20051 - # Now try to grab the symbols.
20052 - nlist=conftest.nm
20053 - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
20054 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
20055 - ac_status=$?
20056 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
20057 - (exit $ac_status); } && test -s "$nlist"; then
20058 - # Try sorting and uniquifying the output.
20059 - if sort "$nlist" | uniq > "$nlist"T; then
20060 - mv -f "$nlist"T "$nlist"
20061 - else
20062 - rm -f "$nlist"T
20063 - fi
20064 -
20065 - # Make sure that we snagged all the symbols we need.
20066 - if grep ' nm_test_var$' "$nlist" >/dev/null; then
20067 - if grep ' nm_test_func$' "$nlist" >/dev/null; then
20068 - cat <<EOF > conftest.$ac_ext
20069 -#ifdef __cplusplus
20070 -extern "C" {
20071 -#endif
20072 -
20073 -EOF
20074 - # Now generate the symbol file.
20075 - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
20076 -
20077 - cat <<EOF >> conftest.$ac_ext
20078 -#if defined (__STDC__) && __STDC__
20079 -# define lt_ptr_t void *
20080 -#else
20081 -# define lt_ptr_t char *
20082 -# define const
20083 -#endif
20084 -
20085 -/* The mapping between symbol names and symbols. */
20086 -const struct {
20087 - const char *name;
20088 - lt_ptr_t address;
20089 -}
20090 -lt_preloaded_symbols[] =
20091 -{
20092 -EOF
20093 - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
20094 - cat <<\EOF >> conftest.$ac_ext
20095 - {0, (lt_ptr_t) 0}
20096 -};
20097 -
20098 -#ifdef __cplusplus
20099 -}
20100 -#endif
20101 -EOF
20102 - # Now try linking the two files.
20103 - mv conftest.$ac_objext conftstm.$ac_objext
20104 - lt_save_LIBS="$LIBS"
20105 - lt_save_CFLAGS="$CFLAGS"
20106 - LIBS="conftstm.$ac_objext"
20107 - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
20108 - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
20109 - (eval $ac_link) 2>&5
20110 - ac_status=$?
20111 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
20112 - (exit $ac_status); } && test -s conftest${ac_exeext}; then
20113 - pipe_works=yes
20114 - fi
20115 - LIBS="$lt_save_LIBS"
20116 - CFLAGS="$lt_save_CFLAGS"
20117 - else
20118 - echo "cannot find nm_test_func in $nlist" >&5
20119 - fi
20120 - else
20121 - echo "cannot find nm_test_var in $nlist" >&5
20122 - fi
20123 - else
20124 - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
20125 - fi
20126 - else
20127 - echo "$progname: failed program was:" >&5
20128 - cat conftest.$ac_ext >&5
20129 - fi
20130 - rm -rf conftest* conftst*
20131 -
20132 - # Do not use the global_symbol_pipe unless it works.
20133 - if test "$pipe_works" = yes; then
20134 - break
20135 - else
20136 - lt_cv_sys_global_symbol_pipe=
20137 - fi
20138 -done
20139 -
20140 -fi
20141 -
20142 -if test -z "$lt_cv_sys_global_symbol_pipe"; then
20143 - lt_cv_sys_global_symbol_to_cdecl=
20144 -fi
20145 -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
20146 - { $as_echo "$as_me:$LINENO: result: failed" >&5
20147 -$as_echo "failed" >&6; }
20148 -else
20149 - { $as_echo "$as_me:$LINENO: result: ok" >&5
20150 -$as_echo "ok" >&6; }
20151 -fi
20152 -
20153 -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
20154 -$as_echo_n "checking for objdir... " >&6; }
20155 -if test "${lt_cv_objdir+set}" = set; then
20156 - $as_echo_n "(cached) " >&6
20157 -else
20158 - rm -f .libs 2>/dev/null
20159 -mkdir .libs 2>/dev/null
20160 -if test -d .libs; then
20161 - lt_cv_objdir=.libs
20162 -else
20163 - # MS-DOS does not allow filenames that begin with a dot.
20164 - lt_cv_objdir=_libs
20165 -fi
20166 -rmdir .libs 2>/dev/null
20167 -fi
20168 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
20169 -$as_echo "$lt_cv_objdir" >&6; }
20170 -objdir=$lt_cv_objdir
20171 -
20172 -
20173 -
20174 -
20175 -
20176 -case $host_os in
20177 -aix3*)
20178 - # AIX sometimes has problems with the GCC collect2 program. For some
20179 - # reason, if we set the COLLECT_NAMES environment variable, the problems
20180 - # vanish in a puff of smoke.
20181 - if test "X${COLLECT_NAMES+set}" != Xset; then
20182 - COLLECT_NAMES=
20183 - export COLLECT_NAMES
20184 - fi
20185 - ;;
20186 -esac
20187 -
20188 -# Sed substitution that helps us do robust quoting. It backslashifies
20189 -# metacharacters that are still active within double-quoted strings.
20190 -Xsed='sed -e 1s/^X//'
20191 -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
20192 -
20193 -# Same as above, but do not quote variable references.
20194 -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
20195 -
20196 -# Sed substitution to delay expansion of an escaped shell variable in a
20197 -# double_quote_subst'ed string.
20198 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
20199 -
20200 -# Sed substitution to avoid accidental globbing in evaled expressions
20201 -no_glob_subst='s/\*/\\\*/g'
20202 -
20203 -# Constants:
20204 -rm="rm -f"
20205 -
20206 -# Global variables:
20207 -default_ofile=libtool
20208 -can_build_shared=yes
20209 -
20210 -# All known linkers require a `.a' archive for static linking (except MSVC,
20211 -# which needs '.lib').
20212 -libext=a
20213 -ltmain="$ac_aux_dir/ltmain.sh"
20214 -ofile="$default_ofile"
20215 -with_gnu_ld="$lt_cv_prog_gnu_ld"
20216 -
20217 -if test -n "$ac_tool_prefix"; then
20218 - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
20219 -set dummy ${ac_tool_prefix}ar; ac_word=$2
20220 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20221 -$as_echo_n "checking for $ac_word... " >&6; }
20222 -if test "${ac_cv_prog_AR+set}" = set; then
20223 - $as_echo_n "(cached) " >&6
20224 -else
20225 - if test -n "$AR"; then
20226 - ac_cv_prog_AR="$AR" # Let the user override the test.
20227 -else
20228 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20229 -for as_dir in $PATH
20230 -do
20231 - IFS=$as_save_IFS
20232 - test -z "$as_dir" && as_dir=.
20233 - for ac_exec_ext in '' $ac_executable_extensions; do
20234 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20235 - ac_cv_prog_AR="${ac_tool_prefix}ar"
20236 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20237 - break 2
20238 - fi
20239 -done
20240 -done
20241 -IFS=$as_save_IFS
20242 -
20243 -fi
20244 -fi
20245 -AR=$ac_cv_prog_AR
20246 -if test -n "$AR"; then
20247 - { $as_echo "$as_me:$LINENO: result: $AR" >&5
20248 -$as_echo "$AR" >&6; }
20249 -else
20250 - { $as_echo "$as_me:$LINENO: result: no" >&5
20251 -$as_echo "no" >&6; }
20252 -fi
20253 -
20254 -
20255 -fi
20256 -if test -z "$ac_cv_prog_AR"; then
20257 - ac_ct_AR=$AR
20258 - # Extract the first word of "ar", so it can be a program name with args.
20259 -set dummy ar; ac_word=$2
20260 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20261 -$as_echo_n "checking for $ac_word... " >&6; }
20262 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
20263 - $as_echo_n "(cached) " >&6
20264 -else
20265 - if test -n "$ac_ct_AR"; then
20266 - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
20267 -else
20268 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20269 -for as_dir in $PATH
20270 -do
20271 - IFS=$as_save_IFS
20272 - test -z "$as_dir" && as_dir=.
20273 - for ac_exec_ext in '' $ac_executable_extensions; do
20274 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20275 - ac_cv_prog_ac_ct_AR="ar"
20276 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20277 - break 2
20278 - fi
20279 -done
20280 -done
20281 -IFS=$as_save_IFS
20282 -
20283 -fi
20284 -fi
20285 -ac_ct_AR=$ac_cv_prog_ac_ct_AR
20286 -if test -n "$ac_ct_AR"; then
20287 - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
20288 -$as_echo "$ac_ct_AR" >&6; }
20289 -else
20290 - { $as_echo "$as_me:$LINENO: result: no" >&5
20291 -$as_echo "no" >&6; }
20292 -fi
20293 -
20294 - if test "x$ac_ct_AR" = x; then
20295 - AR="false"
20296 - else
20297 - case $cross_compiling:$ac_tool_warned in
20298 -yes:)
20299 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
20300 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
20301 -ac_tool_warned=yes ;;
20302 -esac
20303 - AR=$ac_ct_AR
20304 - fi
20305 -else
20306 - AR="$ac_cv_prog_AR"
20307 -fi
20308 -
20309 -if test -n "$ac_tool_prefix"; then
20310 - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
20311 -set dummy ${ac_tool_prefix}ranlib; ac_word=$2
20312 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20313 -$as_echo_n "checking for $ac_word... " >&6; }
20314 -if test "${ac_cv_prog_RANLIB+set}" = set; then
20315 - $as_echo_n "(cached) " >&6
20316 -else
20317 - if test -n "$RANLIB"; then
20318 - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
20319 -else
20320 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20321 -for as_dir in $PATH
20322 -do
20323 - IFS=$as_save_IFS
20324 - test -z "$as_dir" && as_dir=.
20325 - for ac_exec_ext in '' $ac_executable_extensions; do
20326 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20327 - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
20328 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20329 - break 2
20330 - fi
20331 -done
20332 -done
20333 -IFS=$as_save_IFS
20334 -
20335 -fi
20336 -fi
20337 -RANLIB=$ac_cv_prog_RANLIB
20338 -if test -n "$RANLIB"; then
20339 - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
20340 -$as_echo "$RANLIB" >&6; }
20341 -else
20342 - { $as_echo "$as_me:$LINENO: result: no" >&5
20343 -$as_echo "no" >&6; }
20344 -fi
20345 -
20346 -
20347 -fi
20348 -if test -z "$ac_cv_prog_RANLIB"; then
20349 - ac_ct_RANLIB=$RANLIB
20350 - # Extract the first word of "ranlib", so it can be a program name with args.
20351 -set dummy ranlib; ac_word=$2
20352 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20353 -$as_echo_n "checking for $ac_word... " >&6; }
20354 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
20355 - $as_echo_n "(cached) " >&6
20356 -else
20357 - if test -n "$ac_ct_RANLIB"; then
20358 - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
20359 -else
20360 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20361 -for as_dir in $PATH
20362 -do
20363 - IFS=$as_save_IFS
20364 - test -z "$as_dir" && as_dir=.
20365 - for ac_exec_ext in '' $ac_executable_extensions; do
20366 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20367 - ac_cv_prog_ac_ct_RANLIB="ranlib"
20368 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20369 - break 2
20370 - fi
20371 -done
20372 -done
20373 -IFS=$as_save_IFS
20374 -
20375 -fi
20376 -fi
20377 -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
20378 -if test -n "$ac_ct_RANLIB"; then
20379 - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
20380 -$as_echo "$ac_ct_RANLIB" >&6; }
20381 -else
20382 - { $as_echo "$as_me:$LINENO: result: no" >&5
20383 -$as_echo "no" >&6; }
20384 -fi
20385 -
20386 - if test "x$ac_ct_RANLIB" = x; then
20387 - RANLIB=":"
20388 - else
20389 - case $cross_compiling:$ac_tool_warned in
20390 -yes:)
20391 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
20392 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
20393 -ac_tool_warned=yes ;;
20394 -esac
20395 - RANLIB=$ac_ct_RANLIB
20396 - fi
20397 -else
20398 - RANLIB="$ac_cv_prog_RANLIB"
20399 -fi
20400 -
20401 -if test -n "$ac_tool_prefix"; then
20402 - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
20403 -set dummy ${ac_tool_prefix}strip; ac_word=$2
20404 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20405 -$as_echo_n "checking for $ac_word... " >&6; }
20406 -if test "${ac_cv_prog_STRIP+set}" = set; then
20407 - $as_echo_n "(cached) " >&6
20408 -else
20409 - if test -n "$STRIP"; then
20410 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
20411 -else
20412 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20413 -for as_dir in $PATH
20414 -do
20415 - IFS=$as_save_IFS
20416 - test -z "$as_dir" && as_dir=.
20417 - for ac_exec_ext in '' $ac_executable_extensions; do
20418 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20419 - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
20420 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20421 - break 2
20422 - fi
20423 -done
20424 -done
20425 -IFS=$as_save_IFS
20426 -
20427 -fi
20428 -fi
20429 -STRIP=$ac_cv_prog_STRIP
20430 -if test -n "$STRIP"; then
20431 - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
20432 -$as_echo "$STRIP" >&6; }
20433 -else
20434 - { $as_echo "$as_me:$LINENO: result: no" >&5
20435 -$as_echo "no" >&6; }
20436 -fi
20437 -
20438 -
20439 -fi
20440 -if test -z "$ac_cv_prog_STRIP"; then
20441 - ac_ct_STRIP=$STRIP
20442 - # Extract the first word of "strip", so it can be a program name with args.
20443 -set dummy strip; ac_word=$2
20444 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20445 -$as_echo_n "checking for $ac_word... " >&6; }
20446 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
20447 - $as_echo_n "(cached) " >&6
20448 -else
20449 - if test -n "$ac_ct_STRIP"; then
20450 - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
20451 -else
20452 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20453 -for as_dir in $PATH
20454 -do
20455 - IFS=$as_save_IFS
20456 - test -z "$as_dir" && as_dir=.
20457 - for ac_exec_ext in '' $ac_executable_extensions; do
20458 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20459 - ac_cv_prog_ac_ct_STRIP="strip"
20460 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20461 - break 2
20462 - fi
20463 -done
20464 -done
20465 -IFS=$as_save_IFS
20466 -
20467 -fi
20468 -fi
20469 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
20470 -if test -n "$ac_ct_STRIP"; then
20471 - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
20472 -$as_echo "$ac_ct_STRIP" >&6; }
20473 -else
20474 - { $as_echo "$as_me:$LINENO: result: no" >&5
20475 -$as_echo "no" >&6; }
20476 -fi
20477 -
20478 - if test "x$ac_ct_STRIP" = x; then
20479 - STRIP=":"
20480 - else
20481 - case $cross_compiling:$ac_tool_warned in
20482 -yes:)
20483 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
20484 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
20485 -ac_tool_warned=yes ;;
20486 -esac
20487 - STRIP=$ac_ct_STRIP
20488 - fi
20489 -else
20490 - STRIP="$ac_cv_prog_STRIP"
20491 -fi
20492 -
20493 -
20494 -old_CC="$CC"
20495 -old_CFLAGS="$CFLAGS"
20496 -
20497 -# Set sane defaults for various variables
20498 -test -z "$AR" && AR=ar
20499 -test -z "$AR_FLAGS" && AR_FLAGS=cru
20500 -test -z "$AS" && AS=as
20501 -test -z "$CC" && CC=cc
20502 -test -z "$LTCC" && LTCC=$CC
20503 -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
20504 -test -z "$DLLTOOL" && DLLTOOL=dlltool
20505 -test -z "$LD" && LD=ld
20506 -test -z "$LN_S" && LN_S="ln -s"
20507 -test -z "$MAGIC_CMD" && MAGIC_CMD=file
20508 -test -z "$NM" && NM=nm
20509 -test -z "$SED" && SED=sed
20510 -test -z "$OBJDUMP" && OBJDUMP=objdump
20511 -test -z "$RANLIB" && RANLIB=:
20512 -test -z "$STRIP" && STRIP=:
20513 -test -z "$ac_objext" && ac_objext=o
20514 -
20515 -# Determine commands to create old-style static archives.
20516 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
20517 -old_postinstall_cmds='chmod 644 $oldlib'
20518 -old_postuninstall_cmds=
20519 -
20520 -if test -n "$RANLIB"; then
20521 - case $host_os in
20522 - openbsd*)
20523 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
20524 - ;;
20525 - *)
20526 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
20527 - ;;
20528 - esac
20529 - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
20530 -fi
20531 -
20532 -for cc_temp in $compiler""; do
20533 - case $cc_temp in
20534 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
20535 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
20536 - \-*) ;;
20537 - *) break;;
20538 - esac
20539 -done
20540 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
20541 -
20542 -
20543 -# Only perform the check for file, if the check method requires it
20544 -case $deplibs_check_method in
20545 -file_magic*)
20546 - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
20547 - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
20548 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
20549 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
20550 - $as_echo_n "(cached) " >&6
20551 -else
20552 - case $MAGIC_CMD in
20553 -[\\/*] | ?:[\\/]*)
20554 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
20555 - ;;
20556 -*)
20557 - lt_save_MAGIC_CMD="$MAGIC_CMD"
20558 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
20559 - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
20560 - for ac_dir in $ac_dummy; do
20561 - IFS="$lt_save_ifs"
20562 - test -z "$ac_dir" && ac_dir=.
20563 - if test -f $ac_dir/${ac_tool_prefix}file; then
20564 - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
20565 - if test -n "$file_magic_test_file"; then
20566 - case $deplibs_check_method in
20567 - "file_magic "*)
20568 - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
20569 - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
20570 - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
20571 - $EGREP "$file_magic_regex" > /dev/null; then
20572 - :
20573 - else
20574 - cat <<EOF 1>&2
20575 -
20576 -*** Warning: the command libtool uses to detect shared libraries,
20577 -*** $file_magic_cmd, produces output that libtool cannot recognize.
20578 -*** The result is that libtool may fail to recognize shared libraries
20579 -*** as such. This will affect the creation of libtool libraries that
20580 -*** depend on shared libraries, but programs linked with such libtool
20581 -*** libraries will work regardless of this problem. Nevertheless, you
20582 -*** may want to report the problem to your system manager and/or to
20583 -*** bug-libtool@gnu.org
20584 -
20585 -EOF
20586 - fi ;;
20587 - esac
20588 - fi
20589 - break
20590 - fi
20591 - done
20592 - IFS="$lt_save_ifs"
20593 - MAGIC_CMD="$lt_save_MAGIC_CMD"
20594 - ;;
20595 -esac
20596 -fi
20597 -
20598 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
20599 -if test -n "$MAGIC_CMD"; then
20600 - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
20601 -$as_echo "$MAGIC_CMD" >&6; }
20602 -else
20603 - { $as_echo "$as_me:$LINENO: result: no" >&5
20604 -$as_echo "no" >&6; }
20605 -fi
20606 -
20607 -if test -z "$lt_cv_path_MAGIC_CMD"; then
20608 - if test -n "$ac_tool_prefix"; then
20609 - { $as_echo "$as_me:$LINENO: checking for file" >&5
20610 -$as_echo_n "checking for file... " >&6; }
20611 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
20612 - $as_echo_n "(cached) " >&6
20613 -else
20614 - case $MAGIC_CMD in
20615 -[\\/*] | ?:[\\/]*)
20616 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
20617 - ;;
20618 -*)
20619 - lt_save_MAGIC_CMD="$MAGIC_CMD"
20620 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
20621 - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
20622 - for ac_dir in $ac_dummy; do
20623 - IFS="$lt_save_ifs"
20624 - test -z "$ac_dir" && ac_dir=.
20625 - if test -f $ac_dir/file; then
20626 - lt_cv_path_MAGIC_CMD="$ac_dir/file"
20627 - if test -n "$file_magic_test_file"; then
20628 - case $deplibs_check_method in
20629 - "file_magic "*)
20630 - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
20631 - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
20632 - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
20633 - $EGREP "$file_magic_regex" > /dev/null; then
20634 - :
20635 - else
20636 - cat <<EOF 1>&2
20637 -
20638 -*** Warning: the command libtool uses to detect shared libraries,
20639 -*** $file_magic_cmd, produces output that libtool cannot recognize.
20640 -*** The result is that libtool may fail to recognize shared libraries
20641 -*** as such. This will affect the creation of libtool libraries that
20642 -*** depend on shared libraries, but programs linked with such libtool
20643 -*** libraries will work regardless of this problem. Nevertheless, you
20644 -*** may want to report the problem to your system manager and/or to
20645 -*** bug-libtool@gnu.org
20646 -
20647 -EOF
20648 - fi ;;
20649 - esac
20650 - fi
20651 - break
20652 - fi
20653 - done
20654 - IFS="$lt_save_ifs"
20655 - MAGIC_CMD="$lt_save_MAGIC_CMD"
20656 - ;;
20657 -esac
20658 -fi
20659 -
20660 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
20661 -if test -n "$MAGIC_CMD"; then
20662 - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
20663 -$as_echo "$MAGIC_CMD" >&6; }
20664 -else
20665 - { $as_echo "$as_me:$LINENO: result: no" >&5
20666 -$as_echo "no" >&6; }
20667 -fi
20668 -
20669 - else
20670 - MAGIC_CMD=:
20671 - fi
20672 -fi
20673 -
20674 - fi
20675 - ;;
20676 -esac
20677 -
20678 -
20679 - case $host_os in
20680 - rhapsody* | darwin*)
20681 - if test -n "$ac_tool_prefix"; then
20682 - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
20683 -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
20684 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20685 -$as_echo_n "checking for $ac_word... " >&6; }
20686 -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
20687 - $as_echo_n "(cached) " >&6
20688 -else
20689 - if test -n "$DSYMUTIL"; then
20690 - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
20691 -else
20692 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20693 -for as_dir in $PATH
20694 -do
20695 - IFS=$as_save_IFS
20696 - test -z "$as_dir" && as_dir=.
20697 - for ac_exec_ext in '' $ac_executable_extensions; do
20698 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20699 - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
20700 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20701 - break 2
20702 - fi
20703 -done
20704 -done
20705 -IFS=$as_save_IFS
20706 -
20707 -fi
20708 -fi
20709 -DSYMUTIL=$ac_cv_prog_DSYMUTIL
20710 -if test -n "$DSYMUTIL"; then
20711 - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
20712 -$as_echo "$DSYMUTIL" >&6; }
20713 -else
20714 - { $as_echo "$as_me:$LINENO: result: no" >&5
20715 -$as_echo "no" >&6; }
20716 -fi
20717 -
20718 -
20719 -fi
20720 -if test -z "$ac_cv_prog_DSYMUTIL"; then
20721 - ac_ct_DSYMUTIL=$DSYMUTIL
20722 - # Extract the first word of "dsymutil", so it can be a program name with args.
20723 -set dummy dsymutil; ac_word=$2
20724 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20725 -$as_echo_n "checking for $ac_word... " >&6; }
20726 -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
20727 - $as_echo_n "(cached) " >&6
20728 -else
20729 - if test -n "$ac_ct_DSYMUTIL"; then
20730 - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
20731 -else
20732 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20733 -for as_dir in $PATH
20734 -do
20735 - IFS=$as_save_IFS
20736 - test -z "$as_dir" && as_dir=.
20737 - for ac_exec_ext in '' $ac_executable_extensions; do
20738 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20739 - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
20740 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20741 - break 2
20742 - fi
20743 -done
20744 -done
20745 -IFS=$as_save_IFS
20746 -
20747 -fi
20748 -fi
20749 -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
20750 -if test -n "$ac_ct_DSYMUTIL"; then
20751 - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
20752 -$as_echo "$ac_ct_DSYMUTIL" >&6; }
20753 -else
20754 - { $as_echo "$as_me:$LINENO: result: no" >&5
20755 -$as_echo "no" >&6; }
20756 -fi
20757 -
20758 - if test "x$ac_ct_DSYMUTIL" = x; then
20759 - DSYMUTIL=":"
20760 - else
20761 - case $cross_compiling:$ac_tool_warned in
20762 -yes:)
20763 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
20764 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
20765 -ac_tool_warned=yes ;;
20766 -esac
20767 - DSYMUTIL=$ac_ct_DSYMUTIL
20768 - fi
20769 -else
20770 - DSYMUTIL="$ac_cv_prog_DSYMUTIL"
20771 -fi
20772 -
20773 - if test -n "$ac_tool_prefix"; then
20774 - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
20775 -set dummy ${ac_tool_prefix}nmedit; ac_word=$2
20776 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20777 -$as_echo_n "checking for $ac_word... " >&6; }
20778 -if test "${ac_cv_prog_NMEDIT+set}" = set; then
20779 - $as_echo_n "(cached) " >&6
20780 -else
20781 - if test -n "$NMEDIT"; then
20782 - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
20783 -else
20784 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20785 -for as_dir in $PATH
20786 -do
20787 - IFS=$as_save_IFS
20788 - test -z "$as_dir" && as_dir=.
20789 - for ac_exec_ext in '' $ac_executable_extensions; do
20790 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20791 - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
20792 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20793 - break 2
20794 - fi
20795 -done
20796 -done
20797 -IFS=$as_save_IFS
20798 -
20799 -fi
20800 -fi
20801 -NMEDIT=$ac_cv_prog_NMEDIT
20802 -if test -n "$NMEDIT"; then
20803 - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
20804 -$as_echo "$NMEDIT" >&6; }
20805 -else
20806 - { $as_echo "$as_me:$LINENO: result: no" >&5
20807 -$as_echo "no" >&6; }
20808 -fi
20809 -
20810 -
20811 -fi
20812 -if test -z "$ac_cv_prog_NMEDIT"; then
20813 - ac_ct_NMEDIT=$NMEDIT
20814 - # Extract the first word of "nmedit", so it can be a program name with args.
20815 -set dummy nmedit; ac_word=$2
20816 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
20817 -$as_echo_n "checking for $ac_word... " >&6; }
20818 -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
20819 - $as_echo_n "(cached) " >&6
20820 -else
20821 - if test -n "$ac_ct_NMEDIT"; then
20822 - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
20823 -else
20824 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20825 -for as_dir in $PATH
20826 -do
20827 - IFS=$as_save_IFS
20828 - test -z "$as_dir" && as_dir=.
20829 - for ac_exec_ext in '' $ac_executable_extensions; do
20830 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20831 - ac_cv_prog_ac_ct_NMEDIT="nmedit"
20832 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20833 - break 2
20834 - fi
20835 -done
20836 -done
20837 -IFS=$as_save_IFS
20838 -
20839 -fi
20840 -fi
20841 -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
20842 -if test -n "$ac_ct_NMEDIT"; then
20843 - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
20844 -$as_echo "$ac_ct_NMEDIT" >&6; }
20845 -else
20846 - { $as_echo "$as_me:$LINENO: result: no" >&5
20847 -$as_echo "no" >&6; }
20848 -fi
20849 -
20850 - if test "x$ac_ct_NMEDIT" = x; then
20851 - NMEDIT=":"
20852 - else
20853 - case $cross_compiling:$ac_tool_warned in
20854 -yes:)
20855 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
20856 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
20857 -ac_tool_warned=yes ;;
20858 -esac
20859 - NMEDIT=$ac_ct_NMEDIT
20860 - fi
20861 -else
20862 - NMEDIT="$ac_cv_prog_NMEDIT"
20863 -fi
20864 -
20865 -
20866 - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
20867 -$as_echo_n "checking for -single_module linker flag... " >&6; }
20868 -if test "${lt_cv_apple_cc_single_mod+set}" = set; then
20869 - $as_echo_n "(cached) " >&6
20870 -else
20871 - lt_cv_apple_cc_single_mod=no
20872 - if test -z "${LT_MULTI_MODULE}"; then
20873 - # By default we will add the -single_module flag. You can override
20874 - # by either setting the environment variable LT_MULTI_MODULE
20875 - # non-empty at configure time, or by adding -multi_module to the
20876 - # link flags.
20877 - echo "int foo(void){return 1;}" > conftest.c
20878 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
20879 - -dynamiclib ${wl}-single_module conftest.c
20880 - if test -f libconftest.dylib; then
20881 - lt_cv_apple_cc_single_mod=yes
20882 - rm -rf libconftest.dylib*
20883 - fi
20884 - rm conftest.c
20885 - fi
20886 -fi
20887 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
20888 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
20889 - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
20890 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
20891 -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
20892 - $as_echo_n "(cached) " >&6
20893 -else
20894 - lt_cv_ld_exported_symbols_list=no
20895 - save_LDFLAGS=$LDFLAGS
20896 - echo "_main" > conftest.sym
20897 - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
20898 - cat >conftest.$ac_ext <<_ACEOF
20899 -/* confdefs.h. */
20900 -_ACEOF
20901 -cat confdefs.h >>conftest.$ac_ext
20902 -cat >>conftest.$ac_ext <<_ACEOF
20903 -/* end confdefs.h. */
20904 -
20905 -int
20906 -main ()
20907 -{
20908 -
20909 - ;
20910 - return 0;
20911 -}
20912 -_ACEOF
20913 -rm -f conftest.$ac_objext conftest$ac_exeext
20914 -if { (ac_try="$ac_link"
20915 -case "(($ac_try" in
20916 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20917 - *) ac_try_echo=$ac_try;;
20918 -esac
20919 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
20920 -$as_echo "$ac_try_echo") >&5
20921 - (eval "$ac_link") 2>conftest.er1
20922 - ac_status=$?
20923 - grep -v '^ *+' conftest.er1 >conftest.err
20924 - rm -f conftest.er1
20925 - cat conftest.err >&5
20926 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
20927 - (exit $ac_status); } && {
20928 - test -z "$ac_c_werror_flag" ||
20929 - test ! -s conftest.err
20930 - } && test -s conftest$ac_exeext && {
20931 - test "$cross_compiling" = yes ||
20932 - $as_test_x conftest$ac_exeext
20933 - }; then
20934 - lt_cv_ld_exported_symbols_list=yes
20935 -else
20936 - $as_echo "$as_me: failed program was:" >&5
20937 -sed 's/^/| /' conftest.$ac_ext >&5
20938 -
20939 - lt_cv_ld_exported_symbols_list=no
20940 -fi
20941 -
20942 -rm -rf conftest.dSYM
20943 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20944 - conftest$ac_exeext conftest.$ac_ext
20945 - LDFLAGS="$save_LDFLAGS"
20946 -
20947 -fi
20948 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
20949 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
20950 - case $host_os in
20951 - rhapsody* | darwin1.[0123])
20952 - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
20953 - darwin1.*)
20954 - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
20955 - darwin*)
20956 - # if running on 10.5 or later, the deployment target defaults
20957 - # to the OS version, if on x86, and 10.4, the deployment
20958 - # target defaults to 10.4. Don't you love it?
20959 - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
20960 - 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
20961 - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
20962 - 10.[012]*)
20963 - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
20964 - 10.*)
20965 - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
20966 - esac
20967 - ;;
20968 - esac
20969 - if test "$lt_cv_apple_cc_single_mod" = "yes"; then
20970 - _lt_dar_single_mod='$single_module'
20971 - fi
20972 - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
20973 - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
20974 - else
20975 - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
20976 - fi
20977 - if test "$DSYMUTIL" != ":"; then
20978 - _lt_dsymutil="~$DSYMUTIL \$lib || :"
20979 - else
20980 - _lt_dsymutil=
20981 - fi
20982 - ;;
20983 - esac
20984 -
20985 -
20986 -enable_dlopen=no
20987 -enable_win32_dll=no
20988 -
20989 -# Check whether --enable-libtool-lock was given.
20990 -if test "${enable_libtool_lock+set}" = set; then
20991 - enableval=$enable_libtool_lock;
20992 -fi
20993 -
20994 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
20995 -
20996 -
20997 -# Check whether --with-pic was given.
20998 -if test "${with_pic+set}" = set; then
20999 - withval=$with_pic; pic_mode="$withval"
21000 -else
21001 - pic_mode=default
21002 -fi
21003 -
21004 -test -z "$pic_mode" && pic_mode=default
21005 -
21006 -# Use C for the default configuration in the libtool script
21007 -tagname=
21008 -lt_save_CC="$CC"
21009 -ac_ext=c
21010 -ac_cpp='$CPP $CPPFLAGS'
21011 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
21012 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
21013 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
21014 -
21015 -
21016 -# Source file extension for C test sources.
21017 -ac_ext=c
21018 -
21019 -# Object file extension for compiled C test sources.
21020 -objext=o
21021 -objext=$objext
21022 -
21023 -# Code to be used in simple compile tests
21024 -lt_simple_compile_test_code="int some_variable = 0;"
21025 -
21026 -# Code to be used in simple link tests
21027 -lt_simple_link_test_code='int main(){return(0);}'
21028 -
21029 -
21030 -# If no C compiler was specified, use CC.
21031 -LTCC=${LTCC-"$CC"}
21032 -
21033 -# If no C compiler flags were specified, use CFLAGS.
21034 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
21035 -
21036 -# Allow CC to be a program name with arguments.
21037 -compiler=$CC
21038 -
21039 -
21040 -# save warnings/boilerplate of simple test code
21041 -ac_outfile=conftest.$ac_objext
21042 -echo "$lt_simple_compile_test_code" >conftest.$ac_ext
21043 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
21044 -_lt_compiler_boilerplate=`cat conftest.err`
21045 -$rm conftest*
21046 -
21047 -ac_outfile=conftest.$ac_objext
21048 -echo "$lt_simple_link_test_code" >conftest.$ac_ext
21049 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
21050 -_lt_linker_boilerplate=`cat conftest.err`
21051 -$rm -r conftest*
21052 -
21053 -
21054 -
21055 -lt_prog_compiler_no_builtin_flag=
21056 -
21057 -if test "$GCC" = yes; then
21058 - lt_prog_compiler_no_builtin_flag=' -fno-builtin'
21059 -
21060 -
21061 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
21062 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
21063 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
21064 - $as_echo_n "(cached) " >&6
21065 -else
21066 - lt_cv_prog_compiler_rtti_exceptions=no
21067 - ac_outfile=conftest.$ac_objext
21068 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
21069 - lt_compiler_flag="-fno-rtti -fno-exceptions"
21070 - # Insert the option either (1) after the last *FLAGS variable, or
21071 - # (2) before a word containing "conftest.", or (3) at the end.
21072 - # Note that $ac_compile itself does not contain backslashes and begins
21073 - # with a dollar sign (not a hyphen), so the echo should work correctly.
21074 - # The option is referenced via a variable to avoid confusing sed.
21075 - lt_compile=`echo "$ac_compile" | $SED \
21076 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
21077 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
21078 - -e 's:$: $lt_compiler_flag:'`
21079 - (eval echo "\"\$as_me:7818: $lt_compile\"" >&5)
21080 - (eval "$lt_compile" 2>conftest.err)
21081 - ac_status=$?
21082 - cat conftest.err >&5
21083 - echo "$as_me:7822: \$? = $ac_status" >&5
21084 - if (exit $ac_status) && test -s "$ac_outfile"; then
21085 - # The compiler can only warn and ignore the option if not recognized
21086 - # So say no if there are warnings other than the usual output.
21087 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
21088 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
21089 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
21090 - lt_cv_prog_compiler_rtti_exceptions=yes
21091 - fi
21092 - fi
21093 - $rm conftest*
21094 -
21095 -fi
21096 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
21097 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
21098 -
21099 -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
21100 - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
21101 -else
21102 - :
21103 -fi
21104 -
21105 -fi
21106 -
21107 -lt_prog_compiler_wl=
21108 -lt_prog_compiler_pic=
21109 -lt_prog_compiler_static=
21110 -
21111 -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
21112 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
21113 -
21114 - if test "$GCC" = yes; then
21115 - lt_prog_compiler_wl='-Wl,'
21116 - lt_prog_compiler_static='-static'
21117 -
21118 - case $host_os in
21119 - aix*)
21120 - # All AIX code is PIC.
21121 - if test "$host_cpu" = ia64; then
21122 - # AIX 5 now supports IA64 processor
21123 - lt_prog_compiler_static='-Bstatic'
21124 - fi
21125 - ;;
21126 -
21127 - amigaos*)
21128 - # FIXME: we need at least 68020 code to build shared libraries, but
21129 - # adding the `-m68020' flag to GCC prevents building anything better,
21130 - # like `-m68040'.
21131 - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
21132 - ;;
21133 -
21134 - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
21135 - # PIC is the default for these OSes.
21136 - ;;
21137 -
21138 - mingw* | cygwin* | pw32* | os2*)
21139 - # This hack is so that the source file can tell whether it is being
21140 - # built for inclusion in a dll (and should export symbols for example).
21141 - # Although the cygwin gcc ignores -fPIC, still need this for old-style
21142 - # (--disable-auto-import) libraries
21143 - lt_prog_compiler_pic='-DDLL_EXPORT'
21144 - ;;
21145 -
21146 - darwin* | rhapsody*)
21147 - # PIC is the default on this platform
21148 - # Common symbols not allowed in MH_DYLIB files
21149 - lt_prog_compiler_pic='-fno-common'
21150 - ;;
21151 -
21152 - interix[3-9]*)
21153 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
21154 - # Instead, we relocate shared libraries at runtime.
21155 - ;;
21156 -
21157 - msdosdjgpp*)
21158 - # Just because we use GCC doesn't mean we suddenly get shared libraries
21159 - # on systems that don't support them.
21160 - lt_prog_compiler_can_build_shared=no
21161 - enable_shared=no
21162 - ;;
21163 -
21164 - sysv4*MP*)
21165 - if test -d /usr/nec; then
21166 - lt_prog_compiler_pic=-Kconform_pic
21167 - fi
21168 - ;;
21169 -
21170 - hpux*)
21171 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
21172 - # not for PA HP-UX.
21173 - case $host_cpu in
21174 - hppa*64*|ia64*)
21175 - # +Z the default
21176 - ;;
21177 - *)
21178 - lt_prog_compiler_pic='-fPIC'
21179 - ;;
21180 - esac
21181 - ;;
21182 -
21183 - *)
21184 - lt_prog_compiler_pic='-fPIC'
21185 - ;;
21186 - esac
21187 - else
21188 - # PORTME Check for flag to pass linker flags through the system compiler.
21189 - case $host_os in
21190 - aix*)
21191 - lt_prog_compiler_wl='-Wl,'
21192 - if test "$host_cpu" = ia64; then
21193 - # AIX 5 now supports IA64 processor
21194 - lt_prog_compiler_static='-Bstatic'
21195 - else
21196 - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
21197 - fi
21198 - ;;
21199 - darwin*)
21200 - # PIC is the default on this platform
21201 - # Common symbols not allowed in MH_DYLIB files
21202 - case $cc_basename in
21203 - xlc*)
21204 - lt_prog_compiler_pic='-qnocommon'
21205 - lt_prog_compiler_wl='-Wl,'
21206 - ;;
21207 - esac
21208 - ;;
21209 -
21210 - mingw* | cygwin* | pw32* | os2*)
21211 - # This hack is so that the source file can tell whether it is being
21212 - # built for inclusion in a dll (and should export symbols for example).
21213 - lt_prog_compiler_pic='-DDLL_EXPORT'
21214 - ;;
21215 -
21216 - hpux9* | hpux10* | hpux11*)
21217 - lt_prog_compiler_wl='-Wl,'
21218 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
21219 - # not for PA HP-UX.
21220 - case $host_cpu in
21221 - hppa*64*|ia64*)
21222 - # +Z the default
21223 - ;;
21224 - *)
21225 - lt_prog_compiler_pic='+Z'
21226 - ;;
21227 - esac
21228 - # Is there a better lt_prog_compiler_static that works with the bundled CC?
21229 - lt_prog_compiler_static='${wl}-a ${wl}archive'
21230 - ;;
21231 -
21232 - irix5* | irix6* | nonstopux*)
21233 - lt_prog_compiler_wl='-Wl,'
21234 - # PIC (with -KPIC) is the default.
21235 - lt_prog_compiler_static='-non_shared'
21236 - ;;
21237 -
21238 - newsos6)
21239 - lt_prog_compiler_pic='-KPIC'
21240 - lt_prog_compiler_static='-Bstatic'
21241 - ;;
21242 -
21243 - linux* | k*bsd*-gnu)
21244 - case $cc_basename in
21245 - icc* | ecc*)
21246 - lt_prog_compiler_wl='-Wl,'
21247 - lt_prog_compiler_pic='-KPIC'
21248 - lt_prog_compiler_static='-static'
21249 - ;;
21250 - pgcc* | pgf77* | pgf90* | pgf95*)
21251 - # Portland Group compilers (*not* the Pentium gcc compiler,
21252 - # which looks to be a dead project)
21253 - lt_prog_compiler_wl='-Wl,'
21254 - lt_prog_compiler_pic='-fpic'
21255 - lt_prog_compiler_static='-Bstatic'
21256 - ;;
21257 - ccc*)
21258 - lt_prog_compiler_wl='-Wl,'
21259 - # All Alpha code is PIC.
21260 - lt_prog_compiler_static='-non_shared'
21261 - ;;
21262 - *)
21263 - case `$CC -V 2>&1 | sed 5q` in
21264 - *Sun\ C*)
21265 - # Sun C 5.9
21266 - lt_prog_compiler_pic='-KPIC'
21267 - lt_prog_compiler_static='-Bstatic'
21268 - lt_prog_compiler_wl='-Wl,'
21269 - ;;
21270 - *Sun\ F*)
21271 - # Sun Fortran 8.3 passes all unrecognized flags to the linker
21272 - lt_prog_compiler_pic='-KPIC'
21273 - lt_prog_compiler_static='-Bstatic'
21274 - lt_prog_compiler_wl=''
21275 - ;;
21276 - esac
21277 - ;;
21278 - esac
21279 - ;;
21280 -
21281 - osf3* | osf4* | osf5*)
21282 - lt_prog_compiler_wl='-Wl,'
21283 - # All OSF/1 code is PIC.
21284 - lt_prog_compiler_static='-non_shared'
21285 - ;;
21286 -
21287 - rdos*)
21288 - lt_prog_compiler_static='-non_shared'
21289 - ;;
21290 -
21291 - solaris*)
21292 - lt_prog_compiler_pic='-KPIC'
21293 - lt_prog_compiler_static='-Bstatic'
21294 - case $cc_basename in
21295 - f77* | f90* | f95*)
21296 - lt_prog_compiler_wl='-Qoption ld ';;
21297 - *)
21298 - lt_prog_compiler_wl='-Wl,';;
21299 - esac
21300 - ;;
21301 -
21302 - sunos4*)
21303 - lt_prog_compiler_wl='-Qoption ld '
21304 - lt_prog_compiler_pic='-PIC'
21305 - lt_prog_compiler_static='-Bstatic'
21306 - ;;
21307 -
21308 - sysv4 | sysv4.2uw2* | sysv4.3*)
21309 - lt_prog_compiler_wl='-Wl,'
21310 - lt_prog_compiler_pic='-KPIC'
21311 - lt_prog_compiler_static='-Bstatic'
21312 - ;;
21313 -
21314 - sysv4*MP*)
21315 - if test -d /usr/nec ;then
21316 - lt_prog_compiler_pic='-Kconform_pic'
21317 - lt_prog_compiler_static='-Bstatic'
21318 - fi
21319 - ;;
21320 -
21321 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
21322 - lt_prog_compiler_wl='-Wl,'
21323 - lt_prog_compiler_pic='-KPIC'
21324 - lt_prog_compiler_static='-Bstatic'
21325 - ;;
21326 -
21327 - unicos*)
21328 - lt_prog_compiler_wl='-Wl,'
21329 - lt_prog_compiler_can_build_shared=no
21330 - ;;
21331 -
21332 - uts4*)
21333 - lt_prog_compiler_pic='-pic'
21334 - lt_prog_compiler_static='-Bstatic'
21335 - ;;
21336 -
21337 - *)
21338 - lt_prog_compiler_can_build_shared=no
21339 - ;;
21340 - esac
21341 - fi
21342 -
21343 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
21344 -$as_echo "$lt_prog_compiler_pic" >&6; }
21345 -
21346 -#
21347 -# Check to make sure the PIC flag actually works.
21348 -#
21349 -if test -n "$lt_prog_compiler_pic"; then
21350 -
21351 -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
21352 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
21353 -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
21354 - $as_echo_n "(cached) " >&6
21355 -else
21356 - lt_cv_prog_compiler_pic_works=no
21357 - ac_outfile=conftest.$ac_objext
21358 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
21359 - lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
21360 - # Insert the option either (1) after the last *FLAGS variable, or
21361 - # (2) before a word containing "conftest.", or (3) at the end.
21362 - # Note that $ac_compile itself does not contain backslashes and begins
21363 - # with a dollar sign (not a hyphen), so the echo should work correctly.
21364 - # The option is referenced via a variable to avoid confusing sed.
21365 - lt_compile=`echo "$ac_compile" | $SED \
21366 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
21367 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
21368 - -e 's:$: $lt_compiler_flag:'`
21369 - (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
21370 - (eval "$lt_compile" 2>conftest.err)
21371 - ac_status=$?
21372 - cat conftest.err >&5
21373 - echo "$as_me:8112: \$? = $ac_status" >&5
21374 - if (exit $ac_status) && test -s "$ac_outfile"; then
21375 - # The compiler can only warn and ignore the option if not recognized
21376 - # So say no if there are warnings other than the usual output.
21377 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
21378 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
21379 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
21380 - lt_cv_prog_compiler_pic_works=yes
21381 - fi
21382 - fi
21383 - $rm conftest*
21384 -
21385 -fi
21386 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
21387 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
21388 -
21389 -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
21390 - case $lt_prog_compiler_pic in
21391 - "" | " "*) ;;
21392 - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
21393 - esac
21394 -else
21395 - lt_prog_compiler_pic=
21396 - lt_prog_compiler_can_build_shared=no
21397 -fi
21398 -
21399 -fi
21400 -case $host_os in
21401 - # For platforms which do not support PIC, -DPIC is meaningless:
21402 - *djgpp*)
21403 - lt_prog_compiler_pic=
21404 - ;;
21405 - *)
21406 - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
21407 - ;;
21408 -esac
21409 -
21410 -#
21411 -# Check to make sure the static flag actually works.
21412 -#
21413 -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
21414 -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
21415 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
21416 -if test "${lt_cv_prog_compiler_static_works+set}" = set; then
21417 - $as_echo_n "(cached) " >&6
21418 -else
21419 - lt_cv_prog_compiler_static_works=no
21420 - save_LDFLAGS="$LDFLAGS"
21421 - LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
21422 - echo "$lt_simple_link_test_code" > conftest.$ac_ext
21423 - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
21424 - # The linker can only warn and ignore the option if not recognized
21425 - # So say no if there are warnings
21426 - if test -s conftest.err; then
21427 - # Append any errors to the config.log.
21428 - cat conftest.err 1>&5
21429 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
21430 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
21431 - if diff conftest.exp conftest.er2 >/dev/null; then
21432 - lt_cv_prog_compiler_static_works=yes
21433 - fi
21434 - else
21435 - lt_cv_prog_compiler_static_works=yes
21436 - fi
21437 - fi
21438 - $rm -r conftest*
21439 - LDFLAGS="$save_LDFLAGS"
21440 -
21441 -fi
21442 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
21443 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
21444 -
21445 -if test x"$lt_cv_prog_compiler_static_works" = xyes; then
21446 - :
21447 -else
21448 - lt_prog_compiler_static=
21449 -fi
21450 -
21451 -
21452 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
21453 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
21454 -if test "${lt_cv_prog_compiler_c_o+set}" = set; then
21455 - $as_echo_n "(cached) " >&6
21456 -else
21457 - lt_cv_prog_compiler_c_o=no
21458 - $rm -r conftest 2>/dev/null
21459 - mkdir conftest
21460 - cd conftest
21461 - mkdir out
21462 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
21463 -
21464 - lt_compiler_flag="-o out/conftest2.$ac_objext"
21465 - # Insert the option either (1) after the last *FLAGS variable, or
21466 - # (2) before a word containing "conftest.", or (3) at the end.
21467 - # Note that $ac_compile itself does not contain backslashes and begins
21468 - # with a dollar sign (not a hyphen), so the echo should work correctly.
21469 - lt_compile=`echo "$ac_compile" | $SED \
21470 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
21471 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
21472 - -e 's:$: $lt_compiler_flag:'`
21473 - (eval echo "\"\$as_me:8212: $lt_compile\"" >&5)
21474 - (eval "$lt_compile" 2>out/conftest.err)
21475 - ac_status=$?
21476 - cat out/conftest.err >&5
21477 - echo "$as_me:8216: \$? = $ac_status" >&5
21478 - if (exit $ac_status) && test -s out/conftest2.$ac_objext
21479 - then
21480 - # The compiler can only warn and ignore the option if not recognized
21481 - # So say no if there are warnings
21482 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
21483 - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
21484 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
21485 - lt_cv_prog_compiler_c_o=yes
21486 - fi
21487 - fi
21488 - chmod u+w . 2>&5
21489 - $rm conftest*
21490 - # SGI C++ compiler will create directory out/ii_files/ for
21491 - # template instantiation
21492 - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
21493 - $rm out/* && rmdir out
21494 - cd ..
21495 - rmdir conftest
21496 - $rm conftest*
21497 -
21498 -fi
21499 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
21500 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
21501 -
21502 -
21503 -hard_links="nottested"
21504 -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
21505 - # do not overwrite the value of need_locks provided by the user
21506 - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
21507 -$as_echo_n "checking if we can lock with hard links... " >&6; }
21508 - hard_links=yes
21509 - $rm conftest*
21510 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
21511 - touch conftest.a
21512 - ln conftest.a conftest.b 2>&5 || hard_links=no
21513 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
21514 - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
21515 -$as_echo "$hard_links" >&6; }
21516 - if test "$hard_links" = no; then
21517 - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
21518 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
21519 - need_locks=warn
21520 - fi
21521 -else
21522 - need_locks=no
21523 -fi
21524 -
21525 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
21526 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
21527 -
21528 - runpath_var=
21529 - allow_undefined_flag=
21530 - enable_shared_with_static_runtimes=no
21531 - archive_cmds=
21532 - archive_expsym_cmds=
21533 - old_archive_From_new_cmds=
21534 - old_archive_from_expsyms_cmds=
21535 - export_dynamic_flag_spec=
21536 - whole_archive_flag_spec=
21537 - thread_safe_flag_spec=
21538 - hardcode_libdir_flag_spec=
21539 - hardcode_libdir_flag_spec_ld=
21540 - hardcode_libdir_separator=
21541 - hardcode_direct=no
21542 - hardcode_minus_L=no
21543 - hardcode_shlibpath_var=unsupported
21544 - link_all_deplibs=unknown
21545 - hardcode_automatic=no
21546 - module_cmds=
21547 - module_expsym_cmds=
21548 - always_export_symbols=no
21549 - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
21550 - # include_expsyms should be a list of space-separated symbols to be *always*
21551 - # included in the symbol list
21552 - include_expsyms=
21553 - # exclude_expsyms can be an extended regexp of symbols to exclude
21554 - # it will be wrapped by ` (' and `)$', so one must not match beginning or
21555 - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
21556 - # as well as any symbol that contains `d'.
21557 - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
21558 - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
21559 - # platforms (ab)use it in PIC code, but their linkers get confused if
21560 - # the symbol is explicitly referenced. Since portable code cannot
21561 - # rely on this symbol name, it's probably fine to never include it in
21562 - # preloaded symbol tables.
21563 - # Exclude shared library initialization/finalization symbols.
21564 - extract_expsyms_cmds=
21565 - # Just being paranoid about ensuring that cc_basename is set.
21566 - for cc_temp in $compiler""; do
21567 - case $cc_temp in
21568 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
21569 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
21570 - \-*) ;;
21571 - *) break;;
21572 - esac
21573 -done
21574 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
21575 -
21576 - case $host_os in
21577 - cygwin* | mingw* | pw32*)
21578 - # FIXME: the MSVC++ port hasn't been tested in a loooong time
21579 - # When not using gcc, we currently assume that we are using
21580 - # Microsoft Visual C++.
21581 - if test "$GCC" != yes; then
21582 - with_gnu_ld=no
21583 - fi
21584 - ;;
21585 - interix*)
21586 - # we just hope/assume this is gcc and not c89 (= MSVC++)
21587 - with_gnu_ld=yes
21588 - ;;
21589 - openbsd*)
21590 - with_gnu_ld=no
21591 - ;;
21592 - esac
21593 -
21594 - ld_shlibs=yes
21595 - if test "$with_gnu_ld" = yes; then
21596 - # If archive_cmds runs LD, not CC, wlarc should be empty
21597 - wlarc='${wl}'
21598 -
21599 - # Set some defaults for GNU ld with shared library support. These
21600 - # are reset later if shared libraries are not supported. Putting them
21601 - # here allows them to be overridden if necessary.
21602 - runpath_var=LD_RUN_PATH
21603 - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
21604 - export_dynamic_flag_spec='${wl}--export-dynamic'
21605 - # ancient GNU ld didn't support --whole-archive et. al.
21606 - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
21607 - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
21608 - else
21609 - whole_archive_flag_spec=
21610 - fi
21611 - supports_anon_versioning=no
21612 - case `$LD -v 2>/dev/null` in
21613 - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
21614 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
21615 - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
21616 - *\ 2.11.*) ;; # other 2.11 versions
21617 - *) supports_anon_versioning=yes ;;
21618 - esac
21619 -
21620 - # See if GNU ld supports shared libraries.
21621 - case $host_os in
21622 - aix[3-9]*)
21623 - # On AIX/PPC, the GNU linker is very broken
21624 - if test "$host_cpu" != ia64; then
21625 - ld_shlibs=no
21626 - cat <<EOF 1>&2
21627 -
21628 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
21629 -*** to be unable to reliably create shared libraries on AIX.
21630 -*** Therefore, libtool is disabling shared libraries support. If you
21631 -*** really care for shared libraries, you may want to modify your PATH
21632 -*** so that a non-GNU linker is found, and then restart.
21633 -
21634 -EOF
21635 - fi
21636 - ;;
21637 -
21638 - amigaos*)
21639 - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
21640 - hardcode_libdir_flag_spec='-L$libdir'
21641 - hardcode_minus_L=yes
21642 -
21643 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
21644 - # that the semantics of dynamic libraries on AmigaOS, at least up
21645 - # to version 4, is to share data among multiple programs linked
21646 - # with the same dynamic library. Since this doesn't match the
21647 - # behavior of shared libraries on other platforms, we can't use
21648 - # them.
21649 - ld_shlibs=no
21650 - ;;
21651 -
21652 - beos*)
21653 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
21654 - allow_undefined_flag=unsupported
21655 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
21656 - # support --undefined. This deserves some investigation. FIXME
21657 - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
21658 - else
21659 - ld_shlibs=no
21660 - fi
21661 - ;;
21662 -
21663 - cygwin* | mingw* | pw32*)
21664 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
21665 - # as there is no search path for DLLs.
21666 - hardcode_libdir_flag_spec='-L$libdir'
21667 - allow_undefined_flag=unsupported
21668 - always_export_symbols=no
21669 - enable_shared_with_static_runtimes=yes
21670 - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
21671 -
21672 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
21673 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
21674 - # If the export-symbols file already is a .def file (1st line
21675 - # is EXPORTS), use it as is; otherwise, prepend...
21676 - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
21677 - cp $export_symbols $output_objdir/$soname.def;
21678 - else
21679 - echo EXPORTS > $output_objdir/$soname.def;
21680 - cat $export_symbols >> $output_objdir/$soname.def;
21681 - fi~
21682 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
21683 - else
21684 - ld_shlibs=no
21685 - fi
21686 - ;;
21687 -
21688 - interix[3-9]*)
21689 - hardcode_direct=no
21690 - hardcode_shlibpath_var=no
21691 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
21692 - export_dynamic_flag_spec='${wl}-E'
21693 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
21694 - # Instead, shared libraries are loaded at an image base (0x10000000 by
21695 - # default) and relocated if they conflict, which is a slow very memory
21696 - # consuming and fragmenting process. To avoid this, we pick a random,
21697 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
21698 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
21699 - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
21700 - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
21701 - ;;
21702 -
21703 - gnu* | linux* | k*bsd*-gnu)
21704 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
21705 - tmp_addflag=
21706 - case $cc_basename,$host_cpu in
21707 - pgcc*) # Portland Group C compiler
21708 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
21709 - tmp_addflag=' $pic_flag'
21710 - ;;
21711 - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
21712 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
21713 - tmp_addflag=' $pic_flag -Mnomain' ;;
21714 - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
21715 - tmp_addflag=' -i_dynamic' ;;
21716 - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
21717 - tmp_addflag=' -i_dynamic -nofor_main' ;;
21718 - ifc* | ifort*) # Intel Fortran compiler
21719 - tmp_addflag=' -nofor_main' ;;
21720 - esac
21721 - case `$CC -V 2>&1 | sed 5q` in
21722 - *Sun\ C*) # Sun C 5.9
21723 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
21724 - tmp_sharedflag='-G' ;;
21725 - *Sun\ F*) # Sun Fortran 8.3
21726 - tmp_sharedflag='-G' ;;
21727 - *)
21728 - tmp_sharedflag='-shared' ;;
21729 - esac
21730 - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
21731 -
21732 - if test $supports_anon_versioning = yes; then
21733 - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
21734 - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
21735 - $echo "local: *; };" >> $output_objdir/$libname.ver~
21736 - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
21737 - fi
21738 - link_all_deplibs=no
21739 - else
21740 - ld_shlibs=no
21741 - fi
21742 - ;;
21743 -
21744 - netbsd* | netbsdelf*-gnu)
21745 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
21746 - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
21747 - wlarc=
21748 - else
21749 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
21750 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
21751 - fi
21752 - ;;
21753 -
21754 - solaris*)
21755 - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
21756 - ld_shlibs=no
21757 - cat <<EOF 1>&2
21758 -
21759 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
21760 -*** create shared libraries on Solaris systems. Therefore, libtool
21761 -*** is disabling shared libraries support. We urge you to upgrade GNU
21762 -*** binutils to release 2.9.1 or newer. Another option is to modify
21763 -*** your PATH or compiler configuration so that the native linker is
21764 -*** used, and then restart.
21765 -
21766 -EOF
21767 - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
21768 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
21769 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
21770 - else
21771 - ld_shlibs=no
21772 - fi
21773 - ;;
21774 -
21775 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
21776 - case `$LD -v 2>&1` in
21777 - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
21778 - ld_shlibs=no
21779 - cat <<_LT_EOF 1>&2
21780 -
21781 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
21782 -*** reliably create shared libraries on SCO systems. Therefore, libtool
21783 -*** is disabling shared libraries support. We urge you to upgrade GNU
21784 -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
21785 -*** your PATH or compiler configuration so that the native linker is
21786 -*** used, and then restart.
21787 -
21788 -_LT_EOF
21789 - ;;
21790 - *)
21791 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
21792 - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
21793 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
21794 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
21795 - else
21796 - ld_shlibs=no
21797 - fi
21798 - ;;
21799 - esac
21800 - ;;
21801 -
21802 - sunos4*)
21803 - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
21804 - wlarc=
21805 - hardcode_direct=yes
21806 - hardcode_shlibpath_var=no
21807 - ;;
21808 -
21809 - *)
21810 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
21811 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
21812 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
21813 - else
21814 - ld_shlibs=no
21815 - fi
21816 - ;;
21817 - esac
21818 -
21819 - if test "$ld_shlibs" = no; then
21820 - runpath_var=
21821 - hardcode_libdir_flag_spec=
21822 - export_dynamic_flag_spec=
21823 - whole_archive_flag_spec=
21824 - fi
21825 - else
21826 - # PORTME fill in a description of your system's linker (not GNU ld)
21827 - case $host_os in
21828 - aix3*)
21829 - allow_undefined_flag=unsupported
21830 - always_export_symbols=yes
21831 - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
21832 - # Note: this linker hardcodes the directories in LIBPATH if there
21833 - # are no directories specified by -L.
21834 - hardcode_minus_L=yes
21835 - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
21836 - # Neither direct hardcoding nor static linking is supported with a
21837 - # broken collect2.
21838 - hardcode_direct=unsupported
21839 - fi
21840 - ;;
21841 -
21842 - aix[4-9]*)
21843 - if test "$host_cpu" = ia64; then
21844 - # On IA64, the linker does run time linking by default, so we don't
21845 - # have to do anything special.
21846 - aix_use_runtimelinking=no
21847 - exp_sym_flag='-Bexport'
21848 - no_entry_flag=""
21849 - else
21850 - # If we're using GNU nm, then we don't want the "-C" option.
21851 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
21852 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
21853 - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
21854 - else
21855 - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
21856 - fi
21857 - aix_use_runtimelinking=no
21858 -
21859 - # Test if we are trying to use run time linking or normal
21860 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
21861 - # need to do runtime linking.
21862 - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
21863 - for ld_flag in $LDFLAGS; do
21864 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
21865 - aix_use_runtimelinking=yes
21866 - break
21867 - fi
21868 - done
21869 - ;;
21870 - esac
21871 -
21872 - exp_sym_flag='-bexport'
21873 - no_entry_flag='-bnoentry'
21874 - fi
21875 -
21876 - # When large executables or shared objects are built, AIX ld can
21877 - # have problems creating the table of contents. If linking a library
21878 - # or program results in "error TOC overflow" add -mminimal-toc to
21879 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
21880 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
21881 -
21882 - archive_cmds=''
21883 - hardcode_direct=yes
21884 - hardcode_libdir_separator=':'
21885 - link_all_deplibs=yes
21886 -
21887 - if test "$GCC" = yes; then
21888 - case $host_os in aix4.[012]|aix4.[012].*)
21889 - # We only want to do this on AIX 4.2 and lower, the check
21890 - # below for broken collect2 doesn't work under 4.3+
21891 - collect2name=`${CC} -print-prog-name=collect2`
21892 - if test -f "$collect2name" && \
21893 - strings "$collect2name" | grep resolve_lib_name >/dev/null
21894 - then
21895 - # We have reworked collect2
21896 - :
21897 - else
21898 - # We have old collect2
21899 - hardcode_direct=unsupported
21900 - # It fails to find uninstalled libraries when the uninstalled
21901 - # path is not listed in the libpath. Setting hardcode_minus_L
21902 - # to unsupported forces relinking
21903 - hardcode_minus_L=yes
21904 - hardcode_libdir_flag_spec='-L$libdir'
21905 - hardcode_libdir_separator=
21906 - fi
21907 - ;;
21908 - esac
21909 - shared_flag='-shared'
21910 - if test "$aix_use_runtimelinking" = yes; then
21911 - shared_flag="$shared_flag "'${wl}-G'
21912 - fi
21913 - else
21914 - # not using gcc
21915 - if test "$host_cpu" = ia64; then
21916 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
21917 - # chokes on -Wl,-G. The following line is correct:
21918 - shared_flag='-G'
21919 - else
21920 - if test "$aix_use_runtimelinking" = yes; then
21921 - shared_flag='${wl}-G'
21922 - else
21923 - shared_flag='${wl}-bM:SRE'
21924 - fi
21925 - fi
21926 - fi
21927 -
21928 - # It seems that -bexpall does not export symbols beginning with
21929 - # underscore (_), so it is better to generate a list of symbols to export.
21930 - always_export_symbols=yes
21931 - if test "$aix_use_runtimelinking" = yes; then
21932 - # Warning - without using the other runtime loading flags (-brtl),
21933 - # -berok will link without error, but may produce a broken library.
21934 - allow_undefined_flag='-berok'
21935 - # Determine the default libpath from the value encoded in an empty executable.
21936 - cat >conftest.$ac_ext <<_ACEOF
21937 -/* confdefs.h. */
21938 -_ACEOF
21939 -cat confdefs.h >>conftest.$ac_ext
21940 -cat >>conftest.$ac_ext <<_ACEOF
21941 -/* end confdefs.h. */
21942 -
21943 -int
21944 -main ()
21945 -{
21946 -
21947 - ;
21948 - return 0;
21949 -}
21950 -_ACEOF
21951 -rm -f conftest.$ac_objext conftest$ac_exeext
21952 -if { (ac_try="$ac_link"
21953 -case "(($ac_try" in
21954 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21955 - *) ac_try_echo=$ac_try;;
21956 -esac
21957 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
21958 -$as_echo "$ac_try_echo") >&5
21959 - (eval "$ac_link") 2>conftest.er1
21960 - ac_status=$?
21961 - grep -v '^ *+' conftest.er1 >conftest.err
21962 - rm -f conftest.er1
21963 - cat conftest.err >&5
21964 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
21965 - (exit $ac_status); } && {
21966 - test -z "$ac_c_werror_flag" ||
21967 - test ! -s conftest.err
21968 - } && test -s conftest$ac_exeext && {
21969 - test "$cross_compiling" = yes ||
21970 - $as_test_x conftest$ac_exeext
21971 - }; then
21972 -
21973 -lt_aix_libpath_sed='
21974 - /Import File Strings/,/^$/ {
21975 - /^0/ {
21976 - s/^0 *\(.*\)$/\1/
21977 - p
21978 - }
21979 - }'
21980 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
21981 -# Check for a 64-bit object if we didn't find anything.
21982 -if test -z "$aix_libpath"; then
21983 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
21984 -fi
21985 -else
21986 - $as_echo "$as_me: failed program was:" >&5
21987 -sed 's/^/| /' conftest.$ac_ext >&5
21988 -
21989 -
21990 -fi
21991 -
21992 -rm -rf conftest.dSYM
21993 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21994 - conftest$ac_exeext conftest.$ac_ext
21995 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
21996 -
21997 - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
21998 - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
21999 - else
22000 - if test "$host_cpu" = ia64; then
22001 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
22002 - allow_undefined_flag="-z nodefs"
22003 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
22004 - else
22005 - # Determine the default libpath from the value encoded in an empty executable.
22006 - cat >conftest.$ac_ext <<_ACEOF
22007 -/* confdefs.h. */
22008 -_ACEOF
22009 -cat confdefs.h >>conftest.$ac_ext
22010 -cat >>conftest.$ac_ext <<_ACEOF
22011 -/* end confdefs.h. */
22012 -
22013 -int
22014 -main ()
22015 -{
22016 -
22017 - ;
22018 - return 0;
22019 -}
22020 -_ACEOF
22021 -rm -f conftest.$ac_objext conftest$ac_exeext
22022 -if { (ac_try="$ac_link"
22023 -case "(($ac_try" in
22024 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22025 - *) ac_try_echo=$ac_try;;
22026 -esac
22027 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22028 -$as_echo "$ac_try_echo") >&5
22029 - (eval "$ac_link") 2>conftest.er1
22030 - ac_status=$?
22031 - grep -v '^ *+' conftest.er1 >conftest.err
22032 - rm -f conftest.er1
22033 - cat conftest.err >&5
22034 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22035 - (exit $ac_status); } && {
22036 - test -z "$ac_c_werror_flag" ||
22037 - test ! -s conftest.err
22038 - } && test -s conftest$ac_exeext && {
22039 - test "$cross_compiling" = yes ||
22040 - $as_test_x conftest$ac_exeext
22041 - }; then
22042 -
22043 -lt_aix_libpath_sed='
22044 - /Import File Strings/,/^$/ {
22045 - /^0/ {
22046 - s/^0 *\(.*\)$/\1/
22047 - p
22048 - }
22049 - }'
22050 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22051 -# Check for a 64-bit object if we didn't find anything.
22052 -if test -z "$aix_libpath"; then
22053 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
22054 -fi
22055 -else
22056 - $as_echo "$as_me: failed program was:" >&5
22057 -sed 's/^/| /' conftest.$ac_ext >&5
22058 -
22059 -
22060 -fi
22061 -
22062 -rm -rf conftest.dSYM
22063 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
22064 - conftest$ac_exeext conftest.$ac_ext
22065 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22066 -
22067 - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22068 - # Warning - without using the other run time loading flags,
22069 - # -berok will link without error, but may produce a broken library.
22070 - no_undefined_flag=' ${wl}-bernotok'
22071 - allow_undefined_flag=' ${wl}-berok'
22072 - # Exported symbols can be pulled into shared objects from archives
22073 - whole_archive_flag_spec='$convenience'
22074 - archive_cmds_need_lc=yes
22075 - # This is similar to how AIX traditionally builds its shared libraries.
22076 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
22077 - fi
22078 - fi
22079 - ;;
22080 -
22081 - amigaos*)
22082 - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
22083 - hardcode_libdir_flag_spec='-L$libdir'
22084 - hardcode_minus_L=yes
22085 - # see comment about different semantics on the GNU ld section
22086 - ld_shlibs=no
22087 - ;;
22088 -
22089 - bsdi[45]*)
22090 - export_dynamic_flag_spec=-rdynamic
22091 - ;;
22092 -
22093 - cygwin* | mingw* | pw32*)
22094 - # When not using gcc, we currently assume that we are using
22095 - # Microsoft Visual C++.
22096 - # hardcode_libdir_flag_spec is actually meaningless, as there is
22097 - # no search path for DLLs.
22098 - hardcode_libdir_flag_spec=' '
22099 - allow_undefined_flag=unsupported
22100 - # Tell ltmain to make .lib files, not .a files.
22101 - libext=lib
22102 - # Tell ltmain to make .dll files, not .so files.
22103 - shrext_cmds=".dll"
22104 - # FIXME: Setting linknames here is a bad hack.
22105 - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
22106 - # The linker will automatically build a .lib file if we build a DLL.
22107 - old_archive_From_new_cmds='true'
22108 - # FIXME: Should let the user specify the lib program.
22109 - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
22110 - fix_srcfile_path='`cygpath -w "$srcfile"`'
22111 - enable_shared_with_static_runtimes=yes
22112 - ;;
22113 -
22114 - darwin* | rhapsody*)
22115 - case $host_os in
22116 - rhapsody* | darwin1.[012])
22117 - allow_undefined_flag='${wl}-undefined ${wl}suppress'
22118 - ;;
22119 - *) # Darwin 1.3 on
22120 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
22121 - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
22122 - else
22123 - case ${MACOSX_DEPLOYMENT_TARGET} in
22124 - 10.[012])
22125 - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
22126 - ;;
22127 - 10.*)
22128 - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
22129 - ;;
22130 - esac
22131 - fi
22132 - ;;
22133 - esac
22134 - archive_cmds_need_lc=no
22135 - hardcode_direct=no
22136 - hardcode_automatic=yes
22137 - hardcode_shlibpath_var=unsupported
22138 - whole_archive_flag_spec=''
22139 - link_all_deplibs=yes
22140 - if test "$GCC" = yes ; then
22141 - output_verbose_link_cmd='echo'
22142 - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
22143 - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
22144 - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
22145 - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
22146 - else
22147 - case $cc_basename in
22148 - xlc*)
22149 - output_verbose_link_cmd='echo'
22150 - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
22151 - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
22152 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
22153 - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
22154 - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
22155 - ;;
22156 - *)
22157 - ld_shlibs=no
22158 - ;;
22159 - esac
22160 - fi
22161 - ;;
22162 -
22163 - dgux*)
22164 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
22165 - hardcode_libdir_flag_spec='-L$libdir'
22166 - hardcode_shlibpath_var=no
22167 - ;;
22168 -
22169 - freebsd1*)
22170 - ld_shlibs=no
22171 - ;;
22172 -
22173 - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
22174 - # support. Future versions do this automatically, but an explicit c++rt0.o
22175 - # does not break anything, and helps significantly (at the cost of a little
22176 - # extra space).
22177 - freebsd2.2*)
22178 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
22179 - hardcode_libdir_flag_spec='-R$libdir'
22180 - hardcode_direct=yes
22181 - hardcode_shlibpath_var=no
22182 - ;;
22183 -
22184 - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
22185 - freebsd2*)
22186 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
22187 - hardcode_direct=yes
22188 - hardcode_minus_L=yes
22189 - hardcode_shlibpath_var=no
22190 - ;;
22191 -
22192 - # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
22193 - freebsd* | dragonfly*)
22194 - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
22195 - hardcode_libdir_flag_spec='-R$libdir'
22196 - hardcode_direct=yes
22197 - hardcode_shlibpath_var=no
22198 - ;;
22199 -
22200 - hpux9*)
22201 - if test "$GCC" = yes; then
22202 - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
22203 - else
22204 - archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
22205 - fi
22206 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
22207 - hardcode_libdir_separator=:
22208 - hardcode_direct=yes
22209 -
22210 - # hardcode_minus_L: Not really in the search PATH,
22211 - # but as the default location of the library.
22212 - hardcode_minus_L=yes
22213 - export_dynamic_flag_spec='${wl}-E'
22214 - ;;
22215 -
22216 - hpux10*)
22217 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
22218 - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
22219 - else
22220 - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
22221 - fi
22222 - if test "$with_gnu_ld" = no; then
22223 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
22224 - hardcode_libdir_separator=:
22225 -
22226 - hardcode_direct=yes
22227 - export_dynamic_flag_spec='${wl}-E'
22228 -
22229 - # hardcode_minus_L: Not really in the search PATH,
22230 - # but as the default location of the library.
22231 - hardcode_minus_L=yes
22232 - fi
22233 - ;;
22234 -
22235 - hpux11*)
22236 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
22237 - case $host_cpu in
22238 - hppa*64*)
22239 - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22240 - ;;
22241 - ia64*)
22242 - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
22243 - ;;
22244 - *)
22245 - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
22246 - ;;
22247 - esac
22248 - else
22249 - case $host_cpu in
22250 - hppa*64*)
22251 - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22252 - ;;
22253 - ia64*)
22254 - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
22255 - ;;
22256 - *)
22257 - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
22258 - ;;
22259 - esac
22260 - fi
22261 - if test "$with_gnu_ld" = no; then
22262 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
22263 - hardcode_libdir_separator=:
22264 -
22265 - case $host_cpu in
22266 - hppa*64*|ia64*)
22267 - hardcode_libdir_flag_spec_ld='+b $libdir'
22268 - hardcode_direct=no
22269 - hardcode_shlibpath_var=no
22270 - ;;
22271 - *)
22272 - hardcode_direct=yes
22273 - export_dynamic_flag_spec='${wl}-E'
22274 -
22275 - # hardcode_minus_L: Not really in the search PATH,
22276 - # but as the default location of the library.
22277 - hardcode_minus_L=yes
22278 - ;;
22279 - esac
22280 - fi
22281 - ;;
22282 -
22283 - irix5* | irix6* | nonstopux*)
22284 - if test "$GCC" = yes; then
22285 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
22286 - else
22287 - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
22288 - hardcode_libdir_flag_spec_ld='-rpath $libdir'
22289 - fi
22290 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22291 - hardcode_libdir_separator=:
22292 - link_all_deplibs=yes
22293 - ;;
22294 -
22295 - netbsd* | netbsdelf*-gnu)
22296 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
22297 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
22298 - else
22299 - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
22300 - fi
22301 - hardcode_libdir_flag_spec='-R$libdir'
22302 - hardcode_direct=yes
22303 - hardcode_shlibpath_var=no
22304 - ;;
22305 -
22306 - newsos6)
22307 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
22308 - hardcode_direct=yes
22309 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22310 - hardcode_libdir_separator=:
22311 - hardcode_shlibpath_var=no
22312 - ;;
22313 -
22314 - openbsd*)
22315 - if test -f /usr/libexec/ld.so; then
22316 - hardcode_direct=yes
22317 - hardcode_shlibpath_var=no
22318 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
22319 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
22320 - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
22321 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
22322 - export_dynamic_flag_spec='${wl}-E'
22323 - else
22324 - case $host_os in
22325 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
22326 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
22327 - hardcode_libdir_flag_spec='-R$libdir'
22328 - ;;
22329 - *)
22330 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
22331 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
22332 - ;;
22333 - esac
22334 - fi
22335 - else
22336 - ld_shlibs=no
22337 - fi
22338 - ;;
22339 -
22340 - os2*)
22341 - hardcode_libdir_flag_spec='-L$libdir'
22342 - hardcode_minus_L=yes
22343 - allow_undefined_flag=unsupported
22344 - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
22345 - old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
22346 - ;;
22347 -
22348 - osf3*)
22349 - if test "$GCC" = yes; then
22350 - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
22351 - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
22352 - else
22353 - allow_undefined_flag=' -expect_unresolved \*'
22354 - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
22355 - fi
22356 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22357 - hardcode_libdir_separator=:
22358 - ;;
22359 -
22360 - osf4* | osf5*) # as osf3* with the addition of -msym flag
22361 - if test "$GCC" = yes; then
22362 - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
22363 - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
22364 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22365 - else
22366 - allow_undefined_flag=' -expect_unresolved \*'
22367 - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
22368 - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
22369 - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
22370 -
22371 - # Both c and cxx compiler support -rpath directly
22372 - hardcode_libdir_flag_spec='-rpath $libdir'
22373 - fi
22374 - hardcode_libdir_separator=:
22375 - ;;
22376 -
22377 - solaris*)
22378 - no_undefined_flag=' -z text'
22379 - if test "$GCC" = yes; then
22380 - wlarc='${wl}'
22381 - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22382 - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
22383 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
22384 - else
22385 - wlarc=''
22386 - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
22387 - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
22388 - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
22389 - fi
22390 - hardcode_libdir_flag_spec='-R$libdir'
22391 - hardcode_shlibpath_var=no
22392 - case $host_os in
22393 - solaris2.[0-5] | solaris2.[0-5].*) ;;
22394 - *)
22395 - # The compiler driver will combine and reorder linker options,
22396 - # but understands `-z linker_flag'. GCC discards it without `$wl',
22397 - # but is careful enough not to reorder.
22398 - # Supported since Solaris 2.6 (maybe 2.5.1?)
22399 - if test "$GCC" = yes; then
22400 - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
22401 - else
22402 - whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
22403 - fi
22404 - ;;
22405 - esac
22406 - link_all_deplibs=yes
22407 - ;;
22408 -
22409 - sunos4*)
22410 - if test "x$host_vendor" = xsequent; then
22411 - # Use $CC to link under sequent, because it throws in some extra .o
22412 - # files that make .init and .fini sections work.
22413 - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
22414 - else
22415 - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
22416 - fi
22417 - hardcode_libdir_flag_spec='-L$libdir'
22418 - hardcode_direct=yes
22419 - hardcode_minus_L=yes
22420 - hardcode_shlibpath_var=no
22421 - ;;
22422 -
22423 - sysv4)
22424 - case $host_vendor in
22425 - sni)
22426 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
22427 - hardcode_direct=yes # is this really true???
22428 - ;;
22429 - siemens)
22430 - ## LD is ld it makes a PLAMLIB
22431 - ## CC just makes a GrossModule.
22432 - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
22433 - reload_cmds='$CC -r -o $output$reload_objs'
22434 - hardcode_direct=no
22435 - ;;
22436 - motorola)
22437 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
22438 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
22439 - ;;
22440 - esac
22441 - runpath_var='LD_RUN_PATH'
22442 - hardcode_shlibpath_var=no
22443 - ;;
22444 -
22445 - sysv4.3*)
22446 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
22447 - hardcode_shlibpath_var=no
22448 - export_dynamic_flag_spec='-Bexport'
22449 - ;;
22450 -
22451 - sysv4*MP*)
22452 - if test -d /usr/nec; then
22453 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
22454 - hardcode_shlibpath_var=no
22455 - runpath_var=LD_RUN_PATH
22456 - hardcode_runpath_var=yes
22457 - ld_shlibs=yes
22458 - fi
22459 - ;;
22460 -
22461 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
22462 - no_undefined_flag='${wl}-z,text'
22463 - archive_cmds_need_lc=no
22464 - hardcode_shlibpath_var=no
22465 - runpath_var='LD_RUN_PATH'
22466 -
22467 - if test "$GCC" = yes; then
22468 - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
22469 - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
22470 - else
22471 - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
22472 - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
22473 - fi
22474 - ;;
22475 -
22476 - sysv5* | sco3.2v5* | sco5v6*)
22477 - # Note: We can NOT use -z defs as we might desire, because we do not
22478 - # link with -lc, and that would cause any symbols used from libc to
22479 - # always be unresolved, which means just about no library would
22480 - # ever link correctly. If we're not using GNU ld we use -z text
22481 - # though, which does catch some bad symbols but isn't as heavy-handed
22482 - # as -z defs.
22483 - no_undefined_flag='${wl}-z,text'
22484 - allow_undefined_flag='${wl}-z,nodefs'
22485 - archive_cmds_need_lc=no
22486 - hardcode_shlibpath_var=no
22487 - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
22488 - hardcode_libdir_separator=':'
22489 - link_all_deplibs=yes
22490 - export_dynamic_flag_spec='${wl}-Bexport'
22491 - runpath_var='LD_RUN_PATH'
22492 -
22493 - if test "$GCC" = yes; then
22494 - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
22495 - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
22496 - else
22497 - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
22498 - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
22499 - fi
22500 - ;;
22501 -
22502 - uts4*)
22503 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
22504 - hardcode_libdir_flag_spec='-L$libdir'
22505 - hardcode_shlibpath_var=no
22506 - ;;
22507 -
22508 - *)
22509 - ld_shlibs=no
22510 - ;;
22511 - esac
22512 - fi
22513 -
22514 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
22515 -$as_echo "$ld_shlibs" >&6; }
22516 -test "$ld_shlibs" = no && can_build_shared=no
22517 -
22518 -#
22519 -# Do we need to explicitly link libc?
22520 -#
22521 -case "x$archive_cmds_need_lc" in
22522 -x|xyes)
22523 - # Assume -lc should be added
22524 - archive_cmds_need_lc=yes
22525 -
22526 - if test "$enable_shared" = yes && test "$GCC" = yes; then
22527 - case $archive_cmds in
22528 - *'~'*)
22529 - # FIXME: we may have to deal with multi-command sequences.
22530 - ;;
22531 - '$CC '*)
22532 - # Test whether the compiler implicitly links with -lc since on some
22533 - # systems, -lgcc has to come before -lc. If gcc already passes -lc
22534 - # to ld, don't add -lc before -lgcc.
22535 - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
22536 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
22537 - $rm conftest*
22538 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
22539 -
22540 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
22541 - (eval $ac_compile) 2>&5
22542 - ac_status=$?
22543 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22544 - (exit $ac_status); } 2>conftest.err; then
22545 - soname=conftest
22546 - lib=conftest
22547 - libobjs=conftest.$ac_objext
22548 - deplibs=
22549 - wl=$lt_prog_compiler_wl
22550 - pic_flag=$lt_prog_compiler_pic
22551 - compiler_flags=-v
22552 - linker_flags=-v
22553 - verstring=
22554 - output_objdir=.
22555 - libname=conftest
22556 - lt_save_allow_undefined_flag=$allow_undefined_flag
22557 - allow_undefined_flag=
22558 - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
22559 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
22560 - ac_status=$?
22561 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22562 - (exit $ac_status); }
22563 - then
22564 - archive_cmds_need_lc=no
22565 - else
22566 - archive_cmds_need_lc=yes
22567 - fi
22568 - allow_undefined_flag=$lt_save_allow_undefined_flag
22569 - else
22570 - cat conftest.err 1>&5
22571 - fi
22572 - $rm conftest*
22573 - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
22574 -$as_echo "$archive_cmds_need_lc" >&6; }
22575 - ;;
22576 - esac
22577 - fi
22578 - ;;
22579 -esac
22580 -
22581 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
22582 -$as_echo_n "checking dynamic linker characteristics... " >&6; }
22583 -library_names_spec=
22584 -libname_spec='lib$name'
22585 -soname_spec=
22586 -shrext_cmds=".so"
22587 -postinstall_cmds=
22588 -postuninstall_cmds=
22589 -finish_cmds=
22590 -finish_eval=
22591 -shlibpath_var=
22592 -shlibpath_overrides_runpath=unknown
22593 -version_type=none
22594 -dynamic_linker="$host_os ld.so"
22595 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
22596 -
22597 -if test "$GCC" = yes; then
22598 - case $host_os in
22599 - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
22600 - *) lt_awk_arg="/^libraries:/" ;;
22601 - esac
22602 - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
22603 - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
22604 - # if the path contains ";" then we assume it to be the separator
22605 - # otherwise default to the standard path separator (i.e. ":") - it is
22606 - # assumed that no part of a normal pathname contains ";" but that should
22607 - # okay in the real world where ";" in dirpaths is itself problematic.
22608 - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
22609 - else
22610 - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
22611 - fi
22612 - # Ok, now we have the path, separated by spaces, we can step through it
22613 - # and add multilib dir if necessary.
22614 - lt_tmp_lt_search_path_spec=
22615 - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
22616 - for lt_sys_path in $lt_search_path_spec; do
22617 - if test -d "$lt_sys_path/$lt_multi_os_dir"; then
22618 - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
22619 - else
22620 - test -d "$lt_sys_path" && \
22621 - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
22622 - fi
22623 - done
22624 - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
22625 -BEGIN {RS=" "; FS="/|\n";} {
22626 - lt_foo="";
22627 - lt_count=0;
22628 - for (lt_i = NF; lt_i > 0; lt_i--) {
22629 - if ($lt_i != "" && $lt_i != ".") {
22630 - if ($lt_i == "..") {
22631 - lt_count++;
22632 - } else {
22633 - if (lt_count == 0) {
22634 - lt_foo="/" $lt_i lt_foo;
22635 - } else {
22636 - lt_count--;
22637 - }
22638 - }
22639 - }
22640 - }
22641 - if (lt_foo != "") { lt_freq[lt_foo]++; }
22642 - if (lt_freq[lt_foo] == 1) { print lt_foo; }
22643 -}'`
22644 - sys_lib_search_path_spec=`echo $lt_search_path_spec`
22645 -else
22646 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
22647 -fi
22648 -need_lib_prefix=unknown
22649 -hardcode_into_libs=no
22650 -
22651 -# when you set need_version to no, make sure it does not cause -set_version
22652 -# flags to be left without arguments
22653 -need_version=unknown
22654 -
22655 -case $host_os in
22656 -aix3*)
22657 - version_type=linux
22658 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
22659 - shlibpath_var=LIBPATH
22660 -
22661 - # AIX 3 has no versioning support, so we append a major version to the name.
22662 - soname_spec='${libname}${release}${shared_ext}$major'
22663 - ;;
22664 -
22665 -aix[4-9]*)
22666 - version_type=linux
22667 - need_lib_prefix=no
22668 - need_version=no
22669 - hardcode_into_libs=yes
22670 - if test "$host_cpu" = ia64; then
22671 - # AIX 5 supports IA64
22672 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
22673 - shlibpath_var=LD_LIBRARY_PATH
22674 - else
22675 - # With GCC up to 2.95.x, collect2 would create an import file
22676 - # for dependence libraries. The import file would start with
22677 - # the line `#! .'. This would cause the generated library to
22678 - # depend on `.', always an invalid library. This was fixed in
22679 - # development snapshots of GCC prior to 3.0.
22680 - case $host_os in
22681 - aix4 | aix4.[01] | aix4.[01].*)
22682 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
22683 - echo ' yes '
22684 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
22685 - :
22686 - else
22687 - can_build_shared=no
22688 - fi
22689 - ;;
22690 - esac
22691 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
22692 - # soname into executable. Probably we can add versioning support to
22693 - # collect2, so additional links can be useful in future.
22694 - if test "$aix_use_runtimelinking" = yes; then
22695 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
22696 - # instead of lib<name>.a to let people know that these are not
22697 - # typical AIX shared libraries.
22698 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22699 - else
22700 - # We preserve .a as extension for shared libraries through AIX4.2
22701 - # and later when we are not doing run time linking.
22702 - library_names_spec='${libname}${release}.a $libname.a'
22703 - soname_spec='${libname}${release}${shared_ext}$major'
22704 - fi
22705 - shlibpath_var=LIBPATH
22706 - fi
22707 - ;;
22708 -
22709 -amigaos*)
22710 - library_names_spec='$libname.ixlibrary $libname.a'
22711 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
22712 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
22713 - ;;
22714 -
22715 -beos*)
22716 - library_names_spec='${libname}${shared_ext}'
22717 - dynamic_linker="$host_os ld.so"
22718 - shlibpath_var=LIBRARY_PATH
22719 - ;;
22720 -
22721 -bsdi[45]*)
22722 - version_type=linux
22723 - need_version=no
22724 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22725 - soname_spec='${libname}${release}${shared_ext}$major'
22726 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
22727 - shlibpath_var=LD_LIBRARY_PATH
22728 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
22729 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
22730 - # the default ld.so.conf also contains /usr/contrib/lib and
22731 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
22732 - # libtool to hard-code these into programs
22733 - ;;
22734 -
22735 -cygwin* | mingw* | pw32*)
22736 - version_type=windows
22737 - shrext_cmds=".dll"
22738 - need_version=no
22739 - need_lib_prefix=no
22740 -
22741 - case $GCC,$host_os in
22742 - yes,cygwin* | yes,mingw* | yes,pw32*)
22743 - library_names_spec='$libname.dll.a'
22744 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
22745 - postinstall_cmds='base_file=`basename \${file}`~
22746 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
22747 - dldir=$destdir/`dirname \$dlpath`~
22748 - test -d \$dldir || mkdir -p \$dldir~
22749 - $install_prog $dir/$dlname \$dldir/$dlname~
22750 - chmod a+x \$dldir/$dlname'
22751 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
22752 - dlpath=$dir/\$dldll~
22753 - $rm \$dlpath'
22754 - shlibpath_overrides_runpath=yes
22755 -
22756 - case $host_os in
22757 - cygwin*)
22758 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
22759 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22760 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
22761 - ;;
22762 - mingw*)
22763 - # MinGW DLLs use traditional 'lib' prefix
22764 - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22765 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
22766 - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
22767 - # It is most probably a Windows format PATH printed by
22768 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
22769 - # path with ; separators, and with drive letters. We can handle the
22770 - # drive letters (cygwin fileutils understands them), so leave them,
22771 - # especially as we might pass files found there to a mingw objdump,
22772 - # which wouldn't understand a cygwinified path. Ahh.
22773 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
22774 - else
22775 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
22776 - fi
22777 - ;;
22778 - pw32*)
22779 - # pw32 DLLs use 'pw' prefix rather than 'lib'
22780 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22781 - ;;
22782 - esac
22783 - ;;
22784 -
22785 - *)
22786 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
22787 - ;;
22788 - esac
22789 - dynamic_linker='Win32 ld.exe'
22790 - # FIXME: first we should search . and the directory the executable is in
22791 - shlibpath_var=PATH
22792 - ;;
22793 -
22794 -darwin* | rhapsody*)
22795 - dynamic_linker="$host_os dyld"
22796 - version_type=darwin
22797 - need_lib_prefix=no
22798 - need_version=no
22799 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
22800 - soname_spec='${libname}${release}${major}$shared_ext'
22801 - shlibpath_overrides_runpath=yes
22802 - shlibpath_var=DYLD_LIBRARY_PATH
22803 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
22804 -
22805 - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
22806 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
22807 - ;;
22808 -
22809 -dgux*)
22810 - version_type=linux
22811 - need_lib_prefix=no
22812 - need_version=no
22813 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
22814 - soname_spec='${libname}${release}${shared_ext}$major'
22815 - shlibpath_var=LD_LIBRARY_PATH
22816 - ;;
22817 -
22818 -freebsd1*)
22819 - dynamic_linker=no
22820 - ;;
22821 -
22822 -freebsd* | dragonfly*)
22823 - # DragonFly does not have aout. When/if they implement a new
22824 - # versioning mechanism, adjust this.
22825 - if test -x /usr/bin/objformat; then
22826 - objformat=`/usr/bin/objformat`
22827 - else
22828 - case $host_os in
22829 - freebsd[123]*) objformat=aout ;;
22830 - *) objformat=elf ;;
22831 - esac
22832 - fi
22833 - version_type=freebsd-$objformat
22834 - case $version_type in
22835 - freebsd-elf*)
22836 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
22837 - need_version=no
22838 - need_lib_prefix=no
22839 - ;;
22840 - freebsd-*)
22841 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
22842 - need_version=yes
22843 - ;;
22844 - esac
22845 - shlibpath_var=LD_LIBRARY_PATH
22846 - case $host_os in
22847 - freebsd2*)
22848 - shlibpath_overrides_runpath=yes
22849 - ;;
22850 - freebsd3.[01]* | freebsdelf3.[01]*)
22851 - shlibpath_overrides_runpath=yes
22852 - hardcode_into_libs=yes
22853 - ;;
22854 - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
22855 - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
22856 - shlibpath_overrides_runpath=no
22857 - hardcode_into_libs=yes
22858 - ;;
22859 - *) # from 4.6 on, and DragonFly
22860 - shlibpath_overrides_runpath=yes
22861 - hardcode_into_libs=yes
22862 - ;;
22863 - esac
22864 - ;;
22865 -
22866 -gnu*)
22867 - version_type=linux
22868 - need_lib_prefix=no
22869 - need_version=no
22870 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
22871 - soname_spec='${libname}${release}${shared_ext}$major'
22872 - shlibpath_var=LD_LIBRARY_PATH
22873 - hardcode_into_libs=yes
22874 - ;;
22875 -
22876 -hpux9* | hpux10* | hpux11*)
22877 - # Give a soname corresponding to the major version so that dld.sl refuses to
22878 - # link against other versions.
22879 - version_type=sunos
22880 - need_lib_prefix=no
22881 - need_version=no
22882 - case $host_cpu in
22883 - ia64*)
22884 - shrext_cmds='.so'
22885 - hardcode_into_libs=yes
22886 - dynamic_linker="$host_os dld.so"
22887 - shlibpath_var=LD_LIBRARY_PATH
22888 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
22889 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22890 - soname_spec='${libname}${release}${shared_ext}$major'
22891 - if test "X$HPUX_IA64_MODE" = X32; then
22892 - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
22893 - else
22894 - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
22895 - fi
22896 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
22897 - ;;
22898 - hppa*64*)
22899 - shrext_cmds='.sl'
22900 - hardcode_into_libs=yes
22901 - dynamic_linker="$host_os dld.sl"
22902 - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
22903 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
22904 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22905 - soname_spec='${libname}${release}${shared_ext}$major'
22906 - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
22907 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
22908 - ;;
22909 - *)
22910 - shrext_cmds='.sl'
22911 - dynamic_linker="$host_os dld.sl"
22912 - shlibpath_var=SHLIB_PATH
22913 - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
22914 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22915 - soname_spec='${libname}${release}${shared_ext}$major'
22916 - ;;
22917 - esac
22918 - # HP-UX runs *really* slowly unless shared libraries are mode 555.
22919 - postinstall_cmds='chmod 555 $lib'
22920 - ;;
22921 -
22922 -interix[3-9]*)
22923 - version_type=linux
22924 - need_lib_prefix=no
22925 - need_version=no
22926 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
22927 - soname_spec='${libname}${release}${shared_ext}$major'
22928 - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
22929 - shlibpath_var=LD_LIBRARY_PATH
22930 - shlibpath_overrides_runpath=no
22931 - hardcode_into_libs=yes
22932 - ;;
22933 -
22934 -irix5* | irix6* | nonstopux*)
22935 - case $host_os in
22936 - nonstopux*) version_type=nonstopux ;;
22937 - *)
22938 - if test "$lt_cv_prog_gnu_ld" = yes; then
22939 - version_type=linux
22940 - else
22941 - version_type=irix
22942 - fi ;;
22943 - esac
22944 - need_lib_prefix=no
22945 - need_version=no
22946 - soname_spec='${libname}${release}${shared_ext}$major'
22947 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
22948 - case $host_os in
22949 - irix5* | nonstopux*)
22950 - libsuff= shlibsuff=
22951 - ;;
22952 - *)
22953 - case $LD in # libtool.m4 will add one of these switches to LD
22954 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
22955 - libsuff= shlibsuff= libmagic=32-bit;;
22956 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
22957 - libsuff=32 shlibsuff=N32 libmagic=N32;;
22958 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
22959 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
22960 - *) libsuff= shlibsuff= libmagic=never-match;;
22961 - esac
22962 - ;;
22963 - esac
22964 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
22965 - shlibpath_overrides_runpath=no
22966 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
22967 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
22968 - hardcode_into_libs=yes
22969 - ;;
22970 -
22971 -# No shared lib support for Linux oldld, aout, or coff.
22972 -linux*oldld* | linux*aout* | linux*coff*)
22973 - dynamic_linker=no
22974 - ;;
22975 -
22976 -# This must be Linux ELF.
22977 -linux* | k*bsd*-gnu)
22978 - version_type=linux
22979 - need_lib_prefix=no
22980 - need_version=no
22981 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22982 - soname_spec='${libname}${release}${shared_ext}$major'
22983 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
22984 - shlibpath_var=LD_LIBRARY_PATH
22985 - shlibpath_overrides_runpath=no
22986 - # This implies no fast_install, which is unacceptable.
22987 - # Some rework will be needed to allow for fast_install
22988 - # before this can be enabled.
22989 - hardcode_into_libs=yes
22990 -
22991 - # Append ld.so.conf contents to the search path
22992 - if test -f /etc/ld.so.conf; then
22993 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
22994 - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
22995 - fi
22996 -
22997 - # We used to test for /lib/ld.so.1 and disable shared libraries on
22998 - # powerpc, because MkLinux only supported shared libraries with the
22999 - # GNU dynamic linker. Since this was broken with cross compilers,
23000 - # most powerpc-linux boxes support dynamic linking these days and
23001 - # people can always --disable-shared, the test was removed, and we
23002 - # assume the GNU/Linux dynamic linker is in use.
23003 - dynamic_linker='GNU/Linux ld.so'
23004 - ;;
23005 -
23006 -netbsdelf*-gnu)
23007 - version_type=linux
23008 - need_lib_prefix=no
23009 - need_version=no
23010 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
23011 - soname_spec='${libname}${release}${shared_ext}$major'
23012 - shlibpath_var=LD_LIBRARY_PATH
23013 - shlibpath_overrides_runpath=no
23014 - hardcode_into_libs=yes
23015 - dynamic_linker='NetBSD ld.elf_so'
23016 - ;;
23017 -
23018 -netbsd*)
23019 - version_type=sunos
23020 - need_lib_prefix=no
23021 - need_version=no
23022 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
23023 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
23024 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
23025 - dynamic_linker='NetBSD (a.out) ld.so'
23026 - else
23027 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
23028 - soname_spec='${libname}${release}${shared_ext}$major'
23029 - dynamic_linker='NetBSD ld.elf_so'
23030 - fi
23031 - shlibpath_var=LD_LIBRARY_PATH
23032 - shlibpath_overrides_runpath=yes
23033 - hardcode_into_libs=yes
23034 - ;;
23035 -
23036 -newsos6)
23037 - version_type=linux
23038 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
23039 - shlibpath_var=LD_LIBRARY_PATH
23040 - shlibpath_overrides_runpath=yes
23041 - ;;
23042 -
23043 -nto-qnx*)
23044 - version_type=linux
23045 - need_lib_prefix=no
23046 - need_version=no
23047 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
23048 - soname_spec='${libname}${release}${shared_ext}$major'
23049 - shlibpath_var=LD_LIBRARY_PATH
23050 - shlibpath_overrides_runpath=yes
23051 - ;;
23052 -
23053 -openbsd*)
23054 - version_type=sunos
23055 - sys_lib_dlsearch_path_spec="/usr/lib"
23056 - need_lib_prefix=no
23057 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
23058 - case $host_os in
23059 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
23060 - *) need_version=no ;;
23061 - esac
23062 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
23063 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
23064 - shlibpath_var=LD_LIBRARY_PATH
23065 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
23066 - case $host_os in
23067 - openbsd2.[89] | openbsd2.[89].*)
23068 - shlibpath_overrides_runpath=no
23069 - ;;
23070 - *)
23071 - shlibpath_overrides_runpath=yes
23072 - ;;
23073 - esac
23074 - else
23075 - shlibpath_overrides_runpath=yes
23076 - fi
23077 - ;;
23078 -
23079 -os2*)
23080 - libname_spec='$name'
23081 - shrext_cmds=".dll"
23082 - need_lib_prefix=no
23083 - library_names_spec='$libname${shared_ext} $libname.a'
23084 - dynamic_linker='OS/2 ld.exe'
23085 - shlibpath_var=LIBPATH
23086 - ;;
23087 -
23088 -osf3* | osf4* | osf5*)
23089 - version_type=osf
23090 - need_lib_prefix=no
23091 - need_version=no
23092 - soname_spec='${libname}${release}${shared_ext}$major'
23093 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
23094 - shlibpath_var=LD_LIBRARY_PATH
23095 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
23096 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
23097 - ;;
23098 -
23099 -rdos*)
23100 - dynamic_linker=no
23101 - ;;
23102 -
23103 -solaris*)
23104 - version_type=linux
23105 - need_lib_prefix=no
23106 - need_version=no
23107 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
23108 - soname_spec='${libname}${release}${shared_ext}$major'
23109 - shlibpath_var=LD_LIBRARY_PATH
23110 - shlibpath_overrides_runpath=yes
23111 - hardcode_into_libs=yes
23112 - # ldd complains unless libraries are executable
23113 - postinstall_cmds='chmod +x $lib'
23114 - ;;
23115 -
23116 -sunos4*)
23117 - version_type=sunos
23118 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
23119 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
23120 - shlibpath_var=LD_LIBRARY_PATH
23121 - shlibpath_overrides_runpath=yes
23122 - if test "$with_gnu_ld" = yes; then
23123 - need_lib_prefix=no
23124 - fi
23125 - need_version=yes
23126 - ;;
23127 -
23128 -sysv4 | sysv4.3*)
23129 - version_type=linux
23130 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
23131 - soname_spec='${libname}${release}${shared_ext}$major'
23132 - shlibpath_var=LD_LIBRARY_PATH
23133 - case $host_vendor in
23134 - sni)
23135 - shlibpath_overrides_runpath=no
23136 - need_lib_prefix=no
23137 - export_dynamic_flag_spec='${wl}-Blargedynsym'
23138 - runpath_var=LD_RUN_PATH
23139 - ;;
23140 - siemens)
23141 - need_lib_prefix=no
23142 - ;;
23143 - motorola)
23144 - need_lib_prefix=no
23145 - need_version=no
23146 - shlibpath_overrides_runpath=no
23147 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
23148 - ;;
23149 - esac
23150 - ;;
23151 -
23152 -sysv4*MP*)
23153 - if test -d /usr/nec ;then
23154 - version_type=linux
23155 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
23156 - soname_spec='$libname${shared_ext}.$major'
23157 - shlibpath_var=LD_LIBRARY_PATH
23158 - fi
23159 - ;;
23160 -
23161 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
23162 - version_type=freebsd-elf
23163 - need_lib_prefix=no
23164 - need_version=no
23165 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
23166 - soname_spec='${libname}${release}${shared_ext}$major'
23167 - shlibpath_var=LD_LIBRARY_PATH
23168 - hardcode_into_libs=yes
23169 - if test "$with_gnu_ld" = yes; then
23170 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
23171 - shlibpath_overrides_runpath=no
23172 - else
23173 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
23174 - shlibpath_overrides_runpath=yes
23175 - case $host_os in
23176 - sco3.2v5*)
23177 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
23178 - ;;
23179 - esac
23180 - fi
23181 - sys_lib_dlsearch_path_spec='/usr/lib'
23182 - ;;
23183 -
23184 -uts4*)
23185 - version_type=linux
23186 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
23187 - soname_spec='${libname}${release}${shared_ext}$major'
23188 - shlibpath_var=LD_LIBRARY_PATH
23189 - ;;
23190 -
23191 -*)
23192 - dynamic_linker=no
23193 - ;;
23194 -esac
23195 -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
23196 -$as_echo "$dynamic_linker" >&6; }
23197 -test "$dynamic_linker" = no && can_build_shared=no
23198 -
23199 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
23200 - $as_echo_n "(cached) " >&6
23201 -else
23202 - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
23203 -fi
23204 -
23205 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
23206 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
23207 - $as_echo_n "(cached) " >&6
23208 -else
23209 - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
23210 -fi
23211 -
23212 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
23213 -
23214 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
23215 -if test "$GCC" = yes; then
23216 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
23217 -fi
23218 -
23219 -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
23220 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
23221 -hardcode_action=
23222 -if test -n "$hardcode_libdir_flag_spec" || \
23223 - test -n "$runpath_var" || \
23224 - test "X$hardcode_automatic" = "Xyes" ; then
23225 -
23226 - # We can hardcode non-existant directories.
23227 - if test "$hardcode_direct" != no &&
23228 - # If the only mechanism to avoid hardcoding is shlibpath_var, we
23229 - # have to relink, otherwise we might link with an installed library
23230 - # when we should be linking with a yet-to-be-installed one
23231 - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
23232 - test "$hardcode_minus_L" != no; then
23233 - # Linking always hardcodes the temporary library directory.
23234 - hardcode_action=relink
23235 - else
23236 - # We can link without hardcoding, and we can hardcode nonexisting dirs.
23237 - hardcode_action=immediate
23238 - fi
23239 -else
23240 - # We cannot hardcode anything, or else we can only hardcode existing
23241 - # directories.
23242 - hardcode_action=unsupported
23243 -fi
23244 -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
23245 -$as_echo "$hardcode_action" >&6; }
23246 -
23247 -if test "$hardcode_action" = relink; then
23248 - # Fast installation is not supported
23249 - enable_fast_install=no
23250 -elif test "$shlibpath_overrides_runpath" = yes ||
23251 - test "$enable_shared" = no; then
23252 - # Fast installation is not necessary
23253 - enable_fast_install=needless
23254 -fi
23255 -
23256 -striplib=
23257 -old_striplib=
23258 -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
23259 -$as_echo_n "checking whether stripping libraries is possible... " >&6; }
23260 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
23261 - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
23262 - test -z "$striplib" && striplib="$STRIP --strip-unneeded"
23263 - { $as_echo "$as_me:$LINENO: result: yes" >&5
23264 -$as_echo "yes" >&6; }
23265 -else
23266 -# FIXME - insert some real tests, host_os isn't really good enough
23267 - case $host_os in
23268 - darwin*)
23269 - if test -n "$STRIP" ; then
23270 - striplib="$STRIP -x"
23271 - old_striplib="$STRIP -S"
23272 - { $as_echo "$as_me:$LINENO: result: yes" >&5
23273 -$as_echo "yes" >&6; }
23274 - else
23275 - { $as_echo "$as_me:$LINENO: result: no" >&5
23276 -$as_echo "no" >&6; }
23277 -fi
23278 - ;;
23279 - *)
23280 - { $as_echo "$as_me:$LINENO: result: no" >&5
23281 -$as_echo "no" >&6; }
23282 - ;;
23283 - esac
23284 -fi
23285 -
23286 -if test "x$enable_dlopen" != xyes; then
23287 - enable_dlopen=unknown
23288 - enable_dlopen_self=unknown
23289 - enable_dlopen_self_static=unknown
23290 -else
23291 - lt_cv_dlopen=no
23292 - lt_cv_dlopen_libs=
23293 -
23294 - case $host_os in
23295 - beos*)
23296 - lt_cv_dlopen="load_add_on"
23297 - lt_cv_dlopen_libs=
23298 - lt_cv_dlopen_self=yes
23299 - ;;
23300 -
23301 - mingw* | pw32*)
23302 - lt_cv_dlopen="LoadLibrary"
23303 - lt_cv_dlopen_libs=
23304 - ;;
23305 -
23306 - cygwin*)
23307 - lt_cv_dlopen="dlopen"
23308 - lt_cv_dlopen_libs=
23309 - ;;
23310 -
23311 - darwin*)
23312 - # if libdl is installed we need to link against it
23313 - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
23314 -$as_echo_n "checking for dlopen in -ldl... " >&6; }
23315 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
23316 - $as_echo_n "(cached) " >&6
23317 -else
23318 - ac_check_lib_save_LIBS=$LIBS
23319 -LIBS="-ldl $LIBS"
23320 -cat >conftest.$ac_ext <<_ACEOF
23321 -/* confdefs.h. */
23322 -_ACEOF
23323 -cat confdefs.h >>conftest.$ac_ext
23324 -cat >>conftest.$ac_ext <<_ACEOF
23325 -/* end confdefs.h. */
23326 -
23327 -/* Override any GCC internal prototype to avoid an error.
23328 - Use char because int might match the return type of a GCC
23329 - builtin and then its argument prototype would still apply. */
23330 -#ifdef __cplusplus
23331 -extern "C"
23332 -#endif
23333 -char dlopen ();
23334 -int
23335 -main ()
23336 -{
23337 -return dlopen ();
23338 - ;
23339 - return 0;
23340 -}
23341 -_ACEOF
23342 -rm -f conftest.$ac_objext conftest$ac_exeext
23343 -if { (ac_try="$ac_link"
23344 -case "(($ac_try" in
23345 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23346 - *) ac_try_echo=$ac_try;;
23347 -esac
23348 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23349 -$as_echo "$ac_try_echo") >&5
23350 - (eval "$ac_link") 2>conftest.er1
23351 - ac_status=$?
23352 - grep -v '^ *+' conftest.er1 >conftest.err
23353 - rm -f conftest.er1
23354 - cat conftest.err >&5
23355 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23356 - (exit $ac_status); } && {
23357 - test -z "$ac_c_werror_flag" ||
23358 - test ! -s conftest.err
23359 - } && test -s conftest$ac_exeext && {
23360 - test "$cross_compiling" = yes ||
23361 - $as_test_x conftest$ac_exeext
23362 - }; then
23363 - ac_cv_lib_dl_dlopen=yes
23364 -else
23365 - $as_echo "$as_me: failed program was:" >&5
23366 -sed 's/^/| /' conftest.$ac_ext >&5
23367 -
23368 - ac_cv_lib_dl_dlopen=no
23369 -fi
23370 -
23371 -rm -rf conftest.dSYM
23372 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23373 - conftest$ac_exeext conftest.$ac_ext
23374 -LIBS=$ac_check_lib_save_LIBS
23375 -fi
23376 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
23377 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
23378 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
23379 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
23380 -else
23381 -
23382 - lt_cv_dlopen="dyld"
23383 - lt_cv_dlopen_libs=
23384 - lt_cv_dlopen_self=yes
23385 -
23386 -fi
23387 -
23388 - ;;
23389 -
23390 - *)
23391 - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
23392 -$as_echo_n "checking for shl_load... " >&6; }
23393 -if test "${ac_cv_func_shl_load+set}" = set; then
23394 - $as_echo_n "(cached) " >&6
23395 -else
23396 - cat >conftest.$ac_ext <<_ACEOF
23397 -/* confdefs.h. */
23398 -_ACEOF
23399 -cat confdefs.h >>conftest.$ac_ext
23400 -cat >>conftest.$ac_ext <<_ACEOF
23401 -/* end confdefs.h. */
23402 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
23403 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
23404 -#define shl_load innocuous_shl_load
23405 -
23406 -/* System header to define __stub macros and hopefully few prototypes,
23407 - which can conflict with char shl_load (); below.
23408 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
23409 - <limits.h> exists even on freestanding compilers. */
23410 -
23411 -#ifdef __STDC__
23412 -# include <limits.h>
23413 -#else
23414 -# include <assert.h>
23415 -#endif
23416 -
23417 -#undef shl_load
23418 -
23419 -/* Override any GCC internal prototype to avoid an error.
23420 - Use char because int might match the return type of a GCC
23421 - builtin and then its argument prototype would still apply. */
23422 -#ifdef __cplusplus
23423 -extern "C"
23424 -#endif
23425 -char shl_load ();
23426 -/* The GNU C library defines this for functions which it implements
23427 - to always fail with ENOSYS. Some functions are actually named
23428 - something starting with __ and the normal name is an alias. */
23429 -#if defined __stub_shl_load || defined __stub___shl_load
23430 -choke me
23431 -#endif
23432 -
23433 -int
23434 -main ()
23435 -{
23436 -return shl_load ();
23437 - ;
23438 - return 0;
23439 -}
23440 -_ACEOF
23441 -rm -f conftest.$ac_objext conftest$ac_exeext
23442 -if { (ac_try="$ac_link"
23443 -case "(($ac_try" in
23444 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23445 - *) ac_try_echo=$ac_try;;
23446 -esac
23447 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23448 -$as_echo "$ac_try_echo") >&5
23449 - (eval "$ac_link") 2>conftest.er1
23450 - ac_status=$?
23451 - grep -v '^ *+' conftest.er1 >conftest.err
23452 - rm -f conftest.er1
23453 - cat conftest.err >&5
23454 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23455 - (exit $ac_status); } && {
23456 - test -z "$ac_c_werror_flag" ||
23457 - test ! -s conftest.err
23458 - } && test -s conftest$ac_exeext && {
23459 - test "$cross_compiling" = yes ||
23460 - $as_test_x conftest$ac_exeext
23461 - }; then
23462 - ac_cv_func_shl_load=yes
23463 -else
23464 - $as_echo "$as_me: failed program was:" >&5
23465 -sed 's/^/| /' conftest.$ac_ext >&5
23466 -
23467 - ac_cv_func_shl_load=no
23468 -fi
23469 -
23470 -rm -rf conftest.dSYM
23471 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23472 - conftest$ac_exeext conftest.$ac_ext
23473 -fi
23474 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
23475 -$as_echo "$ac_cv_func_shl_load" >&6; }
23476 -if test "x$ac_cv_func_shl_load" = x""yes; then
23477 - lt_cv_dlopen="shl_load"
23478 -else
23479 - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
23480 -$as_echo_n "checking for shl_load in -ldld... " >&6; }
23481 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
23482 - $as_echo_n "(cached) " >&6
23483 -else
23484 - ac_check_lib_save_LIBS=$LIBS
23485 -LIBS="-ldld $LIBS"
23486 -cat >conftest.$ac_ext <<_ACEOF
23487 -/* confdefs.h. */
23488 -_ACEOF
23489 -cat confdefs.h >>conftest.$ac_ext
23490 -cat >>conftest.$ac_ext <<_ACEOF
23491 -/* end confdefs.h. */
23492 -
23493 -/* Override any GCC internal prototype to avoid an error.
23494 - Use char because int might match the return type of a GCC
23495 - builtin and then its argument prototype would still apply. */
23496 -#ifdef __cplusplus
23497 -extern "C"
23498 -#endif
23499 -char shl_load ();
23500 -int
23501 -main ()
23502 -{
23503 -return shl_load ();
23504 - ;
23505 - return 0;
23506 -}
23507 -_ACEOF
23508 -rm -f conftest.$ac_objext conftest$ac_exeext
23509 -if { (ac_try="$ac_link"
23510 -case "(($ac_try" in
23511 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23512 - *) ac_try_echo=$ac_try;;
23513 -esac
23514 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23515 -$as_echo "$ac_try_echo") >&5
23516 - (eval "$ac_link") 2>conftest.er1
23517 - ac_status=$?
23518 - grep -v '^ *+' conftest.er1 >conftest.err
23519 - rm -f conftest.er1
23520 - cat conftest.err >&5
23521 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23522 - (exit $ac_status); } && {
23523 - test -z "$ac_c_werror_flag" ||
23524 - test ! -s conftest.err
23525 - } && test -s conftest$ac_exeext && {
23526 - test "$cross_compiling" = yes ||
23527 - $as_test_x conftest$ac_exeext
23528 - }; then
23529 - ac_cv_lib_dld_shl_load=yes
23530 -else
23531 - $as_echo "$as_me: failed program was:" >&5
23532 -sed 's/^/| /' conftest.$ac_ext >&5
23533 -
23534 - ac_cv_lib_dld_shl_load=no
23535 -fi
23536 -
23537 -rm -rf conftest.dSYM
23538 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23539 - conftest$ac_exeext conftest.$ac_ext
23540 -LIBS=$ac_check_lib_save_LIBS
23541 -fi
23542 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
23543 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
23544 -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
23545 - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
23546 -else
23547 - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
23548 -$as_echo_n "checking for dlopen... " >&6; }
23549 -if test "${ac_cv_func_dlopen+set}" = set; then
23550 - $as_echo_n "(cached) " >&6
23551 -else
23552 - cat >conftest.$ac_ext <<_ACEOF
23553 -/* confdefs.h. */
23554 -_ACEOF
23555 -cat confdefs.h >>conftest.$ac_ext
23556 -cat >>conftest.$ac_ext <<_ACEOF
23557 -/* end confdefs.h. */
23558 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
23559 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
23560 -#define dlopen innocuous_dlopen
23561 -
23562 -/* System header to define __stub macros and hopefully few prototypes,
23563 - which can conflict with char dlopen (); below.
23564 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
23565 - <limits.h> exists even on freestanding compilers. */
23566 -
23567 -#ifdef __STDC__
23568 -# include <limits.h>
23569 -#else
23570 -# include <assert.h>
23571 -#endif
23572 -
23573 -#undef dlopen
23574 -
23575 -/* Override any GCC internal prototype to avoid an error.
23576 - Use char because int might match the return type of a GCC
23577 - builtin and then its argument prototype would still apply. */
23578 -#ifdef __cplusplus
23579 -extern "C"
23580 -#endif
23581 -char dlopen ();
23582 -/* The GNU C library defines this for functions which it implements
23583 - to always fail with ENOSYS. Some functions are actually named
23584 - something starting with __ and the normal name is an alias. */
23585 -#if defined __stub_dlopen || defined __stub___dlopen
23586 -choke me
23587 -#endif
23588 -
23589 -int
23590 -main ()
23591 -{
23592 -return dlopen ();
23593 - ;
23594 - return 0;
23595 -}
23596 -_ACEOF
23597 -rm -f conftest.$ac_objext conftest$ac_exeext
23598 -if { (ac_try="$ac_link"
23599 -case "(($ac_try" in
23600 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23601 - *) ac_try_echo=$ac_try;;
23602 -esac
23603 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23604 -$as_echo "$ac_try_echo") >&5
23605 - (eval "$ac_link") 2>conftest.er1
23606 - ac_status=$?
23607 - grep -v '^ *+' conftest.er1 >conftest.err
23608 - rm -f conftest.er1
23609 - cat conftest.err >&5
23610 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23611 - (exit $ac_status); } && {
23612 - test -z "$ac_c_werror_flag" ||
23613 - test ! -s conftest.err
23614 - } && test -s conftest$ac_exeext && {
23615 - test "$cross_compiling" = yes ||
23616 - $as_test_x conftest$ac_exeext
23617 - }; then
23618 - ac_cv_func_dlopen=yes
23619 -else
23620 - $as_echo "$as_me: failed program was:" >&5
23621 -sed 's/^/| /' conftest.$ac_ext >&5
23622 -
23623 - ac_cv_func_dlopen=no
23624 -fi
23625 -
23626 -rm -rf conftest.dSYM
23627 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23628 - conftest$ac_exeext conftest.$ac_ext
23629 -fi
23630 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
23631 -$as_echo "$ac_cv_func_dlopen" >&6; }
23632 -if test "x$ac_cv_func_dlopen" = x""yes; then
23633 - lt_cv_dlopen="dlopen"
23634 -else
23635 - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
23636 -$as_echo_n "checking for dlopen in -ldl... " >&6; }
23637 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
23638 - $as_echo_n "(cached) " >&6
23639 -else
23640 - ac_check_lib_save_LIBS=$LIBS
23641 -LIBS="-ldl $LIBS"
23642 -cat >conftest.$ac_ext <<_ACEOF
23643 -/* confdefs.h. */
23644 -_ACEOF
23645 -cat confdefs.h >>conftest.$ac_ext
23646 -cat >>conftest.$ac_ext <<_ACEOF
23647 -/* end confdefs.h. */
23648 -
23649 -/* Override any GCC internal prototype to avoid an error.
23650 - Use char because int might match the return type of a GCC
23651 - builtin and then its argument prototype would still apply. */
23652 -#ifdef __cplusplus
23653 -extern "C"
23654 -#endif
23655 -char dlopen ();
23656 -int
23657 -main ()
23658 -{
23659 -return dlopen ();
23660 - ;
23661 - return 0;
23662 -}
23663 -_ACEOF
23664 -rm -f conftest.$ac_objext conftest$ac_exeext
23665 -if { (ac_try="$ac_link"
23666 -case "(($ac_try" in
23667 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23668 - *) ac_try_echo=$ac_try;;
23669 -esac
23670 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23671 -$as_echo "$ac_try_echo") >&5
23672 - (eval "$ac_link") 2>conftest.er1
23673 - ac_status=$?
23674 - grep -v '^ *+' conftest.er1 >conftest.err
23675 - rm -f conftest.er1
23676 - cat conftest.err >&5
23677 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23678 - (exit $ac_status); } && {
23679 - test -z "$ac_c_werror_flag" ||
23680 - test ! -s conftest.err
23681 - } && test -s conftest$ac_exeext && {
23682 - test "$cross_compiling" = yes ||
23683 - $as_test_x conftest$ac_exeext
23684 - }; then
23685 - ac_cv_lib_dl_dlopen=yes
23686 -else
23687 - $as_echo "$as_me: failed program was:" >&5
23688 -sed 's/^/| /' conftest.$ac_ext >&5
23689 -
23690 - ac_cv_lib_dl_dlopen=no
23691 -fi
23692 -
23693 -rm -rf conftest.dSYM
23694 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23695 - conftest$ac_exeext conftest.$ac_ext
23696 -LIBS=$ac_check_lib_save_LIBS
23697 -fi
23698 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
23699 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
23700 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
23701 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
23702 -else
23703 - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
23704 -$as_echo_n "checking for dlopen in -lsvld... " >&6; }
23705 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then
23706 - $as_echo_n "(cached) " >&6
23707 -else
23708 - ac_check_lib_save_LIBS=$LIBS
23709 -LIBS="-lsvld $LIBS"
23710 -cat >conftest.$ac_ext <<_ACEOF
23711 -/* confdefs.h. */
23712 -_ACEOF
23713 -cat confdefs.h >>conftest.$ac_ext
23714 -cat >>conftest.$ac_ext <<_ACEOF
23715 -/* end confdefs.h. */
23716 -
23717 -/* Override any GCC internal prototype to avoid an error.
23718 - Use char because int might match the return type of a GCC
23719 - builtin and then its argument prototype would still apply. */
23720 -#ifdef __cplusplus
23721 -extern "C"
23722 -#endif
23723 -char dlopen ();
23724 -int
23725 -main ()
23726 -{
23727 -return dlopen ();
23728 - ;
23729 - return 0;
23730 -}
23731 -_ACEOF
23732 -rm -f conftest.$ac_objext conftest$ac_exeext
23733 -if { (ac_try="$ac_link"
23734 -case "(($ac_try" in
23735 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23736 - *) ac_try_echo=$ac_try;;
23737 -esac
23738 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23739 -$as_echo "$ac_try_echo") >&5
23740 - (eval "$ac_link") 2>conftest.er1
23741 - ac_status=$?
23742 - grep -v '^ *+' conftest.er1 >conftest.err
23743 - rm -f conftest.er1
23744 - cat conftest.err >&5
23745 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23746 - (exit $ac_status); } && {
23747 - test -z "$ac_c_werror_flag" ||
23748 - test ! -s conftest.err
23749 - } && test -s conftest$ac_exeext && {
23750 - test "$cross_compiling" = yes ||
23751 - $as_test_x conftest$ac_exeext
23752 - }; then
23753 - ac_cv_lib_svld_dlopen=yes
23754 -else
23755 - $as_echo "$as_me: failed program was:" >&5
23756 -sed 's/^/| /' conftest.$ac_ext >&5
23757 -
23758 - ac_cv_lib_svld_dlopen=no
23759 -fi
23760 -
23761 -rm -rf conftest.dSYM
23762 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23763 - conftest$ac_exeext conftest.$ac_ext
23764 -LIBS=$ac_check_lib_save_LIBS
23765 -fi
23766 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
23767 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
23768 -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
23769 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
23770 -else
23771 - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
23772 -$as_echo_n "checking for dld_link in -ldld... " >&6; }
23773 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then
23774 - $as_echo_n "(cached) " >&6
23775 -else
23776 - ac_check_lib_save_LIBS=$LIBS
23777 -LIBS="-ldld $LIBS"
23778 -cat >conftest.$ac_ext <<_ACEOF
23779 -/* confdefs.h. */
23780 -_ACEOF
23781 -cat confdefs.h >>conftest.$ac_ext
23782 -cat >>conftest.$ac_ext <<_ACEOF
23783 -/* end confdefs.h. */
23784 -
23785 -/* Override any GCC internal prototype to avoid an error.
23786 - Use char because int might match the return type of a GCC
23787 - builtin and then its argument prototype would still apply. */
23788 -#ifdef __cplusplus
23789 -extern "C"
23790 -#endif
23791 -char dld_link ();
23792 -int
23793 -main ()
23794 -{
23795 -return dld_link ();
23796 - ;
23797 - return 0;
23798 -}
23799 -_ACEOF
23800 -rm -f conftest.$ac_objext conftest$ac_exeext
23801 -if { (ac_try="$ac_link"
23802 -case "(($ac_try" in
23803 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23804 - *) ac_try_echo=$ac_try;;
23805 -esac
23806 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23807 -$as_echo "$ac_try_echo") >&5
23808 - (eval "$ac_link") 2>conftest.er1
23809 - ac_status=$?
23810 - grep -v '^ *+' conftest.er1 >conftest.err
23811 - rm -f conftest.er1
23812 - cat conftest.err >&5
23813 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23814 - (exit $ac_status); } && {
23815 - test -z "$ac_c_werror_flag" ||
23816 - test ! -s conftest.err
23817 - } && test -s conftest$ac_exeext && {
23818 - test "$cross_compiling" = yes ||
23819 - $as_test_x conftest$ac_exeext
23820 - }; then
23821 - ac_cv_lib_dld_dld_link=yes
23822 -else
23823 - $as_echo "$as_me: failed program was:" >&5
23824 -sed 's/^/| /' conftest.$ac_ext >&5
23825 -
23826 - ac_cv_lib_dld_dld_link=no
23827 -fi
23828 -
23829 -rm -rf conftest.dSYM
23830 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23831 - conftest$ac_exeext conftest.$ac_ext
23832 -LIBS=$ac_check_lib_save_LIBS
23833 -fi
23834 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
23835 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
23836 -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
23837 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
23838 -fi
23839 -
23840 -
23841 -fi
23842 -
23843 -
23844 -fi
23845 -
23846 -
23847 -fi
23848 -
23849 -
23850 -fi
23851 -
23852 -
23853 -fi
23854 -
23855 - ;;
23856 - esac
23857 -
23858 - if test "x$lt_cv_dlopen" != xno; then
23859 - enable_dlopen=yes
23860 - else
23861 - enable_dlopen=no
23862 - fi
23863 -
23864 - case $lt_cv_dlopen in
23865 - dlopen)
23866 - save_CPPFLAGS="$CPPFLAGS"
23867 - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
23868 -
23869 - save_LDFLAGS="$LDFLAGS"
23870 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
23871 -
23872 - save_LIBS="$LIBS"
23873 - LIBS="$lt_cv_dlopen_libs $LIBS"
23874 -
23875 - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
23876 -$as_echo_n "checking whether a program can dlopen itself... " >&6; }
23877 -if test "${lt_cv_dlopen_self+set}" = set; then
23878 - $as_echo_n "(cached) " >&6
23879 -else
23880 - if test "$cross_compiling" = yes; then :
23881 - lt_cv_dlopen_self=cross
23882 -else
23883 - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
23884 - lt_status=$lt_dlunknown
23885 - cat > conftest.$ac_ext <<EOF
23886 -#line 10625 "configure"
23887 -#include "confdefs.h"
23888 -
23889 -#if HAVE_DLFCN_H
23890 -#include <dlfcn.h>
23891 -#endif
23892 -
23893 -#include <stdio.h>
23894 -
23895 -#ifdef RTLD_GLOBAL
23896 -# define LT_DLGLOBAL RTLD_GLOBAL
23897 -#else
23898 -# ifdef DL_GLOBAL
23899 -# define LT_DLGLOBAL DL_GLOBAL
23900 -# else
23901 -# define LT_DLGLOBAL 0
23902 -# endif
23903 -#endif
23904 -
23905 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
23906 - find out it does not work in some platform. */
23907 -#ifndef LT_DLLAZY_OR_NOW
23908 -# ifdef RTLD_LAZY
23909 -# define LT_DLLAZY_OR_NOW RTLD_LAZY
23910 -# else
23911 -# ifdef DL_LAZY
23912 -# define LT_DLLAZY_OR_NOW DL_LAZY
23913 -# else
23914 -# ifdef RTLD_NOW
23915 -# define LT_DLLAZY_OR_NOW RTLD_NOW
23916 -# else
23917 -# ifdef DL_NOW
23918 -# define LT_DLLAZY_OR_NOW DL_NOW
23919 -# else
23920 -# define LT_DLLAZY_OR_NOW 0
23921 -# endif
23922 -# endif
23923 -# endif
23924 -# endif
23925 -#endif
23926 -
23927 -#ifdef __cplusplus
23928 -extern "C" void exit (int);
23929 -#endif
23930 -
23931 -void fnord() { int i=42;}
23932 -int main ()
23933 -{
23934 - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
23935 - int status = $lt_dlunknown;
23936 -
23937 - if (self)
23938 - {
23939 - if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
23940 - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
23941 - /* dlclose (self); */
23942 - }
23943 - else
23944 - puts (dlerror ());
23945 -
23946 - exit (status);
23947 -}
23948 -EOF
23949 - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
23950 - (eval $ac_link) 2>&5
23951 - ac_status=$?
23952 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23953 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
23954 - (./conftest; exit; ) >&5 2>/dev/null
23955 - lt_status=$?
23956 - case x$lt_status in
23957 - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
23958 - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
23959 - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
23960 - esac
23961 - else :
23962 - # compilation failed
23963 - lt_cv_dlopen_self=no
23964 - fi
23965 -fi
23966 -rm -fr conftest*
23967 -
23968 -
23969 -fi
23970 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
23971 -$as_echo "$lt_cv_dlopen_self" >&6; }
23972 -
23973 - if test "x$lt_cv_dlopen_self" = xyes; then
23974 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
23975 - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
23976 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
23977 -if test "${lt_cv_dlopen_self_static+set}" = set; then
23978 - $as_echo_n "(cached) " >&6
23979 -else
23980 - if test "$cross_compiling" = yes; then :
23981 - lt_cv_dlopen_self_static=cross
23982 -else
23983 - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
23984 - lt_status=$lt_dlunknown
23985 - cat > conftest.$ac_ext <<EOF
23986 -#line 10725 "configure"
23987 -#include "confdefs.h"
23988 -
23989 -#if HAVE_DLFCN_H
23990 -#include <dlfcn.h>
23991 -#endif
23992 -
23993 -#include <stdio.h>
23994 -
23995 -#ifdef RTLD_GLOBAL
23996 -# define LT_DLGLOBAL RTLD_GLOBAL
23997 -#else
23998 -# ifdef DL_GLOBAL
23999 -# define LT_DLGLOBAL DL_GLOBAL
24000 -# else
24001 -# define LT_DLGLOBAL 0
24002 -# endif
24003 -#endif
24004 -
24005 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
24006 - find out it does not work in some platform. */
24007 -#ifndef LT_DLLAZY_OR_NOW
24008 -# ifdef RTLD_LAZY
24009 -# define LT_DLLAZY_OR_NOW RTLD_LAZY
24010 -# else
24011 -# ifdef DL_LAZY
24012 -# define LT_DLLAZY_OR_NOW DL_LAZY
24013 -# else
24014 -# ifdef RTLD_NOW
24015 -# define LT_DLLAZY_OR_NOW RTLD_NOW
24016 -# else
24017 -# ifdef DL_NOW
24018 -# define LT_DLLAZY_OR_NOW DL_NOW
24019 -# else
24020 -# define LT_DLLAZY_OR_NOW 0
24021 -# endif
24022 -# endif
24023 -# endif
24024 -# endif
24025 -#endif
24026 -
24027 -#ifdef __cplusplus
24028 -extern "C" void exit (int);
24029 -#endif
24030 -
24031 -void fnord() { int i=42;}
24032 -int main ()
24033 -{
24034 - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
24035 - int status = $lt_dlunknown;
24036 -
24037 - if (self)
24038 - {
24039 - if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
24040 - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
24041 - /* dlclose (self); */
24042 - }
24043 - else
24044 - puts (dlerror ());
24045 -
24046 - exit (status);
24047 -}
24048 -EOF
24049 - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24050 - (eval $ac_link) 2>&5
24051 - ac_status=$?
24052 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24053 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
24054 - (./conftest; exit; ) >&5 2>/dev/null
24055 - lt_status=$?
24056 - case x$lt_status in
24057 - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
24058 - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
24059 - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
24060 - esac
24061 - else :
24062 - # compilation failed
24063 - lt_cv_dlopen_self_static=no
24064 - fi
24065 -fi
24066 -rm -fr conftest*
24067 -
24068 -
24069 -fi
24070 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
24071 -$as_echo "$lt_cv_dlopen_self_static" >&6; }
24072 - fi
24073 -
24074 - CPPFLAGS="$save_CPPFLAGS"
24075 - LDFLAGS="$save_LDFLAGS"
24076 - LIBS="$save_LIBS"
24077 - ;;
24078 - esac
24079 -
24080 - case $lt_cv_dlopen_self in
24081 - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
24082 - *) enable_dlopen_self=unknown ;;
24083 - esac
24084 -
24085 - case $lt_cv_dlopen_self_static in
24086 - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
24087 - *) enable_dlopen_self_static=unknown ;;
24088 - esac
24089 -fi
24090 -
24091 -
24092 -# Report which library types will actually be built
24093 -{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
24094 -$as_echo_n "checking if libtool supports shared libraries... " >&6; }
24095 -{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
24096 -$as_echo "$can_build_shared" >&6; }
24097 -
24098 -{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
24099 -$as_echo_n "checking whether to build shared libraries... " >&6; }
24100 -test "$can_build_shared" = "no" && enable_shared=no
24101 -
24102 -# On AIX, shared libraries and static libraries use the same namespace, and
24103 -# are all built from PIC.
24104 -case $host_os in
24105 -aix3*)
24106 - test "$enable_shared" = yes && enable_static=no
24107 - if test -n "$RANLIB"; then
24108 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
24109 - postinstall_cmds='$RANLIB $lib'
24110 - fi
24111 - ;;
24112 -
24113 -aix[4-9]*)
24114 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
24115 - test "$enable_shared" = yes && enable_static=no
24116 - fi
24117 - ;;
24118 -esac
24119 -{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
24120 -$as_echo "$enable_shared" >&6; }
24121 -
24122 -{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
24123 -$as_echo_n "checking whether to build static libraries... " >&6; }
24124 -# Make sure either enable_shared or enable_static is yes.
24125 -test "$enable_shared" = yes || enable_static=yes
24126 -{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
24127 -$as_echo "$enable_static" >&6; }
24128 -
24129 -# The else clause should only fire when bootstrapping the
24130 -# libtool distribution, otherwise you forgot to ship ltmain.sh
24131 -# with your package, and you will get complaints that there are
24132 -# no rules to generate ltmain.sh.
24133 -if test -f "$ltmain"; then
24134 - # See if we are running on zsh, and set the options which allow our commands through
24135 - # without removal of \ escapes.
24136 - if test -n "${ZSH_VERSION+set}" ; then
24137 - setopt NO_GLOB_SUBST
24138 - fi
24139 - # Now quote all the things that may contain metacharacters while being
24140 - # careful not to overquote the AC_SUBSTed values. We take copies of the
24141 - # variables and quote the copies for generation of the libtool script.
24142 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
24143 - SED SHELL STRIP \
24144 - libname_spec library_names_spec soname_spec extract_expsyms_cmds \
24145 - old_striplib striplib file_magic_cmd finish_cmds finish_eval \
24146 - deplibs_check_method reload_flag reload_cmds need_locks \
24147 - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
24148 - lt_cv_sys_global_symbol_to_c_name_address \
24149 - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
24150 - old_postinstall_cmds old_postuninstall_cmds \
24151 - compiler \
24152 - CC \
24153 - LD \
24154 - lt_prog_compiler_wl \
24155 - lt_prog_compiler_pic \
24156 - lt_prog_compiler_static \
24157 - lt_prog_compiler_no_builtin_flag \
24158 - export_dynamic_flag_spec \
24159 - thread_safe_flag_spec \
24160 - whole_archive_flag_spec \
24161 - enable_shared_with_static_runtimes \
24162 - old_archive_cmds \
24163 - old_archive_from_new_cmds \
24164 - predep_objects \
24165 - postdep_objects \
24166 - predeps \
24167 - postdeps \
24168 - compiler_lib_search_path \
24169 - compiler_lib_search_dirs \
24170 - archive_cmds \
24171 - archive_expsym_cmds \
24172 - postinstall_cmds \
24173 - postuninstall_cmds \
24174 - old_archive_from_expsyms_cmds \
24175 - allow_undefined_flag \
24176 - no_undefined_flag \
24177 - export_symbols_cmds \
24178 - hardcode_libdir_flag_spec \
24179 - hardcode_libdir_flag_spec_ld \
24180 - hardcode_libdir_separator \
24181 - hardcode_automatic \
24182 - module_cmds \
24183 - module_expsym_cmds \
24184 - lt_cv_prog_compiler_c_o \
24185 - fix_srcfile_path \
24186 - exclude_expsyms \
24187 - include_expsyms; do
24188 -
24189 - case $var in
24190 - old_archive_cmds | \
24191 - old_archive_from_new_cmds | \
24192 - archive_cmds | \
24193 - archive_expsym_cmds | \
24194 - module_cmds | \
24195 - module_expsym_cmds | \
24196 - old_archive_from_expsyms_cmds | \
24197 - export_symbols_cmds | \
24198 - extract_expsyms_cmds | reload_cmds | finish_cmds | \
24199 - postinstall_cmds | postuninstall_cmds | \
24200 - old_postinstall_cmds | old_postuninstall_cmds | \
24201 - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
24202 - # Double-quote double-evaled strings.
24203 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
24204 - ;;
24205 - *)
24206 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
24207 - ;;
24208 - esac
24209 - done
24210 -
24211 - case $lt_echo in
24212 - *'\$0 --fallback-echo"')
24213 - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
24214 - ;;
24215 - esac
24216 -
24217 -cfgfile="${ofile}T"
24218 - trap "$rm \"$cfgfile\"; exit 1" 1 2 15
24219 - $rm -f "$cfgfile"
24220 - { $as_echo "$as_me:$LINENO: creating $ofile" >&5
24221 -$as_echo "$as_me: creating $ofile" >&6;}
24222 -
24223 - cat <<__EOF__ >> "$cfgfile"
24224 -#! $SHELL
24225 -
24226 -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
24227 -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
24228 -# NOTE: Changes made to this file will be lost: look at ltmain.sh.
24229 -#
24230 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
24231 -# Free Software Foundation, Inc.
24232 -#
24233 -# This file is part of GNU Libtool:
24234 -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
24235 -#
24236 -# This program is free software; you can redistribute it and/or modify
24237 -# it under the terms of the GNU General Public License as published by
24238 -# the Free Software Foundation; either version 2 of the License, or
24239 -# (at your option) any later version.
24240 -#
24241 -# This program is distributed in the hope that it will be useful, but
24242 -# WITHOUT ANY WARRANTY; without even the implied warranty of
24243 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24244 -# General Public License for more details.
24245 -#
24246 -# You should have received a copy of the GNU General Public License
24247 -# along with this program; if not, write to the Free Software
24248 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
24249 -#
24250 -# As a special exception to the GNU General Public License, if you
24251 -# distribute this file as part of a program that contains a
24252 -# configuration script generated by Autoconf, you may include it under
24253 -# the same distribution terms that you use for the rest of that program.
24254 -
24255 -# A sed program that does not truncate output.
24256 -SED=$lt_SED
24257 -
24258 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
24259 -Xsed="$SED -e 1s/^X//"
24260 -
24261 -# The HP-UX ksh and POSIX shell print the target directory to stdout
24262 -# if CDPATH is set.
24263 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
24264 -
24265 -# The names of the tagged configurations supported by this script.
24266 -available_tags=
24267 -
24268 -# ### BEGIN LIBTOOL CONFIG
24269 -
24270 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
24271 -
24272 -# Shell to use when invoking shell scripts.
24273 -SHELL=$lt_SHELL
24274 -
24275 -# Whether or not to build shared libraries.
24276 -build_libtool_libs=$enable_shared
24277 -
24278 -# Whether or not to build static libraries.
24279 -build_old_libs=$enable_static
24280 -
24281 -# Whether or not to add -lc for building shared libraries.
24282 -build_libtool_need_lc=$archive_cmds_need_lc
24283 -
24284 -# Whether or not to disallow shared libs when runtime libs are static
24285 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
24286 -
24287 -# Whether or not to optimize for fast installation.
24288 -fast_install=$enable_fast_install
24289 -
24290 -# The host system.
24291 -host_alias=$host_alias
24292 -host=$host
24293 -host_os=$host_os
24294 -
24295 -# The build system.
24296 -build_alias=$build_alias
24297 -build=$build
24298 -build_os=$build_os
24299 -
24300 -# An echo program that does not interpret backslashes.
24301 -echo=$lt_echo
24302 -
24303 -# The archiver.
24304 -AR=$lt_AR
24305 -AR_FLAGS=$lt_AR_FLAGS
24306 -
24307 -# A C compiler.
24308 -LTCC=$lt_LTCC
24309 -
24310 -# LTCC compiler flags.
24311 -LTCFLAGS=$lt_LTCFLAGS
24312 -
24313 -# A language-specific compiler.
24314 -CC=$lt_compiler
24315 -
24316 -# Is the compiler the GNU C compiler?
24317 -with_gcc=$GCC
24318 -
24319 -# An ERE matcher.
24320 -EGREP=$lt_EGREP
24321 -
24322 -# The linker used to build libraries.
24323 -LD=$lt_LD
24324 -
24325 -# Whether we need hard or soft links.
24326 -LN_S=$lt_LN_S
24327 -
24328 -# A BSD-compatible nm program.
24329 -NM=$lt_NM
24330 -
24331 -# A symbol stripping program
24332 -STRIP=$lt_STRIP
24333 -
24334 -# Used to examine libraries when file_magic_cmd begins "file"
24335 -MAGIC_CMD=$MAGIC_CMD
24336 -
24337 -# Used on cygwin: DLL creation program.
24338 -DLLTOOL="$DLLTOOL"
24339 -
24340 -# Used on cygwin: object dumper.
24341 -OBJDUMP="$OBJDUMP"
24342 -
24343 -# Used on cygwin: assembler.
24344 -AS="$AS"
24345 -
24346 -# The name of the directory that contains temporary libtool files.
24347 -objdir=$objdir
24348 -
24349 -# How to create reloadable object files.
24350 -reload_flag=$lt_reload_flag
24351 -reload_cmds=$lt_reload_cmds
24352 -
24353 -# How to pass a linker flag through the compiler.
24354 -wl=$lt_lt_prog_compiler_wl
24355 -
24356 -# Object file suffix (normally "o").
24357 -objext="$ac_objext"
24358 -
24359 -# Old archive suffix (normally "a").
24360 -libext="$libext"
24361 -
24362 -# Shared library suffix (normally ".so").
24363 -shrext_cmds='$shrext_cmds'
24364 -
24365 -# Executable file suffix (normally "").
24366 -exeext="$exeext"
24367 -
24368 -# Additional compiler flags for building library objects.
24369 -pic_flag=$lt_lt_prog_compiler_pic
24370 -pic_mode=$pic_mode
24371 -
24372 -# What is the maximum length of a command?
24373 -max_cmd_len=$lt_cv_sys_max_cmd_len
24374 -
24375 -# Does compiler simultaneously support -c and -o options?
24376 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o
24377 -
24378 -# Must we lock files when doing compilation?
24379 -need_locks=$lt_need_locks
24380 -
24381 -# Do we need the lib prefix for modules?
24382 -need_lib_prefix=$need_lib_prefix
24383 -
24384 -# Do we need a version for libraries?
24385 -need_version=$need_version
24386 -
24387 -# Whether dlopen is supported.
24388 -dlopen_support=$enable_dlopen
24389 -
24390 -# Whether dlopen of programs is supported.
24391 -dlopen_self=$enable_dlopen_self
24392 -
24393 -# Whether dlopen of statically linked programs is supported.
24394 -dlopen_self_static=$enable_dlopen_self_static
24395 -
24396 -# Compiler flag to prevent dynamic linking.
24397 -link_static_flag=$lt_lt_prog_compiler_static
24398 -
24399 -# Compiler flag to turn off builtin functions.
24400 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
24401 -
24402 -# Compiler flag to allow reflexive dlopens.
24403 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
24404 -
24405 -# Compiler flag to generate shared objects directly from archives.
24406 -whole_archive_flag_spec=$lt_whole_archive_flag_spec
24407 -
24408 -# Compiler flag to generate thread-safe objects.
24409 -thread_safe_flag_spec=$lt_thread_safe_flag_spec
24410 -
24411 -# Library versioning type.
24412 -version_type=$version_type
24413 -
24414 -# Format of library name prefix.
24415 -libname_spec=$lt_libname_spec
24416 -
24417 -# List of archive names. First name is the real one, the rest are links.
24418 -# The last name is the one that the linker finds with -lNAME.
24419 -library_names_spec=$lt_library_names_spec
24420 -
24421 -# The coded name of the library, if different from the real name.
24422 -soname_spec=$lt_soname_spec
24423 -
24424 -# Commands used to build and install an old-style archive.
24425 -RANLIB=$lt_RANLIB
24426 -old_archive_cmds=$lt_old_archive_cmds
24427 -old_postinstall_cmds=$lt_old_postinstall_cmds
24428 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
24429 -
24430 -# Create an old-style archive from a shared archive.
24431 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
24432 -
24433 -# Create a temporary old-style archive to link instead of a shared archive.
24434 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
24435 -
24436 -# Commands used to build and install a shared archive.
24437 -archive_cmds=$lt_archive_cmds
24438 -archive_expsym_cmds=$lt_archive_expsym_cmds
24439 -postinstall_cmds=$lt_postinstall_cmds
24440 -postuninstall_cmds=$lt_postuninstall_cmds
24441 -
24442 -# Commands used to build a loadable module (assumed same as above if empty)
24443 -module_cmds=$lt_module_cmds
24444 -module_expsym_cmds=$lt_module_expsym_cmds
24445 -
24446 -# Commands to strip libraries.
24447 -old_striplib=$lt_old_striplib
24448 -striplib=$lt_striplib
24449 -
24450 -# Dependencies to place before the objects being linked to create a
24451 -# shared library.
24452 -predep_objects=$lt_predep_objects
24453 -
24454 -# Dependencies to place after the objects being linked to create a
24455 -# shared library.
24456 -postdep_objects=$lt_postdep_objects
24457 -
24458 -# Dependencies to place before the objects being linked to create a
24459 -# shared library.
24460 -predeps=$lt_predeps
24461 -
24462 -# Dependencies to place after the objects being linked to create a
24463 -# shared library.
24464 -postdeps=$lt_postdeps
24465 -
24466 -# The directories searched by this compiler when creating a shared
24467 -# library
24468 -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
24469 -
24470 -# The library search path used internally by the compiler when linking
24471 -# a shared library.
24472 -compiler_lib_search_path=$lt_compiler_lib_search_path
24473 -
24474 -# Method to check whether dependent libraries are shared objects.
24475 -deplibs_check_method=$lt_deplibs_check_method
24476 -
24477 -# Command to use when deplibs_check_method == file_magic.
24478 -file_magic_cmd=$lt_file_magic_cmd
24479 -
24480 -# Flag that allows shared libraries with undefined symbols to be built.
24481 -allow_undefined_flag=$lt_allow_undefined_flag
24482 -
24483 -# Flag that forces no undefined symbols.
24484 -no_undefined_flag=$lt_no_undefined_flag
24485 -
24486 -# Commands used to finish a libtool library installation in a directory.
24487 -finish_cmds=$lt_finish_cmds
24488 -
24489 -# Same as above, but a single script fragment to be evaled but not shown.
24490 -finish_eval=$lt_finish_eval
24491 -
24492 -# Take the output of nm and produce a listing of raw symbols and C names.
24493 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
24494 -
24495 -# Transform the output of nm in a proper C declaration
24496 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
24497 -
24498 -# Transform the output of nm in a C name address pair
24499 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
24500 -
24501 -# This is the shared library runtime path variable.
24502 -runpath_var=$runpath_var
24503 -
24504 -# This is the shared library path variable.
24505 -shlibpath_var=$shlibpath_var
24506 -
24507 -# Is shlibpath searched before the hard-coded library search path?
24508 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
24509 -
24510 -# How to hardcode a shared library path into an executable.
24511 -hardcode_action=$hardcode_action
24512 -
24513 -# Whether we should hardcode library paths into libraries.
24514 -hardcode_into_libs=$hardcode_into_libs
24515 -
24516 -# Flag to hardcode \$libdir into a binary during linking.
24517 -# This must work even if \$libdir does not exist.
24518 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
24519 -
24520 -# If ld is used when linking, flag to hardcode \$libdir into
24521 -# a binary during linking. This must work even if \$libdir does
24522 -# not exist.
24523 -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
24524 -
24525 -# Whether we need a single -rpath flag with a separated argument.
24526 -hardcode_libdir_separator=$lt_hardcode_libdir_separator
24527 -
24528 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
24529 -# resulting binary.
24530 -hardcode_direct=$hardcode_direct
24531 -
24532 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
24533 -# resulting binary.
24534 -hardcode_minus_L=$hardcode_minus_L
24535 -
24536 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
24537 -# the resulting binary.
24538 -hardcode_shlibpath_var=$hardcode_shlibpath_var
24539 -
24540 -# Set to yes if building a shared library automatically hardcodes DIR into the library
24541 -# and all subsequent libraries and executables linked against it.
24542 -hardcode_automatic=$hardcode_automatic
24543 -
24544 -# Variables whose values should be saved in libtool wrapper scripts and
24545 -# restored at relink time.
24546 -variables_saved_for_relink="$variables_saved_for_relink"
24547 -
24548 -# Whether libtool must link a program against all its dependency libraries.
24549 -link_all_deplibs=$link_all_deplibs
24550 -
24551 -# Compile-time system search path for libraries
24552 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
24553 -
24554 -# Run-time system search path for libraries
24555 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
24556 -
24557 -# Fix the shell variable \$srcfile for the compiler.
24558 -fix_srcfile_path=$lt_fix_srcfile_path
24559 -
24560 -# Set to yes if exported symbols are required.
24561 -always_export_symbols=$always_export_symbols
24562 -
24563 -# The commands to list exported symbols.
24564 -export_symbols_cmds=$lt_export_symbols_cmds
24565 -
24566 -# The commands to extract the exported symbol list from a shared archive.
24567 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
24568 -
24569 -# Symbols that should not be listed in the preloaded symbols.
24570 -exclude_expsyms=$lt_exclude_expsyms
24571 -
24572 -# Symbols that must always be exported.
24573 -include_expsyms=$lt_include_expsyms
24574 -
24575 -# ### END LIBTOOL CONFIG
24576 -
24577 -__EOF__
24578 -
24579 -
24580 - case $host_os in
24581 - aix3*)
24582 - cat <<\EOF >> "$cfgfile"
24583 -
24584 -# AIX sometimes has problems with the GCC collect2 program. For some
24585 -# reason, if we set the COLLECT_NAMES environment variable, the problems
24586 -# vanish in a puff of smoke.
24587 -if test "X${COLLECT_NAMES+set}" != Xset; then
24588 - COLLECT_NAMES=
24589 - export COLLECT_NAMES
24590 -fi
24591 -EOF
24592 - ;;
24593 - esac
24594 -
24595 - # We use sed instead of cat because bash on DJGPP gets confused if
24596 - # if finds mixed CR/LF and LF-only lines. Since sed operates in
24597 - # text mode, it properly converts lines to CR/LF. This bash problem
24598 - # is reportedly fixed, but why not run on old versions too?
24599 - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
24600 -
24601 - mv -f "$cfgfile" "$ofile" || \
24602 - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
24603 - chmod +x "$ofile"
24604 -
24605 -else
24606 - # If there is no Makefile yet, we rely on a make rule to execute
24607 - # `config.status --recheck' to rerun these tests and create the
24608 - # libtool script then.
24609 - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
24610 - if test -f "$ltmain_in"; then
24611 - test -f Makefile && make "$ltmain"
24612 - fi
24613 -fi
24614 -
24615 -
24616 -ac_ext=c
24617 -ac_cpp='$CPP $CPPFLAGS'
24618 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
24619 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
24620 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
24621 -
24622 -CC="$lt_save_CC"
24623 -
24624 -
24625 -# Check whether --with-tags was given.
24626 -if test "${with_tags+set}" = set; then
24627 - withval=$with_tags; tagnames="$withval"
24628 -fi
24629 -
24630 -
24631 -if test -f "$ltmain" && test -n "$tagnames"; then
24632 - if test ! -f "${ofile}"; then
24633 - { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
24634 -$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
24635 - fi
24636 -
24637 - if test -z "$LTCC"; then
24638 - eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
24639 - if test -z "$LTCC"; then
24640 - { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
24641 -$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
24642 - else
24643 - { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
24644 -$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
24645 - fi
24646 - fi
24647 - if test -z "$LTCFLAGS"; then
24648 - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
24649 - fi
24650 -
24651 - # Extract list of available tagged configurations in $ofile.
24652 - # Note that this assumes the entire list is on one line.
24653 - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
24654 -
24655 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
24656 - for tagname in $tagnames; do
24657 - IFS="$lt_save_ifs"
24658 - # Check whether tagname contains only valid characters
24659 - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
24660 - "") ;;
24661 - *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
24662 -$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
24663 - { (exit 1); exit 1; }; }
24664 - ;;
24665 - esac
24666 -
24667 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
24668 - then
24669 - { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
24670 -$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
24671 - { (exit 1); exit 1; }; }
24672 - fi
24673 -
24674 - # Update the list of available tags.
24675 - if test -n "$tagname"; then
24676 - echo appending configuration tag \"$tagname\" to $ofile
24677 -
24678 - case $tagname in
24679 - CXX)
24680 - if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
24681 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
24682 - (test "X$CXX" != "Xg++"))) ; then
24683 - ac_ext=cpp
24684 -ac_cpp='$CXXCPP $CPPFLAGS'
24685 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
24686 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
24687 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
24688 -
24689 -
24690 -
24691 -
24692 -archive_cmds_need_lc_CXX=no
24693 -allow_undefined_flag_CXX=
24694 -always_export_symbols_CXX=no
24695 -archive_expsym_cmds_CXX=
24696 -export_dynamic_flag_spec_CXX=
24697 -hardcode_direct_CXX=no
24698 -hardcode_libdir_flag_spec_CXX=
24699 -hardcode_libdir_flag_spec_ld_CXX=
24700 -hardcode_libdir_separator_CXX=
24701 -hardcode_minus_L_CXX=no
24702 -hardcode_shlibpath_var_CXX=unsupported
24703 -hardcode_automatic_CXX=no
24704 -module_cmds_CXX=
24705 -module_expsym_cmds_CXX=
24706 -link_all_deplibs_CXX=unknown
24707 -old_archive_cmds_CXX=$old_archive_cmds
24708 -no_undefined_flag_CXX=
24709 -whole_archive_flag_spec_CXX=
24710 -enable_shared_with_static_runtimes_CXX=no
24711 -
24712 -# Dependencies to place before and after the object being linked:
24713 -predep_objects_CXX=
24714 -postdep_objects_CXX=
24715 -predeps_CXX=
24716 -postdeps_CXX=
24717 -compiler_lib_search_path_CXX=
24718 -compiler_lib_search_dirs_CXX=
24719 -
24720 -# Source file extension for C++ test sources.
24721 -ac_ext=cpp
24722 -
24723 -# Object file extension for compiled C++ test sources.
24724 -objext=o
24725 -objext_CXX=$objext
24726 -
24727 -# Code to be used in simple compile tests
24728 -lt_simple_compile_test_code="int some_variable = 0;"
24729 -
24730 -# Code to be used in simple link tests
24731 -lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
24732 -
24733 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
24734 -
24735 -# If no C compiler was specified, use CC.
24736 -LTCC=${LTCC-"$CC"}
24737 -
24738 -# If no C compiler flags were specified, use CFLAGS.
24739 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
24740 -
24741 -# Allow CC to be a program name with arguments.
24742 -compiler=$CC
24743 -
24744 -
24745 -# save warnings/boilerplate of simple test code
24746 -ac_outfile=conftest.$ac_objext
24747 -echo "$lt_simple_compile_test_code" >conftest.$ac_ext
24748 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
24749 -_lt_compiler_boilerplate=`cat conftest.err`
24750 -$rm conftest*
24751 -
24752 -ac_outfile=conftest.$ac_objext
24753 -echo "$lt_simple_link_test_code" >conftest.$ac_ext
24754 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
24755 -_lt_linker_boilerplate=`cat conftest.err`
24756 -$rm -r conftest*
24757 -
24758 -
24759 -# Allow CC to be a program name with arguments.
24760 -lt_save_CC=$CC
24761 -lt_save_LD=$LD
24762 -lt_save_GCC=$GCC
24763 -GCC=$GXX
24764 -lt_save_with_gnu_ld=$with_gnu_ld
24765 -lt_save_path_LD=$lt_cv_path_LD
24766 -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
24767 - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
24768 -else
24769 - $as_unset lt_cv_prog_gnu_ld
24770 -fi
24771 -if test -n "${lt_cv_path_LDCXX+set}"; then
24772 - lt_cv_path_LD=$lt_cv_path_LDCXX
24773 -else
24774 - $as_unset lt_cv_path_LD
24775 -fi
24776 -test -z "${LDCXX+set}" || LD=$LDCXX
24777 -CC=${CXX-"c++"}
24778 -compiler=$CC
24779 -compiler_CXX=$CC
24780 -for cc_temp in $compiler""; do
24781 - case $cc_temp in
24782 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
24783 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
24784 - \-*) ;;
24785 - *) break;;
24786 - esac
24787 -done
24788 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
24789 -
24790 -
24791 -# We don't want -fno-exception wen compiling C++ code, so set the
24792 -# no_builtin_flag separately
24793 -if test "$GXX" = yes; then
24794 - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
24795 -else
24796 - lt_prog_compiler_no_builtin_flag_CXX=
24797 -fi
24798 -
24799 -if test "$GXX" = yes; then
24800 - # Set up default GNU C++ configuration
24801 -
24802 -
24803 -# Check whether --with-gnu-ld was given.
24804 -if test "${with_gnu_ld+set}" = set; then
24805 - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
24806 -else
24807 - with_gnu_ld=no
24808 -fi
24809 -
24810 -ac_prog=ld
24811 -if test "$GCC" = yes; then
24812 - # Check if gcc -print-prog-name=ld gives a path.
24813 - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
24814 -$as_echo_n "checking for ld used by $CC... " >&6; }
24815 - case $host in
24816 - *-*-mingw*)
24817 - # gcc leaves a trailing carriage return which upsets mingw
24818 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
24819 - *)
24820 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
24821 - esac
24822 - case $ac_prog in
24823 - # Accept absolute paths.
24824 - [\\/]* | ?:[\\/]*)
24825 - re_direlt='/[^/][^/]*/\.\./'
24826 - # Canonicalize the pathname of ld
24827 - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
24828 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
24829 - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
24830 - done
24831 - test -z "$LD" && LD="$ac_prog"
24832 - ;;
24833 - "")
24834 - # If it fails, then pretend we aren't using GCC.
24835 - ac_prog=ld
24836 - ;;
24837 - *)
24838 - # If it is relative, then search for the first ld in PATH.
24839 - with_gnu_ld=unknown
24840 - ;;
24841 - esac
24842 -elif test "$with_gnu_ld" = yes; then
24843 - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
24844 -$as_echo_n "checking for GNU ld... " >&6; }
24845 -else
24846 - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
24847 -$as_echo_n "checking for non-GNU ld... " >&6; }
24848 -fi
24849 -if test "${lt_cv_path_LD+set}" = set; then
24850 - $as_echo_n "(cached) " >&6
24851 -else
24852 - if test -z "$LD"; then
24853 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
24854 - for ac_dir in $PATH; do
24855 - IFS="$lt_save_ifs"
24856 - test -z "$ac_dir" && ac_dir=.
24857 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
24858 - lt_cv_path_LD="$ac_dir/$ac_prog"
24859 - # Check to see if the program is GNU ld. I'd rather use --version,
24860 - # but apparently some variants of GNU ld only accept -v.
24861 - # Break only if it was the GNU/non-GNU ld that we prefer.
24862 - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
24863 - *GNU* | *'with BFD'*)
24864 - test "$with_gnu_ld" != no && break
24865 - ;;
24866 - *)
24867 - test "$with_gnu_ld" != yes && break
24868 - ;;
24869 - esac
24870 - fi
24871 - done
24872 - IFS="$lt_save_ifs"
24873 -else
24874 - lt_cv_path_LD="$LD" # Let the user override the test with a path.
24875 -fi
24876 -fi
24877 -
24878 -LD="$lt_cv_path_LD"
24879 -if test -n "$LD"; then
24880 - { $as_echo "$as_me:$LINENO: result: $LD" >&5
24881 -$as_echo "$LD" >&6; }
24882 -else
24883 - { $as_echo "$as_me:$LINENO: result: no" >&5
24884 -$as_echo "no" >&6; }
24885 -fi
24886 -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
24887 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
24888 - { (exit 1); exit 1; }; }
24889 -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
24890 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
24891 -if test "${lt_cv_prog_gnu_ld+set}" = set; then
24892 - $as_echo_n "(cached) " >&6
24893 -else
24894 - # I'd rather use --version here, but apparently some GNU lds only accept -v.
24895 -case `$LD -v 2>&1 </dev/null` in
24896 -*GNU* | *'with BFD'*)
24897 - lt_cv_prog_gnu_ld=yes
24898 - ;;
24899 -*)
24900 - lt_cv_prog_gnu_ld=no
24901 - ;;
24902 -esac
24903 -fi
24904 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
24905 -$as_echo "$lt_cv_prog_gnu_ld" >&6; }
24906 -with_gnu_ld=$lt_cv_prog_gnu_ld
24907 -
24908 -
24909 -
24910 - # Check if GNU C++ uses GNU ld as the underlying linker, since the
24911 - # archiving commands below assume that GNU ld is being used.
24912 - if test "$with_gnu_ld" = yes; then
24913 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
24914 - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
24915 -
24916 - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
24917 - export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
24918 -
24919 - # If archive_cmds runs LD, not CC, wlarc should be empty
24920 - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
24921 - # investigate it a little bit more. (MM)
24922 - wlarc='${wl}'
24923 -
24924 - # ancient GNU ld didn't support --whole-archive et. al.
24925 - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
24926 - grep 'no-whole-archive' > /dev/null; then
24927 - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
24928 - else
24929 - whole_archive_flag_spec_CXX=
24930 - fi
24931 - else
24932 - with_gnu_ld=no
24933 - wlarc=
24934 -
24935 - # A generic and very simple default shared library creation
24936 - # command for GNU C++ for the case where it uses the native
24937 - # linker, instead of GNU ld. If possible, this setting should
24938 - # overridden to take advantage of the native linker features on
24939 - # the platform it is being used on.
24940 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
24941 - fi
24942 -
24943 - # Commands to make compiler produce verbose output that lists
24944 - # what "hidden" libraries, object files and flags are used when
24945 - # linking a shared library.
24946 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
24947 -
24948 -else
24949 - GXX=no
24950 - with_gnu_ld=no
24951 - wlarc=
24952 -fi
24953 -
24954 -# PORTME: fill in a description of your system's C++ link characteristics
24955 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
24956 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
24957 -ld_shlibs_CXX=yes
24958 -case $host_os in
24959 - aix3*)
24960 - # FIXME: insert proper C++ library support
24961 - ld_shlibs_CXX=no
24962 - ;;
24963 - aix[4-9]*)
24964 - if test "$host_cpu" = ia64; then
24965 - # On IA64, the linker does run time linking by default, so we don't
24966 - # have to do anything special.
24967 - aix_use_runtimelinking=no
24968 - exp_sym_flag='-Bexport'
24969 - no_entry_flag=""
24970 - else
24971 - aix_use_runtimelinking=no
24972 -
24973 - # Test if we are trying to use run time linking or normal
24974 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
24975 - # need to do runtime linking.
24976 - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
24977 - for ld_flag in $LDFLAGS; do
24978 - case $ld_flag in
24979 - *-brtl*)
24980 - aix_use_runtimelinking=yes
24981 - break
24982 - ;;
24983 - esac
24984 - done
24985 - ;;
24986 - esac
24987 -
24988 - exp_sym_flag='-bexport'
24989 - no_entry_flag='-bnoentry'
24990 - fi
24991 -
24992 - # When large executables or shared objects are built, AIX ld can
24993 - # have problems creating the table of contents. If linking a library
24994 - # or program results in "error TOC overflow" add -mminimal-toc to
24995 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
24996 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
24997 -
24998 - archive_cmds_CXX=''
24999 - hardcode_direct_CXX=yes
25000 - hardcode_libdir_separator_CXX=':'
25001 - link_all_deplibs_CXX=yes
25002 -
25003 - if test "$GXX" = yes; then
25004 - case $host_os in aix4.[012]|aix4.[012].*)
25005 - # We only want to do this on AIX 4.2 and lower, the check
25006 - # below for broken collect2 doesn't work under 4.3+
25007 - collect2name=`${CC} -print-prog-name=collect2`
25008 - if test -f "$collect2name" && \
25009 - strings "$collect2name" | grep resolve_lib_name >/dev/null
25010 - then
25011 - # We have reworked collect2
25012 - :
25013 - else
25014 - # We have old collect2
25015 - hardcode_direct_CXX=unsupported
25016 - # It fails to find uninstalled libraries when the uninstalled
25017 - # path is not listed in the libpath. Setting hardcode_minus_L
25018 - # to unsupported forces relinking
25019 - hardcode_minus_L_CXX=yes
25020 - hardcode_libdir_flag_spec_CXX='-L$libdir'
25021 - hardcode_libdir_separator_CXX=
25022 - fi
25023 - ;;
25024 - esac
25025 - shared_flag='-shared'
25026 - if test "$aix_use_runtimelinking" = yes; then
25027 - shared_flag="$shared_flag "'${wl}-G'
25028 - fi
25029 - else
25030 - # not using gcc
25031 - if test "$host_cpu" = ia64; then
25032 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
25033 - # chokes on -Wl,-G. The following line is correct:
25034 - shared_flag='-G'
25035 - else
25036 - if test "$aix_use_runtimelinking" = yes; then
25037 - shared_flag='${wl}-G'
25038 - else
25039 - shared_flag='${wl}-bM:SRE'
25040 - fi
25041 - fi
25042 - fi
25043 -
25044 - # It seems that -bexpall does not export symbols beginning with
25045 - # underscore (_), so it is better to generate a list of symbols to export.
25046 - always_export_symbols_CXX=yes
25047 - if test "$aix_use_runtimelinking" = yes; then
25048 - # Warning - without using the other runtime loading flags (-brtl),
25049 - # -berok will link without error, but may produce a broken library.
25050 - allow_undefined_flag_CXX='-berok'
25051 - # Determine the default libpath from the value encoded in an empty executable.
25052 - cat >conftest.$ac_ext <<_ACEOF
25053 -/* confdefs.h. */
25054 -_ACEOF
25055 -cat confdefs.h >>conftest.$ac_ext
25056 -cat >>conftest.$ac_ext <<_ACEOF
25057 -/* end confdefs.h. */
25058 -
25059 -int
25060 -main ()
25061 -{
25062 -
25063 - ;
25064 - return 0;
25065 -}
25066 -_ACEOF
25067 -rm -f conftest.$ac_objext conftest$ac_exeext
25068 -if { (ac_try="$ac_link"
25069 -case "(($ac_try" in
25070 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25071 - *) ac_try_echo=$ac_try;;
25072 -esac
25073 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25074 -$as_echo "$ac_try_echo") >&5
25075 - (eval "$ac_link") 2>conftest.er1
25076 - ac_status=$?
25077 - grep -v '^ *+' conftest.er1 >conftest.err
25078 - rm -f conftest.er1
25079 - cat conftest.err >&5
25080 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25081 - (exit $ac_status); } && {
25082 - test -z "$ac_cxx_werror_flag" ||
25083 - test ! -s conftest.err
25084 - } && test -s conftest$ac_exeext && {
25085 - test "$cross_compiling" = yes ||
25086 - $as_test_x conftest$ac_exeext
25087 - }; then
25088 -
25089 -lt_aix_libpath_sed='
25090 - /Import File Strings/,/^$/ {
25091 - /^0/ {
25092 - s/^0 *\(.*\)$/\1/
25093 - p
25094 - }
25095 - }'
25096 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
25097 -# Check for a 64-bit object if we didn't find anything.
25098 -if test -z "$aix_libpath"; then
25099 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
25100 -fi
25101 -else
25102 - $as_echo "$as_me: failed program was:" >&5
25103 -sed 's/^/| /' conftest.$ac_ext >&5
25104 -
25105 -
25106 -fi
25107 -
25108 -rm -rf conftest.dSYM
25109 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25110 - conftest$ac_exeext conftest.$ac_ext
25111 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
25112 -
25113 - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
25114 -
25115 - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
25116 - else
25117 - if test "$host_cpu" = ia64; then
25118 - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
25119 - allow_undefined_flag_CXX="-z nodefs"
25120 - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
25121 - else
25122 - # Determine the default libpath from the value encoded in an empty executable.
25123 - cat >conftest.$ac_ext <<_ACEOF
25124 -/* confdefs.h. */
25125 -_ACEOF
25126 -cat confdefs.h >>conftest.$ac_ext
25127 -cat >>conftest.$ac_ext <<_ACEOF
25128 -/* end confdefs.h. */
25129 -
25130 -int
25131 -main ()
25132 -{
25133 -
25134 - ;
25135 - return 0;
25136 -}
25137 -_ACEOF
25138 -rm -f conftest.$ac_objext conftest$ac_exeext
25139 -if { (ac_try="$ac_link"
25140 -case "(($ac_try" in
25141 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25142 - *) ac_try_echo=$ac_try;;
25143 -esac
25144 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25145 -$as_echo "$ac_try_echo") >&5
25146 - (eval "$ac_link") 2>conftest.er1
25147 - ac_status=$?
25148 - grep -v '^ *+' conftest.er1 >conftest.err
25149 - rm -f conftest.er1
25150 - cat conftest.err >&5
25151 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25152 - (exit $ac_status); } && {
25153 - test -z "$ac_cxx_werror_flag" ||
25154 - test ! -s conftest.err
25155 - } && test -s conftest$ac_exeext && {
25156 - test "$cross_compiling" = yes ||
25157 - $as_test_x conftest$ac_exeext
25158 - }; then
25159 -
25160 -lt_aix_libpath_sed='
25161 - /Import File Strings/,/^$/ {
25162 - /^0/ {
25163 - s/^0 *\(.*\)$/\1/
25164 - p
25165 - }
25166 - }'
25167 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
25168 -# Check for a 64-bit object if we didn't find anything.
25169 -if test -z "$aix_libpath"; then
25170 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
25171 -fi
25172 -else
25173 - $as_echo "$as_me: failed program was:" >&5
25174 -sed 's/^/| /' conftest.$ac_ext >&5
25175 -
25176 -
25177 -fi
25178 -
25179 -rm -rf conftest.dSYM
25180 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25181 - conftest$ac_exeext conftest.$ac_ext
25182 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
25183 -
25184 - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
25185 - # Warning - without using the other run time loading flags,
25186 - # -berok will link without error, but may produce a broken library.
25187 - no_undefined_flag_CXX=' ${wl}-bernotok'
25188 - allow_undefined_flag_CXX=' ${wl}-berok'
25189 - # Exported symbols can be pulled into shared objects from archives
25190 - whole_archive_flag_spec_CXX='$convenience'
25191 - archive_cmds_need_lc_CXX=yes
25192 - # This is similar to how AIX traditionally builds its shared libraries.
25193 - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
25194 - fi
25195 - fi
25196 - ;;
25197 -
25198 - beos*)
25199 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
25200 - allow_undefined_flag_CXX=unsupported
25201 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
25202 - # support --undefined. This deserves some investigation. FIXME
25203 - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
25204 - else
25205 - ld_shlibs_CXX=no
25206 - fi
25207 - ;;
25208 -
25209 - chorus*)
25210 - case $cc_basename in
25211 - *)
25212 - # FIXME: insert proper C++ library support
25213 - ld_shlibs_CXX=no
25214 - ;;
25215 - esac
25216 - ;;
25217 -
25218 - cygwin* | mingw* | pw32*)
25219 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
25220 - # as there is no search path for DLLs.
25221 - hardcode_libdir_flag_spec_CXX='-L$libdir'
25222 - allow_undefined_flag_CXX=unsupported
25223 - always_export_symbols_CXX=no
25224 - enable_shared_with_static_runtimes_CXX=yes
25225 -
25226 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
25227 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
25228 - # If the export-symbols file already is a .def file (1st line
25229 - # is EXPORTS), use it as is; otherwise, prepend...
25230 - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
25231 - cp $export_symbols $output_objdir/$soname.def;
25232 - else
25233 - echo EXPORTS > $output_objdir/$soname.def;
25234 - cat $export_symbols >> $output_objdir/$soname.def;
25235 - fi~
25236 - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
25237 - else
25238 - ld_shlibs_CXX=no
25239 - fi
25240 - ;;
25241 - darwin* | rhapsody*)
25242 - archive_cmds_need_lc_CXX=no
25243 - hardcode_direct_CXX=no
25244 - hardcode_automatic_CXX=yes
25245 - hardcode_shlibpath_var_CXX=unsupported
25246 - whole_archive_flag_spec_CXX=''
25247 - link_all_deplibs_CXX=yes
25248 - allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
25249 - if test "$GXX" = yes ; then
25250 - output_verbose_link_cmd='echo'
25251 - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
25252 - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
25253 - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
25254 - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
25255 - if test "$lt_cv_apple_cc_single_mod" != "yes"; then
25256 - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
25257 - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
25258 - fi
25259 - else
25260 - case $cc_basename in
25261 - xlc*)
25262 - output_verbose_link_cmd='echo'
25263 - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
25264 - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
25265 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
25266 - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
25267 - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
25268 - ;;
25269 - *)
25270 - ld_shlibs_CXX=no
25271 - ;;
25272 - esac
25273 - fi
25274 - ;;
25275 -
25276 - dgux*)
25277 - case $cc_basename in
25278 - ec++*)
25279 - # FIXME: insert proper C++ library support
25280 - ld_shlibs_CXX=no
25281 - ;;
25282 - ghcx*)
25283 - # Green Hills C++ Compiler
25284 - # FIXME: insert proper C++ library support
25285 - ld_shlibs_CXX=no
25286 - ;;
25287 - *)
25288 - # FIXME: insert proper C++ library support
25289 - ld_shlibs_CXX=no
25290 - ;;
25291 - esac
25292 - ;;
25293 - freebsd[12]*)
25294 - # C++ shared libraries reported to be fairly broken before switch to ELF
25295 - ld_shlibs_CXX=no
25296 - ;;
25297 - freebsd-elf*)
25298 - archive_cmds_need_lc_CXX=no
25299 - ;;
25300 - freebsd* | dragonfly*)
25301 - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
25302 - # conventions
25303 - ld_shlibs_CXX=yes
25304 - ;;
25305 - gnu*)
25306 - ;;
25307 - hpux9*)
25308 - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
25309 - hardcode_libdir_separator_CXX=:
25310 - export_dynamic_flag_spec_CXX='${wl}-E'
25311 - hardcode_direct_CXX=yes
25312 - hardcode_minus_L_CXX=yes # Not in the search PATH,
25313 - # but as the default
25314 - # location of the library.
25315 -
25316 - case $cc_basename in
25317 - CC*)
25318 - # FIXME: insert proper C++ library support
25319 - ld_shlibs_CXX=no
25320 - ;;
25321 - aCC*)
25322 - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
25323 - # Commands to make compiler produce verbose output that lists
25324 - # what "hidden" libraries, object files and flags are used when
25325 - # linking a shared library.
25326 - #
25327 - # There doesn't appear to be a way to prevent this compiler from
25328 - # explicitly linking system object files so we need to strip them
25329 - # from the output so that they don't get included in the library
25330 - # dependencies.
25331 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
25332 - ;;
25333 - *)
25334 - if test "$GXX" = yes; then
25335 - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
25336 - else
25337 - # FIXME: insert proper C++ library support
25338 - ld_shlibs_CXX=no
25339 - fi
25340 - ;;
25341 - esac
25342 - ;;
25343 - hpux10*|hpux11*)
25344 - if test $with_gnu_ld = no; then
25345 - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
25346 - hardcode_libdir_separator_CXX=:
25347 -
25348 - case $host_cpu in
25349 - hppa*64*|ia64*) ;;
25350 - *)
25351 - export_dynamic_flag_spec_CXX='${wl}-E'
25352 - ;;
25353 - esac
25354 - fi
25355 - case $host_cpu in
25356 - hppa*64*|ia64*)
25357 - hardcode_direct_CXX=no
25358 - hardcode_shlibpath_var_CXX=no
25359 - ;;
25360 - *)
25361 - hardcode_direct_CXX=yes
25362 - hardcode_minus_L_CXX=yes # Not in the search PATH,
25363 - # but as the default
25364 - # location of the library.
25365 - ;;
25366 - esac
25367 -
25368 - case $cc_basename in
25369 - CC*)
25370 - # FIXME: insert proper C++ library support
25371 - ld_shlibs_CXX=no
25372 - ;;
25373 - aCC*)
25374 - case $host_cpu in
25375 - hppa*64*)
25376 - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25377 - ;;
25378 - ia64*)
25379 - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25380 - ;;
25381 - *)
25382 - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25383 - ;;
25384 - esac
25385 - # Commands to make compiler produce verbose output that lists
25386 - # what "hidden" libraries, object files and flags are used when
25387 - # linking a shared library.
25388 - #
25389 - # There doesn't appear to be a way to prevent this compiler from
25390 - # explicitly linking system object files so we need to strip them
25391 - # from the output so that they don't get included in the library
25392 - # dependencies.
25393 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
25394 - ;;
25395 - *)
25396 - if test "$GXX" = yes; then
25397 - if test $with_gnu_ld = no; then
25398 - case $host_cpu in
25399 - hppa*64*)
25400 - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25401 - ;;
25402 - ia64*)
25403 - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25404 - ;;
25405 - *)
25406 - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25407 - ;;
25408 - esac
25409 - fi
25410 - else
25411 - # FIXME: insert proper C++ library support
25412 - ld_shlibs_CXX=no
25413 - fi
25414 - ;;
25415 - esac
25416 - ;;
25417 - interix[3-9]*)
25418 - hardcode_direct_CXX=no
25419 - hardcode_shlibpath_var_CXX=no
25420 - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
25421 - export_dynamic_flag_spec_CXX='${wl}-E'
25422 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
25423 - # Instead, shared libraries are loaded at an image base (0x10000000 by
25424 - # default) and relocated if they conflict, which is a slow very memory
25425 - # consuming and fragmenting process. To avoid this, we pick a random,
25426 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
25427 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
25428 - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
25429 - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
25430 - ;;
25431 - irix5* | irix6*)
25432 - case $cc_basename in
25433 - CC*)
25434 - # SGI C++
25435 - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
25436 -
25437 - # Archives containing C++ object files must be created using
25438 - # "CC -ar", where "CC" is the IRIX C++ compiler. This is
25439 - # necessary to make sure instantiated templates are included
25440 - # in the archive.
25441 - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
25442 - ;;
25443 - *)
25444 - if test "$GXX" = yes; then
25445 - if test "$with_gnu_ld" = no; then
25446 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
25447 - else
25448 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
25449 - fi
25450 - fi
25451 - link_all_deplibs_CXX=yes
25452 - ;;
25453 - esac
25454 - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
25455 - hardcode_libdir_separator_CXX=:
25456 - ;;
25457 - linux* | k*bsd*-gnu)
25458 - case $cc_basename in
25459 - KCC*)
25460 - # Kuck and Associates, Inc. (KAI) C++ Compiler
25461 -
25462 - # KCC will only create a shared library if the output file
25463 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
25464 - # to its proper name (with version) after linking.
25465 - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
25466 - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
25467 - # Commands to make compiler produce verbose output that lists
25468 - # what "hidden" libraries, object files and flags are used when
25469 - # linking a shared library.
25470 - #
25471 - # There doesn't appear to be a way to prevent this compiler from
25472 - # explicitly linking system object files so we need to strip them
25473 - # from the output so that they don't get included in the library
25474 - # dependencies.
25475 - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
25476 -
25477 - hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
25478 - export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
25479 -
25480 - # Archives containing C++ object files must be created using
25481 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
25482 - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
25483 - ;;
25484 - icpc*)
25485 - # Intel C++
25486 - with_gnu_ld=yes
25487 - # version 8.0 and above of icpc choke on multiply defined symbols
25488 - # if we add $predep_objects and $postdep_objects, however 7.1 and
25489 - # earlier do not add the objects themselves.
25490 - case `$CC -V 2>&1` in
25491 - *"Version 7."*)
25492 - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
25493 - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
25494 - ;;
25495 - *) # Version 8.0 or newer
25496 - tmp_idyn=
25497 - case $host_cpu in
25498 - ia64*) tmp_idyn=' -i_dynamic';;
25499 - esac
25500 - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
25501 - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
25502 - ;;
25503 - esac
25504 - archive_cmds_need_lc_CXX=no
25505 - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
25506 - export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
25507 - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
25508 - ;;
25509 - pgCC* | pgcpp*)
25510 - # Portland Group C++ compiler
25511 - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
25512 - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
25513 -
25514 - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
25515 - export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
25516 - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
25517 - ;;
25518 - cxx*)
25519 - # Compaq C++
25520 - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
25521 - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
25522 -
25523 - runpath_var=LD_RUN_PATH
25524 - hardcode_libdir_flag_spec_CXX='-rpath $libdir'
25525 - hardcode_libdir_separator_CXX=:
25526 -
25527 - # Commands to make compiler produce verbose output that lists
25528 - # what "hidden" libraries, object files and flags are used when
25529 - # linking a shared library.
25530 - #
25531 - # There doesn't appear to be a way to prevent this compiler from
25532 - # explicitly linking system object files so we need to strip them
25533 - # from the output so that they don't get included in the library
25534 - # dependencies.
25535 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
25536 - ;;
25537 - *)
25538 - case `$CC -V 2>&1 | sed 5q` in
25539 - *Sun\ C*)
25540 - # Sun C++ 5.9
25541 - no_undefined_flag_CXX=' -zdefs'
25542 - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25543 - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
25544 - hardcode_libdir_flag_spec_CXX='-R$libdir'
25545 - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
25546 -
25547 - # Not sure whether something based on
25548 - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
25549 - # would be better.
25550 - output_verbose_link_cmd='echo'
25551 -
25552 - # Archives containing C++ object files must be created using
25553 - # "CC -xar", where "CC" is the Sun C++ compiler. This is
25554 - # necessary to make sure instantiated templates are included
25555 - # in the archive.
25556 - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
25557 - ;;
25558 - esac
25559 - ;;
25560 - esac
25561 - ;;
25562 - lynxos*)
25563 - # FIXME: insert proper C++ library support
25564 - ld_shlibs_CXX=no
25565 - ;;
25566 - m88k*)
25567 - # FIXME: insert proper C++ library support
25568 - ld_shlibs_CXX=no
25569 - ;;
25570 - mvs*)
25571 - case $cc_basename in
25572 - cxx*)
25573 - # FIXME: insert proper C++ library support
25574 - ld_shlibs_CXX=no
25575 - ;;
25576 - *)
25577 - # FIXME: insert proper C++ library support
25578 - ld_shlibs_CXX=no
25579 - ;;
25580 - esac
25581 - ;;
25582 - netbsd* | netbsdelf*-gnu)
25583 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
25584 - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
25585 - wlarc=
25586 - hardcode_libdir_flag_spec_CXX='-R$libdir'
25587 - hardcode_direct_CXX=yes
25588 - hardcode_shlibpath_var_CXX=no
25589 - fi
25590 - # Workaround some broken pre-1.5 toolchains
25591 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
25592 - ;;
25593 - openbsd2*)
25594 - # C++ shared libraries are fairly broken
25595 - ld_shlibs_CXX=no
25596 - ;;
25597 - openbsd*)
25598 - if test -f /usr/libexec/ld.so; then
25599 - hardcode_direct_CXX=yes
25600 - hardcode_shlibpath_var_CXX=no
25601 - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
25602 - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
25603 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
25604 - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
25605 - export_dynamic_flag_spec_CXX='${wl}-E'
25606 - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
25607 - fi
25608 - output_verbose_link_cmd='echo'
25609 - else
25610 - ld_shlibs_CXX=no
25611 - fi
25612 - ;;
25613 - osf3*)
25614 - case $cc_basename in
25615 - KCC*)
25616 - # Kuck and Associates, Inc. (KAI) C++ Compiler
25617 -
25618 - # KCC will only create a shared library if the output file
25619 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
25620 - # to its proper name (with version) after linking.
25621 - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
25622 -
25623 - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
25624 - hardcode_libdir_separator_CXX=:
25625 -
25626 - # Archives containing C++ object files must be created using
25627 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
25628 - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
25629 -
25630 - ;;
25631 - RCC*)
25632 - # Rational C++ 2.4.1
25633 - # FIXME: insert proper C++ library support
25634 - ld_shlibs_CXX=no
25635 - ;;
25636 - cxx*)
25637 - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
25638 - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
25639 -
25640 - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
25641 - hardcode_libdir_separator_CXX=:
25642 -
25643 - # Commands to make compiler produce verbose output that lists
25644 - # what "hidden" libraries, object files and flags are used when
25645 - # linking a shared library.
25646 - #
25647 - # There doesn't appear to be a way to prevent this compiler from
25648 - # explicitly linking system object files so we need to strip them
25649 - # from the output so that they don't get included in the library
25650 - # dependencies.
25651 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
25652 - ;;
25653 - *)
25654 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
25655 - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
25656 - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
25657 -
25658 - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
25659 - hardcode_libdir_separator_CXX=:
25660 -
25661 - # Commands to make compiler produce verbose output that lists
25662 - # what "hidden" libraries, object files and flags are used when
25663 - # linking a shared library.
25664 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
25665 -
25666 - else
25667 - # FIXME: insert proper C++ library support
25668 - ld_shlibs_CXX=no
25669 - fi
25670 - ;;
25671 - esac
25672 - ;;
25673 - osf4* | osf5*)
25674 - case $cc_basename in
25675 - KCC*)
25676 - # Kuck and Associates, Inc. (KAI) C++ Compiler
25677 -
25678 - # KCC will only create a shared library if the output file
25679 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
25680 - # to its proper name (with version) after linking.
25681 - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
25682 -
25683 - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
25684 - hardcode_libdir_separator_CXX=:
25685 -
25686 - # Archives containing C++ object files must be created using
25687 - # the KAI C++ compiler.
25688 - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
25689 - ;;
25690 - RCC*)
25691 - # Rational C++ 2.4.1
25692 - # FIXME: insert proper C++ library support
25693 - ld_shlibs_CXX=no
25694 - ;;
25695 - cxx*)
25696 - allow_undefined_flag_CXX=' -expect_unresolved \*'
25697 - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
25698 - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
25699 - echo "-hidden">> $lib.exp~
25700 - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
25701 - $rm $lib.exp'
25702 -
25703 - hardcode_libdir_flag_spec_CXX='-rpath $libdir'
25704 - hardcode_libdir_separator_CXX=:
25705 -
25706 - # Commands to make compiler produce verbose output that lists
25707 - # what "hidden" libraries, object files and flags are used when
25708 - # linking a shared library.
25709 - #
25710 - # There doesn't appear to be a way to prevent this compiler from
25711 - # explicitly linking system object files so we need to strip them
25712 - # from the output so that they don't get included in the library
25713 - # dependencies.
25714 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
25715 - ;;
25716 - *)
25717 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
25718 - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
25719 - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
25720 -
25721 - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
25722 - hardcode_libdir_separator_CXX=:
25723 -
25724 - # Commands to make compiler produce verbose output that lists
25725 - # what "hidden" libraries, object files and flags are used when
25726 - # linking a shared library.
25727 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
25728 -
25729 - else
25730 - # FIXME: insert proper C++ library support
25731 - ld_shlibs_CXX=no
25732 - fi
25733 - ;;
25734 - esac
25735 - ;;
25736 - psos*)
25737 - # FIXME: insert proper C++ library support
25738 - ld_shlibs_CXX=no
25739 - ;;
25740 - sunos4*)
25741 - case $cc_basename in
25742 - CC*)
25743 - # Sun C++ 4.x
25744 - # FIXME: insert proper C++ library support
25745 - ld_shlibs_CXX=no
25746 - ;;
25747 - lcc*)
25748 - # Lucid
25749 - # FIXME: insert proper C++ library support
25750 - ld_shlibs_CXX=no
25751 - ;;
25752 - *)
25753 - # FIXME: insert proper C++ library support
25754 - ld_shlibs_CXX=no
25755 - ;;
25756 - esac
25757 - ;;
25758 - solaris*)
25759 - case $cc_basename in
25760 - CC*)
25761 - # Sun C++ 4.2, 5.x and Centerline C++
25762 - archive_cmds_need_lc_CXX=yes
25763 - no_undefined_flag_CXX=' -zdefs'
25764 - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
25765 - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
25766 - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
25767 -
25768 - hardcode_libdir_flag_spec_CXX='-R$libdir'
25769 - hardcode_shlibpath_var_CXX=no
25770 - case $host_os in
25771 - solaris2.[0-5] | solaris2.[0-5].*) ;;
25772 - *)
25773 - # The compiler driver will combine and reorder linker options,
25774 - # but understands `-z linker_flag'.
25775 - # Supported since Solaris 2.6 (maybe 2.5.1?)
25776 - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
25777 - ;;
25778 - esac
25779 - link_all_deplibs_CXX=yes
25780 -
25781 - output_verbose_link_cmd='echo'
25782 -
25783 - # Archives containing C++ object files must be created using
25784 - # "CC -xar", where "CC" is the Sun C++ compiler. This is
25785 - # necessary to make sure instantiated templates are included
25786 - # in the archive.
25787 - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
25788 - ;;
25789 - gcx*)
25790 - # Green Hills C++ Compiler
25791 - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
25792 -
25793 - # The C++ compiler must be used to create the archive.
25794 - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
25795 - ;;
25796 - *)
25797 - # GNU C++ compiler with Solaris linker
25798 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
25799 - no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
25800 - if $CC --version | grep -v '^2\.7' > /dev/null; then
25801 - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
25802 - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
25803 - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
25804 -
25805 - # Commands to make compiler produce verbose output that lists
25806 - # what "hidden" libraries, object files and flags are used when
25807 - # linking a shared library.
25808 - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
25809 - else
25810 - # g++ 2.7 appears to require `-G' NOT `-shared' on this
25811 - # platform.
25812 - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
25813 - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
25814 - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
25815 -
25816 - # Commands to make compiler produce verbose output that lists
25817 - # what "hidden" libraries, object files and flags are used when
25818 - # linking a shared library.
25819 - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
25820 - fi
25821 -
25822 - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
25823 - case $host_os in
25824 - solaris2.[0-5] | solaris2.[0-5].*) ;;
25825 - *)
25826 - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
25827 - ;;
25828 - esac
25829 - fi
25830 - ;;
25831 - esac
25832 - ;;
25833 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
25834 - no_undefined_flag_CXX='${wl}-z,text'
25835 - archive_cmds_need_lc_CXX=no
25836 - hardcode_shlibpath_var_CXX=no
25837 - runpath_var='LD_RUN_PATH'
25838 -
25839 - case $cc_basename in
25840 - CC*)
25841 - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
25842 - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
25843 - ;;
25844 - *)
25845 - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
25846 - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
25847 - ;;
25848 - esac
25849 - ;;
25850 - sysv5* | sco3.2v5* | sco5v6*)
25851 - # Note: We can NOT use -z defs as we might desire, because we do not
25852 - # link with -lc, and that would cause any symbols used from libc to
25853 - # always be unresolved, which means just about no library would
25854 - # ever link correctly. If we're not using GNU ld we use -z text
25855 - # though, which does catch some bad symbols but isn't as heavy-handed
25856 - # as -z defs.
25857 - # For security reasons, it is highly recommended that you always
25858 - # use absolute paths for naming shared libraries, and exclude the
25859 - # DT_RUNPATH tag from executables and libraries. But doing so
25860 - # requires that you compile everything twice, which is a pain.
25861 - # So that behaviour is only enabled if SCOABSPATH is set to a
25862 - # non-empty value in the environment. Most likely only useful for
25863 - # creating official distributions of packages.
25864 - # This is a hack until libtool officially supports absolute path
25865 - # names for shared libraries.
25866 - no_undefined_flag_CXX='${wl}-z,text'
25867 - allow_undefined_flag_CXX='${wl}-z,nodefs'
25868 - archive_cmds_need_lc_CXX=no
25869 - hardcode_shlibpath_var_CXX=no
25870 - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
25871 - hardcode_libdir_separator_CXX=':'
25872 - link_all_deplibs_CXX=yes
25873 - export_dynamic_flag_spec_CXX='${wl}-Bexport'
25874 - runpath_var='LD_RUN_PATH'
25875 -
25876 - case $cc_basename in
25877 - CC*)
25878 - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
25879 - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
25880 - ;;
25881 - *)
25882 - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
25883 - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
25884 - ;;
25885 - esac
25886 - ;;
25887 - tandem*)
25888 - case $cc_basename in
25889 - NCC*)
25890 - # NonStop-UX NCC 3.20
25891 - # FIXME: insert proper C++ library support
25892 - ld_shlibs_CXX=no
25893 - ;;
25894 - *)
25895 - # FIXME: insert proper C++ library support
25896 - ld_shlibs_CXX=no
25897 - ;;
25898 - esac
25899 - ;;
25900 - vxworks*)
25901 - # FIXME: insert proper C++ library support
25902 - ld_shlibs_CXX=no
25903 - ;;
25904 - *)
25905 - # FIXME: insert proper C++ library support
25906 - ld_shlibs_CXX=no
25907 - ;;
25908 -esac
25909 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
25910 -$as_echo "$ld_shlibs_CXX" >&6; }
25911 -test "$ld_shlibs_CXX" = no && can_build_shared=no
25912 -
25913 -GCC_CXX="$GXX"
25914 -LD_CXX="$LD"
25915 -
25916 -cat > conftest.$ac_ext <<EOF
25917 -class Foo
25918 -{
25919 -public:
25920 - Foo (void) { a = 0; }
25921 -private:
25922 - int a;
25923 -};
25924 -EOF
25925 -
25926 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
25927 - (eval $ac_compile) 2>&5
25928 - ac_status=$?
25929 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25930 - (exit $ac_status); }; then
25931 - # Parse the compiler output and extract the necessary
25932 - # objects, libraries and library flags.
25933 -
25934 - # Sentinel used to keep track of whether or not we are before
25935 - # the conftest object file.
25936 - pre_test_object_deps_done=no
25937 -
25938 - # The `*' in the case matches for architectures that use `case' in
25939 - # $output_verbose_cmd can trigger glob expansion during the loop
25940 - # eval without this substitution.
25941 - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
25942 -
25943 - for p in `eval $output_verbose_link_cmd`; do
25944 - case $p in
25945 -
25946 - -L* | -R* | -l*)
25947 - # Some compilers place space between "-{L,R}" and the path.
25948 - # Remove the space.
25949 - if test $p = "-L" \
25950 - || test $p = "-R"; then
25951 - prev=$p
25952 - continue
25953 - else
25954 - prev=
25955 - fi
25956 -
25957 - if test "$pre_test_object_deps_done" = no; then
25958 - case $p in
25959 - -L* | -R*)
25960 - # Internal compiler library paths should come after those
25961 - # provided the user. The postdeps already come after the
25962 - # user supplied libs so there is no need to process them.
25963 - if test -z "$compiler_lib_search_path_CXX"; then
25964 - compiler_lib_search_path_CXX="${prev}${p}"
25965 - else
25966 - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
25967 - fi
25968 - ;;
25969 - # The "-l" case would never come before the object being
25970 - # linked, so don't bother handling this case.
25971 - esac
25972 - else
25973 - if test -z "$postdeps_CXX"; then
25974 - postdeps_CXX="${prev}${p}"
25975 - else
25976 - postdeps_CXX="${postdeps_CXX} ${prev}${p}"
25977 - fi
25978 - fi
25979 - ;;
25980 -
25981 - *.$objext)
25982 - # This assumes that the test object file only shows up
25983 - # once in the compiler output.
25984 - if test "$p" = "conftest.$objext"; then
25985 - pre_test_object_deps_done=yes
25986 - continue
25987 - fi
25988 -
25989 - if test "$pre_test_object_deps_done" = no; then
25990 - if test -z "$predep_objects_CXX"; then
25991 - predep_objects_CXX="$p"
25992 - else
25993 - predep_objects_CXX="$predep_objects_CXX $p"
25994 - fi
25995 - else
25996 - if test -z "$postdep_objects_CXX"; then
25997 - postdep_objects_CXX="$p"
25998 - else
25999 - postdep_objects_CXX="$postdep_objects_CXX $p"
26000 - fi
26001 - fi
26002 - ;;
26003 -
26004 - *) ;; # Ignore the rest.
26005 -
26006 - esac
26007 - done
26008 -
26009 - # Clean up.
26010 - rm -f a.out a.exe
26011 -else
26012 - echo "libtool.m4: error: problem compiling CXX test program"
26013 -fi
26014 -
26015 -$rm -f confest.$objext
26016 -
26017 -compiler_lib_search_dirs_CXX=
26018 -if test -n "$compiler_lib_search_path_CXX"; then
26019 - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
26020 -fi
26021 -
26022 -# PORTME: override above test on systems where it is broken
26023 -case $host_os in
26024 -interix[3-9]*)
26025 - # Interix 3.5 installs completely hosed .la files for C++, so rather than
26026 - # hack all around it, let's just trust "g++" to DTRT.
26027 - predep_objects_CXX=
26028 - postdep_objects_CXX=
26029 - postdeps_CXX=
26030 - ;;
26031 -
26032 -linux*)
26033 - case `$CC -V 2>&1 | sed 5q` in
26034 - *Sun\ C*)
26035 - # Sun C++ 5.9
26036 - #
26037 - # The more standards-conforming stlport4 library is
26038 - # incompatible with the Cstd library. Avoid specifying
26039 - # it if it's in CXXFLAGS. Ignore libCrun as
26040 - # -library=stlport4 depends on it.
26041 - case " $CXX $CXXFLAGS " in
26042 - *" -library=stlport4 "*)
26043 - solaris_use_stlport4=yes
26044 - ;;
26045 - esac
26046 - if test "$solaris_use_stlport4" != yes; then
26047 - postdeps_CXX='-library=Cstd -library=Crun'
26048 - fi
26049 - ;;
26050 - esac
26051 - ;;
26052 -
26053 -solaris*)
26054 - case $cc_basename in
26055 - CC*)
26056 - # The more standards-conforming stlport4 library is
26057 - # incompatible with the Cstd library. Avoid specifying
26058 - # it if it's in CXXFLAGS. Ignore libCrun as
26059 - # -library=stlport4 depends on it.
26060 - case " $CXX $CXXFLAGS " in
26061 - *" -library=stlport4 "*)
26062 - solaris_use_stlport4=yes
26063 - ;;
26064 - esac
26065 -
26066 - # Adding this requires a known-good setup of shared libraries for
26067 - # Sun compiler versions before 5.6, else PIC objects from an old
26068 - # archive will be linked into the output, leading to subtle bugs.
26069 - if test "$solaris_use_stlport4" != yes; then
26070 - postdeps_CXX='-library=Cstd -library=Crun'
26071 - fi
26072 - ;;
26073 - esac
26074 - ;;
26075 -esac
26076 -
26077 -case " $postdeps_CXX " in
26078 -*" -lc "*) archive_cmds_need_lc_CXX=no ;;
26079 -esac
26080 -
26081 -lt_prog_compiler_wl_CXX=
26082 -lt_prog_compiler_pic_CXX=
26083 -lt_prog_compiler_static_CXX=
26084 -
26085 -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
26086 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
26087 -
26088 - # C++ specific cases for pic, static, wl, etc.
26089 - if test "$GXX" = yes; then
26090 - lt_prog_compiler_wl_CXX='-Wl,'
26091 - lt_prog_compiler_static_CXX='-static'
26092 -
26093 - case $host_os in
26094 - aix*)
26095 - # All AIX code is PIC.
26096 - if test "$host_cpu" = ia64; then
26097 - # AIX 5 now supports IA64 processor
26098 - lt_prog_compiler_static_CXX='-Bstatic'
26099 - fi
26100 - ;;
26101 - amigaos*)
26102 - # FIXME: we need at least 68020 code to build shared libraries, but
26103 - # adding the `-m68020' flag to GCC prevents building anything better,
26104 - # like `-m68040'.
26105 - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
26106 - ;;
26107 - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
26108 - # PIC is the default for these OSes.
26109 - ;;
26110 - mingw* | cygwin* | os2* | pw32*)
26111 - # This hack is so that the source file can tell whether it is being
26112 - # built for inclusion in a dll (and should export symbols for example).
26113 - # Although the cygwin gcc ignores -fPIC, still need this for old-style
26114 - # (--disable-auto-import) libraries
26115 - lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
26116 - ;;
26117 - darwin* | rhapsody*)
26118 - # PIC is the default on this platform
26119 - # Common symbols not allowed in MH_DYLIB files
26120 - lt_prog_compiler_pic_CXX='-fno-common'
26121 - ;;
26122 - *djgpp*)
26123 - # DJGPP does not support shared libraries at all
26124 - lt_prog_compiler_pic_CXX=
26125 - ;;
26126 - interix[3-9]*)
26127 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
26128 - # Instead, we relocate shared libraries at runtime.
26129 - ;;
26130 - sysv4*MP*)
26131 - if test -d /usr/nec; then
26132 - lt_prog_compiler_pic_CXX=-Kconform_pic
26133 - fi
26134 - ;;
26135 - hpux*)
26136 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
26137 - # not for PA HP-UX.
26138 - case $host_cpu in
26139 - hppa*64*|ia64*)
26140 - ;;
26141 - *)
26142 - lt_prog_compiler_pic_CXX='-fPIC'
26143 - ;;
26144 - esac
26145 - ;;
26146 - *)
26147 - lt_prog_compiler_pic_CXX='-fPIC'
26148 - ;;
26149 - esac
26150 - else
26151 - case $host_os in
26152 - aix[4-9]*)
26153 - # All AIX code is PIC.
26154 - if test "$host_cpu" = ia64; then
26155 - # AIX 5 now supports IA64 processor
26156 - lt_prog_compiler_static_CXX='-Bstatic'
26157 - else
26158 - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
26159 - fi
26160 - ;;
26161 - chorus*)
26162 - case $cc_basename in
26163 - cxch68*)
26164 - # Green Hills C++ Compiler
26165 - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
26166 - ;;
26167 - esac
26168 - ;;
26169 - darwin*)
26170 - # PIC is the default on this platform
26171 - # Common symbols not allowed in MH_DYLIB files
26172 - case $cc_basename in
26173 - xlc*)
26174 - lt_prog_compiler_pic_CXX='-qnocommon'
26175 - lt_prog_compiler_wl_CXX='-Wl,'
26176 - ;;
26177 - esac
26178 - ;;
26179 - dgux*)
26180 - case $cc_basename in
26181 - ec++*)
26182 - lt_prog_compiler_pic_CXX='-KPIC'
26183 - ;;
26184 - ghcx*)
26185 - # Green Hills C++ Compiler
26186 - lt_prog_compiler_pic_CXX='-pic'
26187 - ;;
26188 - *)
26189 - ;;
26190 - esac
26191 - ;;
26192 - freebsd* | dragonfly*)
26193 - # FreeBSD uses GNU C++
26194 - ;;
26195 - hpux9* | hpux10* | hpux11*)
26196 - case $cc_basename in
26197 - CC*)
26198 - lt_prog_compiler_wl_CXX='-Wl,'
26199 - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
26200 - if test "$host_cpu" != ia64; then
26201 - lt_prog_compiler_pic_CXX='+Z'
26202 - fi
26203 - ;;
26204 - aCC*)
26205 - lt_prog_compiler_wl_CXX='-Wl,'
26206 - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
26207 - case $host_cpu in
26208 - hppa*64*|ia64*)
26209 - # +Z the default
26210 - ;;
26211 - *)
26212 - lt_prog_compiler_pic_CXX='+Z'
26213 - ;;
26214 - esac
26215 - ;;
26216 - *)
26217 - ;;
26218 - esac
26219 - ;;
26220 - interix*)
26221 - # This is c89, which is MS Visual C++ (no shared libs)
26222 - # Anyone wants to do a port?
26223 - ;;
26224 - irix5* | irix6* | nonstopux*)
26225 - case $cc_basename in
26226 - CC*)
26227 - lt_prog_compiler_wl_CXX='-Wl,'
26228 - lt_prog_compiler_static_CXX='-non_shared'
26229 - # CC pic flag -KPIC is the default.
26230 - ;;
26231 - *)
26232 - ;;
26233 - esac
26234 - ;;
26235 - linux* | k*bsd*-gnu)
26236 - case $cc_basename in
26237 - KCC*)
26238 - # KAI C++ Compiler
26239 - lt_prog_compiler_wl_CXX='--backend -Wl,'
26240 - lt_prog_compiler_pic_CXX='-fPIC'
26241 - ;;
26242 - icpc* | ecpc*)
26243 - # Intel C++
26244 - lt_prog_compiler_wl_CXX='-Wl,'
26245 - lt_prog_compiler_pic_CXX='-KPIC'
26246 - lt_prog_compiler_static_CXX='-static'
26247 - ;;
26248 - pgCC* | pgcpp*)
26249 - # Portland Group C++ compiler.
26250 - lt_prog_compiler_wl_CXX='-Wl,'
26251 - lt_prog_compiler_pic_CXX='-fpic'
26252 - lt_prog_compiler_static_CXX='-Bstatic'
26253 - ;;
26254 - cxx*)
26255 - # Compaq C++
26256 - # Make sure the PIC flag is empty. It appears that all Alpha
26257 - # Linux and Compaq Tru64 Unix objects are PIC.
26258 - lt_prog_compiler_pic_CXX=
26259 - lt_prog_compiler_static_CXX='-non_shared'
26260 - ;;
26261 - *)
26262 - case `$CC -V 2>&1 | sed 5q` in
26263 - *Sun\ C*)
26264 - # Sun C++ 5.9
26265 - lt_prog_compiler_pic_CXX='-KPIC'
26266 - lt_prog_compiler_static_CXX='-Bstatic'
26267 - lt_prog_compiler_wl_CXX='-Qoption ld '
26268 - ;;
26269 - esac
26270 - ;;
26271 - esac
26272 - ;;
26273 - lynxos*)
26274 - ;;
26275 - m88k*)
26276 - ;;
26277 - mvs*)
26278 - case $cc_basename in
26279 - cxx*)
26280 - lt_prog_compiler_pic_CXX='-W c,exportall'
26281 - ;;
26282 - *)
26283 - ;;
26284 - esac
26285 - ;;
26286 - netbsd* | netbsdelf*-gnu)
26287 - ;;
26288 - osf3* | osf4* | osf5*)
26289 - case $cc_basename in
26290 - KCC*)
26291 - lt_prog_compiler_wl_CXX='--backend -Wl,'
26292 - ;;
26293 - RCC*)
26294 - # Rational C++ 2.4.1
26295 - lt_prog_compiler_pic_CXX='-pic'
26296 - ;;
26297 - cxx*)
26298 - # Digital/Compaq C++
26299 - lt_prog_compiler_wl_CXX='-Wl,'
26300 - # Make sure the PIC flag is empty. It appears that all Alpha
26301 - # Linux and Compaq Tru64 Unix objects are PIC.
26302 - lt_prog_compiler_pic_CXX=
26303 - lt_prog_compiler_static_CXX='-non_shared'
26304 - ;;
26305 - *)
26306 - ;;
26307 - esac
26308 - ;;
26309 - psos*)
26310 - ;;
26311 - solaris*)
26312 - case $cc_basename in
26313 - CC*)
26314 - # Sun C++ 4.2, 5.x and Centerline C++
26315 - lt_prog_compiler_pic_CXX='-KPIC'
26316 - lt_prog_compiler_static_CXX='-Bstatic'
26317 - lt_prog_compiler_wl_CXX='-Qoption ld '
26318 - ;;
26319 - gcx*)
26320 - # Green Hills C++ Compiler
26321 - lt_prog_compiler_pic_CXX='-PIC'
26322 - ;;
26323 - *)
26324 - ;;
26325 - esac
26326 - ;;
26327 - sunos4*)
26328 - case $cc_basename in
26329 - CC*)
26330 - # Sun C++ 4.x
26331 - lt_prog_compiler_pic_CXX='-pic'
26332 - lt_prog_compiler_static_CXX='-Bstatic'
26333 - ;;
26334 - lcc*)
26335 - # Lucid
26336 - lt_prog_compiler_pic_CXX='-pic'
26337 - ;;
26338 - *)
26339 - ;;
26340 - esac
26341 - ;;
26342 - tandem*)
26343 - case $cc_basename in
26344 - NCC*)
26345 - # NonStop-UX NCC 3.20
26346 - lt_prog_compiler_pic_CXX='-KPIC'
26347 - ;;
26348 - *)
26349 - ;;
26350 - esac
26351 - ;;
26352 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
26353 - case $cc_basename in
26354 - CC*)
26355 - lt_prog_compiler_wl_CXX='-Wl,'
26356 - lt_prog_compiler_pic_CXX='-KPIC'
26357 - lt_prog_compiler_static_CXX='-Bstatic'
26358 - ;;
26359 - esac
26360 - ;;
26361 - vxworks*)
26362 - ;;
26363 - *)
26364 - lt_prog_compiler_can_build_shared_CXX=no
26365 - ;;
26366 - esac
26367 - fi
26368 -
26369 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
26370 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
26371 -
26372 -#
26373 -# Check to make sure the PIC flag actually works.
26374 -#
26375 -if test -n "$lt_prog_compiler_pic_CXX"; then
26376 -
26377 -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
26378 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
26379 -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
26380 - $as_echo_n "(cached) " >&6
26381 -else
26382 - lt_cv_prog_compiler_pic_works_CXX=no
26383 - ac_outfile=conftest.$ac_objext
26384 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
26385 - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
26386 - # Insert the option either (1) after the last *FLAGS variable, or
26387 - # (2) before a word containing "conftest.", or (3) at the end.
26388 - # Note that $ac_compile itself does not contain backslashes and begins
26389 - # with a dollar sign (not a hyphen), so the echo should work correctly.
26390 - # The option is referenced via a variable to avoid confusing sed.
26391 - lt_compile=`echo "$ac_compile" | $SED \
26392 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
26393 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
26394 - -e 's:$: $lt_compiler_flag:'`
26395 - (eval echo "\"\$as_me:13134: $lt_compile\"" >&5)
26396 - (eval "$lt_compile" 2>conftest.err)
26397 - ac_status=$?
26398 - cat conftest.err >&5
26399 - echo "$as_me:13138: \$? = $ac_status" >&5
26400 - if (exit $ac_status) && test -s "$ac_outfile"; then
26401 - # The compiler can only warn and ignore the option if not recognized
26402 - # So say no if there are warnings other than the usual output.
26403 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
26404 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
26405 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
26406 - lt_cv_prog_compiler_pic_works_CXX=yes
26407 - fi
26408 - fi
26409 - $rm conftest*
26410 -
26411 -fi
26412 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
26413 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
26414 -
26415 -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
26416 - case $lt_prog_compiler_pic_CXX in
26417 - "" | " "*) ;;
26418 - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
26419 - esac
26420 -else
26421 - lt_prog_compiler_pic_CXX=
26422 - lt_prog_compiler_can_build_shared_CXX=no
26423 -fi
26424 -
26425 -fi
26426 -case $host_os in
26427 - # For platforms which do not support PIC, -DPIC is meaningless:
26428 - *djgpp*)
26429 - lt_prog_compiler_pic_CXX=
26430 - ;;
26431 - *)
26432 - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
26433 - ;;
26434 -esac
26435 -
26436 -#
26437 -# Check to make sure the static flag actually works.
26438 -#
26439 -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
26440 -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
26441 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
26442 -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
26443 - $as_echo_n "(cached) " >&6
26444 -else
26445 - lt_cv_prog_compiler_static_works_CXX=no
26446 - save_LDFLAGS="$LDFLAGS"
26447 - LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
26448 - echo "$lt_simple_link_test_code" > conftest.$ac_ext
26449 - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
26450 - # The linker can only warn and ignore the option if not recognized
26451 - # So say no if there are warnings
26452 - if test -s conftest.err; then
26453 - # Append any errors to the config.log.
26454 - cat conftest.err 1>&5
26455 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
26456 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
26457 - if diff conftest.exp conftest.er2 >/dev/null; then
26458 - lt_cv_prog_compiler_static_works_CXX=yes
26459 - fi
26460 - else
26461 - lt_cv_prog_compiler_static_works_CXX=yes
26462 - fi
26463 - fi
26464 - $rm -r conftest*
26465 - LDFLAGS="$save_LDFLAGS"
26466 -
26467 -fi
26468 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
26469 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
26470 -
26471 -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
26472 - :
26473 -else
26474 - lt_prog_compiler_static_CXX=
26475 -fi
26476 -
26477 -
26478 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
26479 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
26480 -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
26481 - $as_echo_n "(cached) " >&6
26482 -else
26483 - lt_cv_prog_compiler_c_o_CXX=no
26484 - $rm -r conftest 2>/dev/null
26485 - mkdir conftest
26486 - cd conftest
26487 - mkdir out
26488 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
26489 -
26490 - lt_compiler_flag="-o out/conftest2.$ac_objext"
26491 - # Insert the option either (1) after the last *FLAGS variable, or
26492 - # (2) before a word containing "conftest.", or (3) at the end.
26493 - # Note that $ac_compile itself does not contain backslashes and begins
26494 - # with a dollar sign (not a hyphen), so the echo should work correctly.
26495 - lt_compile=`echo "$ac_compile" | $SED \
26496 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
26497 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
26498 - -e 's:$: $lt_compiler_flag:'`
26499 - (eval echo "\"\$as_me:13238: $lt_compile\"" >&5)
26500 - (eval "$lt_compile" 2>out/conftest.err)
26501 - ac_status=$?
26502 - cat out/conftest.err >&5
26503 - echo "$as_me:13242: \$? = $ac_status" >&5
26504 - if (exit $ac_status) && test -s out/conftest2.$ac_objext
26505 - then
26506 - # The compiler can only warn and ignore the option if not recognized
26507 - # So say no if there are warnings
26508 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
26509 - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
26510 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
26511 - lt_cv_prog_compiler_c_o_CXX=yes
26512 - fi
26513 - fi
26514 - chmod u+w . 2>&5
26515 - $rm conftest*
26516 - # SGI C++ compiler will create directory out/ii_files/ for
26517 - # template instantiation
26518 - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
26519 - $rm out/* && rmdir out
26520 - cd ..
26521 - rmdir conftest
26522 - $rm conftest*
26523 -
26524 -fi
26525 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
26526 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
26527 -
26528 -
26529 -hard_links="nottested"
26530 -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
26531 - # do not overwrite the value of need_locks provided by the user
26532 - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
26533 -$as_echo_n "checking if we can lock with hard links... " >&6; }
26534 - hard_links=yes
26535 - $rm conftest*
26536 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
26537 - touch conftest.a
26538 - ln conftest.a conftest.b 2>&5 || hard_links=no
26539 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
26540 - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
26541 -$as_echo "$hard_links" >&6; }
26542 - if test "$hard_links" = no; then
26543 - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
26544 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
26545 - need_locks=warn
26546 - fi
26547 -else
26548 - need_locks=no
26549 -fi
26550 -
26551 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
26552 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
26553 -
26554 - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
26555 - case $host_os in
26556 - aix[4-9]*)
26557 - # If we're using GNU nm, then we don't want the "-C" option.
26558 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
26559 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
26560 - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
26561 - else
26562 - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
26563 - fi
26564 - ;;
26565 - pw32*)
26566 - export_symbols_cmds_CXX="$ltdll_cmds"
26567 - ;;
26568 - cygwin* | mingw*)
26569 - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
26570 - ;;
26571 - linux* | k*bsd*-gnu)
26572 - link_all_deplibs_CXX=no
26573 - ;;
26574 - *)
26575 - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
26576 - ;;
26577 - esac
26578 - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
26579 -
26580 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
26581 -$as_echo "$ld_shlibs_CXX" >&6; }
26582 -test "$ld_shlibs_CXX" = no && can_build_shared=no
26583 -
26584 -#
26585 -# Do we need to explicitly link libc?
26586 -#
26587 -case "x$archive_cmds_need_lc_CXX" in
26588 -x|xyes)
26589 - # Assume -lc should be added
26590 - archive_cmds_need_lc_CXX=yes
26591 -
26592 - if test "$enable_shared" = yes && test "$GCC" = yes; then
26593 - case $archive_cmds_CXX in
26594 - *'~'*)
26595 - # FIXME: we may have to deal with multi-command sequences.
26596 - ;;
26597 - '$CC '*)
26598 - # Test whether the compiler implicitly links with -lc since on some
26599 - # systems, -lgcc has to come before -lc. If gcc already passes -lc
26600 - # to ld, don't add -lc before -lgcc.
26601 - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
26602 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
26603 - $rm conftest*
26604 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
26605 -
26606 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
26607 - (eval $ac_compile) 2>&5
26608 - ac_status=$?
26609 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
26610 - (exit $ac_status); } 2>conftest.err; then
26611 - soname=conftest
26612 - lib=conftest
26613 - libobjs=conftest.$ac_objext
26614 - deplibs=
26615 - wl=$lt_prog_compiler_wl_CXX
26616 - pic_flag=$lt_prog_compiler_pic_CXX
26617 - compiler_flags=-v
26618 - linker_flags=-v
26619 - verstring=
26620 - output_objdir=.
26621 - libname=conftest
26622 - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
26623 - allow_undefined_flag_CXX=
26624 - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
26625 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
26626 - ac_status=$?
26627 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
26628 - (exit $ac_status); }
26629 - then
26630 - archive_cmds_need_lc_CXX=no
26631 - else
26632 - archive_cmds_need_lc_CXX=yes
26633 - fi
26634 - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
26635 - else
26636 - cat conftest.err 1>&5
26637 - fi
26638 - $rm conftest*
26639 - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
26640 -$as_echo "$archive_cmds_need_lc_CXX" >&6; }
26641 - ;;
26642 - esac
26643 - fi
26644 - ;;
26645 -esac
26646 -
26647 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
26648 -$as_echo_n "checking dynamic linker characteristics... " >&6; }
26649 -library_names_spec=
26650 -libname_spec='lib$name'
26651 -soname_spec=
26652 -shrext_cmds=".so"
26653 -postinstall_cmds=
26654 -postuninstall_cmds=
26655 -finish_cmds=
26656 -finish_eval=
26657 -shlibpath_var=
26658 -shlibpath_overrides_runpath=unknown
26659 -version_type=none
26660 -dynamic_linker="$host_os ld.so"
26661 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
26662 -
26663 -need_lib_prefix=unknown
26664 -hardcode_into_libs=no
26665 -
26666 -# when you set need_version to no, make sure it does not cause -set_version
26667 -# flags to be left without arguments
26668 -need_version=unknown
26669 -
26670 -case $host_os in
26671 -aix3*)
26672 - version_type=linux
26673 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
26674 - shlibpath_var=LIBPATH
26675 -
26676 - # AIX 3 has no versioning support, so we append a major version to the name.
26677 - soname_spec='${libname}${release}${shared_ext}$major'
26678 - ;;
26679 -
26680 -aix[4-9]*)
26681 - version_type=linux
26682 - need_lib_prefix=no
26683 - need_version=no
26684 - hardcode_into_libs=yes
26685 - if test "$host_cpu" = ia64; then
26686 - # AIX 5 supports IA64
26687 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
26688 - shlibpath_var=LD_LIBRARY_PATH
26689 - else
26690 - # With GCC up to 2.95.x, collect2 would create an import file
26691 - # for dependence libraries. The import file would start with
26692 - # the line `#! .'. This would cause the generated library to
26693 - # depend on `.', always an invalid library. This was fixed in
26694 - # development snapshots of GCC prior to 3.0.
26695 - case $host_os in
26696 - aix4 | aix4.[01] | aix4.[01].*)
26697 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
26698 - echo ' yes '
26699 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
26700 - :
26701 - else
26702 - can_build_shared=no
26703 - fi
26704 - ;;
26705 - esac
26706 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
26707 - # soname into executable. Probably we can add versioning support to
26708 - # collect2, so additional links can be useful in future.
26709 - if test "$aix_use_runtimelinking" = yes; then
26710 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
26711 - # instead of lib<name>.a to let people know that these are not
26712 - # typical AIX shared libraries.
26713 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26714 - else
26715 - # We preserve .a as extension for shared libraries through AIX4.2
26716 - # and later when we are not doing run time linking.
26717 - library_names_spec='${libname}${release}.a $libname.a'
26718 - soname_spec='${libname}${release}${shared_ext}$major'
26719 - fi
26720 - shlibpath_var=LIBPATH
26721 - fi
26722 - ;;
26723 -
26724 -amigaos*)
26725 - library_names_spec='$libname.ixlibrary $libname.a'
26726 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
26727 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
26728 - ;;
26729 -
26730 -beos*)
26731 - library_names_spec='${libname}${shared_ext}'
26732 - dynamic_linker="$host_os ld.so"
26733 - shlibpath_var=LIBRARY_PATH
26734 - ;;
26735 -
26736 -bsdi[45]*)
26737 - version_type=linux
26738 - need_version=no
26739 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26740 - soname_spec='${libname}${release}${shared_ext}$major'
26741 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
26742 - shlibpath_var=LD_LIBRARY_PATH
26743 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
26744 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
26745 - # the default ld.so.conf also contains /usr/contrib/lib and
26746 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
26747 - # libtool to hard-code these into programs
26748 - ;;
26749 -
26750 -cygwin* | mingw* | pw32*)
26751 - version_type=windows
26752 - shrext_cmds=".dll"
26753 - need_version=no
26754 - need_lib_prefix=no
26755 -
26756 - case $GCC,$host_os in
26757 - yes,cygwin* | yes,mingw* | yes,pw32*)
26758 - library_names_spec='$libname.dll.a'
26759 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
26760 - postinstall_cmds='base_file=`basename \${file}`~
26761 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
26762 - dldir=$destdir/`dirname \$dlpath`~
26763 - test -d \$dldir || mkdir -p \$dldir~
26764 - $install_prog $dir/$dlname \$dldir/$dlname~
26765 - chmod a+x \$dldir/$dlname'
26766 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
26767 - dlpath=$dir/\$dldll~
26768 - $rm \$dlpath'
26769 - shlibpath_overrides_runpath=yes
26770 -
26771 - case $host_os in
26772 - cygwin*)
26773 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
26774 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
26775 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
26776 - ;;
26777 - mingw*)
26778 - # MinGW DLLs use traditional 'lib' prefix
26779 - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
26780 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
26781 - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
26782 - # It is most probably a Windows format PATH printed by
26783 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
26784 - # path with ; separators, and with drive letters. We can handle the
26785 - # drive letters (cygwin fileutils understands them), so leave them,
26786 - # especially as we might pass files found there to a mingw objdump,
26787 - # which wouldn't understand a cygwinified path. Ahh.
26788 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
26789 - else
26790 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
26791 - fi
26792 - ;;
26793 - pw32*)
26794 - # pw32 DLLs use 'pw' prefix rather than 'lib'
26795 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
26796 - ;;
26797 - esac
26798 - ;;
26799 -
26800 - *)
26801 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
26802 - ;;
26803 - esac
26804 - dynamic_linker='Win32 ld.exe'
26805 - # FIXME: first we should search . and the directory the executable is in
26806 - shlibpath_var=PATH
26807 - ;;
26808 -
26809 -darwin* | rhapsody*)
26810 - dynamic_linker="$host_os dyld"
26811 - version_type=darwin
26812 - need_lib_prefix=no
26813 - need_version=no
26814 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
26815 - soname_spec='${libname}${release}${major}$shared_ext'
26816 - shlibpath_overrides_runpath=yes
26817 - shlibpath_var=DYLD_LIBRARY_PATH
26818 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
26819 -
26820 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
26821 - ;;
26822 -
26823 -dgux*)
26824 - version_type=linux
26825 - need_lib_prefix=no
26826 - need_version=no
26827 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
26828 - soname_spec='${libname}${release}${shared_ext}$major'
26829 - shlibpath_var=LD_LIBRARY_PATH
26830 - ;;
26831 -
26832 -freebsd1*)
26833 - dynamic_linker=no
26834 - ;;
26835 -
26836 -freebsd* | dragonfly*)
26837 - # DragonFly does not have aout. When/if they implement a new
26838 - # versioning mechanism, adjust this.
26839 - if test -x /usr/bin/objformat; then
26840 - objformat=`/usr/bin/objformat`
26841 - else
26842 - case $host_os in
26843 - freebsd[123]*) objformat=aout ;;
26844 - *) objformat=elf ;;
26845 - esac
26846 - fi
26847 - version_type=freebsd-$objformat
26848 - case $version_type in
26849 - freebsd-elf*)
26850 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
26851 - need_version=no
26852 - need_lib_prefix=no
26853 - ;;
26854 - freebsd-*)
26855 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
26856 - need_version=yes
26857 - ;;
26858 - esac
26859 - shlibpath_var=LD_LIBRARY_PATH
26860 - case $host_os in
26861 - freebsd2*)
26862 - shlibpath_overrides_runpath=yes
26863 - ;;
26864 - freebsd3.[01]* | freebsdelf3.[01]*)
26865 - shlibpath_overrides_runpath=yes
26866 - hardcode_into_libs=yes
26867 - ;;
26868 - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
26869 - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
26870 - shlibpath_overrides_runpath=no
26871 - hardcode_into_libs=yes
26872 - ;;
26873 - *) # from 4.6 on, and DragonFly
26874 - shlibpath_overrides_runpath=yes
26875 - hardcode_into_libs=yes
26876 - ;;
26877 - esac
26878 - ;;
26879 -
26880 -gnu*)
26881 - version_type=linux
26882 - need_lib_prefix=no
26883 - need_version=no
26884 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
26885 - soname_spec='${libname}${release}${shared_ext}$major'
26886 - shlibpath_var=LD_LIBRARY_PATH
26887 - hardcode_into_libs=yes
26888 - ;;
26889 -
26890 -hpux9* | hpux10* | hpux11*)
26891 - # Give a soname corresponding to the major version so that dld.sl refuses to
26892 - # link against other versions.
26893 - version_type=sunos
26894 - need_lib_prefix=no
26895 - need_version=no
26896 - case $host_cpu in
26897 - ia64*)
26898 - shrext_cmds='.so'
26899 - hardcode_into_libs=yes
26900 - dynamic_linker="$host_os dld.so"
26901 - shlibpath_var=LD_LIBRARY_PATH
26902 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
26903 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26904 - soname_spec='${libname}${release}${shared_ext}$major'
26905 - if test "X$HPUX_IA64_MODE" = X32; then
26906 - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
26907 - else
26908 - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
26909 - fi
26910 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
26911 - ;;
26912 - hppa*64*)
26913 - shrext_cmds='.sl'
26914 - hardcode_into_libs=yes
26915 - dynamic_linker="$host_os dld.sl"
26916 - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
26917 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
26918 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26919 - soname_spec='${libname}${release}${shared_ext}$major'
26920 - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
26921 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
26922 - ;;
26923 - *)
26924 - shrext_cmds='.sl'
26925 - dynamic_linker="$host_os dld.sl"
26926 - shlibpath_var=SHLIB_PATH
26927 - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
26928 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26929 - soname_spec='${libname}${release}${shared_ext}$major'
26930 - ;;
26931 - esac
26932 - # HP-UX runs *really* slowly unless shared libraries are mode 555.
26933 - postinstall_cmds='chmod 555 $lib'
26934 - ;;
26935 -
26936 -interix[3-9]*)
26937 - version_type=linux
26938 - need_lib_prefix=no
26939 - need_version=no
26940 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
26941 - soname_spec='${libname}${release}${shared_ext}$major'
26942 - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
26943 - shlibpath_var=LD_LIBRARY_PATH
26944 - shlibpath_overrides_runpath=no
26945 - hardcode_into_libs=yes
26946 - ;;
26947 -
26948 -irix5* | irix6* | nonstopux*)
26949 - case $host_os in
26950 - nonstopux*) version_type=nonstopux ;;
26951 - *)
26952 - if test "$lt_cv_prog_gnu_ld" = yes; then
26953 - version_type=linux
26954 - else
26955 - version_type=irix
26956 - fi ;;
26957 - esac
26958 - need_lib_prefix=no
26959 - need_version=no
26960 - soname_spec='${libname}${release}${shared_ext}$major'
26961 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
26962 - case $host_os in
26963 - irix5* | nonstopux*)
26964 - libsuff= shlibsuff=
26965 - ;;
26966 - *)
26967 - case $LD in # libtool.m4 will add one of these switches to LD
26968 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
26969 - libsuff= shlibsuff= libmagic=32-bit;;
26970 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
26971 - libsuff=32 shlibsuff=N32 libmagic=N32;;
26972 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
26973 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
26974 - *) libsuff= shlibsuff= libmagic=never-match;;
26975 - esac
26976 - ;;
26977 - esac
26978 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
26979 - shlibpath_overrides_runpath=no
26980 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
26981 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
26982 - hardcode_into_libs=yes
26983 - ;;
26984 -
26985 -# No shared lib support for Linux oldld, aout, or coff.
26986 -linux*oldld* | linux*aout* | linux*coff*)
26987 - dynamic_linker=no
26988 - ;;
26989 -
26990 -# This must be Linux ELF.
26991 -linux* | k*bsd*-gnu)
26992 - version_type=linux
26993 - need_lib_prefix=no
26994 - need_version=no
26995 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26996 - soname_spec='${libname}${release}${shared_ext}$major'
26997 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
26998 - shlibpath_var=LD_LIBRARY_PATH
26999 - shlibpath_overrides_runpath=no
27000 - # This implies no fast_install, which is unacceptable.
27001 - # Some rework will be needed to allow for fast_install
27002 - # before this can be enabled.
27003 - hardcode_into_libs=yes
27004 -
27005 - # Append ld.so.conf contents to the search path
27006 - if test -f /etc/ld.so.conf; then
27007 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
27008 - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
27009 - fi
27010 -
27011 - # We used to test for /lib/ld.so.1 and disable shared libraries on
27012 - # powerpc, because MkLinux only supported shared libraries with the
27013 - # GNU dynamic linker. Since this was broken with cross compilers,
27014 - # most powerpc-linux boxes support dynamic linking these days and
27015 - # people can always --disable-shared, the test was removed, and we
27016 - # assume the GNU/Linux dynamic linker is in use.
27017 - dynamic_linker='GNU/Linux ld.so'
27018 - ;;
27019 -
27020 -netbsdelf*-gnu)
27021 - version_type=linux
27022 - need_lib_prefix=no
27023 - need_version=no
27024 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
27025 - soname_spec='${libname}${release}${shared_ext}$major'
27026 - shlibpath_var=LD_LIBRARY_PATH
27027 - shlibpath_overrides_runpath=no
27028 - hardcode_into_libs=yes
27029 - dynamic_linker='NetBSD ld.elf_so'
27030 - ;;
27031 -
27032 -netbsd*)
27033 - version_type=sunos
27034 - need_lib_prefix=no
27035 - need_version=no
27036 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
27037 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
27038 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
27039 - dynamic_linker='NetBSD (a.out) ld.so'
27040 - else
27041 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
27042 - soname_spec='${libname}${release}${shared_ext}$major'
27043 - dynamic_linker='NetBSD ld.elf_so'
27044 - fi
27045 - shlibpath_var=LD_LIBRARY_PATH
27046 - shlibpath_overrides_runpath=yes
27047 - hardcode_into_libs=yes
27048 - ;;
27049 -
27050 -newsos6)
27051 - version_type=linux
27052 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27053 - shlibpath_var=LD_LIBRARY_PATH
27054 - shlibpath_overrides_runpath=yes
27055 - ;;
27056 -
27057 -nto-qnx*)
27058 - version_type=linux
27059 - need_lib_prefix=no
27060 - need_version=no
27061 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27062 - soname_spec='${libname}${release}${shared_ext}$major'
27063 - shlibpath_var=LD_LIBRARY_PATH
27064 - shlibpath_overrides_runpath=yes
27065 - ;;
27066 -
27067 -openbsd*)
27068 - version_type=sunos
27069 - sys_lib_dlsearch_path_spec="/usr/lib"
27070 - need_lib_prefix=no
27071 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
27072 - case $host_os in
27073 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
27074 - *) need_version=no ;;
27075 - esac
27076 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
27077 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
27078 - shlibpath_var=LD_LIBRARY_PATH
27079 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
27080 - case $host_os in
27081 - openbsd2.[89] | openbsd2.[89].*)
27082 - shlibpath_overrides_runpath=no
27083 - ;;
27084 - *)
27085 - shlibpath_overrides_runpath=yes
27086 - ;;
27087 - esac
27088 - else
27089 - shlibpath_overrides_runpath=yes
27090 - fi
27091 - ;;
27092 -
27093 -os2*)
27094 - libname_spec='$name'
27095 - shrext_cmds=".dll"
27096 - need_lib_prefix=no
27097 - library_names_spec='$libname${shared_ext} $libname.a'
27098 - dynamic_linker='OS/2 ld.exe'
27099 - shlibpath_var=LIBPATH
27100 - ;;
27101 -
27102 -osf3* | osf4* | osf5*)
27103 - version_type=osf
27104 - need_lib_prefix=no
27105 - need_version=no
27106 - soname_spec='${libname}${release}${shared_ext}$major'
27107 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27108 - shlibpath_var=LD_LIBRARY_PATH
27109 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
27110 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
27111 - ;;
27112 -
27113 -rdos*)
27114 - dynamic_linker=no
27115 - ;;
27116 -
27117 -solaris*)
27118 - version_type=linux
27119 - need_lib_prefix=no
27120 - need_version=no
27121 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27122 - soname_spec='${libname}${release}${shared_ext}$major'
27123 - shlibpath_var=LD_LIBRARY_PATH
27124 - shlibpath_overrides_runpath=yes
27125 - hardcode_into_libs=yes
27126 - # ldd complains unless libraries are executable
27127 - postinstall_cmds='chmod +x $lib'
27128 - ;;
27129 -
27130 -sunos4*)
27131 - version_type=sunos
27132 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
27133 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
27134 - shlibpath_var=LD_LIBRARY_PATH
27135 - shlibpath_overrides_runpath=yes
27136 - if test "$with_gnu_ld" = yes; then
27137 - need_lib_prefix=no
27138 - fi
27139 - need_version=yes
27140 - ;;
27141 -
27142 -sysv4 | sysv4.3*)
27143 - version_type=linux
27144 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27145 - soname_spec='${libname}${release}${shared_ext}$major'
27146 - shlibpath_var=LD_LIBRARY_PATH
27147 - case $host_vendor in
27148 - sni)
27149 - shlibpath_overrides_runpath=no
27150 - need_lib_prefix=no
27151 - export_dynamic_flag_spec='${wl}-Blargedynsym'
27152 - runpath_var=LD_RUN_PATH
27153 - ;;
27154 - siemens)
27155 - need_lib_prefix=no
27156 - ;;
27157 - motorola)
27158 - need_lib_prefix=no
27159 - need_version=no
27160 - shlibpath_overrides_runpath=no
27161 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
27162 - ;;
27163 - esac
27164 - ;;
27165 -
27166 -sysv4*MP*)
27167 - if test -d /usr/nec ;then
27168 - version_type=linux
27169 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
27170 - soname_spec='$libname${shared_ext}.$major'
27171 - shlibpath_var=LD_LIBRARY_PATH
27172 - fi
27173 - ;;
27174 -
27175 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
27176 - version_type=freebsd-elf
27177 - need_lib_prefix=no
27178 - need_version=no
27179 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
27180 - soname_spec='${libname}${release}${shared_ext}$major'
27181 - shlibpath_var=LD_LIBRARY_PATH
27182 - hardcode_into_libs=yes
27183 - if test "$with_gnu_ld" = yes; then
27184 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
27185 - shlibpath_overrides_runpath=no
27186 - else
27187 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
27188 - shlibpath_overrides_runpath=yes
27189 - case $host_os in
27190 - sco3.2v5*)
27191 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
27192 - ;;
27193 - esac
27194 - fi
27195 - sys_lib_dlsearch_path_spec='/usr/lib'
27196 - ;;
27197 -
27198 -uts4*)
27199 - version_type=linux
27200 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27201 - soname_spec='${libname}${release}${shared_ext}$major'
27202 - shlibpath_var=LD_LIBRARY_PATH
27203 - ;;
27204 -
27205 -*)
27206 - dynamic_linker=no
27207 - ;;
27208 -esac
27209 -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
27210 -$as_echo "$dynamic_linker" >&6; }
27211 -test "$dynamic_linker" = no && can_build_shared=no
27212 -
27213 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
27214 - $as_echo_n "(cached) " >&6
27215 -else
27216 - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
27217 -fi
27218 -
27219 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
27220 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
27221 - $as_echo_n "(cached) " >&6
27222 -else
27223 - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
27224 -fi
27225 -
27226 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
27227 -
27228 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
27229 -if test "$GCC" = yes; then
27230 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
27231 -fi
27232 -
27233 -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
27234 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
27235 -hardcode_action_CXX=
27236 -if test -n "$hardcode_libdir_flag_spec_CXX" || \
27237 - test -n "$runpath_var_CXX" || \
27238 - test "X$hardcode_automatic_CXX" = "Xyes" ; then
27239 -
27240 - # We can hardcode non-existant directories.
27241 - if test "$hardcode_direct_CXX" != no &&
27242 - # If the only mechanism to avoid hardcoding is shlibpath_var, we
27243 - # have to relink, otherwise we might link with an installed library
27244 - # when we should be linking with a yet-to-be-installed one
27245 - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
27246 - test "$hardcode_minus_L_CXX" != no; then
27247 - # Linking always hardcodes the temporary library directory.
27248 - hardcode_action_CXX=relink
27249 - else
27250 - # We can link without hardcoding, and we can hardcode nonexisting dirs.
27251 - hardcode_action_CXX=immediate
27252 - fi
27253 -else
27254 - # We cannot hardcode anything, or else we can only hardcode existing
27255 - # directories.
27256 - hardcode_action_CXX=unsupported
27257 -fi
27258 -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
27259 -$as_echo "$hardcode_action_CXX" >&6; }
27260 -
27261 -if test "$hardcode_action_CXX" = relink; then
27262 - # Fast installation is not supported
27263 - enable_fast_install=no
27264 -elif test "$shlibpath_overrides_runpath" = yes ||
27265 - test "$enable_shared" = no; then
27266 - # Fast installation is not necessary
27267 - enable_fast_install=needless
27268 -fi
27269 -
27270 -
27271 -# The else clause should only fire when bootstrapping the
27272 -# libtool distribution, otherwise you forgot to ship ltmain.sh
27273 -# with your package, and you will get complaints that there are
27274 -# no rules to generate ltmain.sh.
27275 -if test -f "$ltmain"; then
27276 - # See if we are running on zsh, and set the options which allow our commands through
27277 - # without removal of \ escapes.
27278 - if test -n "${ZSH_VERSION+set}" ; then
27279 - setopt NO_GLOB_SUBST
27280 - fi
27281 - # Now quote all the things that may contain metacharacters while being
27282 - # careful not to overquote the AC_SUBSTed values. We take copies of the
27283 - # variables and quote the copies for generation of the libtool script.
27284 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
27285 - SED SHELL STRIP \
27286 - libname_spec library_names_spec soname_spec extract_expsyms_cmds \
27287 - old_striplib striplib file_magic_cmd finish_cmds finish_eval \
27288 - deplibs_check_method reload_flag reload_cmds need_locks \
27289 - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
27290 - lt_cv_sys_global_symbol_to_c_name_address \
27291 - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
27292 - old_postinstall_cmds old_postuninstall_cmds \
27293 - compiler_CXX \
27294 - CC_CXX \
27295 - LD_CXX \
27296 - lt_prog_compiler_wl_CXX \
27297 - lt_prog_compiler_pic_CXX \
27298 - lt_prog_compiler_static_CXX \
27299 - lt_prog_compiler_no_builtin_flag_CXX \
27300 - export_dynamic_flag_spec_CXX \
27301 - thread_safe_flag_spec_CXX \
27302 - whole_archive_flag_spec_CXX \
27303 - enable_shared_with_static_runtimes_CXX \
27304 - old_archive_cmds_CXX \
27305 - old_archive_from_new_cmds_CXX \
27306 - predep_objects_CXX \
27307 - postdep_objects_CXX \
27308 - predeps_CXX \
27309 - postdeps_CXX \
27310 - compiler_lib_search_path_CXX \
27311 - compiler_lib_search_dirs_CXX \
27312 - archive_cmds_CXX \
27313 - archive_expsym_cmds_CXX \
27314 - postinstall_cmds_CXX \
27315 - postuninstall_cmds_CXX \
27316 - old_archive_from_expsyms_cmds_CXX \
27317 - allow_undefined_flag_CXX \
27318 - no_undefined_flag_CXX \
27319 - export_symbols_cmds_CXX \
27320 - hardcode_libdir_flag_spec_CXX \
27321 - hardcode_libdir_flag_spec_ld_CXX \
27322 - hardcode_libdir_separator_CXX \
27323 - hardcode_automatic_CXX \
27324 - module_cmds_CXX \
27325 - module_expsym_cmds_CXX \
27326 - lt_cv_prog_compiler_c_o_CXX \
27327 - fix_srcfile_path_CXX \
27328 - exclude_expsyms_CXX \
27329 - include_expsyms_CXX; do
27330 -
27331 - case $var in
27332 - old_archive_cmds_CXX | \
27333 - old_archive_from_new_cmds_CXX | \
27334 - archive_cmds_CXX | \
27335 - archive_expsym_cmds_CXX | \
27336 - module_cmds_CXX | \
27337 - module_expsym_cmds_CXX | \
27338 - old_archive_from_expsyms_cmds_CXX | \
27339 - export_symbols_cmds_CXX | \
27340 - extract_expsyms_cmds | reload_cmds | finish_cmds | \
27341 - postinstall_cmds | postuninstall_cmds | \
27342 - old_postinstall_cmds | old_postuninstall_cmds | \
27343 - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
27344 - # Double-quote double-evaled strings.
27345 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
27346 - ;;
27347 - *)
27348 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
27349 - ;;
27350 - esac
27351 - done
27352 -
27353 - case $lt_echo in
27354 - *'\$0 --fallback-echo"')
27355 - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
27356 - ;;
27357 - esac
27358 -
27359 -cfgfile="$ofile"
27360 -
27361 - cat <<__EOF__ >> "$cfgfile"
27362 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
27363 -
27364 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
27365 -
27366 -# Shell to use when invoking shell scripts.
27367 -SHELL=$lt_SHELL
27368 -
27369 -# Whether or not to build shared libraries.
27370 -build_libtool_libs=$enable_shared
27371 -
27372 -# Whether or not to build static libraries.
27373 -build_old_libs=$enable_static
27374 -
27375 -# Whether or not to add -lc for building shared libraries.
27376 -build_libtool_need_lc=$archive_cmds_need_lc_CXX
27377 -
27378 -# Whether or not to disallow shared libs when runtime libs are static
27379 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
27380 -
27381 -# Whether or not to optimize for fast installation.
27382 -fast_install=$enable_fast_install
27383 -
27384 -# The host system.
27385 -host_alias=$host_alias
27386 -host=$host
27387 -host_os=$host_os
27388 -
27389 -# The build system.
27390 -build_alias=$build_alias
27391 -build=$build
27392 -build_os=$build_os
27393 -
27394 -# An echo program that does not interpret backslashes.
27395 -echo=$lt_echo
27396 -
27397 -# The archiver.
27398 -AR=$lt_AR
27399 -AR_FLAGS=$lt_AR_FLAGS
27400 -
27401 -# A C compiler.
27402 -LTCC=$lt_LTCC
27403 -
27404 -# LTCC compiler flags.
27405 -LTCFLAGS=$lt_LTCFLAGS
27406 -
27407 -# A language-specific compiler.
27408 -CC=$lt_compiler_CXX
27409 -
27410 -# Is the compiler the GNU C compiler?
27411 -with_gcc=$GCC_CXX
27412 -
27413 -# An ERE matcher.
27414 -EGREP=$lt_EGREP
27415 -
27416 -# The linker used to build libraries.
27417 -LD=$lt_LD_CXX
27418 -
27419 -# Whether we need hard or soft links.
27420 -LN_S=$lt_LN_S
27421 -
27422 -# A BSD-compatible nm program.
27423 -NM=$lt_NM
27424 -
27425 -# A symbol stripping program
27426 -STRIP=$lt_STRIP
27427 -
27428 -# Used to examine libraries when file_magic_cmd begins "file"
27429 -MAGIC_CMD=$MAGIC_CMD
27430 -
27431 -# Used on cygwin: DLL creation program.
27432 -DLLTOOL="$DLLTOOL"
27433 -
27434 -# Used on cygwin: object dumper.
27435 -OBJDUMP="$OBJDUMP"
27436 -
27437 -# Used on cygwin: assembler.
27438 -AS="$AS"
27439 -
27440 -# The name of the directory that contains temporary libtool files.
27441 -objdir=$objdir
27442 -
27443 -# How to create reloadable object files.
27444 -reload_flag=$lt_reload_flag
27445 -reload_cmds=$lt_reload_cmds
27446 -
27447 -# How to pass a linker flag through the compiler.
27448 -wl=$lt_lt_prog_compiler_wl_CXX
27449 -
27450 -# Object file suffix (normally "o").
27451 -objext="$ac_objext"
27452 -
27453 -# Old archive suffix (normally "a").
27454 -libext="$libext"
27455 -
27456 -# Shared library suffix (normally ".so").
27457 -shrext_cmds='$shrext_cmds'
27458 -
27459 -# Executable file suffix (normally "").
27460 -exeext="$exeext"
27461 -
27462 -# Additional compiler flags for building library objects.
27463 -pic_flag=$lt_lt_prog_compiler_pic_CXX
27464 -pic_mode=$pic_mode
27465 -
27466 -# What is the maximum length of a command?
27467 -max_cmd_len=$lt_cv_sys_max_cmd_len
27468 -
27469 -# Does compiler simultaneously support -c and -o options?
27470 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
27471 -
27472 -# Must we lock files when doing compilation?
27473 -need_locks=$lt_need_locks
27474 -
27475 -# Do we need the lib prefix for modules?
27476 -need_lib_prefix=$need_lib_prefix
27477 -
27478 -# Do we need a version for libraries?
27479 -need_version=$need_version
27480 -
27481 -# Whether dlopen is supported.
27482 -dlopen_support=$enable_dlopen
27483 -
27484 -# Whether dlopen of programs is supported.
27485 -dlopen_self=$enable_dlopen_self
27486 -
27487 -# Whether dlopen of statically linked programs is supported.
27488 -dlopen_self_static=$enable_dlopen_self_static
27489 -
27490 -# Compiler flag to prevent dynamic linking.
27491 -link_static_flag=$lt_lt_prog_compiler_static_CXX
27492 -
27493 -# Compiler flag to turn off builtin functions.
27494 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
27495 -
27496 -# Compiler flag to allow reflexive dlopens.
27497 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
27498 -
27499 -# Compiler flag to generate shared objects directly from archives.
27500 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
27501 -
27502 -# Compiler flag to generate thread-safe objects.
27503 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
27504 -
27505 -# Library versioning type.
27506 -version_type=$version_type
27507 -
27508 -# Format of library name prefix.
27509 -libname_spec=$lt_libname_spec
27510 -
27511 -# List of archive names. First name is the real one, the rest are links.
27512 -# The last name is the one that the linker finds with -lNAME.
27513 -library_names_spec=$lt_library_names_spec
27514 -
27515 -# The coded name of the library, if different from the real name.
27516 -soname_spec=$lt_soname_spec
27517 -
27518 -# Commands used to build and install an old-style archive.
27519 -RANLIB=$lt_RANLIB
27520 -old_archive_cmds=$lt_old_archive_cmds_CXX
27521 -old_postinstall_cmds=$lt_old_postinstall_cmds
27522 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
27523 -
27524 -# Create an old-style archive from a shared archive.
27525 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
27526 -
27527 -# Create a temporary old-style archive to link instead of a shared archive.
27528 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
27529 -
27530 -# Commands used to build and install a shared archive.
27531 -archive_cmds=$lt_archive_cmds_CXX
27532 -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
27533 -postinstall_cmds=$lt_postinstall_cmds
27534 -postuninstall_cmds=$lt_postuninstall_cmds
27535 -
27536 -# Commands used to build a loadable module (assumed same as above if empty)
27537 -module_cmds=$lt_module_cmds_CXX
27538 -module_expsym_cmds=$lt_module_expsym_cmds_CXX
27539 -
27540 -# Commands to strip libraries.
27541 -old_striplib=$lt_old_striplib
27542 -striplib=$lt_striplib
27543 -
27544 -# Dependencies to place before the objects being linked to create a
27545 -# shared library.
27546 -predep_objects=$lt_predep_objects_CXX
27547 -
27548 -# Dependencies to place after the objects being linked to create a
27549 -# shared library.
27550 -postdep_objects=$lt_postdep_objects_CXX
27551 -
27552 -# Dependencies to place before the objects being linked to create a
27553 -# shared library.
27554 -predeps=$lt_predeps_CXX
27555 -
27556 -# Dependencies to place after the objects being linked to create a
27557 -# shared library.
27558 -postdeps=$lt_postdeps_CXX
27559 -
27560 -# The directories searched by this compiler when creating a shared
27561 -# library
27562 -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
27563 -
27564 -# The library search path used internally by the compiler when linking
27565 -# a shared library.
27566 -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
27567 -
27568 -# Method to check whether dependent libraries are shared objects.
27569 -deplibs_check_method=$lt_deplibs_check_method
27570 -
27571 -# Command to use when deplibs_check_method == file_magic.
27572 -file_magic_cmd=$lt_file_magic_cmd
27573 -
27574 -# Flag that allows shared libraries with undefined symbols to be built.
27575 -allow_undefined_flag=$lt_allow_undefined_flag_CXX
27576 -
27577 -# Flag that forces no undefined symbols.
27578 -no_undefined_flag=$lt_no_undefined_flag_CXX
27579 -
27580 -# Commands used to finish a libtool library installation in a directory.
27581 -finish_cmds=$lt_finish_cmds
27582 -
27583 -# Same as above, but a single script fragment to be evaled but not shown.
27584 -finish_eval=$lt_finish_eval
27585 -
27586 -# Take the output of nm and produce a listing of raw symbols and C names.
27587 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
27588 -
27589 -# Transform the output of nm in a proper C declaration
27590 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
27591 -
27592 -# Transform the output of nm in a C name address pair
27593 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
27594 -
27595 -# This is the shared library runtime path variable.
27596 -runpath_var=$runpath_var
27597 -
27598 -# This is the shared library path variable.
27599 -shlibpath_var=$shlibpath_var
27600 -
27601 -# Is shlibpath searched before the hard-coded library search path?
27602 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
27603 -
27604 -# How to hardcode a shared library path into an executable.
27605 -hardcode_action=$hardcode_action_CXX
27606 -
27607 -# Whether we should hardcode library paths into libraries.
27608 -hardcode_into_libs=$hardcode_into_libs
27609 -
27610 -# Flag to hardcode \$libdir into a binary during linking.
27611 -# This must work even if \$libdir does not exist.
27612 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
27613 -
27614 -# If ld is used when linking, flag to hardcode \$libdir into
27615 -# a binary during linking. This must work even if \$libdir does
27616 -# not exist.
27617 -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
27618 -
27619 -# Whether we need a single -rpath flag with a separated argument.
27620 -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
27621 -
27622 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
27623 -# resulting binary.
27624 -hardcode_direct=$hardcode_direct_CXX
27625 -
27626 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
27627 -# resulting binary.
27628 -hardcode_minus_L=$hardcode_minus_L_CXX
27629 -
27630 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
27631 -# the resulting binary.
27632 -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
27633 -
27634 -# Set to yes if building a shared library automatically hardcodes DIR into the library
27635 -# and all subsequent libraries and executables linked against it.
27636 -hardcode_automatic=$hardcode_automatic_CXX
27637 -
27638 -# Variables whose values should be saved in libtool wrapper scripts and
27639 -# restored at relink time.
27640 -variables_saved_for_relink="$variables_saved_for_relink"
27641 -
27642 -# Whether libtool must link a program against all its dependency libraries.
27643 -link_all_deplibs=$link_all_deplibs_CXX
27644 -
27645 -# Compile-time system search path for libraries
27646 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
27647 -
27648 -# Run-time system search path for libraries
27649 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
27650 -
27651 -# Fix the shell variable \$srcfile for the compiler.
27652 -fix_srcfile_path=$lt_fix_srcfile_path
27653 -
27654 -# Set to yes if exported symbols are required.
27655 -always_export_symbols=$always_export_symbols_CXX
27656 -
27657 -# The commands to list exported symbols.
27658 -export_symbols_cmds=$lt_export_symbols_cmds_CXX
27659 -
27660 -# The commands to extract the exported symbol list from a shared archive.
27661 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
27662 -
27663 -# Symbols that should not be listed in the preloaded symbols.
27664 -exclude_expsyms=$lt_exclude_expsyms_CXX
27665 -
27666 -# Symbols that must always be exported.
27667 -include_expsyms=$lt_include_expsyms_CXX
27668 -
27669 -# ### END LIBTOOL TAG CONFIG: $tagname
27670 -
27671 -__EOF__
27672 -
27673 -
27674 -else
27675 - # If there is no Makefile yet, we rely on a make rule to execute
27676 - # `config.status --recheck' to rerun these tests and create the
27677 - # libtool script then.
27678 - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
27679 - if test -f "$ltmain_in"; then
27680 - test -f Makefile && make "$ltmain"
27681 - fi
27682 -fi
27683 -
27684 -
27685 -ac_ext=c
27686 -ac_cpp='$CPP $CPPFLAGS'
27687 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
27688 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
27689 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
27690 -
27691 -CC=$lt_save_CC
27692 -LDCXX=$LD
27693 -LD=$lt_save_LD
27694 -GCC=$lt_save_GCC
27695 -with_gnu_ldcxx=$with_gnu_ld
27696 -with_gnu_ld=$lt_save_with_gnu_ld
27697 -lt_cv_path_LDCXX=$lt_cv_path_LD
27698 -lt_cv_path_LD=$lt_save_path_LD
27699 -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
27700 -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
27701 -
27702 - else
27703 - tagname=""
27704 - fi
27705 - ;;
27706 -
27707 - F77)
27708 - if test -n "$F77" && test "X$F77" != "Xno"; then
27709 -
27710 -ac_ext=f
27711 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
27712 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
27713 -ac_compiler_gnu=$ac_cv_f77_compiler_gnu
27714 -
27715 -
27716 -archive_cmds_need_lc_F77=no
27717 -allow_undefined_flag_F77=
27718 -always_export_symbols_F77=no
27719 -archive_expsym_cmds_F77=
27720 -export_dynamic_flag_spec_F77=
27721 -hardcode_direct_F77=no
27722 -hardcode_libdir_flag_spec_F77=
27723 -hardcode_libdir_flag_spec_ld_F77=
27724 -hardcode_libdir_separator_F77=
27725 -hardcode_minus_L_F77=no
27726 -hardcode_automatic_F77=no
27727 -module_cmds_F77=
27728 -module_expsym_cmds_F77=
27729 -link_all_deplibs_F77=unknown
27730 -old_archive_cmds_F77=$old_archive_cmds
27731 -no_undefined_flag_F77=
27732 -whole_archive_flag_spec_F77=
27733 -enable_shared_with_static_runtimes_F77=no
27734 -
27735 -# Source file extension for f77 test sources.
27736 -ac_ext=f
27737 -
27738 -# Object file extension for compiled f77 test sources.
27739 -objext=o
27740 -objext_F77=$objext
27741 -
27742 -# Code to be used in simple compile tests
27743 -lt_simple_compile_test_code="\
27744 - subroutine t
27745 - return
27746 - end
27747 -"
27748 -
27749 -# Code to be used in simple link tests
27750 -lt_simple_link_test_code="\
27751 - program t
27752 - end
27753 -"
27754 -
27755 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
27756 -
27757 -# If no C compiler was specified, use CC.
27758 -LTCC=${LTCC-"$CC"}
27759 -
27760 -# If no C compiler flags were specified, use CFLAGS.
27761 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
27762 -
27763 -# Allow CC to be a program name with arguments.
27764 -compiler=$CC
27765 -
27766 -
27767 -# save warnings/boilerplate of simple test code
27768 -ac_outfile=conftest.$ac_objext
27769 -echo "$lt_simple_compile_test_code" >conftest.$ac_ext
27770 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
27771 -_lt_compiler_boilerplate=`cat conftest.err`
27772 -$rm conftest*
27773 -
27774 -ac_outfile=conftest.$ac_objext
27775 -echo "$lt_simple_link_test_code" >conftest.$ac_ext
27776 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
27777 -_lt_linker_boilerplate=`cat conftest.err`
27778 -$rm -r conftest*
27779 -
27780 -
27781 -# Allow CC to be a program name with arguments.
27782 -lt_save_CC="$CC"
27783 -CC=${F77-"f77"}
27784 -compiler=$CC
27785 -compiler_F77=$CC
27786 -for cc_temp in $compiler""; do
27787 - case $cc_temp in
27788 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
27789 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
27790 - \-*) ;;
27791 - *) break;;
27792 - esac
27793 -done
27794 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
27795 -
27796 -
27797 -{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
27798 -$as_echo_n "checking if libtool supports shared libraries... " >&6; }
27799 -{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
27800 -$as_echo "$can_build_shared" >&6; }
27801 -
27802 -{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
27803 -$as_echo_n "checking whether to build shared libraries... " >&6; }
27804 -test "$can_build_shared" = "no" && enable_shared=no
27805 -
27806 -# On AIX, shared libraries and static libraries use the same namespace, and
27807 -# are all built from PIC.
27808 -case $host_os in
27809 -aix3*)
27810 - test "$enable_shared" = yes && enable_static=no
27811 - if test -n "$RANLIB"; then
27812 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
27813 - postinstall_cmds='$RANLIB $lib'
27814 - fi
27815 - ;;
27816 -aix[4-9]*)
27817 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
27818 - test "$enable_shared" = yes && enable_static=no
27819 - fi
27820 - ;;
27821 -esac
27822 -{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
27823 -$as_echo "$enable_shared" >&6; }
27824 -
27825 -{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
27826 -$as_echo_n "checking whether to build static libraries... " >&6; }
27827 -# Make sure either enable_shared or enable_static is yes.
27828 -test "$enable_shared" = yes || enable_static=yes
27829 -{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
27830 -$as_echo "$enable_static" >&6; }
27831 -
27832 -GCC_F77="$G77"
27833 -LD_F77="$LD"
27834 -
27835 -lt_prog_compiler_wl_F77=
27836 -lt_prog_compiler_pic_F77=
27837 -lt_prog_compiler_static_F77=
27838 -
27839 -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
27840 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
27841 -
27842 - if test "$GCC" = yes; then
27843 - lt_prog_compiler_wl_F77='-Wl,'
27844 - lt_prog_compiler_static_F77='-static'
27845 -
27846 - case $host_os in
27847 - aix*)
27848 - # All AIX code is PIC.
27849 - if test "$host_cpu" = ia64; then
27850 - # AIX 5 now supports IA64 processor
27851 - lt_prog_compiler_static_F77='-Bstatic'
27852 - fi
27853 - ;;
27854 -
27855 - amigaos*)
27856 - # FIXME: we need at least 68020 code to build shared libraries, but
27857 - # adding the `-m68020' flag to GCC prevents building anything better,
27858 - # like `-m68040'.
27859 - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
27860 - ;;
27861 -
27862 - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
27863 - # PIC is the default for these OSes.
27864 - ;;
27865 -
27866 - mingw* | cygwin* | pw32* | os2*)
27867 - # This hack is so that the source file can tell whether it is being
27868 - # built for inclusion in a dll (and should export symbols for example).
27869 - # Although the cygwin gcc ignores -fPIC, still need this for old-style
27870 - # (--disable-auto-import) libraries
27871 - lt_prog_compiler_pic_F77='-DDLL_EXPORT'
27872 - ;;
27873 -
27874 - darwin* | rhapsody*)
27875 - # PIC is the default on this platform
27876 - # Common symbols not allowed in MH_DYLIB files
27877 - lt_prog_compiler_pic_F77='-fno-common'
27878 - ;;
27879 -
27880 - interix[3-9]*)
27881 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
27882 - # Instead, we relocate shared libraries at runtime.
27883 - ;;
27884 -
27885 - msdosdjgpp*)
27886 - # Just because we use GCC doesn't mean we suddenly get shared libraries
27887 - # on systems that don't support them.
27888 - lt_prog_compiler_can_build_shared_F77=no
27889 - enable_shared=no
27890 - ;;
27891 -
27892 - sysv4*MP*)
27893 - if test -d /usr/nec; then
27894 - lt_prog_compiler_pic_F77=-Kconform_pic
27895 - fi
27896 - ;;
27897 -
27898 - hpux*)
27899 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
27900 - # not for PA HP-UX.
27901 - case $host_cpu in
27902 - hppa*64*|ia64*)
27903 - # +Z the default
27904 - ;;
27905 - *)
27906 - lt_prog_compiler_pic_F77='-fPIC'
27907 - ;;
27908 - esac
27909 - ;;
27910 -
27911 - *)
27912 - lt_prog_compiler_pic_F77='-fPIC'
27913 - ;;
27914 - esac
27915 - else
27916 - # PORTME Check for flag to pass linker flags through the system compiler.
27917 - case $host_os in
27918 - aix*)
27919 - lt_prog_compiler_wl_F77='-Wl,'
27920 - if test "$host_cpu" = ia64; then
27921 - # AIX 5 now supports IA64 processor
27922 - lt_prog_compiler_static_F77='-Bstatic'
27923 - else
27924 - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
27925 - fi
27926 - ;;
27927 - darwin*)
27928 - # PIC is the default on this platform
27929 - # Common symbols not allowed in MH_DYLIB files
27930 - case $cc_basename in
27931 - xlc*)
27932 - lt_prog_compiler_pic_F77='-qnocommon'
27933 - lt_prog_compiler_wl_F77='-Wl,'
27934 - ;;
27935 - esac
27936 - ;;
27937 -
27938 - mingw* | cygwin* | pw32* | os2*)
27939 - # This hack is so that the source file can tell whether it is being
27940 - # built for inclusion in a dll (and should export symbols for example).
27941 - lt_prog_compiler_pic_F77='-DDLL_EXPORT'
27942 - ;;
27943 -
27944 - hpux9* | hpux10* | hpux11*)
27945 - lt_prog_compiler_wl_F77='-Wl,'
27946 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
27947 - # not for PA HP-UX.
27948 - case $host_cpu in
27949 - hppa*64*|ia64*)
27950 - # +Z the default
27951 - ;;
27952 - *)
27953 - lt_prog_compiler_pic_F77='+Z'
27954 - ;;
27955 - esac
27956 - # Is there a better lt_prog_compiler_static that works with the bundled CC?
27957 - lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
27958 - ;;
27959 -
27960 - irix5* | irix6* | nonstopux*)
27961 - lt_prog_compiler_wl_F77='-Wl,'
27962 - # PIC (with -KPIC) is the default.
27963 - lt_prog_compiler_static_F77='-non_shared'
27964 - ;;
27965 -
27966 - newsos6)
27967 - lt_prog_compiler_pic_F77='-KPIC'
27968 - lt_prog_compiler_static_F77='-Bstatic'
27969 - ;;
27970 -
27971 - linux* | k*bsd*-gnu)
27972 - case $cc_basename in
27973 - icc* | ecc*)
27974 - lt_prog_compiler_wl_F77='-Wl,'
27975 - lt_prog_compiler_pic_F77='-KPIC'
27976 - lt_prog_compiler_static_F77='-static'
27977 - ;;
27978 - pgcc* | pgf77* | pgf90* | pgf95*)
27979 - # Portland Group compilers (*not* the Pentium gcc compiler,
27980 - # which looks to be a dead project)
27981 - lt_prog_compiler_wl_F77='-Wl,'
27982 - lt_prog_compiler_pic_F77='-fpic'
27983 - lt_prog_compiler_static_F77='-Bstatic'
27984 - ;;
27985 - ccc*)
27986 - lt_prog_compiler_wl_F77='-Wl,'
27987 - # All Alpha code is PIC.
27988 - lt_prog_compiler_static_F77='-non_shared'
27989 - ;;
27990 - *)
27991 - case `$CC -V 2>&1 | sed 5q` in
27992 - *Sun\ C*)
27993 - # Sun C 5.9
27994 - lt_prog_compiler_pic_F77='-KPIC'
27995 - lt_prog_compiler_static_F77='-Bstatic'
27996 - lt_prog_compiler_wl_F77='-Wl,'
27997 - ;;
27998 - *Sun\ F*)
27999 - # Sun Fortran 8.3 passes all unrecognized flags to the linker
28000 - lt_prog_compiler_pic_F77='-KPIC'
28001 - lt_prog_compiler_static_F77='-Bstatic'
28002 - lt_prog_compiler_wl_F77=''
28003 - ;;
28004 - esac
28005 - ;;
28006 - esac
28007 - ;;
28008 -
28009 - osf3* | osf4* | osf5*)
28010 - lt_prog_compiler_wl_F77='-Wl,'
28011 - # All OSF/1 code is PIC.
28012 - lt_prog_compiler_static_F77='-non_shared'
28013 - ;;
28014 -
28015 - rdos*)
28016 - lt_prog_compiler_static_F77='-non_shared'
28017 - ;;
28018 -
28019 - solaris*)
28020 - lt_prog_compiler_pic_F77='-KPIC'
28021 - lt_prog_compiler_static_F77='-Bstatic'
28022 - case $cc_basename in
28023 - f77* | f90* | f95*)
28024 - lt_prog_compiler_wl_F77='-Qoption ld ';;
28025 - *)
28026 - lt_prog_compiler_wl_F77='-Wl,';;
28027 - esac
28028 - ;;
28029 -
28030 - sunos4*)
28031 - lt_prog_compiler_wl_F77='-Qoption ld '
28032 - lt_prog_compiler_pic_F77='-PIC'
28033 - lt_prog_compiler_static_F77='-Bstatic'
28034 - ;;
28035 -
28036 - sysv4 | sysv4.2uw2* | sysv4.3*)
28037 - lt_prog_compiler_wl_F77='-Wl,'
28038 - lt_prog_compiler_pic_F77='-KPIC'
28039 - lt_prog_compiler_static_F77='-Bstatic'
28040 - ;;
28041 -
28042 - sysv4*MP*)
28043 - if test -d /usr/nec ;then
28044 - lt_prog_compiler_pic_F77='-Kconform_pic'
28045 - lt_prog_compiler_static_F77='-Bstatic'
28046 - fi
28047 - ;;
28048 -
28049 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
28050 - lt_prog_compiler_wl_F77='-Wl,'
28051 - lt_prog_compiler_pic_F77='-KPIC'
28052 - lt_prog_compiler_static_F77='-Bstatic'
28053 - ;;
28054 -
28055 - unicos*)
28056 - lt_prog_compiler_wl_F77='-Wl,'
28057 - lt_prog_compiler_can_build_shared_F77=no
28058 - ;;
28059 -
28060 - uts4*)
28061 - lt_prog_compiler_pic_F77='-pic'
28062 - lt_prog_compiler_static_F77='-Bstatic'
28063 - ;;
28064 -
28065 - *)
28066 - lt_prog_compiler_can_build_shared_F77=no
28067 - ;;
28068 - esac
28069 - fi
28070 -
28071 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
28072 -$as_echo "$lt_prog_compiler_pic_F77" >&6; }
28073 -
28074 -#
28075 -# Check to make sure the PIC flag actually works.
28076 -#
28077 -if test -n "$lt_prog_compiler_pic_F77"; then
28078 -
28079 -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
28080 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
28081 -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
28082 - $as_echo_n "(cached) " >&6
28083 -else
28084 - lt_cv_prog_compiler_pic_works_F77=no
28085 - ac_outfile=conftest.$ac_objext
28086 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
28087 - lt_compiler_flag="$lt_prog_compiler_pic_F77"
28088 - # Insert the option either (1) after the last *FLAGS variable, or
28089 - # (2) before a word containing "conftest.", or (3) at the end.
28090 - # Note that $ac_compile itself does not contain backslashes and begins
28091 - # with a dollar sign (not a hyphen), so the echo should work correctly.
28092 - # The option is referenced via a variable to avoid confusing sed.
28093 - lt_compile=`echo "$ac_compile" | $SED \
28094 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
28095 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
28096 - -e 's:$: $lt_compiler_flag:'`
28097 - (eval echo "\"\$as_me:14836: $lt_compile\"" >&5)
28098 - (eval "$lt_compile" 2>conftest.err)
28099 - ac_status=$?
28100 - cat conftest.err >&5
28101 - echo "$as_me:14840: \$? = $ac_status" >&5
28102 - if (exit $ac_status) && test -s "$ac_outfile"; then
28103 - # The compiler can only warn and ignore the option if not recognized
28104 - # So say no if there are warnings other than the usual output.
28105 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
28106 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
28107 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
28108 - lt_cv_prog_compiler_pic_works_F77=yes
28109 - fi
28110 - fi
28111 - $rm conftest*
28112 -
28113 -fi
28114 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
28115 -$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
28116 -
28117 -if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
28118 - case $lt_prog_compiler_pic_F77 in
28119 - "" | " "*) ;;
28120 - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
28121 - esac
28122 -else
28123 - lt_prog_compiler_pic_F77=
28124 - lt_prog_compiler_can_build_shared_F77=no
28125 -fi
28126 -
28127 -fi
28128 -case $host_os in
28129 - # For platforms which do not support PIC, -DPIC is meaningless:
28130 - *djgpp*)
28131 - lt_prog_compiler_pic_F77=
28132 - ;;
28133 - *)
28134 - lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
28135 - ;;
28136 -esac
28137 -
28138 -#
28139 -# Check to make sure the static flag actually works.
28140 -#
28141 -wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
28142 -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
28143 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
28144 -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
28145 - $as_echo_n "(cached) " >&6
28146 -else
28147 - lt_cv_prog_compiler_static_works_F77=no
28148 - save_LDFLAGS="$LDFLAGS"
28149 - LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
28150 - echo "$lt_simple_link_test_code" > conftest.$ac_ext
28151 - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
28152 - # The linker can only warn and ignore the option if not recognized
28153 - # So say no if there are warnings
28154 - if test -s conftest.err; then
28155 - # Append any errors to the config.log.
28156 - cat conftest.err 1>&5
28157 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
28158 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
28159 - if diff conftest.exp conftest.er2 >/dev/null; then
28160 - lt_cv_prog_compiler_static_works_F77=yes
28161 - fi
28162 - else
28163 - lt_cv_prog_compiler_static_works_F77=yes
28164 - fi
28165 - fi
28166 - $rm -r conftest*
28167 - LDFLAGS="$save_LDFLAGS"
28168 -
28169 -fi
28170 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
28171 -$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
28172 -
28173 -if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
28174 - :
28175 -else
28176 - lt_prog_compiler_static_F77=
28177 -fi
28178 -
28179 -
28180 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
28181 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
28182 -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
28183 - $as_echo_n "(cached) " >&6
28184 -else
28185 - lt_cv_prog_compiler_c_o_F77=no
28186 - $rm -r conftest 2>/dev/null
28187 - mkdir conftest
28188 - cd conftest
28189 - mkdir out
28190 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
28191 -
28192 - lt_compiler_flag="-o out/conftest2.$ac_objext"
28193 - # Insert the option either (1) after the last *FLAGS variable, or
28194 - # (2) before a word containing "conftest.", or (3) at the end.
28195 - # Note that $ac_compile itself does not contain backslashes and begins
28196 - # with a dollar sign (not a hyphen), so the echo should work correctly.
28197 - lt_compile=`echo "$ac_compile" | $SED \
28198 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
28199 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
28200 - -e 's:$: $lt_compiler_flag:'`
28201 - (eval echo "\"\$as_me:14940: $lt_compile\"" >&5)
28202 - (eval "$lt_compile" 2>out/conftest.err)
28203 - ac_status=$?
28204 - cat out/conftest.err >&5
28205 - echo "$as_me:14944: \$? = $ac_status" >&5
28206 - if (exit $ac_status) && test -s out/conftest2.$ac_objext
28207 - then
28208 - # The compiler can only warn and ignore the option if not recognized
28209 - # So say no if there are warnings
28210 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
28211 - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
28212 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
28213 - lt_cv_prog_compiler_c_o_F77=yes
28214 - fi
28215 - fi
28216 - chmod u+w . 2>&5
28217 - $rm conftest*
28218 - # SGI C++ compiler will create directory out/ii_files/ for
28219 - # template instantiation
28220 - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
28221 - $rm out/* && rmdir out
28222 - cd ..
28223 - rmdir conftest
28224 - $rm conftest*
28225 -
28226 -fi
28227 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
28228 -$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
28229 -
28230 -
28231 -hard_links="nottested"
28232 -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
28233 - # do not overwrite the value of need_locks provided by the user
28234 - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
28235 -$as_echo_n "checking if we can lock with hard links... " >&6; }
28236 - hard_links=yes
28237 - $rm conftest*
28238 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
28239 - touch conftest.a
28240 - ln conftest.a conftest.b 2>&5 || hard_links=no
28241 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
28242 - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
28243 -$as_echo "$hard_links" >&6; }
28244 - if test "$hard_links" = no; then
28245 - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
28246 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
28247 - need_locks=warn
28248 - fi
28249 -else
28250 - need_locks=no
28251 -fi
28252 -
28253 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
28254 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
28255 -
28256 - runpath_var=
28257 - allow_undefined_flag_F77=
28258 - enable_shared_with_static_runtimes_F77=no
28259 - archive_cmds_F77=
28260 - archive_expsym_cmds_F77=
28261 - old_archive_From_new_cmds_F77=
28262 - old_archive_from_expsyms_cmds_F77=
28263 - export_dynamic_flag_spec_F77=
28264 - whole_archive_flag_spec_F77=
28265 - thread_safe_flag_spec_F77=
28266 - hardcode_libdir_flag_spec_F77=
28267 - hardcode_libdir_flag_spec_ld_F77=
28268 - hardcode_libdir_separator_F77=
28269 - hardcode_direct_F77=no
28270 - hardcode_minus_L_F77=no
28271 - hardcode_shlibpath_var_F77=unsupported
28272 - link_all_deplibs_F77=unknown
28273 - hardcode_automatic_F77=no
28274 - module_cmds_F77=
28275 - module_expsym_cmds_F77=
28276 - always_export_symbols_F77=no
28277 - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
28278 - # include_expsyms should be a list of space-separated symbols to be *always*
28279 - # included in the symbol list
28280 - include_expsyms_F77=
28281 - # exclude_expsyms can be an extended regexp of symbols to exclude
28282 - # it will be wrapped by ` (' and `)$', so one must not match beginning or
28283 - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
28284 - # as well as any symbol that contains `d'.
28285 - exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
28286 - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
28287 - # platforms (ab)use it in PIC code, but their linkers get confused if
28288 - # the symbol is explicitly referenced. Since portable code cannot
28289 - # rely on this symbol name, it's probably fine to never include it in
28290 - # preloaded symbol tables.
28291 - # Exclude shared library initialization/finalization symbols.
28292 - extract_expsyms_cmds=
28293 - # Just being paranoid about ensuring that cc_basename is set.
28294 - for cc_temp in $compiler""; do
28295 - case $cc_temp in
28296 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
28297 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
28298 - \-*) ;;
28299 - *) break;;
28300 - esac
28301 -done
28302 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
28303 -
28304 - case $host_os in
28305 - cygwin* | mingw* | pw32*)
28306 - # FIXME: the MSVC++ port hasn't been tested in a loooong time
28307 - # When not using gcc, we currently assume that we are using
28308 - # Microsoft Visual C++.
28309 - if test "$GCC" != yes; then
28310 - with_gnu_ld=no
28311 - fi
28312 - ;;
28313 - interix*)
28314 - # we just hope/assume this is gcc and not c89 (= MSVC++)
28315 - with_gnu_ld=yes
28316 - ;;
28317 - openbsd*)
28318 - with_gnu_ld=no
28319 - ;;
28320 - esac
28321 -
28322 - ld_shlibs_F77=yes
28323 - if test "$with_gnu_ld" = yes; then
28324 - # If archive_cmds runs LD, not CC, wlarc should be empty
28325 - wlarc='${wl}'
28326 -
28327 - # Set some defaults for GNU ld with shared library support. These
28328 - # are reset later if shared libraries are not supported. Putting them
28329 - # here allows them to be overridden if necessary.
28330 - runpath_var=LD_RUN_PATH
28331 - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
28332 - export_dynamic_flag_spec_F77='${wl}--export-dynamic'
28333 - # ancient GNU ld didn't support --whole-archive et. al.
28334 - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
28335 - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
28336 - else
28337 - whole_archive_flag_spec_F77=
28338 - fi
28339 - supports_anon_versioning=no
28340 - case `$LD -v 2>/dev/null` in
28341 - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
28342 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
28343 - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
28344 - *\ 2.11.*) ;; # other 2.11 versions
28345 - *) supports_anon_versioning=yes ;;
28346 - esac
28347 -
28348 - # See if GNU ld supports shared libraries.
28349 - case $host_os in
28350 - aix[3-9]*)
28351 - # On AIX/PPC, the GNU linker is very broken
28352 - if test "$host_cpu" != ia64; then
28353 - ld_shlibs_F77=no
28354 - cat <<EOF 1>&2
28355 -
28356 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
28357 -*** to be unable to reliably create shared libraries on AIX.
28358 -*** Therefore, libtool is disabling shared libraries support. If you
28359 -*** really care for shared libraries, you may want to modify your PATH
28360 -*** so that a non-GNU linker is found, and then restart.
28361 -
28362 -EOF
28363 - fi
28364 - ;;
28365 -
28366 - amigaos*)
28367 - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
28368 - hardcode_libdir_flag_spec_F77='-L$libdir'
28369 - hardcode_minus_L_F77=yes
28370 -
28371 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
28372 - # that the semantics of dynamic libraries on AmigaOS, at least up
28373 - # to version 4, is to share data among multiple programs linked
28374 - # with the same dynamic library. Since this doesn't match the
28375 - # behavior of shared libraries on other platforms, we can't use
28376 - # them.
28377 - ld_shlibs_F77=no
28378 - ;;
28379 -
28380 - beos*)
28381 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
28382 - allow_undefined_flag_F77=unsupported
28383 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
28384 - # support --undefined. This deserves some investigation. FIXME
28385 - archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
28386 - else
28387 - ld_shlibs_F77=no
28388 - fi
28389 - ;;
28390 -
28391 - cygwin* | mingw* | pw32*)
28392 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
28393 - # as there is no search path for DLLs.
28394 - hardcode_libdir_flag_spec_F77='-L$libdir'
28395 - allow_undefined_flag_F77=unsupported
28396 - always_export_symbols_F77=no
28397 - enable_shared_with_static_runtimes_F77=yes
28398 - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
28399 -
28400 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
28401 - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
28402 - # If the export-symbols file already is a .def file (1st line
28403 - # is EXPORTS), use it as is; otherwise, prepend...
28404 - archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
28405 - cp $export_symbols $output_objdir/$soname.def;
28406 - else
28407 - echo EXPORTS > $output_objdir/$soname.def;
28408 - cat $export_symbols >> $output_objdir/$soname.def;
28409 - fi~
28410 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
28411 - else
28412 - ld_shlibs_F77=no
28413 - fi
28414 - ;;
28415 -
28416 - interix[3-9]*)
28417 - hardcode_direct_F77=no
28418 - hardcode_shlibpath_var_F77=no
28419 - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
28420 - export_dynamic_flag_spec_F77='${wl}-E'
28421 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
28422 - # Instead, shared libraries are loaded at an image base (0x10000000 by
28423 - # default) and relocated if they conflict, which is a slow very memory
28424 - # consuming and fragmenting process. To avoid this, we pick a random,
28425 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
28426 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
28427 - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
28428 - archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
28429 - ;;
28430 -
28431 - gnu* | linux* | k*bsd*-gnu)
28432 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
28433 - tmp_addflag=
28434 - case $cc_basename,$host_cpu in
28435 - pgcc*) # Portland Group C compiler
28436 - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
28437 - tmp_addflag=' $pic_flag'
28438 - ;;
28439 - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
28440 - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
28441 - tmp_addflag=' $pic_flag -Mnomain' ;;
28442 - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
28443 - tmp_addflag=' -i_dynamic' ;;
28444 - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
28445 - tmp_addflag=' -i_dynamic -nofor_main' ;;
28446 - ifc* | ifort*) # Intel Fortran compiler
28447 - tmp_addflag=' -nofor_main' ;;
28448 - esac
28449 - case `$CC -V 2>&1 | sed 5q` in
28450 - *Sun\ C*) # Sun C 5.9
28451 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
28452 - tmp_sharedflag='-G' ;;
28453 - *Sun\ F*) # Sun Fortran 8.3
28454 - tmp_sharedflag='-G' ;;
28455 - *)
28456 - tmp_sharedflag='-shared' ;;
28457 - esac
28458 - archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
28459 -
28460 - if test $supports_anon_versioning = yes; then
28461 - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
28462 - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
28463 - $echo "local: *; };" >> $output_objdir/$libname.ver~
28464 - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
28465 - fi
28466 - link_all_deplibs_F77=no
28467 - else
28468 - ld_shlibs_F77=no
28469 - fi
28470 - ;;
28471 -
28472 - netbsd* | netbsdelf*-gnu)
28473 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
28474 - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
28475 - wlarc=
28476 - else
28477 - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
28478 - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
28479 - fi
28480 - ;;
28481 -
28482 - solaris*)
28483 - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
28484 - ld_shlibs_F77=no
28485 - cat <<EOF 1>&2
28486 -
28487 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
28488 -*** create shared libraries on Solaris systems. Therefore, libtool
28489 -*** is disabling shared libraries support. We urge you to upgrade GNU
28490 -*** binutils to release 2.9.1 or newer. Another option is to modify
28491 -*** your PATH or compiler configuration so that the native linker is
28492 -*** used, and then restart.
28493 -
28494 -EOF
28495 - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
28496 - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
28497 - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
28498 - else
28499 - ld_shlibs_F77=no
28500 - fi
28501 - ;;
28502 -
28503 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
28504 - case `$LD -v 2>&1` in
28505 - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
28506 - ld_shlibs_F77=no
28507 - cat <<_LT_EOF 1>&2
28508 -
28509 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
28510 -*** reliably create shared libraries on SCO systems. Therefore, libtool
28511 -*** is disabling shared libraries support. We urge you to upgrade GNU
28512 -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
28513 -*** your PATH or compiler configuration so that the native linker is
28514 -*** used, and then restart.
28515 -
28516 -_LT_EOF
28517 - ;;
28518 - *)
28519 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
28520 - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
28521 - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
28522 - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
28523 - else
28524 - ld_shlibs_F77=no
28525 - fi
28526 - ;;
28527 - esac
28528 - ;;
28529 -
28530 - sunos4*)
28531 - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
28532 - wlarc=
28533 - hardcode_direct_F77=yes
28534 - hardcode_shlibpath_var_F77=no
28535 - ;;
28536 -
28537 - *)
28538 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
28539 - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
28540 - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
28541 - else
28542 - ld_shlibs_F77=no
28543 - fi
28544 - ;;
28545 - esac
28546 -
28547 - if test "$ld_shlibs_F77" = no; then
28548 - runpath_var=
28549 - hardcode_libdir_flag_spec_F77=
28550 - export_dynamic_flag_spec_F77=
28551 - whole_archive_flag_spec_F77=
28552 - fi
28553 - else
28554 - # PORTME fill in a description of your system's linker (not GNU ld)
28555 - case $host_os in
28556 - aix3*)
28557 - allow_undefined_flag_F77=unsupported
28558 - always_export_symbols_F77=yes
28559 - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
28560 - # Note: this linker hardcodes the directories in LIBPATH if there
28561 - # are no directories specified by -L.
28562 - hardcode_minus_L_F77=yes
28563 - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
28564 - # Neither direct hardcoding nor static linking is supported with a
28565 - # broken collect2.
28566 - hardcode_direct_F77=unsupported
28567 - fi
28568 - ;;
28569 -
28570 - aix[4-9]*)
28571 - if test "$host_cpu" = ia64; then
28572 - # On IA64, the linker does run time linking by default, so we don't
28573 - # have to do anything special.
28574 - aix_use_runtimelinking=no
28575 - exp_sym_flag='-Bexport'
28576 - no_entry_flag=""
28577 - else
28578 - # If we're using GNU nm, then we don't want the "-C" option.
28579 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
28580 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
28581 - export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
28582 - else
28583 - export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
28584 - fi
28585 - aix_use_runtimelinking=no
28586 -
28587 - # Test if we are trying to use run time linking or normal
28588 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
28589 - # need to do runtime linking.
28590 - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
28591 - for ld_flag in $LDFLAGS; do
28592 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
28593 - aix_use_runtimelinking=yes
28594 - break
28595 - fi
28596 - done
28597 - ;;
28598 - esac
28599 -
28600 - exp_sym_flag='-bexport'
28601 - no_entry_flag='-bnoentry'
28602 - fi
28603 -
28604 - # When large executables or shared objects are built, AIX ld can
28605 - # have problems creating the table of contents. If linking a library
28606 - # or program results in "error TOC overflow" add -mminimal-toc to
28607 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
28608 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
28609 -
28610 - archive_cmds_F77=''
28611 - hardcode_direct_F77=yes
28612 - hardcode_libdir_separator_F77=':'
28613 - link_all_deplibs_F77=yes
28614 -
28615 - if test "$GCC" = yes; then
28616 - case $host_os in aix4.[012]|aix4.[012].*)
28617 - # We only want to do this on AIX 4.2 and lower, the check
28618 - # below for broken collect2 doesn't work under 4.3+
28619 - collect2name=`${CC} -print-prog-name=collect2`
28620 - if test -f "$collect2name" && \
28621 - strings "$collect2name" | grep resolve_lib_name >/dev/null
28622 - then
28623 - # We have reworked collect2
28624 - :
28625 - else
28626 - # We have old collect2
28627 - hardcode_direct_F77=unsupported
28628 - # It fails to find uninstalled libraries when the uninstalled
28629 - # path is not listed in the libpath. Setting hardcode_minus_L
28630 - # to unsupported forces relinking
28631 - hardcode_minus_L_F77=yes
28632 - hardcode_libdir_flag_spec_F77='-L$libdir'
28633 - hardcode_libdir_separator_F77=
28634 - fi
28635 - ;;
28636 - esac
28637 - shared_flag='-shared'
28638 - if test "$aix_use_runtimelinking" = yes; then
28639 - shared_flag="$shared_flag "'${wl}-G'
28640 - fi
28641 - else
28642 - # not using gcc
28643 - if test "$host_cpu" = ia64; then
28644 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
28645 - # chokes on -Wl,-G. The following line is correct:
28646 - shared_flag='-G'
28647 - else
28648 - if test "$aix_use_runtimelinking" = yes; then
28649 - shared_flag='${wl}-G'
28650 - else
28651 - shared_flag='${wl}-bM:SRE'
28652 - fi
28653 - fi
28654 - fi
28655 -
28656 - # It seems that -bexpall does not export symbols beginning with
28657 - # underscore (_), so it is better to generate a list of symbols to export.
28658 - always_export_symbols_F77=yes
28659 - if test "$aix_use_runtimelinking" = yes; then
28660 - # Warning - without using the other runtime loading flags (-brtl),
28661 - # -berok will link without error, but may produce a broken library.
28662 - allow_undefined_flag_F77='-berok'
28663 - # Determine the default libpath from the value encoded in an empty executable.
28664 - cat >conftest.$ac_ext <<_ACEOF
28665 - program main
28666 -
28667 - end
28668 -_ACEOF
28669 -rm -f conftest.$ac_objext conftest$ac_exeext
28670 -if { (ac_try="$ac_link"
28671 -case "(($ac_try" in
28672 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
28673 - *) ac_try_echo=$ac_try;;
28674 -esac
28675 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
28676 -$as_echo "$ac_try_echo") >&5
28677 - (eval "$ac_link") 2>conftest.er1
28678 - ac_status=$?
28679 - grep -v '^ *+' conftest.er1 >conftest.err
28680 - rm -f conftest.er1
28681 - cat conftest.err >&5
28682 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
28683 - (exit $ac_status); } && {
28684 - test -z "$ac_f77_werror_flag" ||
28685 - test ! -s conftest.err
28686 - } && test -s conftest$ac_exeext && {
28687 - test "$cross_compiling" = yes ||
28688 - $as_test_x conftest$ac_exeext
28689 - }; then
28690 -
28691 -lt_aix_libpath_sed='
28692 - /Import File Strings/,/^$/ {
28693 - /^0/ {
28694 - s/^0 *\(.*\)$/\1/
28695 - p
28696 - }
28697 - }'
28698 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
28699 -# Check for a 64-bit object if we didn't find anything.
28700 -if test -z "$aix_libpath"; then
28701 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
28702 -fi
28703 -else
28704 - $as_echo "$as_me: failed program was:" >&5
28705 -sed 's/^/| /' conftest.$ac_ext >&5
28706 -
28707 -
28708 -fi
28709 -
28710 -rm -rf conftest.dSYM
28711 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
28712 - conftest$ac_exeext conftest.$ac_ext
28713 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
28714 -
28715 - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
28716 - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
28717 - else
28718 - if test "$host_cpu" = ia64; then
28719 - hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
28720 - allow_undefined_flag_F77="-z nodefs"
28721 - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
28722 - else
28723 - # Determine the default libpath from the value encoded in an empty executable.
28724 - cat >conftest.$ac_ext <<_ACEOF
28725 - program main
28726 -
28727 - end
28728 -_ACEOF
28729 -rm -f conftest.$ac_objext conftest$ac_exeext
28730 -if { (ac_try="$ac_link"
28731 -case "(($ac_try" in
28732 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
28733 - *) ac_try_echo=$ac_try;;
28734 -esac
28735 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
28736 -$as_echo "$ac_try_echo") >&5
28737 - (eval "$ac_link") 2>conftest.er1
28738 - ac_status=$?
28739 - grep -v '^ *+' conftest.er1 >conftest.err
28740 - rm -f conftest.er1
28741 - cat conftest.err >&5
28742 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
28743 - (exit $ac_status); } && {
28744 - test -z "$ac_f77_werror_flag" ||
28745 - test ! -s conftest.err
28746 - } && test -s conftest$ac_exeext && {
28747 - test "$cross_compiling" = yes ||
28748 - $as_test_x conftest$ac_exeext
28749 - }; then
28750 -
28751 -lt_aix_libpath_sed='
28752 - /Import File Strings/,/^$/ {
28753 - /^0/ {
28754 - s/^0 *\(.*\)$/\1/
28755 - p
28756 - }
28757 - }'
28758 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
28759 -# Check for a 64-bit object if we didn't find anything.
28760 -if test -z "$aix_libpath"; then
28761 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
28762 -fi
28763 -else
28764 - $as_echo "$as_me: failed program was:" >&5
28765 -sed 's/^/| /' conftest.$ac_ext >&5
28766 -
28767 -
28768 -fi
28769 -
28770 -rm -rf conftest.dSYM
28771 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
28772 - conftest$ac_exeext conftest.$ac_ext
28773 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
28774 -
28775 - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
28776 - # Warning - without using the other run time loading flags,
28777 - # -berok will link without error, but may produce a broken library.
28778 - no_undefined_flag_F77=' ${wl}-bernotok'
28779 - allow_undefined_flag_F77=' ${wl}-berok'
28780 - # Exported symbols can be pulled into shared objects from archives
28781 - whole_archive_flag_spec_F77='$convenience'
28782 - archive_cmds_need_lc_F77=yes
28783 - # This is similar to how AIX traditionally builds its shared libraries.
28784 - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
28785 - fi
28786 - fi
28787 - ;;
28788 -
28789 - amigaos*)
28790 - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
28791 - hardcode_libdir_flag_spec_F77='-L$libdir'
28792 - hardcode_minus_L_F77=yes
28793 - # see comment about different semantics on the GNU ld section
28794 - ld_shlibs_F77=no
28795 - ;;
28796 -
28797 - bsdi[45]*)
28798 - export_dynamic_flag_spec_F77=-rdynamic
28799 - ;;
28800 -
28801 - cygwin* | mingw* | pw32*)
28802 - # When not using gcc, we currently assume that we are using
28803 - # Microsoft Visual C++.
28804 - # hardcode_libdir_flag_spec is actually meaningless, as there is
28805 - # no search path for DLLs.
28806 - hardcode_libdir_flag_spec_F77=' '
28807 - allow_undefined_flag_F77=unsupported
28808 - # Tell ltmain to make .lib files, not .a files.
28809 - libext=lib
28810 - # Tell ltmain to make .dll files, not .so files.
28811 - shrext_cmds=".dll"
28812 - # FIXME: Setting linknames here is a bad hack.
28813 - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
28814 - # The linker will automatically build a .lib file if we build a DLL.
28815 - old_archive_From_new_cmds_F77='true'
28816 - # FIXME: Should let the user specify the lib program.
28817 - old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
28818 - fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
28819 - enable_shared_with_static_runtimes_F77=yes
28820 - ;;
28821 -
28822 - darwin* | rhapsody*)
28823 - case $host_os in
28824 - rhapsody* | darwin1.[012])
28825 - allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
28826 - ;;
28827 - *) # Darwin 1.3 on
28828 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
28829 - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
28830 - else
28831 - case ${MACOSX_DEPLOYMENT_TARGET} in
28832 - 10.[012])
28833 - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
28834 - ;;
28835 - 10.*)
28836 - allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
28837 - ;;
28838 - esac
28839 - fi
28840 - ;;
28841 - esac
28842 - archive_cmds_need_lc_F77=no
28843 - hardcode_direct_F77=no
28844 - hardcode_automatic_F77=yes
28845 - hardcode_shlibpath_var_F77=unsupported
28846 - whole_archive_flag_spec_F77=''
28847 - link_all_deplibs_F77=yes
28848 - if test "$GCC" = yes ; then
28849 - output_verbose_link_cmd='echo'
28850 - archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
28851 - module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
28852 - archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
28853 - module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
28854 - else
28855 - case $cc_basename in
28856 - xlc*)
28857 - output_verbose_link_cmd='echo'
28858 - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
28859 - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
28860 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
28861 - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
28862 - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
28863 - ;;
28864 - *)
28865 - ld_shlibs_F77=no
28866 - ;;
28867 - esac
28868 - fi
28869 - ;;
28870 -
28871 - dgux*)
28872 - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
28873 - hardcode_libdir_flag_spec_F77='-L$libdir'
28874 - hardcode_shlibpath_var_F77=no
28875 - ;;
28876 -
28877 - freebsd1*)
28878 - ld_shlibs_F77=no
28879 - ;;
28880 -
28881 - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
28882 - # support. Future versions do this automatically, but an explicit c++rt0.o
28883 - # does not break anything, and helps significantly (at the cost of a little
28884 - # extra space).
28885 - freebsd2.2*)
28886 - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
28887 - hardcode_libdir_flag_spec_F77='-R$libdir'
28888 - hardcode_direct_F77=yes
28889 - hardcode_shlibpath_var_F77=no
28890 - ;;
28891 -
28892 - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
28893 - freebsd2*)
28894 - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
28895 - hardcode_direct_F77=yes
28896 - hardcode_minus_L_F77=yes
28897 - hardcode_shlibpath_var_F77=no
28898 - ;;
28899 -
28900 - # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
28901 - freebsd* | dragonfly*)
28902 - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
28903 - hardcode_libdir_flag_spec_F77='-R$libdir'
28904 - hardcode_direct_F77=yes
28905 - hardcode_shlibpath_var_F77=no
28906 - ;;
28907 -
28908 - hpux9*)
28909 - if test "$GCC" = yes; then
28910 - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
28911 - else
28912 - archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
28913 - fi
28914 - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
28915 - hardcode_libdir_separator_F77=:
28916 - hardcode_direct_F77=yes
28917 -
28918 - # hardcode_minus_L: Not really in the search PATH,
28919 - # but as the default location of the library.
28920 - hardcode_minus_L_F77=yes
28921 - export_dynamic_flag_spec_F77='${wl}-E'
28922 - ;;
28923 -
28924 - hpux10*)
28925 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
28926 - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
28927 - else
28928 - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
28929 - fi
28930 - if test "$with_gnu_ld" = no; then
28931 - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
28932 - hardcode_libdir_separator_F77=:
28933 -
28934 - hardcode_direct_F77=yes
28935 - export_dynamic_flag_spec_F77='${wl}-E'
28936 -
28937 - # hardcode_minus_L: Not really in the search PATH,
28938 - # but as the default location of the library.
28939 - hardcode_minus_L_F77=yes
28940 - fi
28941 - ;;
28942 -
28943 - hpux11*)
28944 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
28945 - case $host_cpu in
28946 - hppa*64*)
28947 - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
28948 - ;;
28949 - ia64*)
28950 - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
28951 - ;;
28952 - *)
28953 - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
28954 - ;;
28955 - esac
28956 - else
28957 - case $host_cpu in
28958 - hppa*64*)
28959 - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
28960 - ;;
28961 - ia64*)
28962 - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
28963 - ;;
28964 - *)
28965 - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
28966 - ;;
28967 - esac
28968 - fi
28969 - if test "$with_gnu_ld" = no; then
28970 - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
28971 - hardcode_libdir_separator_F77=:
28972 -
28973 - case $host_cpu in
28974 - hppa*64*|ia64*)
28975 - hardcode_libdir_flag_spec_ld_F77='+b $libdir'
28976 - hardcode_direct_F77=no
28977 - hardcode_shlibpath_var_F77=no
28978 - ;;
28979 - *)
28980 - hardcode_direct_F77=yes
28981 - export_dynamic_flag_spec_F77='${wl}-E'
28982 -
28983 - # hardcode_minus_L: Not really in the search PATH,
28984 - # but as the default location of the library.
28985 - hardcode_minus_L_F77=yes
28986 - ;;
28987 - esac
28988 - fi
28989 - ;;
28990 -
28991 - irix5* | irix6* | nonstopux*)
28992 - if test "$GCC" = yes; then
28993 - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
28994 - else
28995 - archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
28996 - hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
28997 - fi
28998 - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
28999 - hardcode_libdir_separator_F77=:
29000 - link_all_deplibs_F77=yes
29001 - ;;
29002 -
29003 - netbsd* | netbsdelf*-gnu)
29004 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
29005 - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
29006 - else
29007 - archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
29008 - fi
29009 - hardcode_libdir_flag_spec_F77='-R$libdir'
29010 - hardcode_direct_F77=yes
29011 - hardcode_shlibpath_var_F77=no
29012 - ;;
29013 -
29014 - newsos6)
29015 - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
29016 - hardcode_direct_F77=yes
29017 - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
29018 - hardcode_libdir_separator_F77=:
29019 - hardcode_shlibpath_var_F77=no
29020 - ;;
29021 -
29022 - openbsd*)
29023 - if test -f /usr/libexec/ld.so; then
29024 - hardcode_direct_F77=yes
29025 - hardcode_shlibpath_var_F77=no
29026 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
29027 - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
29028 - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
29029 - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
29030 - export_dynamic_flag_spec_F77='${wl}-E'
29031 - else
29032 - case $host_os in
29033 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
29034 - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
29035 - hardcode_libdir_flag_spec_F77='-R$libdir'
29036 - ;;
29037 - *)
29038 - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
29039 - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
29040 - ;;
29041 - esac
29042 - fi
29043 - else
29044 - ld_shlibs_F77=no
29045 - fi
29046 - ;;
29047 -
29048 - os2*)
29049 - hardcode_libdir_flag_spec_F77='-L$libdir'
29050 - hardcode_minus_L_F77=yes
29051 - allow_undefined_flag_F77=unsupported
29052 - archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
29053 - old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
29054 - ;;
29055 -
29056 - osf3*)
29057 - if test "$GCC" = yes; then
29058 - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
29059 - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
29060 - else
29061 - allow_undefined_flag_F77=' -expect_unresolved \*'
29062 - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
29063 - fi
29064 - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
29065 - hardcode_libdir_separator_F77=:
29066 - ;;
29067 -
29068 - osf4* | osf5*) # as osf3* with the addition of -msym flag
29069 - if test "$GCC" = yes; then
29070 - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
29071 - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
29072 - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
29073 - else
29074 - allow_undefined_flag_F77=' -expect_unresolved \*'
29075 - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
29076 - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
29077 - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
29078 -
29079 - # Both c and cxx compiler support -rpath directly
29080 - hardcode_libdir_flag_spec_F77='-rpath $libdir'
29081 - fi
29082 - hardcode_libdir_separator_F77=:
29083 - ;;
29084 -
29085 - solaris*)
29086 - no_undefined_flag_F77=' -z text'
29087 - if test "$GCC" = yes; then
29088 - wlarc='${wl}'
29089 - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
29090 - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
29091 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
29092 - else
29093 - wlarc=''
29094 - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
29095 - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
29096 - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
29097 - fi
29098 - hardcode_libdir_flag_spec_F77='-R$libdir'
29099 - hardcode_shlibpath_var_F77=no
29100 - case $host_os in
29101 - solaris2.[0-5] | solaris2.[0-5].*) ;;
29102 - *)
29103 - # The compiler driver will combine and reorder linker options,
29104 - # but understands `-z linker_flag'. GCC discards it without `$wl',
29105 - # but is careful enough not to reorder.
29106 - # Supported since Solaris 2.6 (maybe 2.5.1?)
29107 - if test "$GCC" = yes; then
29108 - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
29109 - else
29110 - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
29111 - fi
29112 - ;;
29113 - esac
29114 - link_all_deplibs_F77=yes
29115 - ;;
29116 -
29117 - sunos4*)
29118 - if test "x$host_vendor" = xsequent; then
29119 - # Use $CC to link under sequent, because it throws in some extra .o
29120 - # files that make .init and .fini sections work.
29121 - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
29122 - else
29123 - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
29124 - fi
29125 - hardcode_libdir_flag_spec_F77='-L$libdir'
29126 - hardcode_direct_F77=yes
29127 - hardcode_minus_L_F77=yes
29128 - hardcode_shlibpath_var_F77=no
29129 - ;;
29130 -
29131 - sysv4)
29132 - case $host_vendor in
29133 - sni)
29134 - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
29135 - hardcode_direct_F77=yes # is this really true???
29136 - ;;
29137 - siemens)
29138 - ## LD is ld it makes a PLAMLIB
29139 - ## CC just makes a GrossModule.
29140 - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
29141 - reload_cmds_F77='$CC -r -o $output$reload_objs'
29142 - hardcode_direct_F77=no
29143 - ;;
29144 - motorola)
29145 - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
29146 - hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
29147 - ;;
29148 - esac
29149 - runpath_var='LD_RUN_PATH'
29150 - hardcode_shlibpath_var_F77=no
29151 - ;;
29152 -
29153 - sysv4.3*)
29154 - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
29155 - hardcode_shlibpath_var_F77=no
29156 - export_dynamic_flag_spec_F77='-Bexport'
29157 - ;;
29158 -
29159 - sysv4*MP*)
29160 - if test -d /usr/nec; then
29161 - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
29162 - hardcode_shlibpath_var_F77=no
29163 - runpath_var=LD_RUN_PATH
29164 - hardcode_runpath_var=yes
29165 - ld_shlibs_F77=yes
29166 - fi
29167 - ;;
29168 -
29169 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
29170 - no_undefined_flag_F77='${wl}-z,text'
29171 - archive_cmds_need_lc_F77=no
29172 - hardcode_shlibpath_var_F77=no
29173 - runpath_var='LD_RUN_PATH'
29174 -
29175 - if test "$GCC" = yes; then
29176 - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
29177 - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
29178 - else
29179 - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
29180 - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
29181 - fi
29182 - ;;
29183 -
29184 - sysv5* | sco3.2v5* | sco5v6*)
29185 - # Note: We can NOT use -z defs as we might desire, because we do not
29186 - # link with -lc, and that would cause any symbols used from libc to
29187 - # always be unresolved, which means just about no library would
29188 - # ever link correctly. If we're not using GNU ld we use -z text
29189 - # though, which does catch some bad symbols but isn't as heavy-handed
29190 - # as -z defs.
29191 - no_undefined_flag_F77='${wl}-z,text'
29192 - allow_undefined_flag_F77='${wl}-z,nodefs'
29193 - archive_cmds_need_lc_F77=no
29194 - hardcode_shlibpath_var_F77=no
29195 - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
29196 - hardcode_libdir_separator_F77=':'
29197 - link_all_deplibs_F77=yes
29198 - export_dynamic_flag_spec_F77='${wl}-Bexport'
29199 - runpath_var='LD_RUN_PATH'
29200 -
29201 - if test "$GCC" = yes; then
29202 - archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
29203 - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
29204 - else
29205 - archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
29206 - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
29207 - fi
29208 - ;;
29209 -
29210 - uts4*)
29211 - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
29212 - hardcode_libdir_flag_spec_F77='-L$libdir'
29213 - hardcode_shlibpath_var_F77=no
29214 - ;;
29215 -
29216 - *)
29217 - ld_shlibs_F77=no
29218 - ;;
29219 - esac
29220 - fi
29221 -
29222 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
29223 -$as_echo "$ld_shlibs_F77" >&6; }
29224 -test "$ld_shlibs_F77" = no && can_build_shared=no
29225 -
29226 -#
29227 -# Do we need to explicitly link libc?
29228 -#
29229 -case "x$archive_cmds_need_lc_F77" in
29230 -x|xyes)
29231 - # Assume -lc should be added
29232 - archive_cmds_need_lc_F77=yes
29233 -
29234 - if test "$enable_shared" = yes && test "$GCC" = yes; then
29235 - case $archive_cmds_F77 in
29236 - *'~'*)
29237 - # FIXME: we may have to deal with multi-command sequences.
29238 - ;;
29239 - '$CC '*)
29240 - # Test whether the compiler implicitly links with -lc since on some
29241 - # systems, -lgcc has to come before -lc. If gcc already passes -lc
29242 - # to ld, don't add -lc before -lgcc.
29243 - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
29244 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
29245 - $rm conftest*
29246 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
29247 -
29248 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
29249 - (eval $ac_compile) 2>&5
29250 - ac_status=$?
29251 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
29252 - (exit $ac_status); } 2>conftest.err; then
29253 - soname=conftest
29254 - lib=conftest
29255 - libobjs=conftest.$ac_objext
29256 - deplibs=
29257 - wl=$lt_prog_compiler_wl_F77
29258 - pic_flag=$lt_prog_compiler_pic_F77
29259 - compiler_flags=-v
29260 - linker_flags=-v
29261 - verstring=
29262 - output_objdir=.
29263 - libname=conftest
29264 - lt_save_allow_undefined_flag=$allow_undefined_flag_F77
29265 - allow_undefined_flag_F77=
29266 - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
29267 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
29268 - ac_status=$?
29269 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
29270 - (exit $ac_status); }
29271 - then
29272 - archive_cmds_need_lc_F77=no
29273 - else
29274 - archive_cmds_need_lc_F77=yes
29275 - fi
29276 - allow_undefined_flag_F77=$lt_save_allow_undefined_flag
29277 - else
29278 - cat conftest.err 1>&5
29279 - fi
29280 - $rm conftest*
29281 - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
29282 -$as_echo "$archive_cmds_need_lc_F77" >&6; }
29283 - ;;
29284 - esac
29285 - fi
29286 - ;;
29287 -esac
29288 -
29289 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
29290 -$as_echo_n "checking dynamic linker characteristics... " >&6; }
29291 -library_names_spec=
29292 -libname_spec='lib$name'
29293 -soname_spec=
29294 -shrext_cmds=".so"
29295 -postinstall_cmds=
29296 -postuninstall_cmds=
29297 -finish_cmds=
29298 -finish_eval=
29299 -shlibpath_var=
29300 -shlibpath_overrides_runpath=unknown
29301 -version_type=none
29302 -dynamic_linker="$host_os ld.so"
29303 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
29304 -
29305 -need_lib_prefix=unknown
29306 -hardcode_into_libs=no
29307 -
29308 -# when you set need_version to no, make sure it does not cause -set_version
29309 -# flags to be left without arguments
29310 -need_version=unknown
29311 -
29312 -case $host_os in
29313 -aix3*)
29314 - version_type=linux
29315 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
29316 - shlibpath_var=LIBPATH
29317 -
29318 - # AIX 3 has no versioning support, so we append a major version to the name.
29319 - soname_spec='${libname}${release}${shared_ext}$major'
29320 - ;;
29321 -
29322 -aix[4-9]*)
29323 - version_type=linux
29324 - need_lib_prefix=no
29325 - need_version=no
29326 - hardcode_into_libs=yes
29327 - if test "$host_cpu" = ia64; then
29328 - # AIX 5 supports IA64
29329 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
29330 - shlibpath_var=LD_LIBRARY_PATH
29331 - else
29332 - # With GCC up to 2.95.x, collect2 would create an import file
29333 - # for dependence libraries. The import file would start with
29334 - # the line `#! .'. This would cause the generated library to
29335 - # depend on `.', always an invalid library. This was fixed in
29336 - # development snapshots of GCC prior to 3.0.
29337 - case $host_os in
29338 - aix4 | aix4.[01] | aix4.[01].*)
29339 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
29340 - echo ' yes '
29341 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
29342 - :
29343 - else
29344 - can_build_shared=no
29345 - fi
29346 - ;;
29347 - esac
29348 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
29349 - # soname into executable. Probably we can add versioning support to
29350 - # collect2, so additional links can be useful in future.
29351 - if test "$aix_use_runtimelinking" = yes; then
29352 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
29353 - # instead of lib<name>.a to let people know that these are not
29354 - # typical AIX shared libraries.
29355 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29356 - else
29357 - # We preserve .a as extension for shared libraries through AIX4.2
29358 - # and later when we are not doing run time linking.
29359 - library_names_spec='${libname}${release}.a $libname.a'
29360 - soname_spec='${libname}${release}${shared_ext}$major'
29361 - fi
29362 - shlibpath_var=LIBPATH
29363 - fi
29364 - ;;
29365 -
29366 -amigaos*)
29367 - library_names_spec='$libname.ixlibrary $libname.a'
29368 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
29369 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
29370 - ;;
29371 -
29372 -beos*)
29373 - library_names_spec='${libname}${shared_ext}'
29374 - dynamic_linker="$host_os ld.so"
29375 - shlibpath_var=LIBRARY_PATH
29376 - ;;
29377 -
29378 -bsdi[45]*)
29379 - version_type=linux
29380 - need_version=no
29381 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29382 - soname_spec='${libname}${release}${shared_ext}$major'
29383 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
29384 - shlibpath_var=LD_LIBRARY_PATH
29385 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
29386 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
29387 - # the default ld.so.conf also contains /usr/contrib/lib and
29388 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
29389 - # libtool to hard-code these into programs
29390 - ;;
29391 -
29392 -cygwin* | mingw* | pw32*)
29393 - version_type=windows
29394 - shrext_cmds=".dll"
29395 - need_version=no
29396 - need_lib_prefix=no
29397 -
29398 - case $GCC,$host_os in
29399 - yes,cygwin* | yes,mingw* | yes,pw32*)
29400 - library_names_spec='$libname.dll.a'
29401 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
29402 - postinstall_cmds='base_file=`basename \${file}`~
29403 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
29404 - dldir=$destdir/`dirname \$dlpath`~
29405 - test -d \$dldir || mkdir -p \$dldir~
29406 - $install_prog $dir/$dlname \$dldir/$dlname~
29407 - chmod a+x \$dldir/$dlname'
29408 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
29409 - dlpath=$dir/\$dldll~
29410 - $rm \$dlpath'
29411 - shlibpath_overrides_runpath=yes
29412 -
29413 - case $host_os in
29414 - cygwin*)
29415 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
29416 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
29417 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
29418 - ;;
29419 - mingw*)
29420 - # MinGW DLLs use traditional 'lib' prefix
29421 - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
29422 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
29423 - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
29424 - # It is most probably a Windows format PATH printed by
29425 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
29426 - # path with ; separators, and with drive letters. We can handle the
29427 - # drive letters (cygwin fileutils understands them), so leave them,
29428 - # especially as we might pass files found there to a mingw objdump,
29429 - # which wouldn't understand a cygwinified path. Ahh.
29430 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
29431 - else
29432 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
29433 - fi
29434 - ;;
29435 - pw32*)
29436 - # pw32 DLLs use 'pw' prefix rather than 'lib'
29437 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
29438 - ;;
29439 - esac
29440 - ;;
29441 -
29442 - *)
29443 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
29444 - ;;
29445 - esac
29446 - dynamic_linker='Win32 ld.exe'
29447 - # FIXME: first we should search . and the directory the executable is in
29448 - shlibpath_var=PATH
29449 - ;;
29450 -
29451 -darwin* | rhapsody*)
29452 - dynamic_linker="$host_os dyld"
29453 - version_type=darwin
29454 - need_lib_prefix=no
29455 - need_version=no
29456 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
29457 - soname_spec='${libname}${release}${major}$shared_ext'
29458 - shlibpath_overrides_runpath=yes
29459 - shlibpath_var=DYLD_LIBRARY_PATH
29460 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
29461 -
29462 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
29463 - ;;
29464 -
29465 -dgux*)
29466 - version_type=linux
29467 - need_lib_prefix=no
29468 - need_version=no
29469 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
29470 - soname_spec='${libname}${release}${shared_ext}$major'
29471 - shlibpath_var=LD_LIBRARY_PATH
29472 - ;;
29473 -
29474 -freebsd1*)
29475 - dynamic_linker=no
29476 - ;;
29477 -
29478 -freebsd* | dragonfly*)
29479 - # DragonFly does not have aout. When/if they implement a new
29480 - # versioning mechanism, adjust this.
29481 - if test -x /usr/bin/objformat; then
29482 - objformat=`/usr/bin/objformat`
29483 - else
29484 - case $host_os in
29485 - freebsd[123]*) objformat=aout ;;
29486 - *) objformat=elf ;;
29487 - esac
29488 - fi
29489 - version_type=freebsd-$objformat
29490 - case $version_type in
29491 - freebsd-elf*)
29492 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
29493 - need_version=no
29494 - need_lib_prefix=no
29495 - ;;
29496 - freebsd-*)
29497 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
29498 - need_version=yes
29499 - ;;
29500 - esac
29501 - shlibpath_var=LD_LIBRARY_PATH
29502 - case $host_os in
29503 - freebsd2*)
29504 - shlibpath_overrides_runpath=yes
29505 - ;;
29506 - freebsd3.[01]* | freebsdelf3.[01]*)
29507 - shlibpath_overrides_runpath=yes
29508 - hardcode_into_libs=yes
29509 - ;;
29510 - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
29511 - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
29512 - shlibpath_overrides_runpath=no
29513 - hardcode_into_libs=yes
29514 - ;;
29515 - *) # from 4.6 on, and DragonFly
29516 - shlibpath_overrides_runpath=yes
29517 - hardcode_into_libs=yes
29518 - ;;
29519 - esac
29520 - ;;
29521 -
29522 -gnu*)
29523 - version_type=linux
29524 - need_lib_prefix=no
29525 - need_version=no
29526 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
29527 - soname_spec='${libname}${release}${shared_ext}$major'
29528 - shlibpath_var=LD_LIBRARY_PATH
29529 - hardcode_into_libs=yes
29530 - ;;
29531 -
29532 -hpux9* | hpux10* | hpux11*)
29533 - # Give a soname corresponding to the major version so that dld.sl refuses to
29534 - # link against other versions.
29535 - version_type=sunos
29536 - need_lib_prefix=no
29537 - need_version=no
29538 - case $host_cpu in
29539 - ia64*)
29540 - shrext_cmds='.so'
29541 - hardcode_into_libs=yes
29542 - dynamic_linker="$host_os dld.so"
29543 - shlibpath_var=LD_LIBRARY_PATH
29544 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
29545 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29546 - soname_spec='${libname}${release}${shared_ext}$major'
29547 - if test "X$HPUX_IA64_MODE" = X32; then
29548 - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
29549 - else
29550 - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
29551 - fi
29552 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
29553 - ;;
29554 - hppa*64*)
29555 - shrext_cmds='.sl'
29556 - hardcode_into_libs=yes
29557 - dynamic_linker="$host_os dld.sl"
29558 - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
29559 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
29560 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29561 - soname_spec='${libname}${release}${shared_ext}$major'
29562 - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
29563 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
29564 - ;;
29565 - *)
29566 - shrext_cmds='.sl'
29567 - dynamic_linker="$host_os dld.sl"
29568 - shlibpath_var=SHLIB_PATH
29569 - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
29570 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29571 - soname_spec='${libname}${release}${shared_ext}$major'
29572 - ;;
29573 - esac
29574 - # HP-UX runs *really* slowly unless shared libraries are mode 555.
29575 - postinstall_cmds='chmod 555 $lib'
29576 - ;;
29577 -
29578 -interix[3-9]*)
29579 - version_type=linux
29580 - need_lib_prefix=no
29581 - need_version=no
29582 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
29583 - soname_spec='${libname}${release}${shared_ext}$major'
29584 - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
29585 - shlibpath_var=LD_LIBRARY_PATH
29586 - shlibpath_overrides_runpath=no
29587 - hardcode_into_libs=yes
29588 - ;;
29589 -
29590 -irix5* | irix6* | nonstopux*)
29591 - case $host_os in
29592 - nonstopux*) version_type=nonstopux ;;
29593 - *)
29594 - if test "$lt_cv_prog_gnu_ld" = yes; then
29595 - version_type=linux
29596 - else
29597 - version_type=irix
29598 - fi ;;
29599 - esac
29600 - need_lib_prefix=no
29601 - need_version=no
29602 - soname_spec='${libname}${release}${shared_ext}$major'
29603 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
29604 - case $host_os in
29605 - irix5* | nonstopux*)
29606 - libsuff= shlibsuff=
29607 - ;;
29608 - *)
29609 - case $LD in # libtool.m4 will add one of these switches to LD
29610 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
29611 - libsuff= shlibsuff= libmagic=32-bit;;
29612 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
29613 - libsuff=32 shlibsuff=N32 libmagic=N32;;
29614 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
29615 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
29616 - *) libsuff= shlibsuff= libmagic=never-match;;
29617 - esac
29618 - ;;
29619 - esac
29620 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
29621 - shlibpath_overrides_runpath=no
29622 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
29623 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
29624 - hardcode_into_libs=yes
29625 - ;;
29626 -
29627 -# No shared lib support for Linux oldld, aout, or coff.
29628 -linux*oldld* | linux*aout* | linux*coff*)
29629 - dynamic_linker=no
29630 - ;;
29631 -
29632 -# This must be Linux ELF.
29633 -linux* | k*bsd*-gnu)
29634 - version_type=linux
29635 - need_lib_prefix=no
29636 - need_version=no
29637 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29638 - soname_spec='${libname}${release}${shared_ext}$major'
29639 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
29640 - shlibpath_var=LD_LIBRARY_PATH
29641 - shlibpath_overrides_runpath=no
29642 - # This implies no fast_install, which is unacceptable.
29643 - # Some rework will be needed to allow for fast_install
29644 - # before this can be enabled.
29645 - hardcode_into_libs=yes
29646 -
29647 - # Append ld.so.conf contents to the search path
29648 - if test -f /etc/ld.so.conf; then
29649 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
29650 - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
29651 - fi
29652 -
29653 - # We used to test for /lib/ld.so.1 and disable shared libraries on
29654 - # powerpc, because MkLinux only supported shared libraries with the
29655 - # GNU dynamic linker. Since this was broken with cross compilers,
29656 - # most powerpc-linux boxes support dynamic linking these days and
29657 - # people can always --disable-shared, the test was removed, and we
29658 - # assume the GNU/Linux dynamic linker is in use.
29659 - dynamic_linker='GNU/Linux ld.so'
29660 - ;;
29661 -
29662 -netbsdelf*-gnu)
29663 - version_type=linux
29664 - need_lib_prefix=no
29665 - need_version=no
29666 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
29667 - soname_spec='${libname}${release}${shared_ext}$major'
29668 - shlibpath_var=LD_LIBRARY_PATH
29669 - shlibpath_overrides_runpath=no
29670 - hardcode_into_libs=yes
29671 - dynamic_linker='NetBSD ld.elf_so'
29672 - ;;
29673 -
29674 -netbsd*)
29675 - version_type=sunos
29676 - need_lib_prefix=no
29677 - need_version=no
29678 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
29679 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
29680 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
29681 - dynamic_linker='NetBSD (a.out) ld.so'
29682 - else
29683 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
29684 - soname_spec='${libname}${release}${shared_ext}$major'
29685 - dynamic_linker='NetBSD ld.elf_so'
29686 - fi
29687 - shlibpath_var=LD_LIBRARY_PATH
29688 - shlibpath_overrides_runpath=yes
29689 - hardcode_into_libs=yes
29690 - ;;
29691 -
29692 -newsos6)
29693 - version_type=linux
29694 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29695 - shlibpath_var=LD_LIBRARY_PATH
29696 - shlibpath_overrides_runpath=yes
29697 - ;;
29698 -
29699 -nto-qnx*)
29700 - version_type=linux
29701 - need_lib_prefix=no
29702 - need_version=no
29703 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29704 - soname_spec='${libname}${release}${shared_ext}$major'
29705 - shlibpath_var=LD_LIBRARY_PATH
29706 - shlibpath_overrides_runpath=yes
29707 - ;;
29708 -
29709 -openbsd*)
29710 - version_type=sunos
29711 - sys_lib_dlsearch_path_spec="/usr/lib"
29712 - need_lib_prefix=no
29713 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
29714 - case $host_os in
29715 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
29716 - *) need_version=no ;;
29717 - esac
29718 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
29719 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
29720 - shlibpath_var=LD_LIBRARY_PATH
29721 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
29722 - case $host_os in
29723 - openbsd2.[89] | openbsd2.[89].*)
29724 - shlibpath_overrides_runpath=no
29725 - ;;
29726 - *)
29727 - shlibpath_overrides_runpath=yes
29728 - ;;
29729 - esac
29730 - else
29731 - shlibpath_overrides_runpath=yes
29732 - fi
29733 - ;;
29734 -
29735 -os2*)
29736 - libname_spec='$name'
29737 - shrext_cmds=".dll"
29738 - need_lib_prefix=no
29739 - library_names_spec='$libname${shared_ext} $libname.a'
29740 - dynamic_linker='OS/2 ld.exe'
29741 - shlibpath_var=LIBPATH
29742 - ;;
29743 -
29744 -osf3* | osf4* | osf5*)
29745 - version_type=osf
29746 - need_lib_prefix=no
29747 - need_version=no
29748 - soname_spec='${libname}${release}${shared_ext}$major'
29749 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29750 - shlibpath_var=LD_LIBRARY_PATH
29751 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
29752 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
29753 - ;;
29754 -
29755 -rdos*)
29756 - dynamic_linker=no
29757 - ;;
29758 -
29759 -solaris*)
29760 - version_type=linux
29761 - need_lib_prefix=no
29762 - need_version=no
29763 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29764 - soname_spec='${libname}${release}${shared_ext}$major'
29765 - shlibpath_var=LD_LIBRARY_PATH
29766 - shlibpath_overrides_runpath=yes
29767 - hardcode_into_libs=yes
29768 - # ldd complains unless libraries are executable
29769 - postinstall_cmds='chmod +x $lib'
29770 - ;;
29771 -
29772 -sunos4*)
29773 - version_type=sunos
29774 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
29775 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
29776 - shlibpath_var=LD_LIBRARY_PATH
29777 - shlibpath_overrides_runpath=yes
29778 - if test "$with_gnu_ld" = yes; then
29779 - need_lib_prefix=no
29780 - fi
29781 - need_version=yes
29782 - ;;
29783 -
29784 -sysv4 | sysv4.3*)
29785 - version_type=linux
29786 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29787 - soname_spec='${libname}${release}${shared_ext}$major'
29788 - shlibpath_var=LD_LIBRARY_PATH
29789 - case $host_vendor in
29790 - sni)
29791 - shlibpath_overrides_runpath=no
29792 - need_lib_prefix=no
29793 - export_dynamic_flag_spec='${wl}-Blargedynsym'
29794 - runpath_var=LD_RUN_PATH
29795 - ;;
29796 - siemens)
29797 - need_lib_prefix=no
29798 - ;;
29799 - motorola)
29800 - need_lib_prefix=no
29801 - need_version=no
29802 - shlibpath_overrides_runpath=no
29803 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
29804 - ;;
29805 - esac
29806 - ;;
29807 -
29808 -sysv4*MP*)
29809 - if test -d /usr/nec ;then
29810 - version_type=linux
29811 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
29812 - soname_spec='$libname${shared_ext}.$major'
29813 - shlibpath_var=LD_LIBRARY_PATH
29814 - fi
29815 - ;;
29816 -
29817 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
29818 - version_type=freebsd-elf
29819 - need_lib_prefix=no
29820 - need_version=no
29821 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
29822 - soname_spec='${libname}${release}${shared_ext}$major'
29823 - shlibpath_var=LD_LIBRARY_PATH
29824 - hardcode_into_libs=yes
29825 - if test "$with_gnu_ld" = yes; then
29826 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
29827 - shlibpath_overrides_runpath=no
29828 - else
29829 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
29830 - shlibpath_overrides_runpath=yes
29831 - case $host_os in
29832 - sco3.2v5*)
29833 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
29834 - ;;
29835 - esac
29836 - fi
29837 - sys_lib_dlsearch_path_spec='/usr/lib'
29838 - ;;
29839 -
29840 -uts4*)
29841 - version_type=linux
29842 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
29843 - soname_spec='${libname}${release}${shared_ext}$major'
29844 - shlibpath_var=LD_LIBRARY_PATH
29845 - ;;
29846 -
29847 -*)
29848 - dynamic_linker=no
29849 - ;;
29850 -esac
29851 -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
29852 -$as_echo "$dynamic_linker" >&6; }
29853 -test "$dynamic_linker" = no && can_build_shared=no
29854 -
29855 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
29856 - $as_echo_n "(cached) " >&6
29857 -else
29858 - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
29859 -fi
29860 -
29861 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
29862 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
29863 - $as_echo_n "(cached) " >&6
29864 -else
29865 - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
29866 -fi
29867 -
29868 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
29869 -
29870 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
29871 -if test "$GCC" = yes; then
29872 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
29873 -fi
29874 -
29875 -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
29876 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
29877 -hardcode_action_F77=
29878 -if test -n "$hardcode_libdir_flag_spec_F77" || \
29879 - test -n "$runpath_var_F77" || \
29880 - test "X$hardcode_automatic_F77" = "Xyes" ; then
29881 -
29882 - # We can hardcode non-existant directories.
29883 - if test "$hardcode_direct_F77" != no &&
29884 - # If the only mechanism to avoid hardcoding is shlibpath_var, we
29885 - # have to relink, otherwise we might link with an installed library
29886 - # when we should be linking with a yet-to-be-installed one
29887 - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
29888 - test "$hardcode_minus_L_F77" != no; then
29889 - # Linking always hardcodes the temporary library directory.
29890 - hardcode_action_F77=relink
29891 - else
29892 - # We can link without hardcoding, and we can hardcode nonexisting dirs.
29893 - hardcode_action_F77=immediate
29894 - fi
29895 -else
29896 - # We cannot hardcode anything, or else we can only hardcode existing
29897 - # directories.
29898 - hardcode_action_F77=unsupported
29899 -fi
29900 -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
29901 -$as_echo "$hardcode_action_F77" >&6; }
29902 -
29903 -if test "$hardcode_action_F77" = relink; then
29904 - # Fast installation is not supported
29905 - enable_fast_install=no
29906 -elif test "$shlibpath_overrides_runpath" = yes ||
29907 - test "$enable_shared" = no; then
29908 - # Fast installation is not necessary
29909 - enable_fast_install=needless
29910 -fi
29911 -
29912 -
29913 -# The else clause should only fire when bootstrapping the
29914 -# libtool distribution, otherwise you forgot to ship ltmain.sh
29915 -# with your package, and you will get complaints that there are
29916 -# no rules to generate ltmain.sh.
29917 -if test -f "$ltmain"; then
29918 - # See if we are running on zsh, and set the options which allow our commands through
29919 - # without removal of \ escapes.
29920 - if test -n "${ZSH_VERSION+set}" ; then
29921 - setopt NO_GLOB_SUBST
29922 - fi
29923 - # Now quote all the things that may contain metacharacters while being
29924 - # careful not to overquote the AC_SUBSTed values. We take copies of the
29925 - # variables and quote the copies for generation of the libtool script.
29926 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
29927 - SED SHELL STRIP \
29928 - libname_spec library_names_spec soname_spec extract_expsyms_cmds \
29929 - old_striplib striplib file_magic_cmd finish_cmds finish_eval \
29930 - deplibs_check_method reload_flag reload_cmds need_locks \
29931 - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
29932 - lt_cv_sys_global_symbol_to_c_name_address \
29933 - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
29934 - old_postinstall_cmds old_postuninstall_cmds \
29935 - compiler_F77 \
29936 - CC_F77 \
29937 - LD_F77 \
29938 - lt_prog_compiler_wl_F77 \
29939 - lt_prog_compiler_pic_F77 \
29940 - lt_prog_compiler_static_F77 \
29941 - lt_prog_compiler_no_builtin_flag_F77 \
29942 - export_dynamic_flag_spec_F77 \
29943 - thread_safe_flag_spec_F77 \
29944 - whole_archive_flag_spec_F77 \
29945 - enable_shared_with_static_runtimes_F77 \
29946 - old_archive_cmds_F77 \
29947 - old_archive_from_new_cmds_F77 \
29948 - predep_objects_F77 \
29949 - postdep_objects_F77 \
29950 - predeps_F77 \
29951 - postdeps_F77 \
29952 - compiler_lib_search_path_F77 \
29953 - compiler_lib_search_dirs_F77 \
29954 - archive_cmds_F77 \
29955 - archive_expsym_cmds_F77 \
29956 - postinstall_cmds_F77 \
29957 - postuninstall_cmds_F77 \
29958 - old_archive_from_expsyms_cmds_F77 \
29959 - allow_undefined_flag_F77 \
29960 - no_undefined_flag_F77 \
29961 - export_symbols_cmds_F77 \
29962 - hardcode_libdir_flag_spec_F77 \
29963 - hardcode_libdir_flag_spec_ld_F77 \
29964 - hardcode_libdir_separator_F77 \
29965 - hardcode_automatic_F77 \
29966 - module_cmds_F77 \
29967 - module_expsym_cmds_F77 \
29968 - lt_cv_prog_compiler_c_o_F77 \
29969 - fix_srcfile_path_F77 \
29970 - exclude_expsyms_F77 \
29971 - include_expsyms_F77; do
29972 -
29973 - case $var in
29974 - old_archive_cmds_F77 | \
29975 - old_archive_from_new_cmds_F77 | \
29976 - archive_cmds_F77 | \
29977 - archive_expsym_cmds_F77 | \
29978 - module_cmds_F77 | \
29979 - module_expsym_cmds_F77 | \
29980 - old_archive_from_expsyms_cmds_F77 | \
29981 - export_symbols_cmds_F77 | \
29982 - extract_expsyms_cmds | reload_cmds | finish_cmds | \
29983 - postinstall_cmds | postuninstall_cmds | \
29984 - old_postinstall_cmds | old_postuninstall_cmds | \
29985 - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
29986 - # Double-quote double-evaled strings.
29987 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
29988 - ;;
29989 - *)
29990 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
29991 - ;;
29992 - esac
29993 - done
29994 -
29995 - case $lt_echo in
29996 - *'\$0 --fallback-echo"')
29997 - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
29998 - ;;
29999 - esac
30000 -
30001 -cfgfile="$ofile"
30002 -
30003 - cat <<__EOF__ >> "$cfgfile"
30004 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
30005 -
30006 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
30007 -
30008 -# Shell to use when invoking shell scripts.
30009 -SHELL=$lt_SHELL
30010 -
30011 -# Whether or not to build shared libraries.
30012 -build_libtool_libs=$enable_shared
30013 -
30014 -# Whether or not to build static libraries.
30015 -build_old_libs=$enable_static
30016 -
30017 -# Whether or not to add -lc for building shared libraries.
30018 -build_libtool_need_lc=$archive_cmds_need_lc_F77
30019 -
30020 -# Whether or not to disallow shared libs when runtime libs are static
30021 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
30022 -
30023 -# Whether or not to optimize for fast installation.
30024 -fast_install=$enable_fast_install
30025 -
30026 -# The host system.
30027 -host_alias=$host_alias
30028 -host=$host
30029 -host_os=$host_os
30030 -
30031 -# The build system.
30032 -build_alias=$build_alias
30033 -build=$build
30034 -build_os=$build_os
30035 -
30036 -# An echo program that does not interpret backslashes.
30037 -echo=$lt_echo
30038 -
30039 -# The archiver.
30040 -AR=$lt_AR
30041 -AR_FLAGS=$lt_AR_FLAGS
30042 -
30043 -# A C compiler.
30044 -LTCC=$lt_LTCC
30045 -
30046 -# LTCC compiler flags.
30047 -LTCFLAGS=$lt_LTCFLAGS
30048 -
30049 -# A language-specific compiler.
30050 -CC=$lt_compiler_F77
30051 -
30052 -# Is the compiler the GNU C compiler?
30053 -with_gcc=$GCC_F77
30054 -
30055 -# An ERE matcher.
30056 -EGREP=$lt_EGREP
30057 -
30058 -# The linker used to build libraries.
30059 -LD=$lt_LD_F77
30060 -
30061 -# Whether we need hard or soft links.
30062 -LN_S=$lt_LN_S
30063 -
30064 -# A BSD-compatible nm program.
30065 -NM=$lt_NM
30066 -
30067 -# A symbol stripping program
30068 -STRIP=$lt_STRIP
30069 -
30070 -# Used to examine libraries when file_magic_cmd begins "file"
30071 -MAGIC_CMD=$MAGIC_CMD
30072 -
30073 -# Used on cygwin: DLL creation program.
30074 -DLLTOOL="$DLLTOOL"
30075 -
30076 -# Used on cygwin: object dumper.
30077 -OBJDUMP="$OBJDUMP"
30078 -
30079 -# Used on cygwin: assembler.
30080 -AS="$AS"
30081 -
30082 -# The name of the directory that contains temporary libtool files.
30083 -objdir=$objdir
30084 -
30085 -# How to create reloadable object files.
30086 -reload_flag=$lt_reload_flag
30087 -reload_cmds=$lt_reload_cmds
30088 -
30089 -# How to pass a linker flag through the compiler.
30090 -wl=$lt_lt_prog_compiler_wl_F77
30091 -
30092 -# Object file suffix (normally "o").
30093 -objext="$ac_objext"
30094 -
30095 -# Old archive suffix (normally "a").
30096 -libext="$libext"
30097 -
30098 -# Shared library suffix (normally ".so").
30099 -shrext_cmds='$shrext_cmds'
30100 -
30101 -# Executable file suffix (normally "").
30102 -exeext="$exeext"
30103 -
30104 -# Additional compiler flags for building library objects.
30105 -pic_flag=$lt_lt_prog_compiler_pic_F77
30106 -pic_mode=$pic_mode
30107 -
30108 -# What is the maximum length of a command?
30109 -max_cmd_len=$lt_cv_sys_max_cmd_len
30110 -
30111 -# Does compiler simultaneously support -c and -o options?
30112 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
30113 -
30114 -# Must we lock files when doing compilation?
30115 -need_locks=$lt_need_locks
30116 -
30117 -# Do we need the lib prefix for modules?
30118 -need_lib_prefix=$need_lib_prefix
30119 -
30120 -# Do we need a version for libraries?
30121 -need_version=$need_version
30122 -
30123 -# Whether dlopen is supported.
30124 -dlopen_support=$enable_dlopen
30125 -
30126 -# Whether dlopen of programs is supported.
30127 -dlopen_self=$enable_dlopen_self
30128 -
30129 -# Whether dlopen of statically linked programs is supported.
30130 -dlopen_self_static=$enable_dlopen_self_static
30131 -
30132 -# Compiler flag to prevent dynamic linking.
30133 -link_static_flag=$lt_lt_prog_compiler_static_F77
30134 -
30135 -# Compiler flag to turn off builtin functions.
30136 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
30137 -
30138 -# Compiler flag to allow reflexive dlopens.
30139 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
30140 -
30141 -# Compiler flag to generate shared objects directly from archives.
30142 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
30143 -
30144 -# Compiler flag to generate thread-safe objects.
30145 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
30146 -
30147 -# Library versioning type.
30148 -version_type=$version_type
30149 -
30150 -# Format of library name prefix.
30151 -libname_spec=$lt_libname_spec
30152 -
30153 -# List of archive names. First name is the real one, the rest are links.
30154 -# The last name is the one that the linker finds with -lNAME.
30155 -library_names_spec=$lt_library_names_spec
30156 -
30157 -# The coded name of the library, if different from the real name.
30158 -soname_spec=$lt_soname_spec
30159 -
30160 -# Commands used to build and install an old-style archive.
30161 -RANLIB=$lt_RANLIB
30162 -old_archive_cmds=$lt_old_archive_cmds_F77
30163 -old_postinstall_cmds=$lt_old_postinstall_cmds
30164 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
30165 -
30166 -# Create an old-style archive from a shared archive.
30167 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
30168 -
30169 -# Create a temporary old-style archive to link instead of a shared archive.
30170 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
30171 -
30172 -# Commands used to build and install a shared archive.
30173 -archive_cmds=$lt_archive_cmds_F77
30174 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77
30175 -postinstall_cmds=$lt_postinstall_cmds
30176 -postuninstall_cmds=$lt_postuninstall_cmds
30177 -
30178 -# Commands used to build a loadable module (assumed same as above if empty)
30179 -module_cmds=$lt_module_cmds_F77
30180 -module_expsym_cmds=$lt_module_expsym_cmds_F77
30181 -
30182 -# Commands to strip libraries.
30183 -old_striplib=$lt_old_striplib
30184 -striplib=$lt_striplib
30185 -
30186 -# Dependencies to place before the objects being linked to create a
30187 -# shared library.
30188 -predep_objects=$lt_predep_objects_F77
30189 -
30190 -# Dependencies to place after the objects being linked to create a
30191 -# shared library.
30192 -postdep_objects=$lt_postdep_objects_F77
30193 -
30194 -# Dependencies to place before the objects being linked to create a
30195 -# shared library.
30196 -predeps=$lt_predeps_F77
30197 -
30198 -# Dependencies to place after the objects being linked to create a
30199 -# shared library.
30200 -postdeps=$lt_postdeps_F77
30201 -
30202 -# The directories searched by this compiler when creating a shared
30203 -# library
30204 -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
30205 -
30206 -# The library search path used internally by the compiler when linking
30207 -# a shared library.
30208 -compiler_lib_search_path=$lt_compiler_lib_search_path_F77
30209 -
30210 -# Method to check whether dependent libraries are shared objects.
30211 -deplibs_check_method=$lt_deplibs_check_method
30212 -
30213 -# Command to use when deplibs_check_method == file_magic.
30214 -file_magic_cmd=$lt_file_magic_cmd
30215 -
30216 -# Flag that allows shared libraries with undefined symbols to be built.
30217 -allow_undefined_flag=$lt_allow_undefined_flag_F77
30218 -
30219 -# Flag that forces no undefined symbols.
30220 -no_undefined_flag=$lt_no_undefined_flag_F77
30221 -
30222 -# Commands used to finish a libtool library installation in a directory.
30223 -finish_cmds=$lt_finish_cmds
30224 -
30225 -# Same as above, but a single script fragment to be evaled but not shown.
30226 -finish_eval=$lt_finish_eval
30227 -
30228 -# Take the output of nm and produce a listing of raw symbols and C names.
30229 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
30230 -
30231 -# Transform the output of nm in a proper C declaration
30232 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
30233 -
30234 -# Transform the output of nm in a C name address pair
30235 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
30236 -
30237 -# This is the shared library runtime path variable.
30238 -runpath_var=$runpath_var
30239 -
30240 -# This is the shared library path variable.
30241 -shlibpath_var=$shlibpath_var
30242 -
30243 -# Is shlibpath searched before the hard-coded library search path?
30244 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
30245 -
30246 -# How to hardcode a shared library path into an executable.
30247 -hardcode_action=$hardcode_action_F77
30248 -
30249 -# Whether we should hardcode library paths into libraries.
30250 -hardcode_into_libs=$hardcode_into_libs
30251 -
30252 -# Flag to hardcode \$libdir into a binary during linking.
30253 -# This must work even if \$libdir does not exist.
30254 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
30255 -
30256 -# If ld is used when linking, flag to hardcode \$libdir into
30257 -# a binary during linking. This must work even if \$libdir does
30258 -# not exist.
30259 -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
30260 -
30261 -# Whether we need a single -rpath flag with a separated argument.
30262 -hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
30263 -
30264 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
30265 -# resulting binary.
30266 -hardcode_direct=$hardcode_direct_F77
30267 -
30268 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
30269 -# resulting binary.
30270 -hardcode_minus_L=$hardcode_minus_L_F77
30271 -
30272 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
30273 -# the resulting binary.
30274 -hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
30275 -
30276 -# Set to yes if building a shared library automatically hardcodes DIR into the library
30277 -# and all subsequent libraries and executables linked against it.
30278 -hardcode_automatic=$hardcode_automatic_F77
30279 -
30280 -# Variables whose values should be saved in libtool wrapper scripts and
30281 -# restored at relink time.
30282 -variables_saved_for_relink="$variables_saved_for_relink"
30283 -
30284 -# Whether libtool must link a program against all its dependency libraries.
30285 -link_all_deplibs=$link_all_deplibs_F77
30286 -
30287 -# Compile-time system search path for libraries
30288 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
30289 -
30290 -# Run-time system search path for libraries
30291 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
30292 -
30293 -# Fix the shell variable \$srcfile for the compiler.
30294 -fix_srcfile_path=$lt_fix_srcfile_path
30295 -
30296 -# Set to yes if exported symbols are required.
30297 -always_export_symbols=$always_export_symbols_F77
30298 -
30299 -# The commands to list exported symbols.
30300 -export_symbols_cmds=$lt_export_symbols_cmds_F77
30301 -
30302 -# The commands to extract the exported symbol list from a shared archive.
30303 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
30304 -
30305 -# Symbols that should not be listed in the preloaded symbols.
30306 -exclude_expsyms=$lt_exclude_expsyms_F77
30307 -
30308 -# Symbols that must always be exported.
30309 -include_expsyms=$lt_include_expsyms_F77
30310 -
30311 -# ### END LIBTOOL TAG CONFIG: $tagname
30312 -
30313 -__EOF__
30314 -
30315 -
30316 -else
30317 - # If there is no Makefile yet, we rely on a make rule to execute
30318 - # `config.status --recheck' to rerun these tests and create the
30319 - # libtool script then.
30320 - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
30321 - if test -f "$ltmain_in"; then
30322 - test -f Makefile && make "$ltmain"
30323 - fi
30324 -fi
30325 -
30326 -
30327 -ac_ext=c
30328 -ac_cpp='$CPP $CPPFLAGS'
30329 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
30330 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
30331 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
30332 -
30333 -CC="$lt_save_CC"
30334 -
30335 - else
30336 - tagname=""
30337 - fi
30338 - ;;
30339 -
30340 - GCJ)
30341 - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
30342 -
30343 -
30344 -# Source file extension for Java test sources.
30345 -ac_ext=java
30346 -
30347 -# Object file extension for compiled Java test sources.
30348 -objext=o
30349 -objext_GCJ=$objext
30350 -
30351 -# Code to be used in simple compile tests
30352 -lt_simple_compile_test_code="class foo {}"
30353 -
30354 -# Code to be used in simple link tests
30355 -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
30356 -
30357 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
30358 -
30359 -# If no C compiler was specified, use CC.
30360 -LTCC=${LTCC-"$CC"}
30361 -
30362 -# If no C compiler flags were specified, use CFLAGS.
30363 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
30364 -
30365 -# Allow CC to be a program name with arguments.
30366 -compiler=$CC
30367 -
30368 -
30369 -# save warnings/boilerplate of simple test code
30370 -ac_outfile=conftest.$ac_objext
30371 -echo "$lt_simple_compile_test_code" >conftest.$ac_ext
30372 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
30373 -_lt_compiler_boilerplate=`cat conftest.err`
30374 -$rm conftest*
30375 -
30376 -ac_outfile=conftest.$ac_objext
30377 -echo "$lt_simple_link_test_code" >conftest.$ac_ext
30378 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
30379 -_lt_linker_boilerplate=`cat conftest.err`
30380 -$rm -r conftest*
30381 -
30382 -
30383 -# Allow CC to be a program name with arguments.
30384 -lt_save_CC="$CC"
30385 -CC=${GCJ-"gcj"}
30386 -compiler=$CC
30387 -compiler_GCJ=$CC
30388 -for cc_temp in $compiler""; do
30389 - case $cc_temp in
30390 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
30391 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
30392 - \-*) ;;
30393 - *) break;;
30394 - esac
30395 -done
30396 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
30397 -
30398 -
30399 -# GCJ did not exist at the time GCC didn't implicitly link libc in.
30400 -archive_cmds_need_lc_GCJ=no
30401 -
30402 -old_archive_cmds_GCJ=$old_archive_cmds
30403 -
30404 -
30405 -lt_prog_compiler_no_builtin_flag_GCJ=
30406 -
30407 -if test "$GCC" = yes; then
30408 - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
30409 -
30410 -
30411 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
30412 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
30413 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
30414 - $as_echo_n "(cached) " >&6
30415 -else
30416 - lt_cv_prog_compiler_rtti_exceptions=no
30417 - ac_outfile=conftest.$ac_objext
30418 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
30419 - lt_compiler_flag="-fno-rtti -fno-exceptions"
30420 - # Insert the option either (1) after the last *FLAGS variable, or
30421 - # (2) before a word containing "conftest.", or (3) at the end.
30422 - # Note that $ac_compile itself does not contain backslashes and begins
30423 - # with a dollar sign (not a hyphen), so the echo should work correctly.
30424 - # The option is referenced via a variable to avoid confusing sed.
30425 - lt_compile=`echo "$ac_compile" | $SED \
30426 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30427 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30428 - -e 's:$: $lt_compiler_flag:'`
30429 - (eval echo "\"\$as_me:17168: $lt_compile\"" >&5)
30430 - (eval "$lt_compile" 2>conftest.err)
30431 - ac_status=$?
30432 - cat conftest.err >&5
30433 - echo "$as_me:17172: \$? = $ac_status" >&5
30434 - if (exit $ac_status) && test -s "$ac_outfile"; then
30435 - # The compiler can only warn and ignore the option if not recognized
30436 - # So say no if there are warnings other than the usual output.
30437 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
30438 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
30439 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
30440 - lt_cv_prog_compiler_rtti_exceptions=yes
30441 - fi
30442 - fi
30443 - $rm conftest*
30444 -
30445 -fi
30446 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
30447 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
30448 -
30449 -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
30450 - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
30451 -else
30452 - :
30453 -fi
30454 -
30455 -fi
30456 -
30457 -lt_prog_compiler_wl_GCJ=
30458 -lt_prog_compiler_pic_GCJ=
30459 -lt_prog_compiler_static_GCJ=
30460 -
30461 -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
30462 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
30463 -
30464 - if test "$GCC" = yes; then
30465 - lt_prog_compiler_wl_GCJ='-Wl,'
30466 - lt_prog_compiler_static_GCJ='-static'
30467 -
30468 - case $host_os in
30469 - aix*)
30470 - # All AIX code is PIC.
30471 - if test "$host_cpu" = ia64; then
30472 - # AIX 5 now supports IA64 processor
30473 - lt_prog_compiler_static_GCJ='-Bstatic'
30474 - fi
30475 - ;;
30476 -
30477 - amigaos*)
30478 - # FIXME: we need at least 68020 code to build shared libraries, but
30479 - # adding the `-m68020' flag to GCC prevents building anything better,
30480 - # like `-m68040'.
30481 - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
30482 - ;;
30483 -
30484 - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
30485 - # PIC is the default for these OSes.
30486 - ;;
30487 -
30488 - mingw* | cygwin* | pw32* | os2*)
30489 - # This hack is so that the source file can tell whether it is being
30490 - # built for inclusion in a dll (and should export symbols for example).
30491 - # Although the cygwin gcc ignores -fPIC, still need this for old-style
30492 - # (--disable-auto-import) libraries
30493 -
30494 - ;;
30495 -
30496 - darwin* | rhapsody*)
30497 - # PIC is the default on this platform
30498 - # Common symbols not allowed in MH_DYLIB files
30499 - lt_prog_compiler_pic_GCJ='-fno-common'
30500 - ;;
30501 -
30502 - interix[3-9]*)
30503 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
30504 - # Instead, we relocate shared libraries at runtime.
30505 - ;;
30506 -
30507 - msdosdjgpp*)
30508 - # Just because we use GCC doesn't mean we suddenly get shared libraries
30509 - # on systems that don't support them.
30510 - lt_prog_compiler_can_build_shared_GCJ=no
30511 - enable_shared=no
30512 - ;;
30513 -
30514 - sysv4*MP*)
30515 - if test -d /usr/nec; then
30516 - lt_prog_compiler_pic_GCJ=-Kconform_pic
30517 - fi
30518 - ;;
30519 -
30520 - hpux*)
30521 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
30522 - # not for PA HP-UX.
30523 - case $host_cpu in
30524 - hppa*64*|ia64*)
30525 - # +Z the default
30526 - ;;
30527 - *)
30528 - lt_prog_compiler_pic_GCJ='-fPIC'
30529 - ;;
30530 - esac
30531 - ;;
30532 -
30533 - *)
30534 - lt_prog_compiler_pic_GCJ='-fPIC'
30535 - ;;
30536 - esac
30537 - else
30538 - # PORTME Check for flag to pass linker flags through the system compiler.
30539 - case $host_os in
30540 - aix*)
30541 - lt_prog_compiler_wl_GCJ='-Wl,'
30542 - if test "$host_cpu" = ia64; then
30543 - # AIX 5 now supports IA64 processor
30544 - lt_prog_compiler_static_GCJ='-Bstatic'
30545 - else
30546 - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
30547 - fi
30548 - ;;
30549 - darwin*)
30550 - # PIC is the default on this platform
30551 - # Common symbols not allowed in MH_DYLIB files
30552 - case $cc_basename in
30553 - xlc*)
30554 - lt_prog_compiler_pic_GCJ='-qnocommon'
30555 - lt_prog_compiler_wl_GCJ='-Wl,'
30556 - ;;
30557 - esac
30558 - ;;
30559 -
30560 - mingw* | cygwin* | pw32* | os2*)
30561 - # This hack is so that the source file can tell whether it is being
30562 - # built for inclusion in a dll (and should export symbols for example).
30563 -
30564 - ;;
30565 -
30566 - hpux9* | hpux10* | hpux11*)
30567 - lt_prog_compiler_wl_GCJ='-Wl,'
30568 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
30569 - # not for PA HP-UX.
30570 - case $host_cpu in
30571 - hppa*64*|ia64*)
30572 - # +Z the default
30573 - ;;
30574 - *)
30575 - lt_prog_compiler_pic_GCJ='+Z'
30576 - ;;
30577 - esac
30578 - # Is there a better lt_prog_compiler_static that works with the bundled CC?
30579 - lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
30580 - ;;
30581 -
30582 - irix5* | irix6* | nonstopux*)
30583 - lt_prog_compiler_wl_GCJ='-Wl,'
30584 - # PIC (with -KPIC) is the default.
30585 - lt_prog_compiler_static_GCJ='-non_shared'
30586 - ;;
30587 -
30588 - newsos6)
30589 - lt_prog_compiler_pic_GCJ='-KPIC'
30590 - lt_prog_compiler_static_GCJ='-Bstatic'
30591 - ;;
30592 -
30593 - linux* | k*bsd*-gnu)
30594 - case $cc_basename in
30595 - icc* | ecc*)
30596 - lt_prog_compiler_wl_GCJ='-Wl,'
30597 - lt_prog_compiler_pic_GCJ='-KPIC'
30598 - lt_prog_compiler_static_GCJ='-static'
30599 - ;;
30600 - pgcc* | pgf77* | pgf90* | pgf95*)
30601 - # Portland Group compilers (*not* the Pentium gcc compiler,
30602 - # which looks to be a dead project)
30603 - lt_prog_compiler_wl_GCJ='-Wl,'
30604 - lt_prog_compiler_pic_GCJ='-fpic'
30605 - lt_prog_compiler_static_GCJ='-Bstatic'
30606 - ;;
30607 - ccc*)
30608 - lt_prog_compiler_wl_GCJ='-Wl,'
30609 - # All Alpha code is PIC.
30610 - lt_prog_compiler_static_GCJ='-non_shared'
30611 - ;;
30612 - *)
30613 - case `$CC -V 2>&1 | sed 5q` in
30614 - *Sun\ C*)
30615 - # Sun C 5.9
30616 - lt_prog_compiler_pic_GCJ='-KPIC'
30617 - lt_prog_compiler_static_GCJ='-Bstatic'
30618 - lt_prog_compiler_wl_GCJ='-Wl,'
30619 - ;;
30620 - *Sun\ F*)
30621 - # Sun Fortran 8.3 passes all unrecognized flags to the linker
30622 - lt_prog_compiler_pic_GCJ='-KPIC'
30623 - lt_prog_compiler_static_GCJ='-Bstatic'
30624 - lt_prog_compiler_wl_GCJ=''
30625 - ;;
30626 - esac
30627 - ;;
30628 - esac
30629 - ;;
30630 -
30631 - osf3* | osf4* | osf5*)
30632 - lt_prog_compiler_wl_GCJ='-Wl,'
30633 - # All OSF/1 code is PIC.
30634 - lt_prog_compiler_static_GCJ='-non_shared'
30635 - ;;
30636 -
30637 - rdos*)
30638 - lt_prog_compiler_static_GCJ='-non_shared'
30639 - ;;
30640 -
30641 - solaris*)
30642 - lt_prog_compiler_pic_GCJ='-KPIC'
30643 - lt_prog_compiler_static_GCJ='-Bstatic'
30644 - case $cc_basename in
30645 - f77* | f90* | f95*)
30646 - lt_prog_compiler_wl_GCJ='-Qoption ld ';;
30647 - *)
30648 - lt_prog_compiler_wl_GCJ='-Wl,';;
30649 - esac
30650 - ;;
30651 -
30652 - sunos4*)
30653 - lt_prog_compiler_wl_GCJ='-Qoption ld '
30654 - lt_prog_compiler_pic_GCJ='-PIC'
30655 - lt_prog_compiler_static_GCJ='-Bstatic'
30656 - ;;
30657 -
30658 - sysv4 | sysv4.2uw2* | sysv4.3*)
30659 - lt_prog_compiler_wl_GCJ='-Wl,'
30660 - lt_prog_compiler_pic_GCJ='-KPIC'
30661 - lt_prog_compiler_static_GCJ='-Bstatic'
30662 - ;;
30663 -
30664 - sysv4*MP*)
30665 - if test -d /usr/nec ;then
30666 - lt_prog_compiler_pic_GCJ='-Kconform_pic'
30667 - lt_prog_compiler_static_GCJ='-Bstatic'
30668 - fi
30669 - ;;
30670 -
30671 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
30672 - lt_prog_compiler_wl_GCJ='-Wl,'
30673 - lt_prog_compiler_pic_GCJ='-KPIC'
30674 - lt_prog_compiler_static_GCJ='-Bstatic'
30675 - ;;
30676 -
30677 - unicos*)
30678 - lt_prog_compiler_wl_GCJ='-Wl,'
30679 - lt_prog_compiler_can_build_shared_GCJ=no
30680 - ;;
30681 -
30682 - uts4*)
30683 - lt_prog_compiler_pic_GCJ='-pic'
30684 - lt_prog_compiler_static_GCJ='-Bstatic'
30685 - ;;
30686 -
30687 - *)
30688 - lt_prog_compiler_can_build_shared_GCJ=no
30689 - ;;
30690 - esac
30691 - fi
30692 -
30693 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
30694 -$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
30695 -
30696 -#
30697 -# Check to make sure the PIC flag actually works.
30698 -#
30699 -if test -n "$lt_prog_compiler_pic_GCJ"; then
30700 -
30701 -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
30702 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
30703 -if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
30704 - $as_echo_n "(cached) " >&6
30705 -else
30706 - lt_cv_prog_compiler_pic_works_GCJ=no
30707 - ac_outfile=conftest.$ac_objext
30708 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
30709 - lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
30710 - # Insert the option either (1) after the last *FLAGS variable, or
30711 - # (2) before a word containing "conftest.", or (3) at the end.
30712 - # Note that $ac_compile itself does not contain backslashes and begins
30713 - # with a dollar sign (not a hyphen), so the echo should work correctly.
30714 - # The option is referenced via a variable to avoid confusing sed.
30715 - lt_compile=`echo "$ac_compile" | $SED \
30716 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30717 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30718 - -e 's:$: $lt_compiler_flag:'`
30719 - (eval echo "\"\$as_me:17458: $lt_compile\"" >&5)
30720 - (eval "$lt_compile" 2>conftest.err)
30721 - ac_status=$?
30722 - cat conftest.err >&5
30723 - echo "$as_me:17462: \$? = $ac_status" >&5
30724 - if (exit $ac_status) && test -s "$ac_outfile"; then
30725 - # The compiler can only warn and ignore the option if not recognized
30726 - # So say no if there are warnings other than the usual output.
30727 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
30728 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
30729 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
30730 - lt_cv_prog_compiler_pic_works_GCJ=yes
30731 - fi
30732 - fi
30733 - $rm conftest*
30734 -
30735 -fi
30736 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
30737 -$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
30738 -
30739 -if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
30740 - case $lt_prog_compiler_pic_GCJ in
30741 - "" | " "*) ;;
30742 - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
30743 - esac
30744 -else
30745 - lt_prog_compiler_pic_GCJ=
30746 - lt_prog_compiler_can_build_shared_GCJ=no
30747 -fi
30748 -
30749 -fi
30750 -case $host_os in
30751 - # For platforms which do not support PIC, -DPIC is meaningless:
30752 - *djgpp*)
30753 - lt_prog_compiler_pic_GCJ=
30754 - ;;
30755 - *)
30756 - lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
30757 - ;;
30758 -esac
30759 -
30760 -#
30761 -# Check to make sure the static flag actually works.
30762 -#
30763 -wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
30764 -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
30765 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
30766 -if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
30767 - $as_echo_n "(cached) " >&6
30768 -else
30769 - lt_cv_prog_compiler_static_works_GCJ=no
30770 - save_LDFLAGS="$LDFLAGS"
30771 - LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
30772 - echo "$lt_simple_link_test_code" > conftest.$ac_ext
30773 - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
30774 - # The linker can only warn and ignore the option if not recognized
30775 - # So say no if there are warnings
30776 - if test -s conftest.err; then
30777 - # Append any errors to the config.log.
30778 - cat conftest.err 1>&5
30779 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
30780 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
30781 - if diff conftest.exp conftest.er2 >/dev/null; then
30782 - lt_cv_prog_compiler_static_works_GCJ=yes
30783 - fi
30784 - else
30785 - lt_cv_prog_compiler_static_works_GCJ=yes
30786 - fi
30787 - fi
30788 - $rm -r conftest*
30789 - LDFLAGS="$save_LDFLAGS"
30790 -
30791 -fi
30792 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
30793 -$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
30794 -
30795 -if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
30796 - :
30797 -else
30798 - lt_prog_compiler_static_GCJ=
30799 -fi
30800 -
30801 -
30802 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
30803 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
30804 -if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
30805 - $as_echo_n "(cached) " >&6
30806 -else
30807 - lt_cv_prog_compiler_c_o_GCJ=no
30808 - $rm -r conftest 2>/dev/null
30809 - mkdir conftest
30810 - cd conftest
30811 - mkdir out
30812 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
30813 -
30814 - lt_compiler_flag="-o out/conftest2.$ac_objext"
30815 - # Insert the option either (1) after the last *FLAGS variable, or
30816 - # (2) before a word containing "conftest.", or (3) at the end.
30817 - # Note that $ac_compile itself does not contain backslashes and begins
30818 - # with a dollar sign (not a hyphen), so the echo should work correctly.
30819 - lt_compile=`echo "$ac_compile" | $SED \
30820 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30821 - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30822 - -e 's:$: $lt_compiler_flag:'`
30823 - (eval echo "\"\$as_me:17562: $lt_compile\"" >&5)
30824 - (eval "$lt_compile" 2>out/conftest.err)
30825 - ac_status=$?
30826 - cat out/conftest.err >&5
30827 - echo "$as_me:17566: \$? = $ac_status" >&5
30828 - if (exit $ac_status) && test -s out/conftest2.$ac_objext
30829 - then
30830 - # The compiler can only warn and ignore the option if not recognized
30831 - # So say no if there are warnings
30832 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
30833 - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
30834 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
30835 - lt_cv_prog_compiler_c_o_GCJ=yes
30836 - fi
30837 - fi
30838 - chmod u+w . 2>&5
30839 - $rm conftest*
30840 - # SGI C++ compiler will create directory out/ii_files/ for
30841 - # template instantiation
30842 - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
30843 - $rm out/* && rmdir out
30844 - cd ..
30845 - rmdir conftest
30846 - $rm conftest*
30847 -
30848 -fi
30849 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
30850 -$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
30851 -
30852 -
30853 -hard_links="nottested"
30854 -if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
30855 - # do not overwrite the value of need_locks provided by the user
30856 - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
30857 -$as_echo_n "checking if we can lock with hard links... " >&6; }
30858 - hard_links=yes
30859 - $rm conftest*
30860 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
30861 - touch conftest.a
30862 - ln conftest.a conftest.b 2>&5 || hard_links=no
30863 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
30864 - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
30865 -$as_echo "$hard_links" >&6; }
30866 - if test "$hard_links" = no; then
30867 - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
30868 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
30869 - need_locks=warn
30870 - fi
30871 -else
30872 - need_locks=no
30873 -fi
30874 -
30875 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
30876 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
30877 -
30878 - runpath_var=
30879 - allow_undefined_flag_GCJ=
30880 - enable_shared_with_static_runtimes_GCJ=no
30881 - archive_cmds_GCJ=
30882 - archive_expsym_cmds_GCJ=
30883 - old_archive_From_new_cmds_GCJ=
30884 - old_archive_from_expsyms_cmds_GCJ=
30885 - export_dynamic_flag_spec_GCJ=
30886 - whole_archive_flag_spec_GCJ=
30887 - thread_safe_flag_spec_GCJ=
30888 - hardcode_libdir_flag_spec_GCJ=
30889 - hardcode_libdir_flag_spec_ld_GCJ=
30890 - hardcode_libdir_separator_GCJ=
30891 - hardcode_direct_GCJ=no
30892 - hardcode_minus_L_GCJ=no
30893 - hardcode_shlibpath_var_GCJ=unsupported
30894 - link_all_deplibs_GCJ=unknown
30895 - hardcode_automatic_GCJ=no
30896 - module_cmds_GCJ=
30897 - module_expsym_cmds_GCJ=
30898 - always_export_symbols_GCJ=no
30899 - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
30900 - # include_expsyms should be a list of space-separated symbols to be *always*
30901 - # included in the symbol list
30902 - include_expsyms_GCJ=
30903 - # exclude_expsyms can be an extended regexp of symbols to exclude
30904 - # it will be wrapped by ` (' and `)$', so one must not match beginning or
30905 - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
30906 - # as well as any symbol that contains `d'.
30907 - exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
30908 - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
30909 - # platforms (ab)use it in PIC code, but their linkers get confused if
30910 - # the symbol is explicitly referenced. Since portable code cannot
30911 - # rely on this symbol name, it's probably fine to never include it in
30912 - # preloaded symbol tables.
30913 - # Exclude shared library initialization/finalization symbols.
30914 - extract_expsyms_cmds=
30915 - # Just being paranoid about ensuring that cc_basename is set.
30916 - for cc_temp in $compiler""; do
30917 - case $cc_temp in
30918 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
30919 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
30920 - \-*) ;;
30921 - *) break;;
30922 - esac
30923 -done
30924 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
30925 -
30926 - case $host_os in
30927 - cygwin* | mingw* | pw32*)
30928 - # FIXME: the MSVC++ port hasn't been tested in a loooong time
30929 - # When not using gcc, we currently assume that we are using
30930 - # Microsoft Visual C++.
30931 - if test "$GCC" != yes; then
30932 - with_gnu_ld=no
30933 - fi
30934 - ;;
30935 - interix*)
30936 - # we just hope/assume this is gcc and not c89 (= MSVC++)
30937 - with_gnu_ld=yes
30938 - ;;
30939 - openbsd*)
30940 - with_gnu_ld=no
30941 - ;;
30942 - esac
30943 -
30944 - ld_shlibs_GCJ=yes
30945 - if test "$with_gnu_ld" = yes; then
30946 - # If archive_cmds runs LD, not CC, wlarc should be empty
30947 - wlarc='${wl}'
30948 -
30949 - # Set some defaults for GNU ld with shared library support. These
30950 - # are reset later if shared libraries are not supported. Putting them
30951 - # here allows them to be overridden if necessary.
30952 - runpath_var=LD_RUN_PATH
30953 - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
30954 - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
30955 - # ancient GNU ld didn't support --whole-archive et. al.
30956 - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
30957 - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
30958 - else
30959 - whole_archive_flag_spec_GCJ=
30960 - fi
30961 - supports_anon_versioning=no
30962 - case `$LD -v 2>/dev/null` in
30963 - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
30964 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
30965 - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
30966 - *\ 2.11.*) ;; # other 2.11 versions
30967 - *) supports_anon_versioning=yes ;;
30968 - esac
30969 -
30970 - # See if GNU ld supports shared libraries.
30971 - case $host_os in
30972 - aix[3-9]*)
30973 - # On AIX/PPC, the GNU linker is very broken
30974 - if test "$host_cpu" != ia64; then
30975 - ld_shlibs_GCJ=no
30976 - cat <<EOF 1>&2
30977 -
30978 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
30979 -*** to be unable to reliably create shared libraries on AIX.
30980 -*** Therefore, libtool is disabling shared libraries support. If you
30981 -*** really care for shared libraries, you may want to modify your PATH
30982 -*** so that a non-GNU linker is found, and then restart.
30983 -
30984 -EOF
30985 - fi
30986 - ;;
30987 -
30988 - amigaos*)
30989 - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
30990 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
30991 - hardcode_minus_L_GCJ=yes
30992 -
30993 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
30994 - # that the semantics of dynamic libraries on AmigaOS, at least up
30995 - # to version 4, is to share data among multiple programs linked
30996 - # with the same dynamic library. Since this doesn't match the
30997 - # behavior of shared libraries on other platforms, we can't use
30998 - # them.
30999 - ld_shlibs_GCJ=no
31000 - ;;
31001 -
31002 - beos*)
31003 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
31004 - allow_undefined_flag_GCJ=unsupported
31005 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
31006 - # support --undefined. This deserves some investigation. FIXME
31007 - archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31008 - else
31009 - ld_shlibs_GCJ=no
31010 - fi
31011 - ;;
31012 -
31013 - cygwin* | mingw* | pw32*)
31014 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
31015 - # as there is no search path for DLLs.
31016 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
31017 - allow_undefined_flag_GCJ=unsupported
31018 - always_export_symbols_GCJ=no
31019 - enable_shared_with_static_runtimes_GCJ=yes
31020 - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
31021 -
31022 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
31023 - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
31024 - # If the export-symbols file already is a .def file (1st line
31025 - # is EXPORTS), use it as is; otherwise, prepend...
31026 - archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
31027 - cp $export_symbols $output_objdir/$soname.def;
31028 - else
31029 - echo EXPORTS > $output_objdir/$soname.def;
31030 - cat $export_symbols >> $output_objdir/$soname.def;
31031 - fi~
31032 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
31033 - else
31034 - ld_shlibs_GCJ=no
31035 - fi
31036 - ;;
31037 -
31038 - interix[3-9]*)
31039 - hardcode_direct_GCJ=no
31040 - hardcode_shlibpath_var_GCJ=no
31041 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
31042 - export_dynamic_flag_spec_GCJ='${wl}-E'
31043 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
31044 - # Instead, shared libraries are loaded at an image base (0x10000000 by
31045 - # default) and relocated if they conflict, which is a slow very memory
31046 - # consuming and fragmenting process. To avoid this, we pick a random,
31047 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
31048 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
31049 - archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
31050 - archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
31051 - ;;
31052 -
31053 - gnu* | linux* | k*bsd*-gnu)
31054 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
31055 - tmp_addflag=
31056 - case $cc_basename,$host_cpu in
31057 - pgcc*) # Portland Group C compiler
31058 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
31059 - tmp_addflag=' $pic_flag'
31060 - ;;
31061 - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
31062 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
31063 - tmp_addflag=' $pic_flag -Mnomain' ;;
31064 - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
31065 - tmp_addflag=' -i_dynamic' ;;
31066 - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
31067 - tmp_addflag=' -i_dynamic -nofor_main' ;;
31068 - ifc* | ifort*) # Intel Fortran compiler
31069 - tmp_addflag=' -nofor_main' ;;
31070 - esac
31071 - case `$CC -V 2>&1 | sed 5q` in
31072 - *Sun\ C*) # Sun C 5.9
31073 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
31074 - tmp_sharedflag='-G' ;;
31075 - *Sun\ F*) # Sun Fortran 8.3
31076 - tmp_sharedflag='-G' ;;
31077 - *)
31078 - tmp_sharedflag='-shared' ;;
31079 - esac
31080 - archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31081 -
31082 - if test $supports_anon_versioning = yes; then
31083 - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
31084 - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
31085 - $echo "local: *; };" >> $output_objdir/$libname.ver~
31086 - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
31087 - fi
31088 - link_all_deplibs_GCJ=no
31089 - else
31090 - ld_shlibs_GCJ=no
31091 - fi
31092 - ;;
31093 -
31094 - netbsd* | netbsdelf*-gnu)
31095 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
31096 - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
31097 - wlarc=
31098 - else
31099 - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31100 - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31101 - fi
31102 - ;;
31103 -
31104 - solaris*)
31105 - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
31106 - ld_shlibs_GCJ=no
31107 - cat <<EOF 1>&2
31108 -
31109 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
31110 -*** create shared libraries on Solaris systems. Therefore, libtool
31111 -*** is disabling shared libraries support. We urge you to upgrade GNU
31112 -*** binutils to release 2.9.1 or newer. Another option is to modify
31113 -*** your PATH or compiler configuration so that the native linker is
31114 -*** used, and then restart.
31115 -
31116 -EOF
31117 - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
31118 - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31119 - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31120 - else
31121 - ld_shlibs_GCJ=no
31122 - fi
31123 - ;;
31124 -
31125 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
31126 - case `$LD -v 2>&1` in
31127 - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
31128 - ld_shlibs_GCJ=no
31129 - cat <<_LT_EOF 1>&2
31130 -
31131 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
31132 -*** reliably create shared libraries on SCO systems. Therefore, libtool
31133 -*** is disabling shared libraries support. We urge you to upgrade GNU
31134 -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
31135 -*** your PATH or compiler configuration so that the native linker is
31136 -*** used, and then restart.
31137 -
31138 -_LT_EOF
31139 - ;;
31140 - *)
31141 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
31142 - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
31143 - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
31144 - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
31145 - else
31146 - ld_shlibs_GCJ=no
31147 - fi
31148 - ;;
31149 - esac
31150 - ;;
31151 -
31152 - sunos4*)
31153 - archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
31154 - wlarc=
31155 - hardcode_direct_GCJ=yes
31156 - hardcode_shlibpath_var_GCJ=no
31157 - ;;
31158 -
31159 - *)
31160 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
31161 - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
31162 - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
31163 - else
31164 - ld_shlibs_GCJ=no
31165 - fi
31166 - ;;
31167 - esac
31168 -
31169 - if test "$ld_shlibs_GCJ" = no; then
31170 - runpath_var=
31171 - hardcode_libdir_flag_spec_GCJ=
31172 - export_dynamic_flag_spec_GCJ=
31173 - whole_archive_flag_spec_GCJ=
31174 - fi
31175 - else
31176 - # PORTME fill in a description of your system's linker (not GNU ld)
31177 - case $host_os in
31178 - aix3*)
31179 - allow_undefined_flag_GCJ=unsupported
31180 - always_export_symbols_GCJ=yes
31181 - archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
31182 - # Note: this linker hardcodes the directories in LIBPATH if there
31183 - # are no directories specified by -L.
31184 - hardcode_minus_L_GCJ=yes
31185 - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
31186 - # Neither direct hardcoding nor static linking is supported with a
31187 - # broken collect2.
31188 - hardcode_direct_GCJ=unsupported
31189 - fi
31190 - ;;
31191 -
31192 - aix[4-9]*)
31193 - if test "$host_cpu" = ia64; then
31194 - # On IA64, the linker does run time linking by default, so we don't
31195 - # have to do anything special.
31196 - aix_use_runtimelinking=no
31197 - exp_sym_flag='-Bexport'
31198 - no_entry_flag=""
31199 - else
31200 - # If we're using GNU nm, then we don't want the "-C" option.
31201 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
31202 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
31203 - export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
31204 - else
31205 - export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
31206 - fi
31207 - aix_use_runtimelinking=no
31208 -
31209 - # Test if we are trying to use run time linking or normal
31210 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
31211 - # need to do runtime linking.
31212 - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
31213 - for ld_flag in $LDFLAGS; do
31214 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
31215 - aix_use_runtimelinking=yes
31216 - break
31217 - fi
31218 - done
31219 - ;;
31220 - esac
31221 -
31222 - exp_sym_flag='-bexport'
31223 - no_entry_flag='-bnoentry'
31224 - fi
31225 -
31226 - # When large executables or shared objects are built, AIX ld can
31227 - # have problems creating the table of contents. If linking a library
31228 - # or program results in "error TOC overflow" add -mminimal-toc to
31229 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
31230 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
31231 -
31232 - archive_cmds_GCJ=''
31233 - hardcode_direct_GCJ=yes
31234 - hardcode_libdir_separator_GCJ=':'
31235 - link_all_deplibs_GCJ=yes
31236 -
31237 - if test "$GCC" = yes; then
31238 - case $host_os in aix4.[012]|aix4.[012].*)
31239 - # We only want to do this on AIX 4.2 and lower, the check
31240 - # below for broken collect2 doesn't work under 4.3+
31241 - collect2name=`${CC} -print-prog-name=collect2`
31242 - if test -f "$collect2name" && \
31243 - strings "$collect2name" | grep resolve_lib_name >/dev/null
31244 - then
31245 - # We have reworked collect2
31246 - :
31247 - else
31248 - # We have old collect2
31249 - hardcode_direct_GCJ=unsupported
31250 - # It fails to find uninstalled libraries when the uninstalled
31251 - # path is not listed in the libpath. Setting hardcode_minus_L
31252 - # to unsupported forces relinking
31253 - hardcode_minus_L_GCJ=yes
31254 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
31255 - hardcode_libdir_separator_GCJ=
31256 - fi
31257 - ;;
31258 - esac
31259 - shared_flag='-shared'
31260 - if test "$aix_use_runtimelinking" = yes; then
31261 - shared_flag="$shared_flag "'${wl}-G'
31262 - fi
31263 - else
31264 - # not using gcc
31265 - if test "$host_cpu" = ia64; then
31266 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
31267 - # chokes on -Wl,-G. The following line is correct:
31268 - shared_flag='-G'
31269 - else
31270 - if test "$aix_use_runtimelinking" = yes; then
31271 - shared_flag='${wl}-G'
31272 - else
31273 - shared_flag='${wl}-bM:SRE'
31274 - fi
31275 - fi
31276 - fi
31277 -
31278 - # It seems that -bexpall does not export symbols beginning with
31279 - # underscore (_), so it is better to generate a list of symbols to export.
31280 - always_export_symbols_GCJ=yes
31281 - if test "$aix_use_runtimelinking" = yes; then
31282 - # Warning - without using the other runtime loading flags (-brtl),
31283 - # -berok will link without error, but may produce a broken library.
31284 - allow_undefined_flag_GCJ='-berok'
31285 - # Determine the default libpath from the value encoded in an empty executable.
31286 - cat >conftest.$ac_ext <<_ACEOF
31287 -/* confdefs.h. */
31288 -_ACEOF
31289 -cat confdefs.h >>conftest.$ac_ext
31290 -cat >>conftest.$ac_ext <<_ACEOF
31291 -/* end confdefs.h. */
31292 -
31293 -int
31294 -main ()
31295 -{
31296 -
31297 - ;
31298 - return 0;
31299 -}
31300 -_ACEOF
31301 -rm -f conftest.$ac_objext conftest$ac_exeext
31302 -if { (ac_try="$ac_link"
31303 -case "(($ac_try" in
31304 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
31305 - *) ac_try_echo=$ac_try;;
31306 -esac
31307 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
31308 -$as_echo "$ac_try_echo") >&5
31309 - (eval "$ac_link") 2>conftest.er1
31310 - ac_status=$?
31311 - grep -v '^ *+' conftest.er1 >conftest.err
31312 - rm -f conftest.er1
31313 - cat conftest.err >&5
31314 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
31315 - (exit $ac_status); } && {
31316 - test -z "$ac_c_werror_flag" ||
31317 - test ! -s conftest.err
31318 - } && test -s conftest$ac_exeext && {
31319 - test "$cross_compiling" = yes ||
31320 - $as_test_x conftest$ac_exeext
31321 - }; then
31322 -
31323 -lt_aix_libpath_sed='
31324 - /Import File Strings/,/^$/ {
31325 - /^0/ {
31326 - s/^0 *\(.*\)$/\1/
31327 - p
31328 - }
31329 - }'
31330 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31331 -# Check for a 64-bit object if we didn't find anything.
31332 -if test -z "$aix_libpath"; then
31333 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31334 -fi
31335 -else
31336 - $as_echo "$as_me: failed program was:" >&5
31337 -sed 's/^/| /' conftest.$ac_ext >&5
31338 -
31339 -
31340 -fi
31341 -
31342 -rm -rf conftest.dSYM
31343 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
31344 - conftest$ac_exeext conftest.$ac_ext
31345 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31346 -
31347 - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
31348 - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
31349 - else
31350 - if test "$host_cpu" = ia64; then
31351 - hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
31352 - allow_undefined_flag_GCJ="-z nodefs"
31353 - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
31354 - else
31355 - # Determine the default libpath from the value encoded in an empty executable.
31356 - cat >conftest.$ac_ext <<_ACEOF
31357 -/* confdefs.h. */
31358 -_ACEOF
31359 -cat confdefs.h >>conftest.$ac_ext
31360 -cat >>conftest.$ac_ext <<_ACEOF
31361 -/* end confdefs.h. */
31362 -
31363 -int
31364 -main ()
31365 -{
31366 -
31367 - ;
31368 - return 0;
31369 -}
31370 -_ACEOF
31371 -rm -f conftest.$ac_objext conftest$ac_exeext
31372 -if { (ac_try="$ac_link"
31373 -case "(($ac_try" in
31374 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
31375 - *) ac_try_echo=$ac_try;;
31376 -esac
31377 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
31378 -$as_echo "$ac_try_echo") >&5
31379 - (eval "$ac_link") 2>conftest.er1
31380 - ac_status=$?
31381 - grep -v '^ *+' conftest.er1 >conftest.err
31382 - rm -f conftest.er1
31383 - cat conftest.err >&5
31384 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
31385 - (exit $ac_status); } && {
31386 - test -z "$ac_c_werror_flag" ||
31387 - test ! -s conftest.err
31388 - } && test -s conftest$ac_exeext && {
31389 - test "$cross_compiling" = yes ||
31390 - $as_test_x conftest$ac_exeext
31391 - }; then
31392 -
31393 -lt_aix_libpath_sed='
31394 - /Import File Strings/,/^$/ {
31395 - /^0/ {
31396 - s/^0 *\(.*\)$/\1/
31397 - p
31398 - }
31399 - }'
31400 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31401 -# Check for a 64-bit object if we didn't find anything.
31402 -if test -z "$aix_libpath"; then
31403 - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
31404 -fi
31405 -else
31406 - $as_echo "$as_me: failed program was:" >&5
31407 -sed 's/^/| /' conftest.$ac_ext >&5
31408 -
31409 -
31410 -fi
31411 -
31412 -rm -rf conftest.dSYM
31413 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
31414 - conftest$ac_exeext conftest.$ac_ext
31415 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31416 -
31417 - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
31418 - # Warning - without using the other run time loading flags,
31419 - # -berok will link without error, but may produce a broken library.
31420 - no_undefined_flag_GCJ=' ${wl}-bernotok'
31421 - allow_undefined_flag_GCJ=' ${wl}-berok'
31422 - # Exported symbols can be pulled into shared objects from archives
31423 - whole_archive_flag_spec_GCJ='$convenience'
31424 - archive_cmds_need_lc_GCJ=yes
31425 - # This is similar to how AIX traditionally builds its shared libraries.
31426 - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
31427 - fi
31428 - fi
31429 - ;;
31430 -
31431 - amigaos*)
31432 - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
31433 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
31434 - hardcode_minus_L_GCJ=yes
31435 - # see comment about different semantics on the GNU ld section
31436 - ld_shlibs_GCJ=no
31437 - ;;
31438 -
31439 - bsdi[45]*)
31440 - export_dynamic_flag_spec_GCJ=-rdynamic
31441 - ;;
31442 -
31443 - cygwin* | mingw* | pw32*)
31444 - # When not using gcc, we currently assume that we are using
31445 - # Microsoft Visual C++.
31446 - # hardcode_libdir_flag_spec is actually meaningless, as there is
31447 - # no search path for DLLs.
31448 - hardcode_libdir_flag_spec_GCJ=' '
31449 - allow_undefined_flag_GCJ=unsupported
31450 - # Tell ltmain to make .lib files, not .a files.
31451 - libext=lib
31452 - # Tell ltmain to make .dll files, not .so files.
31453 - shrext_cmds=".dll"
31454 - # FIXME: Setting linknames here is a bad hack.
31455 - archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
31456 - # The linker will automatically build a .lib file if we build a DLL.
31457 - old_archive_From_new_cmds_GCJ='true'
31458 - # FIXME: Should let the user specify the lib program.
31459 - old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
31460 - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
31461 - enable_shared_with_static_runtimes_GCJ=yes
31462 - ;;
31463 -
31464 - darwin* | rhapsody*)
31465 - case $host_os in
31466 - rhapsody* | darwin1.[012])
31467 - allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
31468 - ;;
31469 - *) # Darwin 1.3 on
31470 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
31471 - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
31472 - else
31473 - case ${MACOSX_DEPLOYMENT_TARGET} in
31474 - 10.[012])
31475 - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
31476 - ;;
31477 - 10.*)
31478 - allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
31479 - ;;
31480 - esac
31481 - fi
31482 - ;;
31483 - esac
31484 - archive_cmds_need_lc_GCJ=no
31485 - hardcode_direct_GCJ=no
31486 - hardcode_automatic_GCJ=yes
31487 - hardcode_shlibpath_var_GCJ=unsupported
31488 - whole_archive_flag_spec_GCJ=''
31489 - link_all_deplibs_GCJ=yes
31490 - if test "$GCC" = yes ; then
31491 - output_verbose_link_cmd='echo'
31492 - archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
31493 - module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
31494 - archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
31495 - module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
31496 - else
31497 - case $cc_basename in
31498 - xlc*)
31499 - output_verbose_link_cmd='echo'
31500 - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
31501 - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
31502 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
31503 - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
31504 - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
31505 - ;;
31506 - *)
31507 - ld_shlibs_GCJ=no
31508 - ;;
31509 - esac
31510 - fi
31511 - ;;
31512 -
31513 - dgux*)
31514 - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
31515 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
31516 - hardcode_shlibpath_var_GCJ=no
31517 - ;;
31518 -
31519 - freebsd1*)
31520 - ld_shlibs_GCJ=no
31521 - ;;
31522 -
31523 - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
31524 - # support. Future versions do this automatically, but an explicit c++rt0.o
31525 - # does not break anything, and helps significantly (at the cost of a little
31526 - # extra space).
31527 - freebsd2.2*)
31528 - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
31529 - hardcode_libdir_flag_spec_GCJ='-R$libdir'
31530 - hardcode_direct_GCJ=yes
31531 - hardcode_shlibpath_var_GCJ=no
31532 - ;;
31533 -
31534 - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
31535 - freebsd2*)
31536 - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
31537 - hardcode_direct_GCJ=yes
31538 - hardcode_minus_L_GCJ=yes
31539 - hardcode_shlibpath_var_GCJ=no
31540 - ;;
31541 -
31542 - # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
31543 - freebsd* | dragonfly*)
31544 - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
31545 - hardcode_libdir_flag_spec_GCJ='-R$libdir'
31546 - hardcode_direct_GCJ=yes
31547 - hardcode_shlibpath_var_GCJ=no
31548 - ;;
31549 -
31550 - hpux9*)
31551 - if test "$GCC" = yes; then
31552 - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
31553 - else
31554 - archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
31555 - fi
31556 - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
31557 - hardcode_libdir_separator_GCJ=:
31558 - hardcode_direct_GCJ=yes
31559 -
31560 - # hardcode_minus_L: Not really in the search PATH,
31561 - # but as the default location of the library.
31562 - hardcode_minus_L_GCJ=yes
31563 - export_dynamic_flag_spec_GCJ='${wl}-E'
31564 - ;;
31565 -
31566 - hpux10*)
31567 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
31568 - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
31569 - else
31570 - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
31571 - fi
31572 - if test "$with_gnu_ld" = no; then
31573 - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
31574 - hardcode_libdir_separator_GCJ=:
31575 -
31576 - hardcode_direct_GCJ=yes
31577 - export_dynamic_flag_spec_GCJ='${wl}-E'
31578 -
31579 - # hardcode_minus_L: Not really in the search PATH,
31580 - # but as the default location of the library.
31581 - hardcode_minus_L_GCJ=yes
31582 - fi
31583 - ;;
31584 -
31585 - hpux11*)
31586 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
31587 - case $host_cpu in
31588 - hppa*64*)
31589 - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
31590 - ;;
31591 - ia64*)
31592 - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
31593 - ;;
31594 - *)
31595 - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
31596 - ;;
31597 - esac
31598 - else
31599 - case $host_cpu in
31600 - hppa*64*)
31601 - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
31602 - ;;
31603 - ia64*)
31604 - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
31605 - ;;
31606 - *)
31607 - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
31608 - ;;
31609 - esac
31610 - fi
31611 - if test "$with_gnu_ld" = no; then
31612 - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
31613 - hardcode_libdir_separator_GCJ=:
31614 -
31615 - case $host_cpu in
31616 - hppa*64*|ia64*)
31617 - hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
31618 - hardcode_direct_GCJ=no
31619 - hardcode_shlibpath_var_GCJ=no
31620 - ;;
31621 - *)
31622 - hardcode_direct_GCJ=yes
31623 - export_dynamic_flag_spec_GCJ='${wl}-E'
31624 -
31625 - # hardcode_minus_L: Not really in the search PATH,
31626 - # but as the default location of the library.
31627 - hardcode_minus_L_GCJ=yes
31628 - ;;
31629 - esac
31630 - fi
31631 - ;;
31632 -
31633 - irix5* | irix6* | nonstopux*)
31634 - if test "$GCC" = yes; then
31635 - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
31636 - else
31637 - archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
31638 - hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
31639 - fi
31640 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
31641 - hardcode_libdir_separator_GCJ=:
31642 - link_all_deplibs_GCJ=yes
31643 - ;;
31644 -
31645 - netbsd* | netbsdelf*-gnu)
31646 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
31647 - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
31648 - else
31649 - archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
31650 - fi
31651 - hardcode_libdir_flag_spec_GCJ='-R$libdir'
31652 - hardcode_direct_GCJ=yes
31653 - hardcode_shlibpath_var_GCJ=no
31654 - ;;
31655 -
31656 - newsos6)
31657 - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
31658 - hardcode_direct_GCJ=yes
31659 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
31660 - hardcode_libdir_separator_GCJ=:
31661 - hardcode_shlibpath_var_GCJ=no
31662 - ;;
31663 -
31664 - openbsd*)
31665 - if test -f /usr/libexec/ld.so; then
31666 - hardcode_direct_GCJ=yes
31667 - hardcode_shlibpath_var_GCJ=no
31668 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
31669 - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
31670 - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
31671 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
31672 - export_dynamic_flag_spec_GCJ='${wl}-E'
31673 - else
31674 - case $host_os in
31675 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
31676 - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
31677 - hardcode_libdir_flag_spec_GCJ='-R$libdir'
31678 - ;;
31679 - *)
31680 - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
31681 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
31682 - ;;
31683 - esac
31684 - fi
31685 - else
31686 - ld_shlibs_GCJ=no
31687 - fi
31688 - ;;
31689 -
31690 - os2*)
31691 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
31692 - hardcode_minus_L_GCJ=yes
31693 - allow_undefined_flag_GCJ=unsupported
31694 - archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
31695 - old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
31696 - ;;
31697 -
31698 - osf3*)
31699 - if test "$GCC" = yes; then
31700 - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
31701 - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
31702 - else
31703 - allow_undefined_flag_GCJ=' -expect_unresolved \*'
31704 - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
31705 - fi
31706 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
31707 - hardcode_libdir_separator_GCJ=:
31708 - ;;
31709 -
31710 - osf4* | osf5*) # as osf3* with the addition of -msym flag
31711 - if test "$GCC" = yes; then
31712 - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
31713 - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
31714 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
31715 - else
31716 - allow_undefined_flag_GCJ=' -expect_unresolved \*'
31717 - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
31718 - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
31719 - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
31720 -
31721 - # Both c and cxx compiler support -rpath directly
31722 - hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
31723 - fi
31724 - hardcode_libdir_separator_GCJ=:
31725 - ;;
31726 -
31727 - solaris*)
31728 - no_undefined_flag_GCJ=' -z text'
31729 - if test "$GCC" = yes; then
31730 - wlarc='${wl}'
31731 - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
31732 - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
31733 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
31734 - else
31735 - wlarc=''
31736 - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
31737 - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
31738 - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
31739 - fi
31740 - hardcode_libdir_flag_spec_GCJ='-R$libdir'
31741 - hardcode_shlibpath_var_GCJ=no
31742 - case $host_os in
31743 - solaris2.[0-5] | solaris2.[0-5].*) ;;
31744 - *)
31745 - # The compiler driver will combine and reorder linker options,
31746 - # but understands `-z linker_flag'. GCC discards it without `$wl',
31747 - # but is careful enough not to reorder.
31748 - # Supported since Solaris 2.6 (maybe 2.5.1?)
31749 - if test "$GCC" = yes; then
31750 - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
31751 - else
31752 - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
31753 - fi
31754 - ;;
31755 - esac
31756 - link_all_deplibs_GCJ=yes
31757 - ;;
31758 -
31759 - sunos4*)
31760 - if test "x$host_vendor" = xsequent; then
31761 - # Use $CC to link under sequent, because it throws in some extra .o
31762 - # files that make .init and .fini sections work.
31763 - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
31764 - else
31765 - archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
31766 - fi
31767 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
31768 - hardcode_direct_GCJ=yes
31769 - hardcode_minus_L_GCJ=yes
31770 - hardcode_shlibpath_var_GCJ=no
31771 - ;;
31772 -
31773 - sysv4)
31774 - case $host_vendor in
31775 - sni)
31776 - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
31777 - hardcode_direct_GCJ=yes # is this really true???
31778 - ;;
31779 - siemens)
31780 - ## LD is ld it makes a PLAMLIB
31781 - ## CC just makes a GrossModule.
31782 - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
31783 - reload_cmds_GCJ='$CC -r -o $output$reload_objs'
31784 - hardcode_direct_GCJ=no
31785 - ;;
31786 - motorola)
31787 - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
31788 - hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
31789 - ;;
31790 - esac
31791 - runpath_var='LD_RUN_PATH'
31792 - hardcode_shlibpath_var_GCJ=no
31793 - ;;
31794 -
31795 - sysv4.3*)
31796 - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
31797 - hardcode_shlibpath_var_GCJ=no
31798 - export_dynamic_flag_spec_GCJ='-Bexport'
31799 - ;;
31800 -
31801 - sysv4*MP*)
31802 - if test -d /usr/nec; then
31803 - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
31804 - hardcode_shlibpath_var_GCJ=no
31805 - runpath_var=LD_RUN_PATH
31806 - hardcode_runpath_var=yes
31807 - ld_shlibs_GCJ=yes
31808 - fi
31809 - ;;
31810 -
31811 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
31812 - no_undefined_flag_GCJ='${wl}-z,text'
31813 - archive_cmds_need_lc_GCJ=no
31814 - hardcode_shlibpath_var_GCJ=no
31815 - runpath_var='LD_RUN_PATH'
31816 -
31817 - if test "$GCC" = yes; then
31818 - archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
31819 - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
31820 - else
31821 - archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
31822 - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
31823 - fi
31824 - ;;
31825 -
31826 - sysv5* | sco3.2v5* | sco5v6*)
31827 - # Note: We can NOT use -z defs as we might desire, because we do not
31828 - # link with -lc, and that would cause any symbols used from libc to
31829 - # always be unresolved, which means just about no library would
31830 - # ever link correctly. If we're not using GNU ld we use -z text
31831 - # though, which does catch some bad symbols but isn't as heavy-handed
31832 - # as -z defs.
31833 - no_undefined_flag_GCJ='${wl}-z,text'
31834 - allow_undefined_flag_GCJ='${wl}-z,nodefs'
31835 - archive_cmds_need_lc_GCJ=no
31836 - hardcode_shlibpath_var_GCJ=no
31837 - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
31838 - hardcode_libdir_separator_GCJ=':'
31839 - link_all_deplibs_GCJ=yes
31840 - export_dynamic_flag_spec_GCJ='${wl}-Bexport'
31841 - runpath_var='LD_RUN_PATH'
31842 -
31843 - if test "$GCC" = yes; then
31844 - archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
31845 - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
31846 - else
31847 - archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
31848 - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
31849 - fi
31850 - ;;
31851 -
31852 - uts4*)
31853 - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
31854 - hardcode_libdir_flag_spec_GCJ='-L$libdir'
31855 - hardcode_shlibpath_var_GCJ=no
31856 - ;;
31857 -
31858 - *)
31859 - ld_shlibs_GCJ=no
31860 - ;;
31861 - esac
31862 - fi
31863 -
31864 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
31865 -$as_echo "$ld_shlibs_GCJ" >&6; }
31866 -test "$ld_shlibs_GCJ" = no && can_build_shared=no
31867 -
31868 -#
31869 -# Do we need to explicitly link libc?
31870 -#
31871 -case "x$archive_cmds_need_lc_GCJ" in
31872 -x|xyes)
31873 - # Assume -lc should be added
31874 - archive_cmds_need_lc_GCJ=yes
31875 -
31876 - if test "$enable_shared" = yes && test "$GCC" = yes; then
31877 - case $archive_cmds_GCJ in
31878 - *'~'*)
31879 - # FIXME: we may have to deal with multi-command sequences.
31880 - ;;
31881 - '$CC '*)
31882 - # Test whether the compiler implicitly links with -lc since on some
31883 - # systems, -lgcc has to come before -lc. If gcc already passes -lc
31884 - # to ld, don't add -lc before -lgcc.
31885 - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
31886 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
31887 - $rm conftest*
31888 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
31889 -
31890 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
31891 - (eval $ac_compile) 2>&5
31892 - ac_status=$?
31893 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
31894 - (exit $ac_status); } 2>conftest.err; then
31895 - soname=conftest
31896 - lib=conftest
31897 - libobjs=conftest.$ac_objext
31898 - deplibs=
31899 - wl=$lt_prog_compiler_wl_GCJ
31900 - pic_flag=$lt_prog_compiler_pic_GCJ
31901 - compiler_flags=-v
31902 - linker_flags=-v
31903 - verstring=
31904 - output_objdir=.
31905 - libname=conftest
31906 - lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
31907 - allow_undefined_flag_GCJ=
31908 - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
31909 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
31910 - ac_status=$?
31911 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
31912 - (exit $ac_status); }
31913 - then
31914 - archive_cmds_need_lc_GCJ=no
31915 - else
31916 - archive_cmds_need_lc_GCJ=yes
31917 - fi
31918 - allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
31919 - else
31920 - cat conftest.err 1>&5
31921 - fi
31922 - $rm conftest*
31923 - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
31924 -$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
31925 - ;;
31926 - esac
31927 - fi
31928 - ;;
31929 -esac
31930 -
31931 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
31932 -$as_echo_n "checking dynamic linker characteristics... " >&6; }
31933 -library_names_spec=
31934 -libname_spec='lib$name'
31935 -soname_spec=
31936 -shrext_cmds=".so"
31937 -postinstall_cmds=
31938 -postuninstall_cmds=
31939 -finish_cmds=
31940 -finish_eval=
31941 -shlibpath_var=
31942 -shlibpath_overrides_runpath=unknown
31943 -version_type=none
31944 -dynamic_linker="$host_os ld.so"
31945 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
31946 -
31947 -need_lib_prefix=unknown
31948 -hardcode_into_libs=no
31949 -
31950 -# when you set need_version to no, make sure it does not cause -set_version
31951 -# flags to be left without arguments
31952 -need_version=unknown
31953 -
31954 -case $host_os in
31955 -aix3*)
31956 - version_type=linux
31957 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
31958 - shlibpath_var=LIBPATH
31959 -
31960 - # AIX 3 has no versioning support, so we append a major version to the name.
31961 - soname_spec='${libname}${release}${shared_ext}$major'
31962 - ;;
31963 -
31964 -aix[4-9]*)
31965 - version_type=linux
31966 - need_lib_prefix=no
31967 - need_version=no
31968 - hardcode_into_libs=yes
31969 - if test "$host_cpu" = ia64; then
31970 - # AIX 5 supports IA64
31971 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
31972 - shlibpath_var=LD_LIBRARY_PATH
31973 - else
31974 - # With GCC up to 2.95.x, collect2 would create an import file
31975 - # for dependence libraries. The import file would start with
31976 - # the line `#! .'. This would cause the generated library to
31977 - # depend on `.', always an invalid library. This was fixed in
31978 - # development snapshots of GCC prior to 3.0.
31979 - case $host_os in
31980 - aix4 | aix4.[01] | aix4.[01].*)
31981 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
31982 - echo ' yes '
31983 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
31984 - :
31985 - else
31986 - can_build_shared=no
31987 - fi
31988 - ;;
31989 - esac
31990 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
31991 - # soname into executable. Probably we can add versioning support to
31992 - # collect2, so additional links can be useful in future.
31993 - if test "$aix_use_runtimelinking" = yes; then
31994 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
31995 - # instead of lib<name>.a to let people know that these are not
31996 - # typical AIX shared libraries.
31997 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
31998 - else
31999 - # We preserve .a as extension for shared libraries through AIX4.2
32000 - # and later when we are not doing run time linking.
32001 - library_names_spec='${libname}${release}.a $libname.a'
32002 - soname_spec='${libname}${release}${shared_ext}$major'
32003 - fi
32004 - shlibpath_var=LIBPATH
32005 - fi
32006 - ;;
32007 -
32008 -amigaos*)
32009 - library_names_spec='$libname.ixlibrary $libname.a'
32010 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
32011 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
32012 - ;;
32013 -
32014 -beos*)
32015 - library_names_spec='${libname}${shared_ext}'
32016 - dynamic_linker="$host_os ld.so"
32017 - shlibpath_var=LIBRARY_PATH
32018 - ;;
32019 -
32020 -bsdi[45]*)
32021 - version_type=linux
32022 - need_version=no
32023 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32024 - soname_spec='${libname}${release}${shared_ext}$major'
32025 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
32026 - shlibpath_var=LD_LIBRARY_PATH
32027 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
32028 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
32029 - # the default ld.so.conf also contains /usr/contrib/lib and
32030 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
32031 - # libtool to hard-code these into programs
32032 - ;;
32033 -
32034 -cygwin* | mingw* | pw32*)
32035 - version_type=windows
32036 - shrext_cmds=".dll"
32037 - need_version=no
32038 - need_lib_prefix=no
32039 -
32040 - case $GCC,$host_os in
32041 - yes,cygwin* | yes,mingw* | yes,pw32*)
32042 - library_names_spec='$libname.dll.a'
32043 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
32044 - postinstall_cmds='base_file=`basename \${file}`~
32045 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
32046 - dldir=$destdir/`dirname \$dlpath`~
32047 - test -d \$dldir || mkdir -p \$dldir~
32048 - $install_prog $dir/$dlname \$dldir/$dlname~
32049 - chmod a+x \$dldir/$dlname'
32050 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
32051 - dlpath=$dir/\$dldll~
32052 - $rm \$dlpath'
32053 - shlibpath_overrides_runpath=yes
32054 -
32055 - case $host_os in
32056 - cygwin*)
32057 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
32058 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
32059 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
32060 - ;;
32061 - mingw*)
32062 - # MinGW DLLs use traditional 'lib' prefix
32063 - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
32064 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
32065 - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
32066 - # It is most probably a Windows format PATH printed by
32067 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
32068 - # path with ; separators, and with drive letters. We can handle the
32069 - # drive letters (cygwin fileutils understands them), so leave them,
32070 - # especially as we might pass files found there to a mingw objdump,
32071 - # which wouldn't understand a cygwinified path. Ahh.
32072 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
32073 - else
32074 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
32075 - fi
32076 - ;;
32077 - pw32*)
32078 - # pw32 DLLs use 'pw' prefix rather than 'lib'
32079 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
32080 - ;;
32081 - esac
32082 - ;;
32083 -
32084 - *)
32085 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
32086 - ;;
32087 - esac
32088 - dynamic_linker='Win32 ld.exe'
32089 - # FIXME: first we should search . and the directory the executable is in
32090 - shlibpath_var=PATH
32091 - ;;
32092 -
32093 -darwin* | rhapsody*)
32094 - dynamic_linker="$host_os dyld"
32095 - version_type=darwin
32096 - need_lib_prefix=no
32097 - need_version=no
32098 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
32099 - soname_spec='${libname}${release}${major}$shared_ext'
32100 - shlibpath_overrides_runpath=yes
32101 - shlibpath_var=DYLD_LIBRARY_PATH
32102 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
32103 -
32104 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
32105 - ;;
32106 -
32107 -dgux*)
32108 - version_type=linux
32109 - need_lib_prefix=no
32110 - need_version=no
32111 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
32112 - soname_spec='${libname}${release}${shared_ext}$major'
32113 - shlibpath_var=LD_LIBRARY_PATH
32114 - ;;
32115 -
32116 -freebsd1*)
32117 - dynamic_linker=no
32118 - ;;
32119 -
32120 -freebsd* | dragonfly*)
32121 - # DragonFly does not have aout. When/if they implement a new
32122 - # versioning mechanism, adjust this.
32123 - if test -x /usr/bin/objformat; then
32124 - objformat=`/usr/bin/objformat`
32125 - else
32126 - case $host_os in
32127 - freebsd[123]*) objformat=aout ;;
32128 - *) objformat=elf ;;
32129 - esac
32130 - fi
32131 - version_type=freebsd-$objformat
32132 - case $version_type in
32133 - freebsd-elf*)
32134 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
32135 - need_version=no
32136 - need_lib_prefix=no
32137 - ;;
32138 - freebsd-*)
32139 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
32140 - need_version=yes
32141 - ;;
32142 - esac
32143 - shlibpath_var=LD_LIBRARY_PATH
32144 - case $host_os in
32145 - freebsd2*)
32146 - shlibpath_overrides_runpath=yes
32147 - ;;
32148 - freebsd3.[01]* | freebsdelf3.[01]*)
32149 - shlibpath_overrides_runpath=yes
32150 - hardcode_into_libs=yes
32151 - ;;
32152 - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
32153 - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
32154 - shlibpath_overrides_runpath=no
32155 - hardcode_into_libs=yes
32156 - ;;
32157 - *) # from 4.6 on, and DragonFly
32158 - shlibpath_overrides_runpath=yes
32159 - hardcode_into_libs=yes
32160 - ;;
32161 - esac
32162 - ;;
32163 -
32164 -gnu*)
32165 - version_type=linux
32166 - need_lib_prefix=no
32167 - need_version=no
32168 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
32169 - soname_spec='${libname}${release}${shared_ext}$major'
32170 - shlibpath_var=LD_LIBRARY_PATH
32171 - hardcode_into_libs=yes
32172 - ;;
32173 -
32174 -hpux9* | hpux10* | hpux11*)
32175 - # Give a soname corresponding to the major version so that dld.sl refuses to
32176 - # link against other versions.
32177 - version_type=sunos
32178 - need_lib_prefix=no
32179 - need_version=no
32180 - case $host_cpu in
32181 - ia64*)
32182 - shrext_cmds='.so'
32183 - hardcode_into_libs=yes
32184 - dynamic_linker="$host_os dld.so"
32185 - shlibpath_var=LD_LIBRARY_PATH
32186 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
32187 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32188 - soname_spec='${libname}${release}${shared_ext}$major'
32189 - if test "X$HPUX_IA64_MODE" = X32; then
32190 - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
32191 - else
32192 - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
32193 - fi
32194 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
32195 - ;;
32196 - hppa*64*)
32197 - shrext_cmds='.sl'
32198 - hardcode_into_libs=yes
32199 - dynamic_linker="$host_os dld.sl"
32200 - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
32201 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
32202 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32203 - soname_spec='${libname}${release}${shared_ext}$major'
32204 - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
32205 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
32206 - ;;
32207 - *)
32208 - shrext_cmds='.sl'
32209 - dynamic_linker="$host_os dld.sl"
32210 - shlibpath_var=SHLIB_PATH
32211 - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
32212 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32213 - soname_spec='${libname}${release}${shared_ext}$major'
32214 - ;;
32215 - esac
32216 - # HP-UX runs *really* slowly unless shared libraries are mode 555.
32217 - postinstall_cmds='chmod 555 $lib'
32218 - ;;
32219 -
32220 -interix[3-9]*)
32221 - version_type=linux
32222 - need_lib_prefix=no
32223 - need_version=no
32224 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
32225 - soname_spec='${libname}${release}${shared_ext}$major'
32226 - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
32227 - shlibpath_var=LD_LIBRARY_PATH
32228 - shlibpath_overrides_runpath=no
32229 - hardcode_into_libs=yes
32230 - ;;
32231 -
32232 -irix5* | irix6* | nonstopux*)
32233 - case $host_os in
32234 - nonstopux*) version_type=nonstopux ;;
32235 - *)
32236 - if test "$lt_cv_prog_gnu_ld" = yes; then
32237 - version_type=linux
32238 - else
32239 - version_type=irix
32240 - fi ;;
32241 - esac
32242 - need_lib_prefix=no
32243 - need_version=no
32244 - soname_spec='${libname}${release}${shared_ext}$major'
32245 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
32246 - case $host_os in
32247 - irix5* | nonstopux*)
32248 - libsuff= shlibsuff=
32249 - ;;
32250 - *)
32251 - case $LD in # libtool.m4 will add one of these switches to LD
32252 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
32253 - libsuff= shlibsuff= libmagic=32-bit;;
32254 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
32255 - libsuff=32 shlibsuff=N32 libmagic=N32;;
32256 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
32257 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
32258 - *) libsuff= shlibsuff= libmagic=never-match;;
32259 - esac
32260 - ;;
32261 - esac
32262 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
32263 - shlibpath_overrides_runpath=no
32264 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
32265 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
32266 - hardcode_into_libs=yes
32267 - ;;
32268 -
32269 -# No shared lib support for Linux oldld, aout, or coff.
32270 -linux*oldld* | linux*aout* | linux*coff*)
32271 - dynamic_linker=no
32272 - ;;
32273 -
32274 -# This must be Linux ELF.
32275 -linux* | k*bsd*-gnu)
32276 - version_type=linux
32277 - need_lib_prefix=no
32278 - need_version=no
32279 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32280 - soname_spec='${libname}${release}${shared_ext}$major'
32281 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
32282 - shlibpath_var=LD_LIBRARY_PATH
32283 - shlibpath_overrides_runpath=no
32284 - # This implies no fast_install, which is unacceptable.
32285 - # Some rework will be needed to allow for fast_install
32286 - # before this can be enabled.
32287 - hardcode_into_libs=yes
32288 -
32289 - # Append ld.so.conf contents to the search path
32290 - if test -f /etc/ld.so.conf; then
32291 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
32292 - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
32293 - fi
32294 -
32295 - # We used to test for /lib/ld.so.1 and disable shared libraries on
32296 - # powerpc, because MkLinux only supported shared libraries with the
32297 - # GNU dynamic linker. Since this was broken with cross compilers,
32298 - # most powerpc-linux boxes support dynamic linking these days and
32299 - # people can always --disable-shared, the test was removed, and we
32300 - # assume the GNU/Linux dynamic linker is in use.
32301 - dynamic_linker='GNU/Linux ld.so'
32302 - ;;
32303 -
32304 -netbsdelf*-gnu)
32305 - version_type=linux
32306 - need_lib_prefix=no
32307 - need_version=no
32308 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
32309 - soname_spec='${libname}${release}${shared_ext}$major'
32310 - shlibpath_var=LD_LIBRARY_PATH
32311 - shlibpath_overrides_runpath=no
32312 - hardcode_into_libs=yes
32313 - dynamic_linker='NetBSD ld.elf_so'
32314 - ;;
32315 -
32316 -netbsd*)
32317 - version_type=sunos
32318 - need_lib_prefix=no
32319 - need_version=no
32320 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
32321 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
32322 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
32323 - dynamic_linker='NetBSD (a.out) ld.so'
32324 - else
32325 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
32326 - soname_spec='${libname}${release}${shared_ext}$major'
32327 - dynamic_linker='NetBSD ld.elf_so'
32328 - fi
32329 - shlibpath_var=LD_LIBRARY_PATH
32330 - shlibpath_overrides_runpath=yes
32331 - hardcode_into_libs=yes
32332 - ;;
32333 -
32334 -newsos6)
32335 - version_type=linux
32336 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32337 - shlibpath_var=LD_LIBRARY_PATH
32338 - shlibpath_overrides_runpath=yes
32339 - ;;
32340 -
32341 -nto-qnx*)
32342 - version_type=linux
32343 - need_lib_prefix=no
32344 - need_version=no
32345 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32346 - soname_spec='${libname}${release}${shared_ext}$major'
32347 - shlibpath_var=LD_LIBRARY_PATH
32348 - shlibpath_overrides_runpath=yes
32349 - ;;
32350 -
32351 -openbsd*)
32352 - version_type=sunos
32353 - sys_lib_dlsearch_path_spec="/usr/lib"
32354 - need_lib_prefix=no
32355 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
32356 - case $host_os in
32357 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
32358 - *) need_version=no ;;
32359 - esac
32360 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
32361 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
32362 - shlibpath_var=LD_LIBRARY_PATH
32363 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
32364 - case $host_os in
32365 - openbsd2.[89] | openbsd2.[89].*)
32366 - shlibpath_overrides_runpath=no
32367 - ;;
32368 - *)
32369 - shlibpath_overrides_runpath=yes
32370 - ;;
32371 - esac
32372 - else
32373 - shlibpath_overrides_runpath=yes
32374 - fi
32375 - ;;
32376 -
32377 -os2*)
32378 - libname_spec='$name'
32379 - shrext_cmds=".dll"
32380 - need_lib_prefix=no
32381 - library_names_spec='$libname${shared_ext} $libname.a'
32382 - dynamic_linker='OS/2 ld.exe'
32383 - shlibpath_var=LIBPATH
32384 - ;;
32385 -
32386 -osf3* | osf4* | osf5*)
32387 - version_type=osf
32388 - need_lib_prefix=no
32389 - need_version=no
32390 - soname_spec='${libname}${release}${shared_ext}$major'
32391 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32392 - shlibpath_var=LD_LIBRARY_PATH
32393 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
32394 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
32395 - ;;
32396 -
32397 -rdos*)
32398 - dynamic_linker=no
32399 - ;;
32400 -
32401 -solaris*)
32402 - version_type=linux
32403 - need_lib_prefix=no
32404 - need_version=no
32405 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32406 - soname_spec='${libname}${release}${shared_ext}$major'
32407 - shlibpath_var=LD_LIBRARY_PATH
32408 - shlibpath_overrides_runpath=yes
32409 - hardcode_into_libs=yes
32410 - # ldd complains unless libraries are executable
32411 - postinstall_cmds='chmod +x $lib'
32412 - ;;
32413 -
32414 -sunos4*)
32415 - version_type=sunos
32416 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
32417 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
32418 - shlibpath_var=LD_LIBRARY_PATH
32419 - shlibpath_overrides_runpath=yes
32420 - if test "$with_gnu_ld" = yes; then
32421 - need_lib_prefix=no
32422 - fi
32423 - need_version=yes
32424 - ;;
32425 -
32426 -sysv4 | sysv4.3*)
32427 - version_type=linux
32428 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32429 - soname_spec='${libname}${release}${shared_ext}$major'
32430 - shlibpath_var=LD_LIBRARY_PATH
32431 - case $host_vendor in
32432 - sni)
32433 - shlibpath_overrides_runpath=no
32434 - need_lib_prefix=no
32435 - export_dynamic_flag_spec='${wl}-Blargedynsym'
32436 - runpath_var=LD_RUN_PATH
32437 - ;;
32438 - siemens)
32439 - need_lib_prefix=no
32440 - ;;
32441 - motorola)
32442 - need_lib_prefix=no
32443 - need_version=no
32444 - shlibpath_overrides_runpath=no
32445 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
32446 - ;;
32447 - esac
32448 - ;;
32449 -
32450 -sysv4*MP*)
32451 - if test -d /usr/nec ;then
32452 - version_type=linux
32453 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
32454 - soname_spec='$libname${shared_ext}.$major'
32455 - shlibpath_var=LD_LIBRARY_PATH
32456 - fi
32457 - ;;
32458 -
32459 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
32460 - version_type=freebsd-elf
32461 - need_lib_prefix=no
32462 - need_version=no
32463 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
32464 - soname_spec='${libname}${release}${shared_ext}$major'
32465 - shlibpath_var=LD_LIBRARY_PATH
32466 - hardcode_into_libs=yes
32467 - if test "$with_gnu_ld" = yes; then
32468 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
32469 - shlibpath_overrides_runpath=no
32470 - else
32471 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
32472 - shlibpath_overrides_runpath=yes
32473 - case $host_os in
32474 - sco3.2v5*)
32475 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
32476 - ;;
32477 - esac
32478 - fi
32479 - sys_lib_dlsearch_path_spec='/usr/lib'
32480 - ;;
32481 -
32482 -uts4*)
32483 - version_type=linux
32484 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
32485 - soname_spec='${libname}${release}${shared_ext}$major'
32486 - shlibpath_var=LD_LIBRARY_PATH
32487 - ;;
32488 -
32489 -*)
32490 - dynamic_linker=no
32491 - ;;
32492 -esac
32493 -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
32494 -$as_echo "$dynamic_linker" >&6; }
32495 -test "$dynamic_linker" = no && can_build_shared=no
32496 -
32497 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
32498 - $as_echo_n "(cached) " >&6
32499 -else
32500 - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
32501 -fi
32502 -
32503 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
32504 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
32505 - $as_echo_n "(cached) " >&6
32506 -else
32507 - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
32508 -fi
32509 -
32510 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
32511 -
32512 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
32513 -if test "$GCC" = yes; then
32514 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
32515 -fi
32516 -
32517 -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
32518 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
32519 -hardcode_action_GCJ=
32520 -if test -n "$hardcode_libdir_flag_spec_GCJ" || \
32521 - test -n "$runpath_var_GCJ" || \
32522 - test "X$hardcode_automatic_GCJ" = "Xyes" ; then
32523 -
32524 - # We can hardcode non-existant directories.
32525 - if test "$hardcode_direct_GCJ" != no &&
32526 - # If the only mechanism to avoid hardcoding is shlibpath_var, we
32527 - # have to relink, otherwise we might link with an installed library
32528 - # when we should be linking with a yet-to-be-installed one
32529 - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
32530 - test "$hardcode_minus_L_GCJ" != no; then
32531 - # Linking always hardcodes the temporary library directory.
32532 - hardcode_action_GCJ=relink
32533 - else
32534 - # We can link without hardcoding, and we can hardcode nonexisting dirs.
32535 - hardcode_action_GCJ=immediate
32536 - fi
32537 -else
32538 - # We cannot hardcode anything, or else we can only hardcode existing
32539 - # directories.
32540 - hardcode_action_GCJ=unsupported
32541 -fi
32542 -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
32543 -$as_echo "$hardcode_action_GCJ" >&6; }
32544 -
32545 -if test "$hardcode_action_GCJ" = relink; then
32546 - # Fast installation is not supported
32547 - enable_fast_install=no
32548 -elif test "$shlibpath_overrides_runpath" = yes ||
32549 - test "$enable_shared" = no; then
32550 - # Fast installation is not necessary
32551 - enable_fast_install=needless
32552 -fi
32553 -
32554 -
32555 -# The else clause should only fire when bootstrapping the
32556 -# libtool distribution, otherwise you forgot to ship ltmain.sh
32557 -# with your package, and you will get complaints that there are
32558 -# no rules to generate ltmain.sh.
32559 -if test -f "$ltmain"; then
32560 - # See if we are running on zsh, and set the options which allow our commands through
32561 - # without removal of \ escapes.
32562 - if test -n "${ZSH_VERSION+set}" ; then
32563 - setopt NO_GLOB_SUBST
32564 - fi
32565 - # Now quote all the things that may contain metacharacters while being
32566 - # careful not to overquote the AC_SUBSTed values. We take copies of the
32567 - # variables and quote the copies for generation of the libtool script.
32568 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
32569 - SED SHELL STRIP \
32570 - libname_spec library_names_spec soname_spec extract_expsyms_cmds \
32571 - old_striplib striplib file_magic_cmd finish_cmds finish_eval \
32572 - deplibs_check_method reload_flag reload_cmds need_locks \
32573 - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
32574 - lt_cv_sys_global_symbol_to_c_name_address \
32575 - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
32576 - old_postinstall_cmds old_postuninstall_cmds \
32577 - compiler_GCJ \
32578 - CC_GCJ \
32579 - LD_GCJ \
32580 - lt_prog_compiler_wl_GCJ \
32581 - lt_prog_compiler_pic_GCJ \
32582 - lt_prog_compiler_static_GCJ \
32583 - lt_prog_compiler_no_builtin_flag_GCJ \
32584 - export_dynamic_flag_spec_GCJ \
32585 - thread_safe_flag_spec_GCJ \
32586 - whole_archive_flag_spec_GCJ \
32587 - enable_shared_with_static_runtimes_GCJ \
32588 - old_archive_cmds_GCJ \
32589 - old_archive_from_new_cmds_GCJ \
32590 - predep_objects_GCJ \
32591 - postdep_objects_GCJ \
32592 - predeps_GCJ \
32593 - postdeps_GCJ \
32594 - compiler_lib_search_path_GCJ \
32595 - compiler_lib_search_dirs_GCJ \
32596 - archive_cmds_GCJ \
32597 - archive_expsym_cmds_GCJ \
32598 - postinstall_cmds_GCJ \
32599 - postuninstall_cmds_GCJ \
32600 - old_archive_from_expsyms_cmds_GCJ \
32601 - allow_undefined_flag_GCJ \
32602 - no_undefined_flag_GCJ \
32603 - export_symbols_cmds_GCJ \
32604 - hardcode_libdir_flag_spec_GCJ \
32605 - hardcode_libdir_flag_spec_ld_GCJ \
32606 - hardcode_libdir_separator_GCJ \
32607 - hardcode_automatic_GCJ \
32608 - module_cmds_GCJ \
32609 - module_expsym_cmds_GCJ \
32610 - lt_cv_prog_compiler_c_o_GCJ \
32611 - fix_srcfile_path_GCJ \
32612 - exclude_expsyms_GCJ \
32613 - include_expsyms_GCJ; do
32614 -
32615 - case $var in
32616 - old_archive_cmds_GCJ | \
32617 - old_archive_from_new_cmds_GCJ | \
32618 - archive_cmds_GCJ | \
32619 - archive_expsym_cmds_GCJ | \
32620 - module_cmds_GCJ | \
32621 - module_expsym_cmds_GCJ | \
32622 - old_archive_from_expsyms_cmds_GCJ | \
32623 - export_symbols_cmds_GCJ | \
32624 - extract_expsyms_cmds | reload_cmds | finish_cmds | \
32625 - postinstall_cmds | postuninstall_cmds | \
32626 - old_postinstall_cmds | old_postuninstall_cmds | \
32627 - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
32628 - # Double-quote double-evaled strings.
32629 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
32630 - ;;
32631 - *)
32632 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
32633 - ;;
32634 - esac
32635 - done
32636 -
32637 - case $lt_echo in
32638 - *'\$0 --fallback-echo"')
32639 - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
32640 - ;;
32641 - esac
32642 -
32643 -cfgfile="$ofile"
32644 -
32645 - cat <<__EOF__ >> "$cfgfile"
32646 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
32647 -
32648 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
32649 -
32650 -# Shell to use when invoking shell scripts.
32651 -SHELL=$lt_SHELL
32652 -
32653 -# Whether or not to build shared libraries.
32654 -build_libtool_libs=$enable_shared
32655 -
32656 -# Whether or not to build static libraries.
32657 -build_old_libs=$enable_static
32658 -
32659 -# Whether or not to add -lc for building shared libraries.
32660 -build_libtool_need_lc=$archive_cmds_need_lc_GCJ
32661 -
32662 -# Whether or not to disallow shared libs when runtime libs are static
32663 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
32664 -
32665 -# Whether or not to optimize for fast installation.
32666 -fast_install=$enable_fast_install
32667 -
32668 -# The host system.
32669 -host_alias=$host_alias
32670 -host=$host
32671 -host_os=$host_os
32672 -
32673 -# The build system.
32674 -build_alias=$build_alias
32675 -build=$build
32676 -build_os=$build_os
32677 -
32678 -# An echo program that does not interpret backslashes.
32679 -echo=$lt_echo
32680 -
32681 -# The archiver.
32682 -AR=$lt_AR
32683 -AR_FLAGS=$lt_AR_FLAGS
32684 -
32685 -# A C compiler.
32686 -LTCC=$lt_LTCC
32687 -
32688 -# LTCC compiler flags.
32689 -LTCFLAGS=$lt_LTCFLAGS
32690 -
32691 -# A language-specific compiler.
32692 -CC=$lt_compiler_GCJ
32693 -
32694 -# Is the compiler the GNU C compiler?
32695 -with_gcc=$GCC_GCJ
32696 -
32697 -# An ERE matcher.
32698 -EGREP=$lt_EGREP
32699 -
32700 -# The linker used to build libraries.
32701 -LD=$lt_LD_GCJ
32702 -
32703 -# Whether we need hard or soft links.
32704 -LN_S=$lt_LN_S
32705 -
32706 -# A BSD-compatible nm program.
32707 -NM=$lt_NM
32708 -
32709 -# A symbol stripping program
32710 -STRIP=$lt_STRIP
32711 -
32712 -# Used to examine libraries when file_magic_cmd begins "file"
32713 -MAGIC_CMD=$MAGIC_CMD
32714 -
32715 -# Used on cygwin: DLL creation program.
32716 -DLLTOOL="$DLLTOOL"
32717 -
32718 -# Used on cygwin: object dumper.
32719 -OBJDUMP="$OBJDUMP"
32720 -
32721 -# Used on cygwin: assembler.
32722 -AS="$AS"
32723 -
32724 -# The name of the directory that contains temporary libtool files.
32725 -objdir=$objdir
32726 -
32727 -# How to create reloadable object files.
32728 -reload_flag=$lt_reload_flag
32729 -reload_cmds=$lt_reload_cmds
32730 -
32731 -# How to pass a linker flag through the compiler.
32732 -wl=$lt_lt_prog_compiler_wl_GCJ
32733 -
32734 -# Object file suffix (normally "o").
32735 -objext="$ac_objext"
32736 -
32737 -# Old archive suffix (normally "a").
32738 -libext="$libext"
32739 -
32740 -# Shared library suffix (normally ".so").
32741 -shrext_cmds='$shrext_cmds'
32742 -
32743 -# Executable file suffix (normally "").
32744 -exeext="$exeext"
32745 -
32746 -# Additional compiler flags for building library objects.
32747 -pic_flag=$lt_lt_prog_compiler_pic_GCJ
32748 -pic_mode=$pic_mode
32749 -
32750 -# What is the maximum length of a command?
32751 -max_cmd_len=$lt_cv_sys_max_cmd_len
32752 -
32753 -# Does compiler simultaneously support -c and -o options?
32754 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
32755 -
32756 -# Must we lock files when doing compilation?
32757 -need_locks=$lt_need_locks
32758 -
32759 -# Do we need the lib prefix for modules?
32760 -need_lib_prefix=$need_lib_prefix
32761 -
32762 -# Do we need a version for libraries?
32763 -need_version=$need_version
32764 -
32765 -# Whether dlopen is supported.
32766 -dlopen_support=$enable_dlopen
32767 -
32768 -# Whether dlopen of programs is supported.
32769 -dlopen_self=$enable_dlopen_self
32770 -
32771 -# Whether dlopen of statically linked programs is supported.
32772 -dlopen_self_static=$enable_dlopen_self_static
32773 -
32774 -# Compiler flag to prevent dynamic linking.
32775 -link_static_flag=$lt_lt_prog_compiler_static_GCJ
32776 -
32777 -# Compiler flag to turn off builtin functions.
32778 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
32779 -
32780 -# Compiler flag to allow reflexive dlopens.
32781 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
32782 -
32783 -# Compiler flag to generate shared objects directly from archives.
32784 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
32785 -
32786 -# Compiler flag to generate thread-safe objects.
32787 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
32788 -
32789 -# Library versioning type.
32790 -version_type=$version_type
32791 -
32792 -# Format of library name prefix.
32793 -libname_spec=$lt_libname_spec
32794 -
32795 -# List of archive names. First name is the real one, the rest are links.
32796 -# The last name is the one that the linker finds with -lNAME.
32797 -library_names_spec=$lt_library_names_spec
32798 -
32799 -# The coded name of the library, if different from the real name.
32800 -soname_spec=$lt_soname_spec
32801 -
32802 -# Commands used to build and install an old-style archive.
32803 -RANLIB=$lt_RANLIB
32804 -old_archive_cmds=$lt_old_archive_cmds_GCJ
32805 -old_postinstall_cmds=$lt_old_postinstall_cmds
32806 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
32807 -
32808 -# Create an old-style archive from a shared archive.
32809 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
32810 -
32811 -# Create a temporary old-style archive to link instead of a shared archive.
32812 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
32813 -
32814 -# Commands used to build and install a shared archive.
32815 -archive_cmds=$lt_archive_cmds_GCJ
32816 -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
32817 -postinstall_cmds=$lt_postinstall_cmds
32818 -postuninstall_cmds=$lt_postuninstall_cmds
32819 -
32820 -# Commands used to build a loadable module (assumed same as above if empty)
32821 -module_cmds=$lt_module_cmds_GCJ
32822 -module_expsym_cmds=$lt_module_expsym_cmds_GCJ
32823 -
32824 -# Commands to strip libraries.
32825 -old_striplib=$lt_old_striplib
32826 -striplib=$lt_striplib
32827 -
32828 -# Dependencies to place before the objects being linked to create a
32829 -# shared library.
32830 -predep_objects=$lt_predep_objects_GCJ
32831 -
32832 -# Dependencies to place after the objects being linked to create a
32833 -# shared library.
32834 -postdep_objects=$lt_postdep_objects_GCJ
32835 -
32836 -# Dependencies to place before the objects being linked to create a
32837 -# shared library.
32838 -predeps=$lt_predeps_GCJ
32839 -
32840 -# Dependencies to place after the objects being linked to create a
32841 -# shared library.
32842 -postdeps=$lt_postdeps_GCJ
32843 -
32844 -# The directories searched by this compiler when creating a shared
32845 -# library
32846 -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
32847 -
32848 -# The library search path used internally by the compiler when linking
32849 -# a shared library.
32850 -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
32851 -
32852 -# Method to check whether dependent libraries are shared objects.
32853 -deplibs_check_method=$lt_deplibs_check_method
32854 -
32855 -# Command to use when deplibs_check_method == file_magic.
32856 -file_magic_cmd=$lt_file_magic_cmd
32857 -
32858 -# Flag that allows shared libraries with undefined symbols to be built.
32859 -allow_undefined_flag=$lt_allow_undefined_flag_GCJ
32860 -
32861 -# Flag that forces no undefined symbols.
32862 -no_undefined_flag=$lt_no_undefined_flag_GCJ
32863 -
32864 -# Commands used to finish a libtool library installation in a directory.
32865 -finish_cmds=$lt_finish_cmds
32866 -
32867 -# Same as above, but a single script fragment to be evaled but not shown.
32868 -finish_eval=$lt_finish_eval
32869 -
32870 -# Take the output of nm and produce a listing of raw symbols and C names.
32871 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
32872 -
32873 -# Transform the output of nm in a proper C declaration
32874 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
32875 -
32876 -# Transform the output of nm in a C name address pair
32877 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
32878 -
32879 -# This is the shared library runtime path variable.
32880 -runpath_var=$runpath_var
32881 -
32882 -# This is the shared library path variable.
32883 -shlibpath_var=$shlibpath_var
32884 -
32885 -# Is shlibpath searched before the hard-coded library search path?
32886 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
32887 -
32888 -# How to hardcode a shared library path into an executable.
32889 -hardcode_action=$hardcode_action_GCJ
32890 -
32891 -# Whether we should hardcode library paths into libraries.
32892 -hardcode_into_libs=$hardcode_into_libs
32893 -
32894 -# Flag to hardcode \$libdir into a binary during linking.
32895 -# This must work even if \$libdir does not exist.
32896 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
32897 -
32898 -# If ld is used when linking, flag to hardcode \$libdir into
32899 -# a binary during linking. This must work even if \$libdir does
32900 -# not exist.
32901 -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
32902 -
32903 -# Whether we need a single -rpath flag with a separated argument.
32904 -hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
32905 -
32906 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
32907 -# resulting binary.
32908 -hardcode_direct=$hardcode_direct_GCJ
32909 -
32910 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
32911 -# resulting binary.
32912 -hardcode_minus_L=$hardcode_minus_L_GCJ
32913 -
32914 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
32915 -# the resulting binary.
32916 -hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
32917 -
32918 -# Set to yes if building a shared library automatically hardcodes DIR into the library
32919 -# and all subsequent libraries and executables linked against it.
32920 -hardcode_automatic=$hardcode_automatic_GCJ
32921 -
32922 -# Variables whose values should be saved in libtool wrapper scripts and
32923 -# restored at relink time.
32924 -variables_saved_for_relink="$variables_saved_for_relink"
32925 -
32926 -# Whether libtool must link a program against all its dependency libraries.
32927 -link_all_deplibs=$link_all_deplibs_GCJ
32928 -
32929 -# Compile-time system search path for libraries
32930 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
32931 -
32932 -# Run-time system search path for libraries
32933 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
32934 -
32935 -# Fix the shell variable \$srcfile for the compiler.
32936 -fix_srcfile_path=$lt_fix_srcfile_path
32937 -
32938 -# Set to yes if exported symbols are required.
32939 -always_export_symbols=$always_export_symbols_GCJ
32940 -
32941 -# The commands to list exported symbols.
32942 -export_symbols_cmds=$lt_export_symbols_cmds_GCJ
32943 -
32944 -# The commands to extract the exported symbol list from a shared archive.
32945 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
32946 -
32947 -# Symbols that should not be listed in the preloaded symbols.
32948 -exclude_expsyms=$lt_exclude_expsyms_GCJ
32949 -
32950 -# Symbols that must always be exported.
32951 -include_expsyms=$lt_include_expsyms_GCJ
32952 -
32953 -# ### END LIBTOOL TAG CONFIG: $tagname
32954 -
32955 -__EOF__
32956 -
32957 -
32958 -else
32959 - # If there is no Makefile yet, we rely on a make rule to execute
32960 - # `config.status --recheck' to rerun these tests and create the
32961 - # libtool script then.
32962 - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
32963 - if test -f "$ltmain_in"; then
32964 - test -f Makefile && make "$ltmain"
32965 - fi
32966 -fi
32967 -
32968 -
32969 -ac_ext=c
32970 -ac_cpp='$CPP $CPPFLAGS'
32971 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
32972 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
32973 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
32974 -
32975 -CC="$lt_save_CC"
32976 -
32977 - else
32978 - tagname=""
32979 - fi
32980 - ;;
32981 -
32982 - RC)
32983 -
32984 -
32985 -# Source file extension for RC test sources.
32986 -ac_ext=rc
32987 -
32988 -# Object file extension for compiled RC test sources.
32989 -objext=o
32990 -objext_RC=$objext
32991 -
32992 -# Code to be used in simple compile tests
32993 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
32994 -
32995 -# Code to be used in simple link tests
32996 -lt_simple_link_test_code="$lt_simple_compile_test_code"
32997 -
32998 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
32999 -
33000 -# If no C compiler was specified, use CC.
33001 -LTCC=${LTCC-"$CC"}
33002 -
33003 -# If no C compiler flags were specified, use CFLAGS.
33004 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
33005 -
33006 -# Allow CC to be a program name with arguments.
33007 -compiler=$CC
33008 -
33009 -
33010 -# save warnings/boilerplate of simple test code
33011 -ac_outfile=conftest.$ac_objext
33012 -echo "$lt_simple_compile_test_code" >conftest.$ac_ext
33013 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
33014 -_lt_compiler_boilerplate=`cat conftest.err`
33015 -$rm conftest*
33016 -
33017 -ac_outfile=conftest.$ac_objext
33018 -echo "$lt_simple_link_test_code" >conftest.$ac_ext
33019 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
33020 -_lt_linker_boilerplate=`cat conftest.err`
33021 -$rm -r conftest*
33022 -
33023 -
33024 -# Allow CC to be a program name with arguments.
33025 -lt_save_CC="$CC"
33026 -CC=${RC-"windres"}
33027 -compiler=$CC
33028 -compiler_RC=$CC
33029 -for cc_temp in $compiler""; do
33030 - case $cc_temp in
33031 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
33032 - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
33033 - \-*) ;;
33034 - *) break;;
33035 - esac
33036 -done
33037 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
33038 -
33039 -lt_cv_prog_compiler_c_o_RC=yes
33040 -
33041 -# The else clause should only fire when bootstrapping the
33042 -# libtool distribution, otherwise you forgot to ship ltmain.sh
33043 -# with your package, and you will get complaints that there are
33044 -# no rules to generate ltmain.sh.
33045 -if test -f "$ltmain"; then
33046 - # See if we are running on zsh, and set the options which allow our commands through
33047 - # without removal of \ escapes.
33048 - if test -n "${ZSH_VERSION+set}" ; then
33049 - setopt NO_GLOB_SUBST
33050 - fi
33051 - # Now quote all the things that may contain metacharacters while being
33052 - # careful not to overquote the AC_SUBSTed values. We take copies of the
33053 - # variables and quote the copies for generation of the libtool script.
33054 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
33055 - SED SHELL STRIP \
33056 - libname_spec library_names_spec soname_spec extract_expsyms_cmds \
33057 - old_striplib striplib file_magic_cmd finish_cmds finish_eval \
33058 - deplibs_check_method reload_flag reload_cmds need_locks \
33059 - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
33060 - lt_cv_sys_global_symbol_to_c_name_address \
33061 - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
33062 - old_postinstall_cmds old_postuninstall_cmds \
33063 - compiler_RC \
33064 - CC_RC \
33065 - LD_RC \
33066 - lt_prog_compiler_wl_RC \
33067 - lt_prog_compiler_pic_RC \
33068 - lt_prog_compiler_static_RC \
33069 - lt_prog_compiler_no_builtin_flag_RC \
33070 - export_dynamic_flag_spec_RC \
33071 - thread_safe_flag_spec_RC \
33072 - whole_archive_flag_spec_RC \
33073 - enable_shared_with_static_runtimes_RC \
33074 - old_archive_cmds_RC \
33075 - old_archive_from_new_cmds_RC \
33076 - predep_objects_RC \
33077 - postdep_objects_RC \
33078 - predeps_RC \
33079 - postdeps_RC \
33080 - compiler_lib_search_path_RC \
33081 - compiler_lib_search_dirs_RC \
33082 - archive_cmds_RC \
33083 - archive_expsym_cmds_RC \
33084 - postinstall_cmds_RC \
33085 - postuninstall_cmds_RC \
33086 - old_archive_from_expsyms_cmds_RC \
33087 - allow_undefined_flag_RC \
33088 - no_undefined_flag_RC \
33089 - export_symbols_cmds_RC \
33090 - hardcode_libdir_flag_spec_RC \
33091 - hardcode_libdir_flag_spec_ld_RC \
33092 - hardcode_libdir_separator_RC \
33093 - hardcode_automatic_RC \
33094 - module_cmds_RC \
33095 - module_expsym_cmds_RC \
33096 - lt_cv_prog_compiler_c_o_RC \
33097 - fix_srcfile_path_RC \
33098 - exclude_expsyms_RC \
33099 - include_expsyms_RC; do
33100 -
33101 - case $var in
33102 - old_archive_cmds_RC | \
33103 - old_archive_from_new_cmds_RC | \
33104 - archive_cmds_RC | \
33105 - archive_expsym_cmds_RC | \
33106 - module_cmds_RC | \
33107 - module_expsym_cmds_RC | \
33108 - old_archive_from_expsyms_cmds_RC | \
33109 - export_symbols_cmds_RC | \
33110 - extract_expsyms_cmds | reload_cmds | finish_cmds | \
33111 - postinstall_cmds | postuninstall_cmds | \
33112 - old_postinstall_cmds | old_postuninstall_cmds | \
33113 - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
33114 - # Double-quote double-evaled strings.
33115 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
33116 - ;;
33117 - *)
33118 - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
33119 - ;;
33120 - esac
33121 - done
33122 -
33123 - case $lt_echo in
33124 - *'\$0 --fallback-echo"')
33125 - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
33126 - ;;
33127 - esac
33128 -
33129 -cfgfile="$ofile"
33130 -
33131 - cat <<__EOF__ >> "$cfgfile"
33132 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
33133 -
33134 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
33135 -
33136 -# Shell to use when invoking shell scripts.
33137 -SHELL=$lt_SHELL
33138 -
33139 -# Whether or not to build shared libraries.
33140 -build_libtool_libs=$enable_shared
33141 -
33142 -# Whether or not to build static libraries.
33143 -build_old_libs=$enable_static
33144 -
33145 -# Whether or not to add -lc for building shared libraries.
33146 -build_libtool_need_lc=$archive_cmds_need_lc_RC
33147 -
33148 -# Whether or not to disallow shared libs when runtime libs are static
33149 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
33150 -
33151 -# Whether or not to optimize for fast installation.
33152 -fast_install=$enable_fast_install
33153 -
33154 -# The host system.
33155 -host_alias=$host_alias
33156 -host=$host
33157 -host_os=$host_os
33158 -
33159 -# The build system.
33160 -build_alias=$build_alias
33161 -build=$build
33162 -build_os=$build_os
33163 -
33164 -# An echo program that does not interpret backslashes.
33165 -echo=$lt_echo
33166 -
33167 -# The archiver.
33168 -AR=$lt_AR
33169 -AR_FLAGS=$lt_AR_FLAGS
33170 -
33171 -# A C compiler.
33172 -LTCC=$lt_LTCC
33173 -
33174 -# LTCC compiler flags.
33175 -LTCFLAGS=$lt_LTCFLAGS
33176 -
33177 -# A language-specific compiler.
33178 -CC=$lt_compiler_RC
33179 -
33180 -# Is the compiler the GNU C compiler?
33181 -with_gcc=$GCC_RC
33182 -
33183 -# An ERE matcher.
33184 -EGREP=$lt_EGREP
33185 -
33186 -# The linker used to build libraries.
33187 -LD=$lt_LD_RC
33188 -
33189 -# Whether we need hard or soft links.
33190 -LN_S=$lt_LN_S
33191 -
33192 -# A BSD-compatible nm program.
33193 -NM=$lt_NM
33194 -
33195 -# A symbol stripping program
33196 -STRIP=$lt_STRIP
33197 -
33198 -# Used to examine libraries when file_magic_cmd begins "file"
33199 -MAGIC_CMD=$MAGIC_CMD
33200 -
33201 -# Used on cygwin: DLL creation program.
33202 -DLLTOOL="$DLLTOOL"
33203 -
33204 -# Used on cygwin: object dumper.
33205 -OBJDUMP="$OBJDUMP"
33206 -
33207 -# Used on cygwin: assembler.
33208 -AS="$AS"
33209 -
33210 -# The name of the directory that contains temporary libtool files.
33211 -objdir=$objdir
33212 -
33213 -# How to create reloadable object files.
33214 -reload_flag=$lt_reload_flag
33215 -reload_cmds=$lt_reload_cmds
33216 -
33217 -# How to pass a linker flag through the compiler.
33218 -wl=$lt_lt_prog_compiler_wl_RC
33219 -
33220 -# Object file suffix (normally "o").
33221 -objext="$ac_objext"
33222 -
33223 -# Old archive suffix (normally "a").
33224 -libext="$libext"
33225 -
33226 -# Shared library suffix (normally ".so").
33227 -shrext_cmds='$shrext_cmds'
33228 -
33229 -# Executable file suffix (normally "").
33230 -exeext="$exeext"
33231 -
33232 -# Additional compiler flags for building library objects.
33233 -pic_flag=$lt_lt_prog_compiler_pic_RC
33234 -pic_mode=$pic_mode
33235 -
33236 -# What is the maximum length of a command?
33237 -max_cmd_len=$lt_cv_sys_max_cmd_len
33238 -
33239 -# Does compiler simultaneously support -c and -o options?
33240 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
33241 -
33242 -# Must we lock files when doing compilation?
33243 -need_locks=$lt_need_locks
33244 -
33245 -# Do we need the lib prefix for modules?
33246 -need_lib_prefix=$need_lib_prefix
33247 -
33248 -# Do we need a version for libraries?
33249 -need_version=$need_version
33250 -
33251 -# Whether dlopen is supported.
33252 -dlopen_support=$enable_dlopen
33253 -
33254 -# Whether dlopen of programs is supported.
33255 -dlopen_self=$enable_dlopen_self
33256 -
33257 -# Whether dlopen of statically linked programs is supported.
33258 -dlopen_self_static=$enable_dlopen_self_static
33259 -
33260 -# Compiler flag to prevent dynamic linking.
33261 -link_static_flag=$lt_lt_prog_compiler_static_RC
33262 -
33263 -# Compiler flag to turn off builtin functions.
33264 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
33265 -
33266 -# Compiler flag to allow reflexive dlopens.
33267 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
33268 -
33269 -# Compiler flag to generate shared objects directly from archives.
33270 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
33271 -
33272 -# Compiler flag to generate thread-safe objects.
33273 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
33274 -
33275 -# Library versioning type.
33276 -version_type=$version_type
33277 -
33278 -# Format of library name prefix.
33279 -libname_spec=$lt_libname_spec
33280 -
33281 -# List of archive names. First name is the real one, the rest are links.
33282 -# The last name is the one that the linker finds with -lNAME.
33283 -library_names_spec=$lt_library_names_spec
33284 -
33285 -# The coded name of the library, if different from the real name.
33286 -soname_spec=$lt_soname_spec
33287 -
33288 -# Commands used to build and install an old-style archive.
33289 -RANLIB=$lt_RANLIB
33290 -old_archive_cmds=$lt_old_archive_cmds_RC
33291 -old_postinstall_cmds=$lt_old_postinstall_cmds
33292 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
33293 -
33294 -# Create an old-style archive from a shared archive.
33295 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
33296 -
33297 -# Create a temporary old-style archive to link instead of a shared archive.
33298 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
33299 -
33300 -# Commands used to build and install a shared archive.
33301 -archive_cmds=$lt_archive_cmds_RC
33302 -archive_expsym_cmds=$lt_archive_expsym_cmds_RC
33303 -postinstall_cmds=$lt_postinstall_cmds
33304 -postuninstall_cmds=$lt_postuninstall_cmds
33305 -
33306 -# Commands used to build a loadable module (assumed same as above if empty)
33307 -module_cmds=$lt_module_cmds_RC
33308 -module_expsym_cmds=$lt_module_expsym_cmds_RC
33309 -
33310 -# Commands to strip libraries.
33311 -old_striplib=$lt_old_striplib
33312 -striplib=$lt_striplib
33313 -
33314 -# Dependencies to place before the objects being linked to create a
33315 -# shared library.
33316 -predep_objects=$lt_predep_objects_RC
33317 -
33318 -# Dependencies to place after the objects being linked to create a
33319 -# shared library.
33320 -postdep_objects=$lt_postdep_objects_RC
33321 -
33322 -# Dependencies to place before the objects being linked to create a
33323 -# shared library.
33324 -predeps=$lt_predeps_RC
33325 -
33326 -# Dependencies to place after the objects being linked to create a
33327 -# shared library.
33328 -postdeps=$lt_postdeps_RC
33329 -
33330 -# The directories searched by this compiler when creating a shared
33331 -# library
33332 -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
33333 -
33334 -# The library search path used internally by the compiler when linking
33335 -# a shared library.
33336 -compiler_lib_search_path=$lt_compiler_lib_search_path_RC
33337 -
33338 -# Method to check whether dependent libraries are shared objects.
33339 -deplibs_check_method=$lt_deplibs_check_method
33340 -
33341 -# Command to use when deplibs_check_method == file_magic.
33342 -file_magic_cmd=$lt_file_magic_cmd
33343 -
33344 -# Flag that allows shared libraries with undefined symbols to be built.
33345 -allow_undefined_flag=$lt_allow_undefined_flag_RC
33346 -
33347 -# Flag that forces no undefined symbols.
33348 -no_undefined_flag=$lt_no_undefined_flag_RC
33349 -
33350 -# Commands used to finish a libtool library installation in a directory.
33351 -finish_cmds=$lt_finish_cmds
33352 -
33353 -# Same as above, but a single script fragment to be evaled but not shown.
33354 -finish_eval=$lt_finish_eval
33355 -
33356 -# Take the output of nm and produce a listing of raw symbols and C names.
33357 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
33358 -
33359 -# Transform the output of nm in a proper C declaration
33360 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
33361 -
33362 -# Transform the output of nm in a C name address pair
33363 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
33364 -
33365 -# This is the shared library runtime path variable.
33366 -runpath_var=$runpath_var
33367 -
33368 -# This is the shared library path variable.
33369 -shlibpath_var=$shlibpath_var
33370 -
33371 -# Is shlibpath searched before the hard-coded library search path?
33372 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
33373 -
33374 -# How to hardcode a shared library path into an executable.
33375 -hardcode_action=$hardcode_action_RC
33376 -
33377 -# Whether we should hardcode library paths into libraries.
33378 -hardcode_into_libs=$hardcode_into_libs
33379 -
33380 -# Flag to hardcode \$libdir into a binary during linking.
33381 -# This must work even if \$libdir does not exist.
33382 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
33383 -
33384 -# If ld is used when linking, flag to hardcode \$libdir into
33385 -# a binary during linking. This must work even if \$libdir does
33386 -# not exist.
33387 -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
33388 -
33389 -# Whether we need a single -rpath flag with a separated argument.
33390 -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
33391 -
33392 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
33393 -# resulting binary.
33394 -hardcode_direct=$hardcode_direct_RC
33395 -
33396 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
33397 -# resulting binary.
33398 -hardcode_minus_L=$hardcode_minus_L_RC
33399 -
33400 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
33401 -# the resulting binary.
33402 -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
33403 -
33404 -# Set to yes if building a shared library automatically hardcodes DIR into the library
33405 -# and all subsequent libraries and executables linked against it.
33406 -hardcode_automatic=$hardcode_automatic_RC
33407 -
33408 -# Variables whose values should be saved in libtool wrapper scripts and
33409 -# restored at relink time.
33410 -variables_saved_for_relink="$variables_saved_for_relink"
33411 -
33412 -# Whether libtool must link a program against all its dependency libraries.
33413 -link_all_deplibs=$link_all_deplibs_RC
33414 -
33415 -# Compile-time system search path for libraries
33416 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
33417 -
33418 -# Run-time system search path for libraries
33419 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
33420 -
33421 -# Fix the shell variable \$srcfile for the compiler.
33422 -fix_srcfile_path=$lt_fix_srcfile_path
33423 -
33424 -# Set to yes if exported symbols are required.
33425 -always_export_symbols=$always_export_symbols_RC
33426 -
33427 -# The commands to list exported symbols.
33428 -export_symbols_cmds=$lt_export_symbols_cmds_RC
33429 -
33430 -# The commands to extract the exported symbol list from a shared archive.
33431 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
33432 -
33433 -# Symbols that should not be listed in the preloaded symbols.
33434 -exclude_expsyms=$lt_exclude_expsyms_RC
33435 -
33436 -# Symbols that must always be exported.
33437 -include_expsyms=$lt_include_expsyms_RC
33438 -
33439 -# ### END LIBTOOL TAG CONFIG: $tagname
33440 -
33441 -__EOF__
33442 -
33443 -
33444 -else
33445 - # If there is no Makefile yet, we rely on a make rule to execute
33446 - # `config.status --recheck' to rerun these tests and create the
33447 - # libtool script then.
33448 - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
33449 - if test -f "$ltmain_in"; then
33450 - test -f Makefile && make "$ltmain"
33451 - fi
33452 -fi
33453 -
33454 -
33455 -ac_ext=c
33456 -ac_cpp='$CPP $CPPFLAGS'
33457 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
33458 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
33459 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
33460 -
33461 -CC="$lt_save_CC"
33462 -
33463 - ;;
33464 -
33465 - *)
33466 - { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
33467 -$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
33468 - { (exit 1); exit 1; }; }
33469 - ;;
33470 - esac
33471 -
33472 - # Append the new tag name to the list of available tags.
33473 - if test -n "$tagname" ; then
33474 - available_tags="$available_tags $tagname"
33475 - fi
33476 - fi
33477 - done
33478 - IFS="$lt_save_ifs"
33479 -
33480 - # Now substitute the updated list of available tags.
33481 - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
33482 - mv "${ofile}T" "$ofile"
33483 - chmod +x "$ofile"
33484 - else
33485 - rm -f "${ofile}T"
33486 - { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
33487 -$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
33488 - { (exit 1); exit 1; }; }
33489 - fi
33490 -fi
33491 -
33492 -
33493 -
33494 -# This can be used to rebuild libtool when needed
33495 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
33496 -
33497 -# Always use our own libtool.
33498 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
33499 -
33500 -# Prevent multiple expansion
33501 -
33502 -
33503 -
33504 -
33505 -
33506 -
33507 -
33508 -
33509 -
33510 -
33511 -
33512 -
33513 -
33514 -
33515 -
33516 -
33517 -
33518 -
33519 -
33520 -
33521 -# Find a good install program. We prefer a C program (faster),
33522 -# so one script is as good as another. But avoid the broken or
33523 -# incompatible versions:
33524 -# SysV /etc/install, /usr/sbin/install
33525 -# SunOS /usr/etc/install
33526 -# IRIX /sbin/install
33527 -# AIX /bin/install
33528 -# AmigaOS /C/install, which installs bootblocks on floppy discs
33529 -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
33530 -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
33531 -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
33532 -# OS/2's system install, which has a completely different semantic
33533 -# ./install, which can be erroneously created by make from ./install.sh.
33534 -# Reject install programs that cannot install multiple files.
33535 -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
33536 -$as_echo_n "checking for a BSD-compatible install... " >&6; }
33537 -if test -z "$INSTALL"; then
33538 -if test "${ac_cv_path_install+set}" = set; then
33539 - $as_echo_n "(cached) " >&6
33540 -else
33541 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
33542 -for as_dir in $PATH
33543 -do
33544 - IFS=$as_save_IFS
33545 - test -z "$as_dir" && as_dir=.
33546 - # Account for people who put trailing slashes in PATH elements.
33547 -case $as_dir/ in
33548 - ./ | .// | /cC/* | \
33549 - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
33550 - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
33551 - /usr/ucb/* ) ;;
33552 - *)
33553 - # OSF1 and SCO ODT 3.0 have their own names for install.
33554 - # Don't use installbsd from OSF since it installs stuff as root
33555 - # by default.
33556 - for ac_prog in ginstall scoinst install; do
33557 - for ac_exec_ext in '' $ac_executable_extensions; do
33558 - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
33559 - if test $ac_prog = install &&
33560 - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
33561 - # AIX install. It has an incompatible calling convention.
33562 - :
33563 - elif test $ac_prog = install &&
33564 - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
33565 - # program-specific install script used by HP pwplus--don't use.
33566 - :
33567 - else
33568 - rm -rf conftest.one conftest.two conftest.dir
33569 - echo one > conftest.one
33570 - echo two > conftest.two
33571 - mkdir conftest.dir
33572 - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
33573 - test -s conftest.one && test -s conftest.two &&
33574 - test -s conftest.dir/conftest.one &&
33575 - test -s conftest.dir/conftest.two
33576 - then
33577 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
33578 - break 3
33579 - fi
33580 - fi
33581 - fi
33582 - done
33583 - done
33584 - ;;
33585 -esac
33586 -
33587 -done
33588 -IFS=$as_save_IFS
33589 -
33590 -rm -rf conftest.one conftest.two conftest.dir
33591 -
33592 -fi
33593 - if test "${ac_cv_path_install+set}" = set; then
33594 - INSTALL=$ac_cv_path_install
33595 - else
33596 - # As a last resort, use the slow shell script. Don't cache a
33597 - # value for INSTALL within a source directory, because that will
33598 - # break other packages using the cache if that directory is
33599 - # removed, or if the value is a relative name.
33600 - INSTALL=$ac_install_sh
33601 - fi
33602 -fi
33603 -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
33604 -$as_echo "$INSTALL" >&6; }
33605 -
33606 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
33607 -# It thinks the first close brace ends the variable substitution.
33608 -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
33609 -
33610 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
33611 -
33612 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
33613 -
33614 -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
33615 -$as_echo_n "checking for ANSI C header files... " >&6; }
33616 -if test "${ac_cv_header_stdc+set}" = set; then
33617 - $as_echo_n "(cached) " >&6
33618 -else
33619 - cat >conftest.$ac_ext <<_ACEOF
33620 -/* confdefs.h. */
33621 -_ACEOF
33622 -cat confdefs.h >>conftest.$ac_ext
33623 -cat >>conftest.$ac_ext <<_ACEOF
33624 -/* end confdefs.h. */
33625 -#include <stdlib.h>
33626 -#include <stdarg.h>
33627 -#include <string.h>
33628 -#include <float.h>
33629 -
33630 -int
33631 -main ()
33632 -{
33633 -
33634 - ;
33635 - return 0;
33636 -}
33637 -_ACEOF
33638 -rm -f conftest.$ac_objext
33639 -if { (ac_try="$ac_compile"
33640 -case "(($ac_try" in
33641 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
33642 - *) ac_try_echo=$ac_try;;
33643 -esac
33644 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
33645 -$as_echo "$ac_try_echo") >&5
33646 - (eval "$ac_compile") 2>conftest.er1
33647 - ac_status=$?
33648 - grep -v '^ *+' conftest.er1 >conftest.err
33649 - rm -f conftest.er1
33650 - cat conftest.err >&5
33651 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
33652 - (exit $ac_status); } && {
33653 - test -z "$ac_c_werror_flag" ||
33654 - test ! -s conftest.err
33655 - } && test -s conftest.$ac_objext; then
33656 - ac_cv_header_stdc=yes
33657 -else
33658 - $as_echo "$as_me: failed program was:" >&5
33659 -sed 's/^/| /' conftest.$ac_ext >&5
33660 -
33661 - ac_cv_header_stdc=no
33662 -fi
33663 -
33664 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
33665 -
33666 -if test $ac_cv_header_stdc = yes; then
33667 - # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
33668 - cat >conftest.$ac_ext <<_ACEOF
33669 -/* confdefs.h. */
33670 -_ACEOF
33671 -cat confdefs.h >>conftest.$ac_ext
33672 -cat >>conftest.$ac_ext <<_ACEOF
33673 -/* end confdefs.h. */
33674 -#include <string.h>
33675 -
33676 -_ACEOF
33677 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
33678 - $EGREP "memchr" >/dev/null 2>&1; then
33679 - :
33680 -else
33681 - ac_cv_header_stdc=no
33682 -fi
33683 -rm -f conftest*
33684 -
33685 -fi
33686 -
33687 -if test $ac_cv_header_stdc = yes; then
33688 - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
33689 - cat >conftest.$ac_ext <<_ACEOF
33690 -/* confdefs.h. */
33691 -_ACEOF
33692 -cat confdefs.h >>conftest.$ac_ext
33693 -cat >>conftest.$ac_ext <<_ACEOF
33694 -/* end confdefs.h. */
33695 -#include <stdlib.h>
33696 -
33697 -_ACEOF
33698 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
33699 - $EGREP "free" >/dev/null 2>&1; then
33700 - :
33701 -else
33702 - ac_cv_header_stdc=no
33703 -fi
33704 -rm -f conftest*
33705 -
33706 -fi
33707 -
33708 -if test $ac_cv_header_stdc = yes; then
33709 - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
33710 - if test "$cross_compiling" = yes; then
33711 - :
33712 -else
33713 - cat >conftest.$ac_ext <<_ACEOF
33714 -/* confdefs.h. */
33715 -_ACEOF
33716 -cat confdefs.h >>conftest.$ac_ext
33717 -cat >>conftest.$ac_ext <<_ACEOF
33718 -/* end confdefs.h. */
33719 -#include <ctype.h>
33720 -#include <stdlib.h>
33721 -#if ((' ' & 0x0FF) == 0x020)
33722 -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
33723 -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
33724 -#else
33725 -# define ISLOWER(c) \
33726 - (('a' <= (c) && (c) <= 'i') \
33727 - || ('j' <= (c) && (c) <= 'r') \
33728 - || ('s' <= (c) && (c) <= 'z'))
33729 -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
33730 -#endif
33731 -
33732 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
33733 -int
33734 -main ()
33735 -{
33736 - int i;
33737 - for (i = 0; i < 256; i++)
33738 - if (XOR (islower (i), ISLOWER (i))
33739 - || toupper (i) != TOUPPER (i))
33740 - return 2;
33741 - return 0;
33742 -}
33743 -_ACEOF
33744 -rm -f conftest$ac_exeext
33745 -if { (ac_try="$ac_link"
33746 -case "(($ac_try" in
33747 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
33748 - *) ac_try_echo=$ac_try;;
33749 -esac
33750 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
33751 -$as_echo "$ac_try_echo") >&5
33752 - (eval "$ac_link") 2>&5
33753 - ac_status=$?
33754 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
33755 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
33756 - { (case "(($ac_try" in
33757 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
33758 - *) ac_try_echo=$ac_try;;
33759 -esac
33760 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
33761 -$as_echo "$ac_try_echo") >&5
33762 - (eval "$ac_try") 2>&5
33763 - ac_status=$?
33764 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
33765 - (exit $ac_status); }; }; then
33766 - :
33767 -else
33768 - $as_echo "$as_me: program exited with status $ac_status" >&5
33769 -$as_echo "$as_me: failed program was:" >&5
33770 -sed 's/^/| /' conftest.$ac_ext >&5
33771 -
33772 -( exit $ac_status )
33773 -ac_cv_header_stdc=no
33774 -fi
33775 -rm -rf conftest.dSYM
33776 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
33777 -fi
33778 -
33779 -
33780 -fi
33781 -fi
33782 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
33783 -$as_echo "$ac_cv_header_stdc" >&6; }
33784 -if test $ac_cv_header_stdc = yes; then
33785 -
33786 -cat >>confdefs.h <<\_ACEOF
33787 -#define STDC_HEADERS 1
33788 -_ACEOF
33789 -
33790 -fi
33791 -
33792 -# By default we simply use the C compiler to build assembly code.
33793 -
33794 -test "${CCAS+set}" = set || CCAS=$CC
33795 -test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
33796 -
33797 -
33798 -
33799 -depcc="$CCAS" am_compiler_list=
33800 -
33801 -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
33802 -$as_echo_n "checking dependency style of $depcc... " >&6; }
33803 -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then
33804 - $as_echo_n "(cached) " >&6
33805 -else
33806 - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
33807 - # We make a subdir and do the tests there. Otherwise we can end up
33808 - # making bogus files that we don't know about and never remove. For
33809 - # instance it was reported that on HP-UX the gcc test will end up
33810 - # making a dummy file named `D' -- because `-MD' means `put the output
33811 - # in D'.
33812 - mkdir conftest.dir
33813 - # Copy depcomp to subdir because otherwise we won't find it if we're
33814 - # using a relative directory.
33815 - cp "$am_depcomp" conftest.dir
33816 - cd conftest.dir
33817 - # We will build objects and dependencies in a subdirectory because
33818 - # it helps to detect inapplicable dependency modes. For instance
33819 - # both Tru64's cc and ICC support -MD to output dependencies as a
33820 - # side effect of compilation, but ICC will put the dependencies in
33821 - # the current directory while Tru64 will put them in the object
33822 - # directory.
33823 - mkdir sub
33824 -
33825 - am_cv_CCAS_dependencies_compiler_type=none
33826 - if test "$am_compiler_list" = ""; then
33827 - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
33828 - fi
33829 - for depmode in $am_compiler_list; do
33830 - # Setup a source with many dependencies, because some compilers
33831 - # like to wrap large dependency lists on column 80 (with \), and
33832 - # we should not choose a depcomp mode which is confused by this.
33833 - #
33834 - # We need to recreate these files for each test, as the compiler may
33835 - # overwrite some of them when testing with obscure command lines.
33836 - # This happens at least with the AIX C compiler.
33837 - : > sub/conftest.c
33838 - for i in 1 2 3 4 5 6; do
33839 - echo '#include "conftst'$i'.h"' >> sub/conftest.c
33840 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
33841 - # Solaris 8's {/usr,}/bin/sh.
33842 - touch sub/conftst$i.h
33843 - done
33844 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
33845 -
33846 - case $depmode in
33847 - nosideeffect)
33848 - # after this tag, mechanisms are not by side-effect, so they'll
33849 - # only be used when explicitly requested
33850 - if test "x$enable_dependency_tracking" = xyes; then
33851 - continue
33852 - else
33853 - break
33854 - fi
33855 - ;;
33856 - none) break ;;
33857 - esac
33858 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
33859 - # mode. It turns out that the SunPro C++ compiler does not properly
33860 - # handle `-M -o', and we need to detect this.
33861 - if depmode=$depmode \
33862 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
33863 - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
33864 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
33865 - >/dev/null 2>conftest.err &&
33866 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
33867 - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
33868 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
33869 - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
33870 - # icc doesn't choke on unknown options, it will just issue warnings
33871 - # or remarks (even with -Werror). So we grep stderr for any message
33872 - # that says an option was ignored or not supported.
33873 - # When given -MP, icc 7.0 and 7.1 complain thusly:
33874 - # icc: Command line warning: ignoring option '-M'; no argument required
33875 - # The diagnosis changed in icc 8.0:
33876 - # icc: Command line remark: option '-MP' not supported
33877 - if (grep 'ignoring option' conftest.err ||
33878 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
33879 - am_cv_CCAS_dependencies_compiler_type=$depmode
33880 - break
33881 - fi
33882 - fi
33883 - done
33884 -
33885 - cd ..
33886 - rm -rf conftest.dir
33887 -else
33888 - am_cv_CCAS_dependencies_compiler_type=none
33889 -fi
33890 -
33891 -fi
33892 -{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5
33893 -$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
33894 -CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
33895 -
33896 - if
33897 - test "x$enable_dependency_tracking" != xno \
33898 - && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
33899 - am__fastdepCCAS_TRUE=
33900 - am__fastdepCCAS_FALSE='#'
33901 -else
33902 - am__fastdepCCAS_TRUE='#'
33903 - am__fastdepCCAS_FALSE=
33904 -fi
33905 -
33906 -
33907 -
33908 -
33909 -GETTEXT_PACKAGE=$PACKAGE
33910 -
33911 -
33912 -cat >>confdefs.h <<_ACEOF
33913 -#define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
33914 -_ACEOF
33915 -
33916 -
33917 -
33918 -
33919 - MKINSTALLDIRS=
33920 - if test -n "$ac_aux_dir"; then
33921 - case "$ac_aux_dir" in
33922 - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
33923 - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
33924 - esac
33925 - fi
33926 - if test -z "$MKINSTALLDIRS"; then
33927 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
33928 - fi
33929 -
33930 -
33931 -
33932 - { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
33933 -$as_echo_n "checking whether NLS is requested... " >&6; }
33934 - # Check whether --enable-nls was given.
33935 -if test "${enable_nls+set}" = set; then
33936 - enableval=$enable_nls; USE_NLS=$enableval
33937 -else
33938 - USE_NLS=yes
33939 -fi
33940 -
33941 - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
33942 -$as_echo "$USE_NLS" >&6; }
33943 -
33944 -
33945 -
33946 -
33947 -
33948 -
33949 -# Prepare PATH_SEPARATOR.
33950 -# The user is always right.
33951 -if test "${PATH_SEPARATOR+set}" != set; then
33952 - echo "#! /bin/sh" >conf$$.sh
33953 - echo "exit 0" >>conf$$.sh
33954 - chmod +x conf$$.sh
33955 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
33956 - PATH_SEPARATOR=';'
33957 - else
33958 - PATH_SEPARATOR=:
33959 - fi
33960 - rm -f conf$$.sh
33961 -fi
33962 -
33963 -# Find out how to test for executable files. Don't use a zero-byte file,
33964 -# as systems may use methods other than mode bits to determine executability.
33965 -cat >conf$$.file <<_ASEOF
33966 -#! /bin/sh
33967 -exit 0
33968 -_ASEOF
33969 -chmod +x conf$$.file
33970 -if test -x conf$$.file >/dev/null 2>&1; then
33971 - ac_executable_p="test -x"
33972 -else
33973 - ac_executable_p="test -f"
33974 -fi
33975 -rm -f conf$$.file
33976 -
33977 -# Extract the first word of "msgfmt", so it can be a program name with args.
33978 -set dummy msgfmt; ac_word=$2
33979 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
33980 -$as_echo_n "checking for $ac_word... " >&6; }
33981 -if test "${ac_cv_path_MSGFMT+set}" = set; then
33982 - $as_echo_n "(cached) " >&6
33983 -else
33984 - case "$MSGFMT" in
33985 - [\\/]* | ?:[\\/]*)
33986 - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
33987 - ;;
33988 - *)
33989 - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
33990 - for ac_dir in $PATH; do
33991 - IFS="$ac_save_IFS"
33992 - test -z "$ac_dir" && ac_dir=.
33993 - for ac_exec_ext in '' $ac_executable_extensions; do
33994 - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
33995 - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
33996 - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
33997 - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
33998 - break 2
33999 - fi
34000 - fi
34001 - done
34002 - done
34003 - IFS="$ac_save_IFS"
34004 - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
34005 - ;;
34006 -esac
34007 -fi
34008 -MSGFMT="$ac_cv_path_MSGFMT"
34009 -if test "$MSGFMT" != ":"; then
34010 - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
34011 -$as_echo "$MSGFMT" >&6; }
34012 -else
34013 - { $as_echo "$as_me:$LINENO: result: no" >&5
34014 -$as_echo "no" >&6; }
34015 -fi
34016 -
34017 - # Extract the first word of "gmsgfmt", so it can be a program name with args.
34018 -set dummy gmsgfmt; ac_word=$2
34019 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
34020 -$as_echo_n "checking for $ac_word... " >&6; }
34021 -if test "${ac_cv_path_GMSGFMT+set}" = set; then
34022 - $as_echo_n "(cached) " >&6
34023 -else
34024 - case $GMSGFMT in
34025 - [\\/]* | ?:[\\/]*)
34026 - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
34027 - ;;
34028 - *)
34029 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
34030 -for as_dir in $PATH
34031 -do
34032 - IFS=$as_save_IFS
34033 - test -z "$as_dir" && as_dir=.
34034 - for ac_exec_ext in '' $ac_executable_extensions; do
34035 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
34036 - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
34037 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
34038 - break 2
34039 - fi
34040 -done
34041 -done
34042 -IFS=$as_save_IFS
34043 -
34044 - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
34045 - ;;
34046 -esac
34047 -fi
34048 -GMSGFMT=$ac_cv_path_GMSGFMT
34049 -if test -n "$GMSGFMT"; then
34050 - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
34051 -$as_echo "$GMSGFMT" >&6; }
34052 -else
34053 - { $as_echo "$as_me:$LINENO: result: no" >&5
34054 -$as_echo "no" >&6; }
34055 -fi
34056 -
34057 -
34058 -
34059 -
34060 -# Prepare PATH_SEPARATOR.
34061 -# The user is always right.
34062 -if test "${PATH_SEPARATOR+set}" != set; then
34063 - echo "#! /bin/sh" >conf$$.sh
34064 - echo "exit 0" >>conf$$.sh
34065 - chmod +x conf$$.sh
34066 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
34067 - PATH_SEPARATOR=';'
34068 - else
34069 - PATH_SEPARATOR=:
34070 - fi
34071 - rm -f conf$$.sh
34072 -fi
34073 -
34074 -# Find out how to test for executable files. Don't use a zero-byte file,
34075 -# as systems may use methods other than mode bits to determine executability.
34076 -cat >conf$$.file <<_ASEOF
34077 -#! /bin/sh
34078 -exit 0
34079 -_ASEOF
34080 -chmod +x conf$$.file
34081 -if test -x conf$$.file >/dev/null 2>&1; then
34082 - ac_executable_p="test -x"
34083 -else
34084 - ac_executable_p="test -f"
34085 -fi
34086 -rm -f conf$$.file
34087 -
34088 -# Extract the first word of "xgettext", so it can be a program name with args.
34089 -set dummy xgettext; ac_word=$2
34090 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
34091 -$as_echo_n "checking for $ac_word... " >&6; }
34092 -if test "${ac_cv_path_XGETTEXT+set}" = set; then
34093 - $as_echo_n "(cached) " >&6
34094 -else
34095 - case "$XGETTEXT" in
34096 - [\\/]* | ?:[\\/]*)
34097 - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
34098 - ;;
34099 - *)
34100 - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
34101 - for ac_dir in $PATH; do
34102 - IFS="$ac_save_IFS"
34103 - test -z "$ac_dir" && ac_dir=.
34104 - for ac_exec_ext in '' $ac_executable_extensions; do
34105 - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
34106 - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
34107 - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
34108 - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
34109 - break 2
34110 - fi
34111 - fi
34112 - done
34113 - done
34114 - IFS="$ac_save_IFS"
34115 - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
34116 - ;;
34117 -esac
34118 -fi
34119 -XGETTEXT="$ac_cv_path_XGETTEXT"
34120 -if test "$XGETTEXT" != ":"; then
34121 - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
34122 -$as_echo "$XGETTEXT" >&6; }
34123 -else
34124 - { $as_echo "$as_me:$LINENO: result: no" >&5
34125 -$as_echo "no" >&6; }
34126 -fi
34127 -
34128 - rm -f messages.po
34129 -
34130 -
34131 -# Prepare PATH_SEPARATOR.
34132 -# The user is always right.
34133 -if test "${PATH_SEPARATOR+set}" != set; then
34134 - echo "#! /bin/sh" >conf$$.sh
34135 - echo "exit 0" >>conf$$.sh
34136 - chmod +x conf$$.sh
34137 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
34138 - PATH_SEPARATOR=';'
34139 - else
34140 - PATH_SEPARATOR=:
34141 - fi
34142 - rm -f conf$$.sh
34143 -fi
34144 -
34145 -# Find out how to test for executable files. Don't use a zero-byte file,
34146 -# as systems may use methods other than mode bits to determine executability.
34147 -cat >conf$$.file <<_ASEOF
34148 -#! /bin/sh
34149 -exit 0
34150 -_ASEOF
34151 -chmod +x conf$$.file
34152 -if test -x conf$$.file >/dev/null 2>&1; then
34153 - ac_executable_p="test -x"
34154 -else
34155 - ac_executable_p="test -f"
34156 -fi
34157 -rm -f conf$$.file
34158 -
34159 -# Extract the first word of "msgmerge", so it can be a program name with args.
34160 -set dummy msgmerge; ac_word=$2
34161 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
34162 -$as_echo_n "checking for $ac_word... " >&6; }
34163 -if test "${ac_cv_path_MSGMERGE+set}" = set; then
34164 - $as_echo_n "(cached) " >&6
34165 -else
34166 - case "$MSGMERGE" in
34167 - [\\/]* | ?:[\\/]*)
34168 - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
34169 - ;;
34170 - *)
34171 - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
34172 - for ac_dir in $PATH; do
34173 - IFS="$ac_save_IFS"
34174 - test -z "$ac_dir" && ac_dir=.
34175 - for ac_exec_ext in '' $ac_executable_extensions; do
34176 - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
34177 - if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
34178 - ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
34179 - break 2
34180 - fi
34181 - fi
34182 - done
34183 - done
34184 - IFS="$ac_save_IFS"
34185 - test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
34186 - ;;
34187 -esac
34188 -fi
34189 -MSGMERGE="$ac_cv_path_MSGMERGE"
34190 -if test "$MSGMERGE" != ":"; then
34191 - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
34192 -$as_echo "$MSGMERGE" >&6; }
34193 -else
34194 - { $as_echo "$as_me:$LINENO: result: no" >&5
34195 -$as_echo "no" >&6; }
34196 -fi
34197 -
34198 -
34199 - if test "$GMSGFMT" != ":"; then
34200 - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
34201 - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
34202 - : ;
34203 - else
34204 - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
34205 - { $as_echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
34206 -$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
34207 - GMSGFMT=":"
34208 - fi
34209 - fi
34210 -
34211 - if test "$XGETTEXT" != ":"; then
34212 - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
34213 - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
34214 - : ;
34215 - else
34216 - { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
34217 -$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
34218 - XGETTEXT=":"
34219 - fi
34220 - rm -f messages.po
34221 - fi
34222 -
34223 - ac_config_commands="$ac_config_commands default-1"
34224 -
34225 -
34226 -if test -n "$ac_tool_prefix"; then
34227 - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
34228 -set dummy ${ac_tool_prefix}ranlib; ac_word=$2
34229 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
34230 -$as_echo_n "checking for $ac_word... " >&6; }
34231 -if test "${ac_cv_prog_RANLIB+set}" = set; then
34232 - $as_echo_n "(cached) " >&6
34233 -else
34234 - if test -n "$RANLIB"; then
34235 - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
34236 -else
34237 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
34238 -for as_dir in $PATH
34239 -do
34240 - IFS=$as_save_IFS
34241 - test -z "$as_dir" && as_dir=.
34242 - for ac_exec_ext in '' $ac_executable_extensions; do
34243 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
34244 - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
34245 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
34246 - break 2
34247 - fi
34248 -done
34249 -done
34250 -IFS=$as_save_IFS
34251 -
34252 -fi
34253 -fi
34254 -RANLIB=$ac_cv_prog_RANLIB
34255 -if test -n "$RANLIB"; then
34256 - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
34257 -$as_echo "$RANLIB" >&6; }
34258 -else
34259 - { $as_echo "$as_me:$LINENO: result: no" >&5
34260 -$as_echo "no" >&6; }
34261 -fi
34262 -
34263 -
34264 -fi
34265 -if test -z "$ac_cv_prog_RANLIB"; then
34266 - ac_ct_RANLIB=$RANLIB
34267 - # Extract the first word of "ranlib", so it can be a program name with args.
34268 -set dummy ranlib; ac_word=$2
34269 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
34270 -$as_echo_n "checking for $ac_word... " >&6; }
34271 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
34272 - $as_echo_n "(cached) " >&6
34273 -else
34274 - if test -n "$ac_ct_RANLIB"; then
34275 - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
34276 -else
34277 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
34278 -for as_dir in $PATH
34279 -do
34280 - IFS=$as_save_IFS
34281 - test -z "$as_dir" && as_dir=.
34282 - for ac_exec_ext in '' $ac_executable_extensions; do
34283 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
34284 - ac_cv_prog_ac_ct_RANLIB="ranlib"
34285 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
34286 - break 2
34287 - fi
34288 -done
34289 -done
34290 -IFS=$as_save_IFS
34291 -
34292 -fi
34293 -fi
34294 -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
34295 -if test -n "$ac_ct_RANLIB"; then
34296 - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
34297 -$as_echo "$ac_ct_RANLIB" >&6; }
34298 -else
34299 - { $as_echo "$as_me:$LINENO: result: no" >&5
34300 -$as_echo "no" >&6; }
34301 -fi
34302 -
34303 - if test "x$ac_ct_RANLIB" = x; then
34304 - RANLIB=":"
34305 - else
34306 - case $cross_compiling:$ac_tool_warned in
34307 -yes:)
34308 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
34309 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
34310 -ac_tool_warned=yes ;;
34311 -esac
34312 - RANLIB=$ac_ct_RANLIB
34313 - fi
34314 -else
34315 - RANLIB="$ac_cv_prog_RANLIB"
34316 -fi
34317 -
34318 -
34319 - { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
34320 -$as_echo_n "checking for strerror in -lcposix... " >&6; }
34321 -if test "${ac_cv_lib_cposix_strerror+set}" = set; then
34322 - $as_echo_n "(cached) " >&6
34323 -else
34324 - ac_check_lib_save_LIBS=$LIBS
34325 -LIBS="-lcposix $LIBS"
34326 -cat >conftest.$ac_ext <<_ACEOF
34327 -/* confdefs.h. */
34328 -_ACEOF
34329 -cat confdefs.h >>conftest.$ac_ext
34330 -cat >>conftest.$ac_ext <<_ACEOF
34331 -/* end confdefs.h. */
34332 -
34333 -/* Override any GCC internal prototype to avoid an error.
34334 - Use char because int might match the return type of a GCC
34335 - builtin and then its argument prototype would still apply. */
34336 -#ifdef __cplusplus
34337 -extern "C"
34338 -#endif
34339 -char strerror ();
34340 -int
34341 -main ()
34342 -{
34343 -return strerror ();
34344 - ;
34345 - return 0;
34346 -}
34347 -_ACEOF
34348 -rm -f conftest.$ac_objext conftest$ac_exeext
34349 -if { (ac_try="$ac_link"
34350 -case "(($ac_try" in
34351 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34352 - *) ac_try_echo=$ac_try;;
34353 -esac
34354 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34355 -$as_echo "$ac_try_echo") >&5
34356 - (eval "$ac_link") 2>conftest.er1
34357 - ac_status=$?
34358 - grep -v '^ *+' conftest.er1 >conftest.err
34359 - rm -f conftest.er1
34360 - cat conftest.err >&5
34361 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34362 - (exit $ac_status); } && {
34363 - test -z "$ac_c_werror_flag" ||
34364 - test ! -s conftest.err
34365 - } && test -s conftest$ac_exeext && {
34366 - test "$cross_compiling" = yes ||
34367 - $as_test_x conftest$ac_exeext
34368 - }; then
34369 - ac_cv_lib_cposix_strerror=yes
34370 -else
34371 - $as_echo "$as_me: failed program was:" >&5
34372 -sed 's/^/| /' conftest.$ac_ext >&5
34373 -
34374 - ac_cv_lib_cposix_strerror=no
34375 -fi
34376 -
34377 -rm -rf conftest.dSYM
34378 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
34379 - conftest$ac_exeext conftest.$ac_ext
34380 -LIBS=$ac_check_lib_save_LIBS
34381 -fi
34382 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
34383 -$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
34384 -if test "x$ac_cv_lib_cposix_strerror" = x""yes; then
34385 - LIBS="$LIBS -lcposix"
34386 -fi
34387 -
34388 -
34389 -
34390 -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
34391 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
34392 -if test "${ac_cv_c_const+set}" = set; then
34393 - $as_echo_n "(cached) " >&6
34394 -else
34395 - cat >conftest.$ac_ext <<_ACEOF
34396 -/* confdefs.h. */
34397 -_ACEOF
34398 -cat confdefs.h >>conftest.$ac_ext
34399 -cat >>conftest.$ac_ext <<_ACEOF
34400 -/* end confdefs.h. */
34401 -
34402 -int
34403 -main ()
34404 -{
34405 -/* FIXME: Include the comments suggested by Paul. */
34406 -#ifndef __cplusplus
34407 - /* Ultrix mips cc rejects this. */
34408 - typedef int charset[2];
34409 - const charset cs;
34410 - /* SunOS 4.1.1 cc rejects this. */
34411 - char const *const *pcpcc;
34412 - char **ppc;
34413 - /* NEC SVR4.0.2 mips cc rejects this. */
34414 - struct point {int x, y;};
34415 - static struct point const zero = {0,0};
34416 - /* AIX XL C 1.02.0.0 rejects this.
34417 - It does not let you subtract one const X* pointer from another in
34418 - an arm of an if-expression whose if-part is not a constant
34419 - expression */
34420 - const char *g = "string";
34421 - pcpcc = &g + (g ? g-g : 0);
34422 - /* HPUX 7.0 cc rejects these. */
34423 - ++pcpcc;
34424 - ppc = (char**) pcpcc;
34425 - pcpcc = (char const *const *) ppc;
34426 - { /* SCO 3.2v4 cc rejects this. */
34427 - char *t;
34428 - char const *s = 0 ? (char *) 0 : (char const *) 0;
34429 -
34430 - *t++ = 0;
34431 - if (s) return 0;
34432 - }
34433 - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
34434 - int x[] = {25, 17};
34435 - const int *foo = &x[0];
34436 - ++foo;
34437 - }
34438 - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
34439 - typedef const int *iptr;
34440 - iptr p = 0;
34441 - ++p;
34442 - }
34443 - { /* AIX XL C 1.02.0.0 rejects this saying
34444 - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
34445 - struct s { int j; const int *ap[3]; };
34446 - struct s *b; b->j = 5;
34447 - }
34448 - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
34449 - const int foo = 10;
34450 - if (!foo) return 0;
34451 - }
34452 - return !cs[0] && !zero.x;
34453 -#endif
34454 -
34455 - ;
34456 - return 0;
34457 -}
34458 -_ACEOF
34459 -rm -f conftest.$ac_objext
34460 -if { (ac_try="$ac_compile"
34461 -case "(($ac_try" in
34462 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34463 - *) ac_try_echo=$ac_try;;
34464 -esac
34465 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34466 -$as_echo "$ac_try_echo") >&5
34467 - (eval "$ac_compile") 2>conftest.er1
34468 - ac_status=$?
34469 - grep -v '^ *+' conftest.er1 >conftest.err
34470 - rm -f conftest.er1
34471 - cat conftest.err >&5
34472 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34473 - (exit $ac_status); } && {
34474 - test -z "$ac_c_werror_flag" ||
34475 - test ! -s conftest.err
34476 - } && test -s conftest.$ac_objext; then
34477 - ac_cv_c_const=yes
34478 -else
34479 - $as_echo "$as_me: failed program was:" >&5
34480 -sed 's/^/| /' conftest.$ac_ext >&5
34481 -
34482 - ac_cv_c_const=no
34483 -fi
34484 -
34485 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
34486 -fi
34487 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
34488 -$as_echo "$ac_cv_c_const" >&6; }
34489 -if test $ac_cv_c_const = no; then
34490 -
34491 -cat >>confdefs.h <<\_ACEOF
34492 -#define const /**/
34493 -_ACEOF
34494 -
34495 -fi
34496 -
34497 -{ $as_echo "$as_me:$LINENO: checking for inline" >&5
34498 -$as_echo_n "checking for inline... " >&6; }
34499 -if test "${ac_cv_c_inline+set}" = set; then
34500 - $as_echo_n "(cached) " >&6
34501 -else
34502 - ac_cv_c_inline=no
34503 -for ac_kw in inline __inline__ __inline; do
34504 - cat >conftest.$ac_ext <<_ACEOF
34505 -/* confdefs.h. */
34506 -_ACEOF
34507 -cat confdefs.h >>conftest.$ac_ext
34508 -cat >>conftest.$ac_ext <<_ACEOF
34509 -/* end confdefs.h. */
34510 -#ifndef __cplusplus
34511 -typedef int foo_t;
34512 -static $ac_kw foo_t static_foo () {return 0; }
34513 -$ac_kw foo_t foo () {return 0; }
34514 -#endif
34515 -
34516 -_ACEOF
34517 -rm -f conftest.$ac_objext
34518 -if { (ac_try="$ac_compile"
34519 -case "(($ac_try" in
34520 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34521 - *) ac_try_echo=$ac_try;;
34522 -esac
34523 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34524 -$as_echo "$ac_try_echo") >&5
34525 - (eval "$ac_compile") 2>conftest.er1
34526 - ac_status=$?
34527 - grep -v '^ *+' conftest.er1 >conftest.err
34528 - rm -f conftest.er1
34529 - cat conftest.err >&5
34530 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34531 - (exit $ac_status); } && {
34532 - test -z "$ac_c_werror_flag" ||
34533 - test ! -s conftest.err
34534 - } && test -s conftest.$ac_objext; then
34535 - ac_cv_c_inline=$ac_kw
34536 -else
34537 - $as_echo "$as_me: failed program was:" >&5
34538 -sed 's/^/| /' conftest.$ac_ext >&5
34539 -
34540 -
34541 -fi
34542 -
34543 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
34544 - test "$ac_cv_c_inline" != no && break
34545 -done
34546 -
34547 -fi
34548 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
34549 -$as_echo "$ac_cv_c_inline" >&6; }
34550 -
34551 -
34552 -case $ac_cv_c_inline in
34553 - inline | yes) ;;
34554 - *)
34555 - case $ac_cv_c_inline in
34556 - no) ac_val=;;
34557 - *) ac_val=$ac_cv_c_inline;;
34558 - esac
34559 - cat >>confdefs.h <<_ACEOF
34560 -#ifndef __cplusplus
34561 -#define inline $ac_val
34562 -#endif
34563 -_ACEOF
34564 - ;;
34565 -esac
34566 -
34567 -{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
34568 -$as_echo_n "checking for off_t... " >&6; }
34569 -if test "${ac_cv_type_off_t+set}" = set; then
34570 - $as_echo_n "(cached) " >&6
34571 -else
34572 - ac_cv_type_off_t=no
34573 -cat >conftest.$ac_ext <<_ACEOF
34574 -/* confdefs.h. */
34575 -_ACEOF
34576 -cat confdefs.h >>conftest.$ac_ext
34577 -cat >>conftest.$ac_ext <<_ACEOF
34578 -/* end confdefs.h. */
34579 -$ac_includes_default
34580 -int
34581 -main ()
34582 -{
34583 -if (sizeof (off_t))
34584 - return 0;
34585 - ;
34586 - return 0;
34587 -}
34588 -_ACEOF
34589 -rm -f conftest.$ac_objext
34590 -if { (ac_try="$ac_compile"
34591 -case "(($ac_try" in
34592 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34593 - *) ac_try_echo=$ac_try;;
34594 -esac
34595 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34596 -$as_echo "$ac_try_echo") >&5
34597 - (eval "$ac_compile") 2>conftest.er1
34598 - ac_status=$?
34599 - grep -v '^ *+' conftest.er1 >conftest.err
34600 - rm -f conftest.er1
34601 - cat conftest.err >&5
34602 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34603 - (exit $ac_status); } && {
34604 - test -z "$ac_c_werror_flag" ||
34605 - test ! -s conftest.err
34606 - } && test -s conftest.$ac_objext; then
34607 - cat >conftest.$ac_ext <<_ACEOF
34608 -/* confdefs.h. */
34609 -_ACEOF
34610 -cat confdefs.h >>conftest.$ac_ext
34611 -cat >>conftest.$ac_ext <<_ACEOF
34612 -/* end confdefs.h. */
34613 -$ac_includes_default
34614 -int
34615 -main ()
34616 -{
34617 -if (sizeof ((off_t)))
34618 - return 0;
34619 - ;
34620 - return 0;
34621 -}
34622 -_ACEOF
34623 -rm -f conftest.$ac_objext
34624 -if { (ac_try="$ac_compile"
34625 -case "(($ac_try" in
34626 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34627 - *) ac_try_echo=$ac_try;;
34628 -esac
34629 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34630 -$as_echo "$ac_try_echo") >&5
34631 - (eval "$ac_compile") 2>conftest.er1
34632 - ac_status=$?
34633 - grep -v '^ *+' conftest.er1 >conftest.err
34634 - rm -f conftest.er1
34635 - cat conftest.err >&5
34636 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34637 - (exit $ac_status); } && {
34638 - test -z "$ac_c_werror_flag" ||
34639 - test ! -s conftest.err
34640 - } && test -s conftest.$ac_objext; then
34641 - :
34642 -else
34643 - $as_echo "$as_me: failed program was:" >&5
34644 -sed 's/^/| /' conftest.$ac_ext >&5
34645 -
34646 - ac_cv_type_off_t=yes
34647 -fi
34648 -
34649 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
34650 -else
34651 - $as_echo "$as_me: failed program was:" >&5
34652 -sed 's/^/| /' conftest.$ac_ext >&5
34653 -
34654 -
34655 -fi
34656 -
34657 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
34658 -fi
34659 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
34660 -$as_echo "$ac_cv_type_off_t" >&6; }
34661 -if test "x$ac_cv_type_off_t" = x""yes; then
34662 - :
34663 -else
34664 -
34665 -cat >>confdefs.h <<_ACEOF
34666 -#define off_t long int
34667 -_ACEOF
34668 -
34669 -fi
34670 -
34671 -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
34672 -$as_echo_n "checking for size_t... " >&6; }
34673 -if test "${ac_cv_type_size_t+set}" = set; then
34674 - $as_echo_n "(cached) " >&6
34675 -else
34676 - ac_cv_type_size_t=no
34677 -cat >conftest.$ac_ext <<_ACEOF
34678 -/* confdefs.h. */
34679 -_ACEOF
34680 -cat confdefs.h >>conftest.$ac_ext
34681 -cat >>conftest.$ac_ext <<_ACEOF
34682 -/* end confdefs.h. */
34683 -$ac_includes_default
34684 -int
34685 -main ()
34686 -{
34687 -if (sizeof (size_t))
34688 - return 0;
34689 - ;
34690 - return 0;
34691 -}
34692 -_ACEOF
34693 -rm -f conftest.$ac_objext
34694 -if { (ac_try="$ac_compile"
34695 -case "(($ac_try" in
34696 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34697 - *) ac_try_echo=$ac_try;;
34698 -esac
34699 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34700 -$as_echo "$ac_try_echo") >&5
34701 - (eval "$ac_compile") 2>conftest.er1
34702 - ac_status=$?
34703 - grep -v '^ *+' conftest.er1 >conftest.err
34704 - rm -f conftest.er1
34705 - cat conftest.err >&5
34706 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34707 - (exit $ac_status); } && {
34708 - test -z "$ac_c_werror_flag" ||
34709 - test ! -s conftest.err
34710 - } && test -s conftest.$ac_objext; then
34711 - cat >conftest.$ac_ext <<_ACEOF
34712 -/* confdefs.h. */
34713 -_ACEOF
34714 -cat confdefs.h >>conftest.$ac_ext
34715 -cat >>conftest.$ac_ext <<_ACEOF
34716 -/* end confdefs.h. */
34717 -$ac_includes_default
34718 -int
34719 -main ()
34720 -{
34721 -if (sizeof ((size_t)))
34722 - return 0;
34723 - ;
34724 - return 0;
34725 -}
34726 -_ACEOF
34727 -rm -f conftest.$ac_objext
34728 -if { (ac_try="$ac_compile"
34729 -case "(($ac_try" in
34730 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34731 - *) ac_try_echo=$ac_try;;
34732 -esac
34733 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34734 -$as_echo "$ac_try_echo") >&5
34735 - (eval "$ac_compile") 2>conftest.er1
34736 - ac_status=$?
34737 - grep -v '^ *+' conftest.er1 >conftest.err
34738 - rm -f conftest.er1
34739 - cat conftest.err >&5
34740 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34741 - (exit $ac_status); } && {
34742 - test -z "$ac_c_werror_flag" ||
34743 - test ! -s conftest.err
34744 - } && test -s conftest.$ac_objext; then
34745 - :
34746 -else
34747 - $as_echo "$as_me: failed program was:" >&5
34748 -sed 's/^/| /' conftest.$ac_ext >&5
34749 -
34750 - ac_cv_type_size_t=yes
34751 -fi
34752 -
34753 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
34754 -else
34755 - $as_echo "$as_me: failed program was:" >&5
34756 -sed 's/^/| /' conftest.$ac_ext >&5
34757 -
34758 -
34759 -fi
34760 -
34761 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
34762 -fi
34763 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
34764 -$as_echo "$ac_cv_type_size_t" >&6; }
34765 -if test "x$ac_cv_type_size_t" = x""yes; then
34766 - :
34767 -else
34768 -
34769 -cat >>confdefs.h <<_ACEOF
34770 -#define size_t unsigned int
34771 -_ACEOF
34772 -
34773 -fi
34774 -
34775 -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
34776 -# for constant arguments. Useless!
34777 -{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
34778 -$as_echo_n "checking for working alloca.h... " >&6; }
34779 -if test "${ac_cv_working_alloca_h+set}" = set; then
34780 - $as_echo_n "(cached) " >&6
34781 -else
34782 - cat >conftest.$ac_ext <<_ACEOF
34783 -/* confdefs.h. */
34784 -_ACEOF
34785 -cat confdefs.h >>conftest.$ac_ext
34786 -cat >>conftest.$ac_ext <<_ACEOF
34787 -/* end confdefs.h. */
34788 -#include <alloca.h>
34789 -int
34790 -main ()
34791 -{
34792 -char *p = (char *) alloca (2 * sizeof (int));
34793 - if (p) return 0;
34794 - ;
34795 - return 0;
34796 -}
34797 -_ACEOF
34798 -rm -f conftest.$ac_objext conftest$ac_exeext
34799 -if { (ac_try="$ac_link"
34800 -case "(($ac_try" in
34801 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34802 - *) ac_try_echo=$ac_try;;
34803 -esac
34804 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34805 -$as_echo "$ac_try_echo") >&5
34806 - (eval "$ac_link") 2>conftest.er1
34807 - ac_status=$?
34808 - grep -v '^ *+' conftest.er1 >conftest.err
34809 - rm -f conftest.er1
34810 - cat conftest.err >&5
34811 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34812 - (exit $ac_status); } && {
34813 - test -z "$ac_c_werror_flag" ||
34814 - test ! -s conftest.err
34815 - } && test -s conftest$ac_exeext && {
34816 - test "$cross_compiling" = yes ||
34817 - $as_test_x conftest$ac_exeext
34818 - }; then
34819 - ac_cv_working_alloca_h=yes
34820 -else
34821 - $as_echo "$as_me: failed program was:" >&5
34822 -sed 's/^/| /' conftest.$ac_ext >&5
34823 -
34824 - ac_cv_working_alloca_h=no
34825 -fi
34826 -
34827 -rm -rf conftest.dSYM
34828 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
34829 - conftest$ac_exeext conftest.$ac_ext
34830 -fi
34831 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
34832 -$as_echo "$ac_cv_working_alloca_h" >&6; }
34833 -if test $ac_cv_working_alloca_h = yes; then
34834 -
34835 -cat >>confdefs.h <<\_ACEOF
34836 -#define HAVE_ALLOCA_H 1
34837 -_ACEOF
34838 -
34839 -fi
34840 -
34841 -{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
34842 -$as_echo_n "checking for alloca... " >&6; }
34843 -if test "${ac_cv_func_alloca_works+set}" = set; then
34844 - $as_echo_n "(cached) " >&6
34845 -else
34846 - cat >conftest.$ac_ext <<_ACEOF
34847 -/* confdefs.h. */
34848 -_ACEOF
34849 -cat confdefs.h >>conftest.$ac_ext
34850 -cat >>conftest.$ac_ext <<_ACEOF
34851 -/* end confdefs.h. */
34852 -#ifdef __GNUC__
34853 -# define alloca __builtin_alloca
34854 -#else
34855 -# ifdef _MSC_VER
34856 -# include <malloc.h>
34857 -# define alloca _alloca
34858 -# else
34859 -# ifdef HAVE_ALLOCA_H
34860 -# include <alloca.h>
34861 -# else
34862 -# ifdef _AIX
34863 - #pragma alloca
34864 -# else
34865 -# ifndef alloca /* predefined by HP cc +Olibcalls */
34866 -char *alloca ();
34867 -# endif
34868 -# endif
34869 -# endif
34870 -# endif
34871 -#endif
34872 -
34873 -int
34874 -main ()
34875 -{
34876 -char *p = (char *) alloca (1);
34877 - if (p) return 0;
34878 - ;
34879 - return 0;
34880 -}
34881 -_ACEOF
34882 -rm -f conftest.$ac_objext conftest$ac_exeext
34883 -if { (ac_try="$ac_link"
34884 -case "(($ac_try" in
34885 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
34886 - *) ac_try_echo=$ac_try;;
34887 -esac
34888 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
34889 -$as_echo "$ac_try_echo") >&5
34890 - (eval "$ac_link") 2>conftest.er1
34891 - ac_status=$?
34892 - grep -v '^ *+' conftest.er1 >conftest.err
34893 - rm -f conftest.er1
34894 - cat conftest.err >&5
34895 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
34896 - (exit $ac_status); } && {
34897 - test -z "$ac_c_werror_flag" ||
34898 - test ! -s conftest.err
34899 - } && test -s conftest$ac_exeext && {
34900 - test "$cross_compiling" = yes ||
34901 - $as_test_x conftest$ac_exeext
34902 - }; then
34903 - ac_cv_func_alloca_works=yes
34904 -else
34905 - $as_echo "$as_me: failed program was:" >&5
34906 -sed 's/^/| /' conftest.$ac_ext >&5
34907 -
34908 - ac_cv_func_alloca_works=no
34909 -fi
34910 -
34911 -rm -rf conftest.dSYM
34912 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
34913 - conftest$ac_exeext conftest.$ac_ext
34914 -fi
34915 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
34916 -$as_echo "$ac_cv_func_alloca_works" >&6; }
34917 -
34918 -if test $ac_cv_func_alloca_works = yes; then
34919 -
34920 -cat >>confdefs.h <<\_ACEOF
34921 -#define HAVE_ALLOCA 1
34922 -_ACEOF
34923 -
34924 -else
34925 - # The SVR3 libPW and SVR4 libucb both contain incompatible functions
34926 -# that cause trouble. Some versions do not even contain alloca or
34927 -# contain a buggy version. If you still want to use their alloca,
34928 -# use ar to extract alloca.o from them instead of compiling alloca.c.
34929 -
34930 -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
34931 -
34932 -cat >>confdefs.h <<\_ACEOF
34933 -#define C_ALLOCA 1
34934 -_ACEOF
34935 -
34936 -
34937 -{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
34938 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
34939 -if test "${ac_cv_os_cray+set}" = set; then
34940 - $as_echo_n "(cached) " >&6
34941 -else
34942 - cat >conftest.$ac_ext <<_ACEOF
34943 -/* confdefs.h. */
34944 -_ACEOF
34945 -cat confdefs.h >>conftest.$ac_ext
34946 -cat >>conftest.$ac_ext <<_ACEOF
34947 -/* end confdefs.h. */
34948 -#if defined CRAY && ! defined CRAY2
34949 -webecray
34950 -#else
34951 -wenotbecray
34952 -#endif
34953 -
34954 -_ACEOF
34955 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
34956 - $EGREP "webecray" >/dev/null 2>&1; then
34957 - ac_cv_os_cray=yes
34958 -else
34959 - ac_cv_os_cray=no
34960 -fi
34961 -rm -f conftest*
34962 -
34963 -fi
34964 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
34965 -$as_echo "$ac_cv_os_cray" >&6; }
34966 -if test $ac_cv_os_cray = yes; then
34967 - for ac_func in _getb67 GETB67 getb67; do
34968 - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
34969 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
34970 -$as_echo_n "checking for $ac_func... " >&6; }
34971 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
34972 - $as_echo_n "(cached) " >&6
34973 -else
34974 - cat >conftest.$ac_ext <<_ACEOF
34975 -/* confdefs.h. */
34976 -_ACEOF
34977 -cat confdefs.h >>conftest.$ac_ext
34978 -cat >>conftest.$ac_ext <<_ACEOF
34979 -/* end confdefs.h. */
34980 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
34981 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
34982 -#define $ac_func innocuous_$ac_func
34983 -
34984 -/* System header to define __stub macros and hopefully few prototypes,
34985 - which can conflict with char $ac_func (); below.
34986 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
34987 - <limits.h> exists even on freestanding compilers. */
34988 -
34989 -#ifdef __STDC__
34990 -# include <limits.h>
34991 -#else
34992 -# include <assert.h>
34993 -#endif
34994 -
34995 -#undef $ac_func
34996 -
34997 -/* Override any GCC internal prototype to avoid an error.
34998 - Use char because int might match the return type of a GCC
34999 - builtin and then its argument prototype would still apply. */
35000 -#ifdef __cplusplus
35001 -extern "C"
35002 -#endif
35003 -char $ac_func ();
35004 -/* The GNU C library defines this for functions which it implements
35005 - to always fail with ENOSYS. Some functions are actually named
35006 - something starting with __ and the normal name is an alias. */
35007 -#if defined __stub_$ac_func || defined __stub___$ac_func
35008 -choke me
35009 -#endif
35010 -
35011 -int
35012 -main ()
35013 -{
35014 -return $ac_func ();
35015 - ;
35016 - return 0;
35017 -}
35018 -_ACEOF
35019 -rm -f conftest.$ac_objext conftest$ac_exeext
35020 -if { (ac_try="$ac_link"
35021 -case "(($ac_try" in
35022 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35023 - *) ac_try_echo=$ac_try;;
35024 -esac
35025 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35026 -$as_echo "$ac_try_echo") >&5
35027 - (eval "$ac_link") 2>conftest.er1
35028 - ac_status=$?
35029 - grep -v '^ *+' conftest.er1 >conftest.err
35030 - rm -f conftest.er1
35031 - cat conftest.err >&5
35032 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35033 - (exit $ac_status); } && {
35034 - test -z "$ac_c_werror_flag" ||
35035 - test ! -s conftest.err
35036 - } && test -s conftest$ac_exeext && {
35037 - test "$cross_compiling" = yes ||
35038 - $as_test_x conftest$ac_exeext
35039 - }; then
35040 - eval "$as_ac_var=yes"
35041 -else
35042 - $as_echo "$as_me: failed program was:" >&5
35043 -sed 's/^/| /' conftest.$ac_ext >&5
35044 -
35045 - eval "$as_ac_var=no"
35046 -fi
35047 -
35048 -rm -rf conftest.dSYM
35049 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
35050 - conftest$ac_exeext conftest.$ac_ext
35051 -fi
35052 -ac_res=`eval 'as_val=${'$as_ac_var'}
35053 - $as_echo "$as_val"'`
35054 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
35055 -$as_echo "$ac_res" >&6; }
35056 -as_val=`eval 'as_val=${'$as_ac_var'}
35057 - $as_echo "$as_val"'`
35058 - if test "x$as_val" = x""yes; then
35059 -
35060 -cat >>confdefs.h <<_ACEOF
35061 -#define CRAY_STACKSEG_END $ac_func
35062 -_ACEOF
35063 -
35064 - break
35065 -fi
35066 -
35067 - done
35068 -fi
35069 -
35070 -{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
35071 -$as_echo_n "checking stack direction for C alloca... " >&6; }
35072 -if test "${ac_cv_c_stack_direction+set}" = set; then
35073 - $as_echo_n "(cached) " >&6
35074 -else
35075 - if test "$cross_compiling" = yes; then
35076 - ac_cv_c_stack_direction=0
35077 -else
35078 - cat >conftest.$ac_ext <<_ACEOF
35079 -/* confdefs.h. */
35080 -_ACEOF
35081 -cat confdefs.h >>conftest.$ac_ext
35082 -cat >>conftest.$ac_ext <<_ACEOF
35083 -/* end confdefs.h. */
35084 -$ac_includes_default
35085 -int
35086 -find_stack_direction ()
35087 -{
35088 - static char *addr = 0;
35089 - auto char dummy;
35090 - if (addr == 0)
35091 - {
35092 - addr = &dummy;
35093 - return find_stack_direction ();
35094 - }
35095 - else
35096 - return (&dummy > addr) ? 1 : -1;
35097 -}
35098 -
35099 -int
35100 -main ()
35101 -{
35102 - return find_stack_direction () < 0;
35103 -}
35104 -_ACEOF
35105 -rm -f conftest$ac_exeext
35106 -if { (ac_try="$ac_link"
35107 -case "(($ac_try" in
35108 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35109 - *) ac_try_echo=$ac_try;;
35110 -esac
35111 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35112 -$as_echo "$ac_try_echo") >&5
35113 - (eval "$ac_link") 2>&5
35114 - ac_status=$?
35115 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35116 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
35117 - { (case "(($ac_try" in
35118 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35119 - *) ac_try_echo=$ac_try;;
35120 -esac
35121 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35122 -$as_echo "$ac_try_echo") >&5
35123 - (eval "$ac_try") 2>&5
35124 - ac_status=$?
35125 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35126 - (exit $ac_status); }; }; then
35127 - ac_cv_c_stack_direction=1
35128 -else
35129 - $as_echo "$as_me: program exited with status $ac_status" >&5
35130 -$as_echo "$as_me: failed program was:" >&5
35131 -sed 's/^/| /' conftest.$ac_ext >&5
35132 -
35133 -( exit $ac_status )
35134 -ac_cv_c_stack_direction=-1
35135 -fi
35136 -rm -rf conftest.dSYM
35137 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
35138 -fi
35139 -
35140 -
35141 -fi
35142 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
35143 -$as_echo "$ac_cv_c_stack_direction" >&6; }
35144 -
35145 -cat >>confdefs.h <<_ACEOF
35146 -#define STACK_DIRECTION $ac_cv_c_stack_direction
35147 -_ACEOF
35148 -
35149 -
35150 -fi
35151 -
35152 -
35153 -
35154 -for ac_header in stdlib.h unistd.h
35155 -do
35156 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
35157 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
35158 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
35159 -$as_echo_n "checking for $ac_header... " >&6; }
35160 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
35161 - $as_echo_n "(cached) " >&6
35162 -fi
35163 -ac_res=`eval 'as_val=${'$as_ac_Header'}
35164 - $as_echo "$as_val"'`
35165 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
35166 -$as_echo "$ac_res" >&6; }
35167 -else
35168 - # Is the header compilable?
35169 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
35170 -$as_echo_n "checking $ac_header usability... " >&6; }
35171 -cat >conftest.$ac_ext <<_ACEOF
35172 -/* confdefs.h. */
35173 -_ACEOF
35174 -cat confdefs.h >>conftest.$ac_ext
35175 -cat >>conftest.$ac_ext <<_ACEOF
35176 -/* end confdefs.h. */
35177 -$ac_includes_default
35178 -#include <$ac_header>
35179 -_ACEOF
35180 -rm -f conftest.$ac_objext
35181 -if { (ac_try="$ac_compile"
35182 -case "(($ac_try" in
35183 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35184 - *) ac_try_echo=$ac_try;;
35185 -esac
35186 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35187 -$as_echo "$ac_try_echo") >&5
35188 - (eval "$ac_compile") 2>conftest.er1
35189 - ac_status=$?
35190 - grep -v '^ *+' conftest.er1 >conftest.err
35191 - rm -f conftest.er1
35192 - cat conftest.err >&5
35193 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35194 - (exit $ac_status); } && {
35195 - test -z "$ac_c_werror_flag" ||
35196 - test ! -s conftest.err
35197 - } && test -s conftest.$ac_objext; then
35198 - ac_header_compiler=yes
35199 -else
35200 - $as_echo "$as_me: failed program was:" >&5
35201 -sed 's/^/| /' conftest.$ac_ext >&5
35202 -
35203 - ac_header_compiler=no
35204 -fi
35205 -
35206 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
35207 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
35208 -$as_echo "$ac_header_compiler" >&6; }
35209 -
35210 -# Is the header present?
35211 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
35212 -$as_echo_n "checking $ac_header presence... " >&6; }
35213 -cat >conftest.$ac_ext <<_ACEOF
35214 -/* confdefs.h. */
35215 -_ACEOF
35216 -cat confdefs.h >>conftest.$ac_ext
35217 -cat >>conftest.$ac_ext <<_ACEOF
35218 -/* end confdefs.h. */
35219 -#include <$ac_header>
35220 -_ACEOF
35221 -if { (ac_try="$ac_cpp conftest.$ac_ext"
35222 -case "(($ac_try" in
35223 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35224 - *) ac_try_echo=$ac_try;;
35225 -esac
35226 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35227 -$as_echo "$ac_try_echo") >&5
35228 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
35229 - ac_status=$?
35230 - grep -v '^ *+' conftest.er1 >conftest.err
35231 - rm -f conftest.er1
35232 - cat conftest.err >&5
35233 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35234 - (exit $ac_status); } >/dev/null && {
35235 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
35236 - test ! -s conftest.err
35237 - }; then
35238 - ac_header_preproc=yes
35239 -else
35240 - $as_echo "$as_me: failed program was:" >&5
35241 -sed 's/^/| /' conftest.$ac_ext >&5
35242 -
35243 - ac_header_preproc=no
35244 -fi
35245 -
35246 -rm -f conftest.err conftest.$ac_ext
35247 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
35248 -$as_echo "$ac_header_preproc" >&6; }
35249 -
35250 -# So? What about this header?
35251 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
35252 - yes:no: )
35253 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
35254 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
35255 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
35256 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
35257 - ac_header_preproc=yes
35258 - ;;
35259 - no:yes:* )
35260 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
35261 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
35262 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
35263 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
35264 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
35265 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
35266 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
35267 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
35268 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
35269 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
35270 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
35271 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
35272 -
35273 - ;;
35274 -esac
35275 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
35276 -$as_echo_n "checking for $ac_header... " >&6; }
35277 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
35278 - $as_echo_n "(cached) " >&6
35279 -else
35280 - eval "$as_ac_Header=\$ac_header_preproc"
35281 -fi
35282 -ac_res=`eval 'as_val=${'$as_ac_Header'}
35283 - $as_echo "$as_val"'`
35284 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
35285 -$as_echo "$ac_res" >&6; }
35286 -
35287 -fi
35288 -as_val=`eval 'as_val=${'$as_ac_Header'}
35289 - $as_echo "$as_val"'`
35290 - if test "x$as_val" = x""yes; then
35291 - cat >>confdefs.h <<_ACEOF
35292 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
35293 -_ACEOF
35294 -
35295 -fi
35296 -
35297 -done
35298 -
35299 -
35300 -for ac_func in getpagesize
35301 -do
35302 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
35303 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
35304 -$as_echo_n "checking for $ac_func... " >&6; }
35305 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
35306 - $as_echo_n "(cached) " >&6
35307 -else
35308 - cat >conftest.$ac_ext <<_ACEOF
35309 -/* confdefs.h. */
35310 -_ACEOF
35311 -cat confdefs.h >>conftest.$ac_ext
35312 -cat >>conftest.$ac_ext <<_ACEOF
35313 -/* end confdefs.h. */
35314 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
35315 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
35316 -#define $ac_func innocuous_$ac_func
35317 -
35318 -/* System header to define __stub macros and hopefully few prototypes,
35319 - which can conflict with char $ac_func (); below.
35320 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
35321 - <limits.h> exists even on freestanding compilers. */
35322 -
35323 -#ifdef __STDC__
35324 -# include <limits.h>
35325 -#else
35326 -# include <assert.h>
35327 -#endif
35328 -
35329 -#undef $ac_func
35330 -
35331 -/* Override any GCC internal prototype to avoid an error.
35332 - Use char because int might match the return type of a GCC
35333 - builtin and then its argument prototype would still apply. */
35334 -#ifdef __cplusplus
35335 -extern "C"
35336 -#endif
35337 -char $ac_func ();
35338 -/* The GNU C library defines this for functions which it implements
35339 - to always fail with ENOSYS. Some functions are actually named
35340 - something starting with __ and the normal name is an alias. */
35341 -#if defined __stub_$ac_func || defined __stub___$ac_func
35342 -choke me
35343 -#endif
35344 -
35345 -int
35346 -main ()
35347 -{
35348 -return $ac_func ();
35349 - ;
35350 - return 0;
35351 -}
35352 -_ACEOF
35353 -rm -f conftest.$ac_objext conftest$ac_exeext
35354 -if { (ac_try="$ac_link"
35355 -case "(($ac_try" in
35356 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35357 - *) ac_try_echo=$ac_try;;
35358 -esac
35359 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35360 -$as_echo "$ac_try_echo") >&5
35361 - (eval "$ac_link") 2>conftest.er1
35362 - ac_status=$?
35363 - grep -v '^ *+' conftest.er1 >conftest.err
35364 - rm -f conftest.er1
35365 - cat conftest.err >&5
35366 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35367 - (exit $ac_status); } && {
35368 - test -z "$ac_c_werror_flag" ||
35369 - test ! -s conftest.err
35370 - } && test -s conftest$ac_exeext && {
35371 - test "$cross_compiling" = yes ||
35372 - $as_test_x conftest$ac_exeext
35373 - }; then
35374 - eval "$as_ac_var=yes"
35375 -else
35376 - $as_echo "$as_me: failed program was:" >&5
35377 -sed 's/^/| /' conftest.$ac_ext >&5
35378 -
35379 - eval "$as_ac_var=no"
35380 -fi
35381 -
35382 -rm -rf conftest.dSYM
35383 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
35384 - conftest$ac_exeext conftest.$ac_ext
35385 -fi
35386 -ac_res=`eval 'as_val=${'$as_ac_var'}
35387 - $as_echo "$as_val"'`
35388 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
35389 -$as_echo "$ac_res" >&6; }
35390 -as_val=`eval 'as_val=${'$as_ac_var'}
35391 - $as_echo "$as_val"'`
35392 - if test "x$as_val" = x""yes; then
35393 - cat >>confdefs.h <<_ACEOF
35394 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
35395 -_ACEOF
35396 -
35397 -fi
35398 -done
35399 -
35400 -{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
35401 -$as_echo_n "checking for working mmap... " >&6; }
35402 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
35403 - $as_echo_n "(cached) " >&6
35404 -else
35405 - if test "$cross_compiling" = yes; then
35406 - ac_cv_func_mmap_fixed_mapped=no
35407 -else
35408 - cat >conftest.$ac_ext <<_ACEOF
35409 -/* confdefs.h. */
35410 -_ACEOF
35411 -cat confdefs.h >>conftest.$ac_ext
35412 -cat >>conftest.$ac_ext <<_ACEOF
35413 -/* end confdefs.h. */
35414 -$ac_includes_default
35415 -/* malloc might have been renamed as rpl_malloc. */
35416 -#undef malloc
35417 -
35418 -/* Thanks to Mike Haertel and Jim Avera for this test.
35419 - Here is a matrix of mmap possibilities:
35420 - mmap private not fixed
35421 - mmap private fixed at somewhere currently unmapped
35422 - mmap private fixed at somewhere already mapped
35423 - mmap shared not fixed
35424 - mmap shared fixed at somewhere currently unmapped
35425 - mmap shared fixed at somewhere already mapped
35426 - For private mappings, we should verify that changes cannot be read()
35427 - back from the file, nor mmap's back from the file at a different
35428 - address. (There have been systems where private was not correctly
35429 - implemented like the infamous i386 svr4.0, and systems where the
35430 - VM page cache was not coherent with the file system buffer cache
35431 - like early versions of FreeBSD and possibly contemporary NetBSD.)
35432 - For shared mappings, we should conversely verify that changes get
35433 - propagated back to all the places they're supposed to be.
35434 -
35435 - Grep wants private fixed already mapped.
35436 - The main things grep needs to know about mmap are:
35437 - * does it exist and is it safe to write into the mmap'd area
35438 - * how to use it (BSD variants) */
35439 -
35440 -#include <fcntl.h>
35441 -#include <sys/mman.h>
35442 -
35443 -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
35444 -char *malloc ();
35445 -#endif
35446 -
35447 -/* This mess was copied from the GNU getpagesize.h. */
35448 -#ifndef HAVE_GETPAGESIZE
35449 -/* Assume that all systems that can run configure have sys/param.h. */
35450 -# ifndef HAVE_SYS_PARAM_H
35451 -# define HAVE_SYS_PARAM_H 1
35452 -# endif
35453 -
35454 -# ifdef _SC_PAGESIZE
35455 -# define getpagesize() sysconf(_SC_PAGESIZE)
35456 -# else /* no _SC_PAGESIZE */
35457 -# ifdef HAVE_SYS_PARAM_H
35458 -# include <sys/param.h>
35459 -# ifdef EXEC_PAGESIZE
35460 -# define getpagesize() EXEC_PAGESIZE
35461 -# else /* no EXEC_PAGESIZE */
35462 -# ifdef NBPG
35463 -# define getpagesize() NBPG * CLSIZE
35464 -# ifndef CLSIZE
35465 -# define CLSIZE 1
35466 -# endif /* no CLSIZE */
35467 -# else /* no NBPG */
35468 -# ifdef NBPC
35469 -# define getpagesize() NBPC
35470 -# else /* no NBPC */
35471 -# ifdef PAGESIZE
35472 -# define getpagesize() PAGESIZE
35473 -# endif /* PAGESIZE */
35474 -# endif /* no NBPC */
35475 -# endif /* no NBPG */
35476 -# endif /* no EXEC_PAGESIZE */
35477 -# else /* no HAVE_SYS_PARAM_H */
35478 -# define getpagesize() 8192 /* punt totally */
35479 -# endif /* no HAVE_SYS_PARAM_H */
35480 -# endif /* no _SC_PAGESIZE */
35481 -
35482 -#endif /* no HAVE_GETPAGESIZE */
35483 -
35484 -int
35485 -main ()
35486 -{
35487 - char *data, *data2, *data3;
35488 - int i, pagesize;
35489 - int fd;
35490 -
35491 - pagesize = getpagesize ();
35492 -
35493 - /* First, make a file with some known garbage in it. */
35494 - data = (char *) malloc (pagesize);
35495 - if (!data)
35496 - return 1;
35497 - for (i = 0; i < pagesize; ++i)
35498 - *(data + i) = rand ();
35499 - umask (0);
35500 - fd = creat ("conftest.mmap", 0600);
35501 - if (fd < 0)
35502 - return 1;
35503 - if (write (fd, data, pagesize) != pagesize)
35504 - return 1;
35505 - close (fd);
35506 -
35507 - /* Next, try to mmap the file at a fixed address which already has
35508 - something else allocated at it. If we can, also make sure that
35509 - we see the same garbage. */
35510 - fd = open ("conftest.mmap", O_RDWR);
35511 - if (fd < 0)
35512 - return 1;
35513 - data2 = (char *) malloc (2 * pagesize);
35514 - if (!data2)
35515 - return 1;
35516 - data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
35517 - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
35518 - MAP_PRIVATE | MAP_FIXED, fd, 0L))
35519 - return 1;
35520 - for (i = 0; i < pagesize; ++i)
35521 - if (*(data + i) != *(data2 + i))
35522 - return 1;
35523 -
35524 - /* Finally, make sure that changes to the mapped area do not
35525 - percolate back to the file as seen by read(). (This is a bug on
35526 - some variants of i386 svr4.0.) */
35527 - for (i = 0; i < pagesize; ++i)
35528 - *(data2 + i) = *(data2 + i) + 1;
35529 - data3 = (char *) malloc (pagesize);
35530 - if (!data3)
35531 - return 1;
35532 - if (read (fd, data3, pagesize) != pagesize)
35533 - return 1;
35534 - for (i = 0; i < pagesize; ++i)
35535 - if (*(data + i) != *(data3 + i))
35536 - return 1;
35537 - close (fd);
35538 - return 0;
35539 -}
35540 -_ACEOF
35541 -rm -f conftest$ac_exeext
35542 -if { (ac_try="$ac_link"
35543 -case "(($ac_try" in
35544 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35545 - *) ac_try_echo=$ac_try;;
35546 -esac
35547 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35548 -$as_echo "$ac_try_echo") >&5
35549 - (eval "$ac_link") 2>&5
35550 - ac_status=$?
35551 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35552 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
35553 - { (case "(($ac_try" in
35554 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35555 - *) ac_try_echo=$ac_try;;
35556 -esac
35557 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35558 -$as_echo "$ac_try_echo") >&5
35559 - (eval "$ac_try") 2>&5
35560 - ac_status=$?
35561 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35562 - (exit $ac_status); }; }; then
35563 - ac_cv_func_mmap_fixed_mapped=yes
35564 -else
35565 - $as_echo "$as_me: program exited with status $ac_status" >&5
35566 -$as_echo "$as_me: failed program was:" >&5
35567 -sed 's/^/| /' conftest.$ac_ext >&5
35568 -
35569 -( exit $ac_status )
35570 -ac_cv_func_mmap_fixed_mapped=no
35571 -fi
35572 -rm -rf conftest.dSYM
35573 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
35574 -fi
35575 -
35576 -
35577 -fi
35578 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
35579 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
35580 -if test $ac_cv_func_mmap_fixed_mapped = yes; then
35581 -
35582 -cat >>confdefs.h <<\_ACEOF
35583 -#define HAVE_MMAP 1
35584 -_ACEOF
35585 -
35586 -fi
35587 -rm -f conftest.mmap
35588 -
35589 -
35590 - { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
35591 -$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
35592 -if test "${ac_cv_gnu_library_2_1+set}" = set; then
35593 - $as_echo_n "(cached) " >&6
35594 -else
35595 - cat >conftest.$ac_ext <<_ACEOF
35596 -/* confdefs.h. */
35597 -_ACEOF
35598 -cat confdefs.h >>conftest.$ac_ext
35599 -cat >>conftest.$ac_ext <<_ACEOF
35600 -/* end confdefs.h. */
35601 -
35602 -#include <features.h>
35603 -#ifdef __GNU_LIBRARY__
35604 - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
35605 - Lucky GNU user
35606 - #endif
35607 -#endif
35608 -
35609 -_ACEOF
35610 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
35611 - $EGREP "Lucky GNU user" >/dev/null 2>&1; then
35612 - ac_cv_gnu_library_2_1=yes
35613 -else
35614 - ac_cv_gnu_library_2_1=no
35615 -fi
35616 -rm -f conftest*
35617 -
35618 -
35619 -
35620 -fi
35621 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
35622 -$as_echo "$ac_cv_gnu_library_2_1" >&6; }
35623 -
35624 - GLIBC21="$ac_cv_gnu_library_2_1"
35625 -
35626 -
35627 -
35628 -
35629 - { $as_echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
35630 -$as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; }
35631 -if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
35632 - $as_echo_n "(cached) " >&6
35633 -else
35634 -
35635 - if test "$cross_compiling" = yes; then
35636 -
35637 - # Guess based on the CPU.
35638 - case "$host_cpu" in
35639 - alpha* | i3456786 | m68k | s390*)
35640 - gt_cv_int_divbyzero_sigfpe="guessing yes";;
35641 - *)
35642 - gt_cv_int_divbyzero_sigfpe="guessing no";;
35643 - esac
35644 -
35645 -else
35646 - cat >conftest.$ac_ext <<_ACEOF
35647 -/* confdefs.h. */
35648 -_ACEOF
35649 -cat confdefs.h >>conftest.$ac_ext
35650 -cat >>conftest.$ac_ext <<_ACEOF
35651 -/* end confdefs.h. */
35652 -
35653 -#include <stdlib.h>
35654 -#include <signal.h>
35655 -
35656 -static void
35657 -#ifdef __cplusplus
35658 -sigfpe_handler (int sig)
35659 -#else
35660 -sigfpe_handler (sig) int sig;
35661 -#endif
35662 -{
35663 - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
35664 - exit (sig != SIGFPE);
35665 -}
35666 -
35667 -int x = 1;
35668 -int y = 0;
35669 -int z;
35670 -int nan;
35671 -
35672 -int main ()
35673 -{
35674 - signal (SIGFPE, sigfpe_handler);
35675 -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
35676 -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
35677 - signal (SIGTRAP, sigfpe_handler);
35678 -#endif
35679 -/* Linux/SPARC yields signal SIGILL. */
35680 -#if defined (__sparc__) && defined (__linux__)
35681 - signal (SIGILL, sigfpe_handler);
35682 -#endif
35683 -
35684 - z = x / y;
35685 - nan = y / y;
35686 - exit (1);
35687 -}
35688 -
35689 -_ACEOF
35690 -rm -f conftest$ac_exeext
35691 -if { (ac_try="$ac_link"
35692 -case "(($ac_try" in
35693 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35694 - *) ac_try_echo=$ac_try;;
35695 -esac
35696 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35697 -$as_echo "$ac_try_echo") >&5
35698 - (eval "$ac_link") 2>&5
35699 - ac_status=$?
35700 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35701 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
35702 - { (case "(($ac_try" in
35703 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35704 - *) ac_try_echo=$ac_try;;
35705 -esac
35706 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35707 -$as_echo "$ac_try_echo") >&5
35708 - (eval "$ac_try") 2>&5
35709 - ac_status=$?
35710 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35711 - (exit $ac_status); }; }; then
35712 - gt_cv_int_divbyzero_sigfpe=yes
35713 -else
35714 - $as_echo "$as_me: program exited with status $ac_status" >&5
35715 -$as_echo "$as_me: failed program was:" >&5
35716 -sed 's/^/| /' conftest.$ac_ext >&5
35717 -
35718 -( exit $ac_status )
35719 -gt_cv_int_divbyzero_sigfpe=no
35720 -fi
35721 -rm -rf conftest.dSYM
35722 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
35723 -fi
35724 -
35725 -
35726 -
35727 -fi
35728 -{ $as_echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
35729 -$as_echo "$gt_cv_int_divbyzero_sigfpe" >&6; }
35730 - case "$gt_cv_int_divbyzero_sigfpe" in
35731 - *yes) value=1;;
35732 - *) value=0;;
35733 - esac
35734 -
35735 -cat >>confdefs.h <<_ACEOF
35736 -#define INTDIV0_RAISES_SIGFPE $value
35737 -_ACEOF
35738 -
35739 -
35740 -
35741 - { $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5
35742 -$as_echo_n "checking for inttypes.h... " >&6; }
35743 -if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
35744 - $as_echo_n "(cached) " >&6
35745 -else
35746 - cat >conftest.$ac_ext <<_ACEOF
35747 -/* confdefs.h. */
35748 -_ACEOF
35749 -cat confdefs.h >>conftest.$ac_ext
35750 -cat >>conftest.$ac_ext <<_ACEOF
35751 -/* end confdefs.h. */
35752 -#include <sys/types.h>
35753 -#include <inttypes.h>
35754 -int
35755 -main ()
35756 -{
35757 -uintmax_t i = (uintmax_t) -1;
35758 - ;
35759 - return 0;
35760 -}
35761 -_ACEOF
35762 -rm -f conftest.$ac_objext
35763 -if { (ac_try="$ac_compile"
35764 -case "(($ac_try" in
35765 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35766 - *) ac_try_echo=$ac_try;;
35767 -esac
35768 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35769 -$as_echo "$ac_try_echo") >&5
35770 - (eval "$ac_compile") 2>conftest.er1
35771 - ac_status=$?
35772 - grep -v '^ *+' conftest.er1 >conftest.err
35773 - rm -f conftest.er1
35774 - cat conftest.err >&5
35775 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35776 - (exit $ac_status); } && {
35777 - test -z "$ac_c_werror_flag" ||
35778 - test ! -s conftest.err
35779 - } && test -s conftest.$ac_objext; then
35780 - jm_ac_cv_header_inttypes_h=yes
35781 -else
35782 - $as_echo "$as_me: failed program was:" >&5
35783 -sed 's/^/| /' conftest.$ac_ext >&5
35784 -
35785 - jm_ac_cv_header_inttypes_h=no
35786 -fi
35787 -
35788 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
35789 -fi
35790 -{ $as_echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5
35791 -$as_echo "$jm_ac_cv_header_inttypes_h" >&6; }
35792 - if test $jm_ac_cv_header_inttypes_h = yes; then
35793 -
35794 -cat >>confdefs.h <<_ACEOF
35795 -#define HAVE_INTTYPES_H_WITH_UINTMAX 1
35796 -_ACEOF
35797 -
35798 - fi
35799 -
35800 -
35801 - { $as_echo "$as_me:$LINENO: checking for stdint.h" >&5
35802 -$as_echo_n "checking for stdint.h... " >&6; }
35803 -if test "${jm_ac_cv_header_stdint_h+set}" = set; then
35804 - $as_echo_n "(cached) " >&6
35805 -else
35806 - cat >conftest.$ac_ext <<_ACEOF
35807 -/* confdefs.h. */
35808 -_ACEOF
35809 -cat confdefs.h >>conftest.$ac_ext
35810 -cat >>conftest.$ac_ext <<_ACEOF
35811 -/* end confdefs.h. */
35812 -#include <sys/types.h>
35813 -#include <stdint.h>
35814 -int
35815 -main ()
35816 -{
35817 -uintmax_t i = (uintmax_t) -1;
35818 - ;
35819 - return 0;
35820 -}
35821 -_ACEOF
35822 -rm -f conftest.$ac_objext
35823 -if { (ac_try="$ac_compile"
35824 -case "(($ac_try" in
35825 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35826 - *) ac_try_echo=$ac_try;;
35827 -esac
35828 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35829 -$as_echo "$ac_try_echo") >&5
35830 - (eval "$ac_compile") 2>conftest.er1
35831 - ac_status=$?
35832 - grep -v '^ *+' conftest.er1 >conftest.err
35833 - rm -f conftest.er1
35834 - cat conftest.err >&5
35835 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35836 - (exit $ac_status); } && {
35837 - test -z "$ac_c_werror_flag" ||
35838 - test ! -s conftest.err
35839 - } && test -s conftest.$ac_objext; then
35840 - jm_ac_cv_header_stdint_h=yes
35841 -else
35842 - $as_echo "$as_me: failed program was:" >&5
35843 -sed 's/^/| /' conftest.$ac_ext >&5
35844 -
35845 - jm_ac_cv_header_stdint_h=no
35846 -fi
35847 -
35848 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
35849 -fi
35850 -{ $as_echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5
35851 -$as_echo "$jm_ac_cv_header_stdint_h" >&6; }
35852 - if test $jm_ac_cv_header_stdint_h = yes; then
35853 -
35854 -cat >>confdefs.h <<_ACEOF
35855 -#define HAVE_STDINT_H_WITH_UINTMAX 1
35856 -_ACEOF
35857 -
35858 - fi
35859 -
35860 -
35861 - { $as_echo "$as_me:$LINENO: checking for unsigned long long" >&5
35862 -$as_echo_n "checking for unsigned long long... " >&6; }
35863 -if test "${ac_cv_type_unsigned_long_long+set}" = set; then
35864 - $as_echo_n "(cached) " >&6
35865 -else
35866 - cat >conftest.$ac_ext <<_ACEOF
35867 -/* confdefs.h. */
35868 -_ACEOF
35869 -cat confdefs.h >>conftest.$ac_ext
35870 -cat >>conftest.$ac_ext <<_ACEOF
35871 -/* end confdefs.h. */
35872 -unsigned long long ull = 1; int i = 63;
35873 -int
35874 -main ()
35875 -{
35876 -unsigned long long ullmax = (unsigned long long) -1;
35877 - return ull << i | ull >> i | ullmax / ull | ullmax % ull;
35878 - ;
35879 - return 0;
35880 -}
35881 -_ACEOF
35882 -rm -f conftest.$ac_objext conftest$ac_exeext
35883 -if { (ac_try="$ac_link"
35884 -case "(($ac_try" in
35885 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35886 - *) ac_try_echo=$ac_try;;
35887 -esac
35888 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35889 -$as_echo "$ac_try_echo") >&5
35890 - (eval "$ac_link") 2>conftest.er1
35891 - ac_status=$?
35892 - grep -v '^ *+' conftest.er1 >conftest.err
35893 - rm -f conftest.er1
35894 - cat conftest.err >&5
35895 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35896 - (exit $ac_status); } && {
35897 - test -z "$ac_c_werror_flag" ||
35898 - test ! -s conftest.err
35899 - } && test -s conftest$ac_exeext && {
35900 - test "$cross_compiling" = yes ||
35901 - $as_test_x conftest$ac_exeext
35902 - }; then
35903 - ac_cv_type_unsigned_long_long=yes
35904 -else
35905 - $as_echo "$as_me: failed program was:" >&5
35906 -sed 's/^/| /' conftest.$ac_ext >&5
35907 -
35908 - ac_cv_type_unsigned_long_long=no
35909 -fi
35910 -
35911 -rm -rf conftest.dSYM
35912 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
35913 - conftest$ac_exeext conftest.$ac_ext
35914 -fi
35915 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
35916 -$as_echo "$ac_cv_type_unsigned_long_long" >&6; }
35917 - if test $ac_cv_type_unsigned_long_long = yes; then
35918 -
35919 -cat >>confdefs.h <<\_ACEOF
35920 -#define HAVE_UNSIGNED_LONG_LONG 1
35921 -_ACEOF
35922 -
35923 - fi
35924 -
35925 -
35926 -
35927 -
35928 - if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
35929 -
35930 - test $ac_cv_type_unsigned_long_long = yes \
35931 - && ac_type='unsigned long long' \
35932 - || ac_type='unsigned long'
35933 -
35934 -cat >>confdefs.h <<_ACEOF
35935 -#define uintmax_t $ac_type
35936 -_ACEOF
35937 -
35938 - else
35939 -
35940 -cat >>confdefs.h <<\_ACEOF
35941 -#define HAVE_UINTMAX_T 1
35942 -_ACEOF
35943 -
35944 - fi
35945 -
35946 -
35947 - { $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5
35948 -$as_echo_n "checking for inttypes.h... " >&6; }
35949 -if test "${gt_cv_header_inttypes_h+set}" = set; then
35950 - $as_echo_n "(cached) " >&6
35951 -else
35952 -
35953 - cat >conftest.$ac_ext <<_ACEOF
35954 -/* confdefs.h. */
35955 -_ACEOF
35956 -cat confdefs.h >>conftest.$ac_ext
35957 -cat >>conftest.$ac_ext <<_ACEOF
35958 -/* end confdefs.h. */
35959 -#include <sys/types.h>
35960 -#include <inttypes.h>
35961 -int
35962 -main ()
35963 -{
35964 -
35965 - ;
35966 - return 0;
35967 -}
35968 -_ACEOF
35969 -rm -f conftest.$ac_objext
35970 -if { (ac_try="$ac_compile"
35971 -case "(($ac_try" in
35972 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
35973 - *) ac_try_echo=$ac_try;;
35974 -esac
35975 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
35976 -$as_echo "$ac_try_echo") >&5
35977 - (eval "$ac_compile") 2>conftest.er1
35978 - ac_status=$?
35979 - grep -v '^ *+' conftest.er1 >conftest.err
35980 - rm -f conftest.er1
35981 - cat conftest.err >&5
35982 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
35983 - (exit $ac_status); } && {
35984 - test -z "$ac_c_werror_flag" ||
35985 - test ! -s conftest.err
35986 - } && test -s conftest.$ac_objext; then
35987 - gt_cv_header_inttypes_h=yes
35988 -else
35989 - $as_echo "$as_me: failed program was:" >&5
35990 -sed 's/^/| /' conftest.$ac_ext >&5
35991 -
35992 - gt_cv_header_inttypes_h=no
35993 -fi
35994 -
35995 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
35996 -
35997 -fi
35998 -{ $as_echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
35999 -$as_echo "$gt_cv_header_inttypes_h" >&6; }
36000 - if test $gt_cv_header_inttypes_h = yes; then
36001 -
36002 -cat >>confdefs.h <<_ACEOF
36003 -#define HAVE_INTTYPES_H 1
36004 -_ACEOF
36005 -
36006 - fi
36007 -
36008 -
36009 -
36010 - if test $gt_cv_header_inttypes_h = yes; then
36011 - { $as_echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
36012 -$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
36013 -if test "${gt_cv_inttypes_pri_broken+set}" = set; then
36014 - $as_echo_n "(cached) " >&6
36015 -else
36016 -
36017 - cat >conftest.$ac_ext <<_ACEOF
36018 -/* confdefs.h. */
36019 -_ACEOF
36020 -cat confdefs.h >>conftest.$ac_ext
36021 -cat >>conftest.$ac_ext <<_ACEOF
36022 -/* end confdefs.h. */
36023 -#include <inttypes.h>
36024 -#ifdef PRId32
36025 -char *p = PRId32;
36026 -#endif
36027 -
36028 -int
36029 -main ()
36030 -{
36031 -
36032 - ;
36033 - return 0;
36034 -}
36035 -_ACEOF
36036 -rm -f conftest.$ac_objext
36037 -if { (ac_try="$ac_compile"
36038 -case "(($ac_try" in
36039 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
36040 - *) ac_try_echo=$ac_try;;
36041 -esac
36042 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
36043 -$as_echo "$ac_try_echo") >&5
36044 - (eval "$ac_compile") 2>conftest.er1
36045 - ac_status=$?
36046 - grep -v '^ *+' conftest.er1 >conftest.err
36047 - rm -f conftest.er1
36048 - cat conftest.err >&5
36049 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
36050 - (exit $ac_status); } && {
36051 - test -z "$ac_c_werror_flag" ||
36052 - test ! -s conftest.err
36053 - } && test -s conftest.$ac_objext; then
36054 - gt_cv_inttypes_pri_broken=no
36055 -else
36056 - $as_echo "$as_me: failed program was:" >&5
36057 -sed 's/^/| /' conftest.$ac_ext >&5
36058 -
36059 - gt_cv_inttypes_pri_broken=yes
36060 -fi
36061 -
36062 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
36063 -
36064 -fi
36065 -{ $as_echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
36066 -$as_echo "$gt_cv_inttypes_pri_broken" >&6; }
36067 - fi
36068 - if test "$gt_cv_inttypes_pri_broken" = yes; then
36069 -
36070 -cat >>confdefs.h <<_ACEOF
36071 -#define PRI_MACROS_BROKEN 1
36072 -_ACEOF
36073 -
36074 - fi
36075 -
36076 -
36077 - if test "X$prefix" = "XNONE"; then
36078 - acl_final_prefix="$ac_default_prefix"
36079 - else
36080 - acl_final_prefix="$prefix"
36081 - fi
36082 - if test "X$exec_prefix" = "XNONE"; then
36083 - acl_final_exec_prefix='${prefix}'
36084 - else
36085 - acl_final_exec_prefix="$exec_prefix"
36086 - fi
36087 - acl_save_prefix="$prefix"
36088 - prefix="$acl_final_prefix"
36089 - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
36090 - prefix="$acl_save_prefix"
36091 -
36092 -
36093 -# Check whether --with-gnu-ld was given.
36094 -if test "${with_gnu_ld+set}" = set; then
36095 - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
36096 -else
36097 - with_gnu_ld=no
36098 -fi
36099 -
36100 -# Prepare PATH_SEPARATOR.
36101 -# The user is always right.
36102 -if test "${PATH_SEPARATOR+set}" != set; then
36103 - echo "#! /bin/sh" >conf$$.sh
36104 - echo "exit 0" >>conf$$.sh
36105 - chmod +x conf$$.sh
36106 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
36107 - PATH_SEPARATOR=';'
36108 - else
36109 - PATH_SEPARATOR=:
36110 - fi
36111 - rm -f conf$$.sh
36112 -fi
36113 -ac_prog=ld
36114 -if test "$GCC" = yes; then
36115 - # Check if gcc -print-prog-name=ld gives a path.
36116 - { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
36117 -$as_echo_n "checking for ld used by GCC... " >&6; }
36118 - case $host in
36119 - *-*-mingw*)
36120 - # gcc leaves a trailing carriage return which upsets mingw
36121 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
36122 - *)
36123 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
36124 - esac
36125 - case $ac_prog in
36126 - # Accept absolute paths.
36127 - [\\/]* | [A-Za-z]:[\\/]*)
36128 - re_direlt='/[^/][^/]*/\.\./'
36129 - # Canonicalize the path of ld
36130 - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
36131 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
36132 - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
36133 - done
36134 - test -z "$LD" && LD="$ac_prog"
36135 - ;;
36136 - "")
36137 - # If it fails, then pretend we aren't using GCC.
36138 - ac_prog=ld
36139 - ;;
36140 - *)
36141 - # If it is relative, then search for the first ld in PATH.
36142 - with_gnu_ld=unknown
36143 - ;;
36144 - esac
36145 -elif test "$with_gnu_ld" = yes; then
36146 - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
36147 -$as_echo_n "checking for GNU ld... " >&6; }
36148 -else
36149 - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
36150 -$as_echo_n "checking for non-GNU ld... " >&6; }
36151 -fi
36152 -if test "${acl_cv_path_LD+set}" = set; then
36153 - $as_echo_n "(cached) " >&6
36154 -else
36155 - if test -z "$LD"; then
36156 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
36157 - for ac_dir in $PATH; do
36158 - test -z "$ac_dir" && ac_dir=.
36159 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
36160 - acl_cv_path_LD="$ac_dir/$ac_prog"
36161 - # Check to see if the program is GNU ld. I'd rather use --version,
36162 - # but apparently some GNU ld's only accept -v.
36163 - # Break only if it was the GNU/non-GNU ld that we prefer.
36164 - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
36165 - test "$with_gnu_ld" != no && break
36166 - else
36167 - test "$with_gnu_ld" != yes && break
36168 - fi
36169 - fi
36170 - done
36171 - IFS="$ac_save_ifs"
36172 -else
36173 - acl_cv_path_LD="$LD" # Let the user override the test with a path.
36174 -fi
36175 -fi
36176 -
36177 -LD="$acl_cv_path_LD"
36178 -if test -n "$LD"; then
36179 - { $as_echo "$as_me:$LINENO: result: $LD" >&5
36180 -$as_echo "$LD" >&6; }
36181 -else
36182 - { $as_echo "$as_me:$LINENO: result: no" >&5
36183 -$as_echo "no" >&6; }
36184 -fi
36185 -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
36186 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
36187 - { (exit 1); exit 1; }; }
36188 -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
36189 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
36190 -if test "${acl_cv_prog_gnu_ld+set}" = set; then
36191 - $as_echo_n "(cached) " >&6
36192 -else
36193 - # I'd rather use --version here, but apparently some GNU ld's only accept -v.
36194 -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
36195 - acl_cv_prog_gnu_ld=yes
36196 -else
36197 - acl_cv_prog_gnu_ld=no
36198 -fi
36199 -fi
36200 -{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
36201 -$as_echo "$acl_cv_prog_gnu_ld" >&6; }
36202 -with_gnu_ld=$acl_cv_prog_gnu_ld
36203 -
36204 -
36205 -
36206 - { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
36207 -$as_echo_n "checking for shared library run path origin... " >&6; }
36208 -if test "${acl_cv_rpath+set}" = set; then
36209 - $as_echo_n "(cached) " >&6
36210 -else
36211 -
36212 - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
36213 - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
36214 - . ./conftest.sh
36215 - rm -f ./conftest.sh
36216 - acl_cv_rpath=done
36217 -
36218 -fi
36219 -{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
36220 -$as_echo "$acl_cv_rpath" >&6; }
36221 - wl="$acl_cv_wl"
36222 - libext="$acl_cv_libext"
36223 - shlibext="$acl_cv_shlibext"
36224 - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
36225 - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
36226 - hardcode_direct="$acl_cv_hardcode_direct"
36227 - hardcode_minus_L="$acl_cv_hardcode_minus_L"
36228 - # Check whether --enable-rpath was given.
36229 -if test "${enable_rpath+set}" = set; then
36230 - enableval=$enable_rpath; :
36231 -else
36232 - enable_rpath=yes
36233 -fi
36234 -
36235 -
36236 -
36237 -
36238 -
36239 -
36240 -
36241 -
36242 - use_additional=yes
36243 -
36244 - acl_save_prefix="$prefix"
36245 - prefix="$acl_final_prefix"
36246 - acl_save_exec_prefix="$exec_prefix"
36247 - exec_prefix="$acl_final_exec_prefix"
36248 -
36249 - eval additional_includedir=\"$includedir\"
36250 - eval additional_libdir=\"$libdir\"
36251 -
36252 - exec_prefix="$acl_save_exec_prefix"
36253 - prefix="$acl_save_prefix"
36254 -
36255 -
36256 -# Check whether --with-libiconv-prefix was given.
36257 -if test "${with_libiconv_prefix+set}" = set; then
36258 - withval=$with_libiconv_prefix;
36259 - if test "X$withval" = "Xno"; then
36260 - use_additional=no
36261 - else
36262 - if test "X$withval" = "X"; then
36263 -
36264 - acl_save_prefix="$prefix"
36265 - prefix="$acl_final_prefix"
36266 - acl_save_exec_prefix="$exec_prefix"
36267 - exec_prefix="$acl_final_exec_prefix"
36268 -
36269 - eval additional_includedir=\"$includedir\"
36270 - eval additional_libdir=\"$libdir\"
36271 -
36272 - exec_prefix="$acl_save_exec_prefix"
36273 - prefix="$acl_save_prefix"
36274 -
36275 - else
36276 - additional_includedir="$withval/include"
36277 - additional_libdir="$withval/lib"
36278 - fi
36279 - fi
36280 -
36281 -fi
36282 -
36283 - LIBICONV=
36284 - LTLIBICONV=
36285 - INCICONV=
36286 - rpathdirs=
36287 - ltrpathdirs=
36288 - names_already_handled=
36289 - names_next_round='iconv '
36290 - while test -n "$names_next_round"; do
36291 - names_this_round="$names_next_round"
36292 - names_next_round=
36293 - for name in $names_this_round; do
36294 - already_handled=
36295 - for n in $names_already_handled; do
36296 - if test "$n" = "$name"; then
36297 - already_handled=yes
36298 - break
36299 - fi
36300 - done
36301 - if test -z "$already_handled"; then
36302 - names_already_handled="$names_already_handled $name"
36303 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
36304 - eval value=\"\$HAVE_LIB$uppername\"
36305 - if test -n "$value"; then
36306 - if test "$value" = yes; then
36307 - eval value=\"\$LIB$uppername\"
36308 - test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
36309 - eval value=\"\$LTLIB$uppername\"
36310 - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
36311 - else
36312 - :
36313 - fi
36314 - else
36315 - found_dir=
36316 - found_la=
36317 - found_so=
36318 - found_a=
36319 - if test $use_additional = yes; then
36320 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
36321 - found_dir="$additional_libdir"
36322 - found_so="$additional_libdir/lib$name.$shlibext"
36323 - if test -f "$additional_libdir/lib$name.la"; then
36324 - found_la="$additional_libdir/lib$name.la"
36325 - fi
36326 - else
36327 - if test -f "$additional_libdir/lib$name.$libext"; then
36328 - found_dir="$additional_libdir"
36329 - found_a="$additional_libdir/lib$name.$libext"
36330 - if test -f "$additional_libdir/lib$name.la"; then
36331 - found_la="$additional_libdir/lib$name.la"
36332 - fi
36333 - fi
36334 - fi
36335 - fi
36336 - if test "X$found_dir" = "X"; then
36337 - for x in $LDFLAGS $LTLIBICONV; do
36338 -
36339 - acl_save_prefix="$prefix"
36340 - prefix="$acl_final_prefix"
36341 - acl_save_exec_prefix="$exec_prefix"
36342 - exec_prefix="$acl_final_exec_prefix"
36343 - eval x=\"$x\"
36344 - exec_prefix="$acl_save_exec_prefix"
36345 - prefix="$acl_save_prefix"
36346 -
36347 - case "$x" in
36348 - -L*)
36349 - dir=`echo "X$x" | sed -e 's/^X-L//'`
36350 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
36351 - found_dir="$dir"
36352 - found_so="$dir/lib$name.$shlibext"
36353 - if test -f "$dir/lib$name.la"; then
36354 - found_la="$dir/lib$name.la"
36355 - fi
36356 - else
36357 - if test -f "$dir/lib$name.$libext"; then
36358 - found_dir="$dir"
36359 - found_a="$dir/lib$name.$libext"
36360 - if test -f "$dir/lib$name.la"; then
36361 - found_la="$dir/lib$name.la"
36362 - fi
36363 - fi
36364 - fi
36365 - ;;
36366 - esac
36367 - if test "X$found_dir" != "X"; then
36368 - break
36369 - fi
36370 - done
36371 - fi
36372 - if test "X$found_dir" != "X"; then
36373 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
36374 - if test "X$found_so" != "X"; then
36375 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
36376 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
36377 - else
36378 - haveit=
36379 - for x in $ltrpathdirs; do
36380 - if test "X$x" = "X$found_dir"; then
36381 - haveit=yes
36382 - break
36383 - fi
36384 - done
36385 - if test -z "$haveit"; then
36386 - ltrpathdirs="$ltrpathdirs $found_dir"
36387 - fi
36388 - if test "$hardcode_direct" = yes; then
36389 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
36390 - else
36391 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
36392 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
36393 - haveit=
36394 - for x in $rpathdirs; do
36395 - if test "X$x" = "X$found_dir"; then
36396 - haveit=yes
36397 - break
36398 - fi
36399 - done
36400 - if test -z "$haveit"; then
36401 - rpathdirs="$rpathdirs $found_dir"
36402 - fi
36403 - else
36404 - haveit=
36405 - for x in $LDFLAGS $LIBICONV; do
36406 -
36407 - acl_save_prefix="$prefix"
36408 - prefix="$acl_final_prefix"
36409 - acl_save_exec_prefix="$exec_prefix"
36410 - exec_prefix="$acl_final_exec_prefix"
36411 - eval x=\"$x\"
36412 - exec_prefix="$acl_save_exec_prefix"
36413 - prefix="$acl_save_prefix"
36414 -
36415 - if test "X$x" = "X-L$found_dir"; then
36416 - haveit=yes
36417 - break
36418 - fi
36419 - done
36420 - if test -z "$haveit"; then
36421 - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
36422 - fi
36423 - if test "$hardcode_minus_L" != no; then
36424 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
36425 - else
36426 - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
36427 - fi
36428 - fi
36429 - fi
36430 - fi
36431 - else
36432 - if test "X$found_a" != "X"; then
36433 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
36434 - else
36435 - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
36436 - fi
36437 - fi
36438 - additional_includedir=
36439 - case "$found_dir" in
36440 - */lib | */lib/)
36441 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
36442 - additional_includedir="$basedir/include"
36443 - ;;
36444 - esac
36445 - if test "X$additional_includedir" != "X"; then
36446 - if test "X$additional_includedir" != "X/usr/include"; then
36447 - haveit=
36448 - if test "X$additional_includedir" = "X/usr/local/include"; then
36449 - if test -n "$GCC"; then
36450 - case $host_os in
36451 - linux*) haveit=yes;;
36452 - esac
36453 - fi
36454 - fi
36455 - if test -z "$haveit"; then
36456 - for x in $CPPFLAGS $INCICONV; do
36457 -
36458 - acl_save_prefix="$prefix"
36459 - prefix="$acl_final_prefix"
36460 - acl_save_exec_prefix="$exec_prefix"
36461 - exec_prefix="$acl_final_exec_prefix"
36462 - eval x=\"$x\"
36463 - exec_prefix="$acl_save_exec_prefix"
36464 - prefix="$acl_save_prefix"
36465 -
36466 - if test "X$x" = "X-I$additional_includedir"; then
36467 - haveit=yes
36468 - break
36469 - fi
36470 - done
36471 - if test -z "$haveit"; then
36472 - if test -d "$additional_includedir"; then
36473 - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
36474 - fi
36475 - fi
36476 - fi
36477 - fi
36478 - fi
36479 - if test -n "$found_la"; then
36480 - save_libdir="$libdir"
36481 - case "$found_la" in
36482 - */* | *\\*) . "$found_la" ;;
36483 - *) . "./$found_la" ;;
36484 - esac
36485 - libdir="$save_libdir"
36486 - for dep in $dependency_libs; do
36487 - case "$dep" in
36488 - -L*)
36489 - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
36490 - if test "X$additional_libdir" != "X/usr/lib"; then
36491 - haveit=
36492 - if test "X$additional_libdir" = "X/usr/local/lib"; then
36493 - if test -n "$GCC"; then
36494 - case $host_os in
36495 - linux*) haveit=yes;;
36496 - esac
36497 - fi
36498 - fi
36499 - if test -z "$haveit"; then
36500 - haveit=
36501 - for x in $LDFLAGS $LIBICONV; do
36502 -
36503 - acl_save_prefix="$prefix"
36504 - prefix="$acl_final_prefix"
36505 - acl_save_exec_prefix="$exec_prefix"
36506 - exec_prefix="$acl_final_exec_prefix"
36507 - eval x=\"$x\"
36508 - exec_prefix="$acl_save_exec_prefix"
36509 - prefix="$acl_save_prefix"
36510 -
36511 - if test "X$x" = "X-L$additional_libdir"; then
36512 - haveit=yes
36513 - break
36514 - fi
36515 - done
36516 - if test -z "$haveit"; then
36517 - if test -d "$additional_libdir"; then
36518 - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
36519 - fi
36520 - fi
36521 - haveit=
36522 - for x in $LDFLAGS $LTLIBICONV; do
36523 -
36524 - acl_save_prefix="$prefix"
36525 - prefix="$acl_final_prefix"
36526 - acl_save_exec_prefix="$exec_prefix"
36527 - exec_prefix="$acl_final_exec_prefix"
36528 - eval x=\"$x\"
36529 - exec_prefix="$acl_save_exec_prefix"
36530 - prefix="$acl_save_prefix"
36531 -
36532 - if test "X$x" = "X-L$additional_libdir"; then
36533 - haveit=yes
36534 - break
36535 - fi
36536 - done
36537 - if test -z "$haveit"; then
36538 - if test -d "$additional_libdir"; then
36539 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
36540 - fi
36541 - fi
36542 - fi
36543 - fi
36544 - ;;
36545 - -R*)
36546 - dir=`echo "X$dep" | sed -e 's/^X-R//'`
36547 - if test "$enable_rpath" != no; then
36548 - haveit=
36549 - for x in $rpathdirs; do
36550 - if test "X$x" = "X$dir"; then
36551 - haveit=yes
36552 - break
36553 - fi
36554 - done
36555 - if test -z "$haveit"; then
36556 - rpathdirs="$rpathdirs $dir"
36557 - fi
36558 - haveit=
36559 - for x in $ltrpathdirs; do
36560 - if test "X$x" = "X$dir"; then
36561 - haveit=yes
36562 - break
36563 - fi
36564 - done
36565 - if test -z "$haveit"; then
36566 - ltrpathdirs="$ltrpathdirs $dir"
36567 - fi
36568 - fi
36569 - ;;
36570 - -l*)
36571 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
36572 - ;;
36573 - *.la)
36574 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
36575 - ;;
36576 - *)
36577 - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
36578 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
36579 - ;;
36580 - esac
36581 - done
36582 - fi
36583 - else
36584 - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
36585 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
36586 - fi
36587 - fi
36588 - fi
36589 - done
36590 - done
36591 - if test "X$rpathdirs" != "X"; then
36592 - if test -n "$hardcode_libdir_separator"; then
36593 - alldirs=
36594 - for found_dir in $rpathdirs; do
36595 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
36596 - done
36597 - acl_save_libdir="$libdir"
36598 - libdir="$alldirs"
36599 - eval flag=\"$hardcode_libdir_flag_spec\"
36600 - libdir="$acl_save_libdir"
36601 - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
36602 - else
36603 - for found_dir in $rpathdirs; do
36604 - acl_save_libdir="$libdir"
36605 - libdir="$found_dir"
36606 - eval flag=\"$hardcode_libdir_flag_spec\"
36607 - libdir="$acl_save_libdir"
36608 - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
36609 - done
36610 - fi
36611 - fi
36612 - if test "X$ltrpathdirs" != "X"; then
36613 - for found_dir in $ltrpathdirs; do
36614 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
36615 - done
36616 - fi
36617 -
36618 -
36619 -
36620 -
36621 -
36622 -
36623 -
36624 -
36625 -
36626 -
36627 -
36628 -
36629 -
36630 -
36631 -for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
36632 -stdlib.h string.h unistd.h sys/param.h
36633 -do
36634 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
36635 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
36636 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
36637 -$as_echo_n "checking for $ac_header... " >&6; }
36638 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
36639 - $as_echo_n "(cached) " >&6
36640 -fi
36641 -ac_res=`eval 'as_val=${'$as_ac_Header'}
36642 - $as_echo "$as_val"'`
36643 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
36644 -$as_echo "$ac_res" >&6; }
36645 -else
36646 - # Is the header compilable?
36647 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
36648 -$as_echo_n "checking $ac_header usability... " >&6; }
36649 -cat >conftest.$ac_ext <<_ACEOF
36650 -/* confdefs.h. */
36651 -_ACEOF
36652 -cat confdefs.h >>conftest.$ac_ext
36653 -cat >>conftest.$ac_ext <<_ACEOF
36654 -/* end confdefs.h. */
36655 -$ac_includes_default
36656 -#include <$ac_header>
36657 -_ACEOF
36658 -rm -f conftest.$ac_objext
36659 -if { (ac_try="$ac_compile"
36660 -case "(($ac_try" in
36661 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
36662 - *) ac_try_echo=$ac_try;;
36663 -esac
36664 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
36665 -$as_echo "$ac_try_echo") >&5
36666 - (eval "$ac_compile") 2>conftest.er1
36667 - ac_status=$?
36668 - grep -v '^ *+' conftest.er1 >conftest.err
36669 - rm -f conftest.er1
36670 - cat conftest.err >&5
36671 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
36672 - (exit $ac_status); } && {
36673 - test -z "$ac_c_werror_flag" ||
36674 - test ! -s conftest.err
36675 - } && test -s conftest.$ac_objext; then
36676 - ac_header_compiler=yes
36677 -else
36678 - $as_echo "$as_me: failed program was:" >&5
36679 -sed 's/^/| /' conftest.$ac_ext >&5
36680 -
36681 - ac_header_compiler=no
36682 -fi
36683 -
36684 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
36685 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
36686 -$as_echo "$ac_header_compiler" >&6; }
36687 -
36688 -# Is the header present?
36689 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
36690 -$as_echo_n "checking $ac_header presence... " >&6; }
36691 -cat >conftest.$ac_ext <<_ACEOF
36692 -/* confdefs.h. */
36693 -_ACEOF
36694 -cat confdefs.h >>conftest.$ac_ext
36695 -cat >>conftest.$ac_ext <<_ACEOF
36696 -/* end confdefs.h. */
36697 -#include <$ac_header>
36698 -_ACEOF
36699 -if { (ac_try="$ac_cpp conftest.$ac_ext"
36700 -case "(($ac_try" in
36701 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
36702 - *) ac_try_echo=$ac_try;;
36703 -esac
36704 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
36705 -$as_echo "$ac_try_echo") >&5
36706 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
36707 - ac_status=$?
36708 - grep -v '^ *+' conftest.er1 >conftest.err
36709 - rm -f conftest.er1
36710 - cat conftest.err >&5
36711 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
36712 - (exit $ac_status); } >/dev/null && {
36713 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
36714 - test ! -s conftest.err
36715 - }; then
36716 - ac_header_preproc=yes
36717 -else
36718 - $as_echo "$as_me: failed program was:" >&5
36719 -sed 's/^/| /' conftest.$ac_ext >&5
36720 -
36721 - ac_header_preproc=no
36722 -fi
36723 -
36724 -rm -f conftest.err conftest.$ac_ext
36725 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
36726 -$as_echo "$ac_header_preproc" >&6; }
36727 -
36728 -# So? What about this header?
36729 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
36730 - yes:no: )
36731 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
36732 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
36733 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
36734 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
36735 - ac_header_preproc=yes
36736 - ;;
36737 - no:yes:* )
36738 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
36739 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
36740 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
36741 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
36742 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
36743 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
36744 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
36745 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
36746 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
36747 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
36748 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
36749 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
36750 -
36751 - ;;
36752 -esac
36753 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
36754 -$as_echo_n "checking for $ac_header... " >&6; }
36755 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
36756 - $as_echo_n "(cached) " >&6
36757 -else
36758 - eval "$as_ac_Header=\$ac_header_preproc"
36759 -fi
36760 -ac_res=`eval 'as_val=${'$as_ac_Header'}
36761 - $as_echo "$as_val"'`
36762 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
36763 -$as_echo "$ac_res" >&6; }
36764 -
36765 -fi
36766 -as_val=`eval 'as_val=${'$as_ac_Header'}
36767 - $as_echo "$as_val"'`
36768 - if test "x$as_val" = x""yes; then
36769 - cat >>confdefs.h <<_ACEOF
36770 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
36771 -_ACEOF
36772 -
36773 -fi
36774 -
36775 -done
36776 -
36777 -
36778 -
36779 -
36780 -
36781 -
36782 -
36783 -
36784 -
36785 -
36786 -
36787 -
36788 -
36789 -
36790 -
36791 -
36792 -
36793 -
36794 -
36795 -
36796 -
36797 -
36798 -
36799 -for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
36800 -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
36801 -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \
36802 -__fsetlocking
36803 -do
36804 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
36805 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
36806 -$as_echo_n "checking for $ac_func... " >&6; }
36807 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
36808 - $as_echo_n "(cached) " >&6
36809 -else
36810 - cat >conftest.$ac_ext <<_ACEOF
36811 -/* confdefs.h. */
36812 -_ACEOF
36813 -cat confdefs.h >>conftest.$ac_ext
36814 -cat >>conftest.$ac_ext <<_ACEOF
36815 -/* end confdefs.h. */
36816 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
36817 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
36818 -#define $ac_func innocuous_$ac_func
36819 -
36820 -/* System header to define __stub macros and hopefully few prototypes,
36821 - which can conflict with char $ac_func (); below.
36822 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
36823 - <limits.h> exists even on freestanding compilers. */
36824 -
36825 -#ifdef __STDC__
36826 -# include <limits.h>
36827 -#else
36828 -# include <assert.h>
36829 -#endif
36830 -
36831 -#undef $ac_func
36832 -
36833 -/* Override any GCC internal prototype to avoid an error.
36834 - Use char because int might match the return type of a GCC
36835 - builtin and then its argument prototype would still apply. */
36836 -#ifdef __cplusplus
36837 -extern "C"
36838 -#endif
36839 -char $ac_func ();
36840 -/* The GNU C library defines this for functions which it implements
36841 - to always fail with ENOSYS. Some functions are actually named
36842 - something starting with __ and the normal name is an alias. */
36843 -#if defined __stub_$ac_func || defined __stub___$ac_func
36844 -choke me
36845 -#endif
36846 -
36847 -int
36848 -main ()
36849 -{
36850 -return $ac_func ();
36851 - ;
36852 - return 0;
36853 -}
36854 -_ACEOF
36855 -rm -f conftest.$ac_objext conftest$ac_exeext
36856 -if { (ac_try="$ac_link"
36857 -case "(($ac_try" in
36858 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
36859 - *) ac_try_echo=$ac_try;;
36860 -esac
36861 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
36862 -$as_echo "$ac_try_echo") >&5
36863 - (eval "$ac_link") 2>conftest.er1
36864 - ac_status=$?
36865 - grep -v '^ *+' conftest.er1 >conftest.err
36866 - rm -f conftest.er1
36867 - cat conftest.err >&5
36868 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
36869 - (exit $ac_status); } && {
36870 - test -z "$ac_c_werror_flag" ||
36871 - test ! -s conftest.err
36872 - } && test -s conftest$ac_exeext && {
36873 - test "$cross_compiling" = yes ||
36874 - $as_test_x conftest$ac_exeext
36875 - }; then
36876 - eval "$as_ac_var=yes"
36877 -else
36878 - $as_echo "$as_me: failed program was:" >&5
36879 -sed 's/^/| /' conftest.$ac_ext >&5
36880 -
36881 - eval "$as_ac_var=no"
36882 -fi
36883 -
36884 -rm -rf conftest.dSYM
36885 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
36886 - conftest$ac_exeext conftest.$ac_ext
36887 -fi
36888 -ac_res=`eval 'as_val=${'$as_ac_var'}
36889 - $as_echo "$as_val"'`
36890 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
36891 -$as_echo "$ac_res" >&6; }
36892 -as_val=`eval 'as_val=${'$as_ac_var'}
36893 - $as_echo "$as_val"'`
36894 - if test "x$as_val" = x""yes; then
36895 - cat >>confdefs.h <<_ACEOF
36896 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
36897 -_ACEOF
36898 -
36899 -fi
36900 -done
36901 -
36902 -
36903 -
36904 -
36905 -
36906 -
36907 -
36908 - am_save_CPPFLAGS="$CPPFLAGS"
36909 -
36910 - for element in $INCICONV; do
36911 - haveit=
36912 - for x in $CPPFLAGS; do
36913 -
36914 - acl_save_prefix="$prefix"
36915 - prefix="$acl_final_prefix"
36916 - acl_save_exec_prefix="$exec_prefix"
36917 - exec_prefix="$acl_final_exec_prefix"
36918 - eval x=\"$x\"
36919 - exec_prefix="$acl_save_exec_prefix"
36920 - prefix="$acl_save_prefix"
36921 -
36922 - if test "X$x" = "X$element"; then
36923 - haveit=yes
36924 - break
36925 - fi
36926 - done
36927 - if test -z "$haveit"; then
36928 - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
36929 - fi
36930 - done
36931 -
36932 -
36933 - { $as_echo "$as_me:$LINENO: checking for iconv" >&5
36934 -$as_echo_n "checking for iconv... " >&6; }
36935 -if test "${am_cv_func_iconv+set}" = set; then
36936 - $as_echo_n "(cached) " >&6
36937 -else
36938 -
36939 - am_cv_func_iconv="no, consider installing GNU libiconv"
36940 - am_cv_lib_iconv=no
36941 - cat >conftest.$ac_ext <<_ACEOF
36942 -/* confdefs.h. */
36943 -_ACEOF
36944 -cat confdefs.h >>conftest.$ac_ext
36945 -cat >>conftest.$ac_ext <<_ACEOF
36946 -/* end confdefs.h. */
36947 -#include <stdlib.h>
36948 -#include <iconv.h>
36949 -int
36950 -main ()
36951 -{
36952 -iconv_t cd = iconv_open("","");
36953 - iconv(cd,NULL,NULL,NULL,NULL);
36954 - iconv_close(cd);
36955 - ;
36956 - return 0;
36957 -}
36958 -_ACEOF
36959 -rm -f conftest.$ac_objext conftest$ac_exeext
36960 -if { (ac_try="$ac_link"
36961 -case "(($ac_try" in
36962 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
36963 - *) ac_try_echo=$ac_try;;
36964 -esac
36965 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
36966 -$as_echo "$ac_try_echo") >&5
36967 - (eval "$ac_link") 2>conftest.er1
36968 - ac_status=$?
36969 - grep -v '^ *+' conftest.er1 >conftest.err
36970 - rm -f conftest.er1
36971 - cat conftest.err >&5
36972 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
36973 - (exit $ac_status); } && {
36974 - test -z "$ac_c_werror_flag" ||
36975 - test ! -s conftest.err
36976 - } && test -s conftest$ac_exeext && {
36977 - test "$cross_compiling" = yes ||
36978 - $as_test_x conftest$ac_exeext
36979 - }; then
36980 - am_cv_func_iconv=yes
36981 -else
36982 - $as_echo "$as_me: failed program was:" >&5
36983 -sed 's/^/| /' conftest.$ac_ext >&5
36984 -
36985 -
36986 -fi
36987 -
36988 -rm -rf conftest.dSYM
36989 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
36990 - conftest$ac_exeext conftest.$ac_ext
36991 - if test "$am_cv_func_iconv" != yes; then
36992 - am_save_LIBS="$LIBS"
36993 - LIBS="$LIBS $LIBICONV"
36994 - cat >conftest.$ac_ext <<_ACEOF
36995 -/* confdefs.h. */
36996 -_ACEOF
36997 -cat confdefs.h >>conftest.$ac_ext
36998 -cat >>conftest.$ac_ext <<_ACEOF
36999 -/* end confdefs.h. */
37000 -#include <stdlib.h>
37001 -#include <iconv.h>
37002 -int
37003 -main ()
37004 -{
37005 -iconv_t cd = iconv_open("","");
37006 - iconv(cd,NULL,NULL,NULL,NULL);
37007 - iconv_close(cd);
37008 - ;
37009 - return 0;
37010 -}
37011 -_ACEOF
37012 -rm -f conftest.$ac_objext conftest$ac_exeext
37013 -if { (ac_try="$ac_link"
37014 -case "(($ac_try" in
37015 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
37016 - *) ac_try_echo=$ac_try;;
37017 -esac
37018 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
37019 -$as_echo "$ac_try_echo") >&5
37020 - (eval "$ac_link") 2>conftest.er1
37021 - ac_status=$?
37022 - grep -v '^ *+' conftest.er1 >conftest.err
37023 - rm -f conftest.er1
37024 - cat conftest.err >&5
37025 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
37026 - (exit $ac_status); } && {
37027 - test -z "$ac_c_werror_flag" ||
37028 - test ! -s conftest.err
37029 - } && test -s conftest$ac_exeext && {
37030 - test "$cross_compiling" = yes ||
37031 - $as_test_x conftest$ac_exeext
37032 - }; then
37033 - am_cv_lib_iconv=yes
37034 - am_cv_func_iconv=yes
37035 -else
37036 - $as_echo "$as_me: failed program was:" >&5
37037 -sed 's/^/| /' conftest.$ac_ext >&5
37038 -
37039 -
37040 -fi
37041 -
37042 -rm -rf conftest.dSYM
37043 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
37044 - conftest$ac_exeext conftest.$ac_ext
37045 - LIBS="$am_save_LIBS"
37046 - fi
37047 -
37048 -fi
37049 -{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
37050 -$as_echo "$am_cv_func_iconv" >&6; }
37051 - if test "$am_cv_func_iconv" = yes; then
37052 -
37053 -cat >>confdefs.h <<\_ACEOF
37054 -#define HAVE_ICONV 1
37055 -_ACEOF
37056 -
37057 - fi
37058 - if test "$am_cv_lib_iconv" = yes; then
37059 - { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
37060 -$as_echo_n "checking how to link with libiconv... " >&6; }
37061 - { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
37062 -$as_echo "$LIBICONV" >&6; }
37063 - else
37064 - CPPFLAGS="$am_save_CPPFLAGS"
37065 - LIBICONV=
37066 - LTLIBICONV=
37067 - fi
37068 -
37069 -
37070 -
37071 - if test "$am_cv_func_iconv" = yes; then
37072 - { $as_echo "$as_me:$LINENO: checking for iconv declaration" >&5
37073 -$as_echo_n "checking for iconv declaration... " >&6; }
37074 - if test "${am_cv_proto_iconv+set}" = set; then
37075 - $as_echo_n "(cached) " >&6
37076 -else
37077 -
37078 - cat >conftest.$ac_ext <<_ACEOF
37079 -/* confdefs.h. */
37080 -_ACEOF
37081 -cat confdefs.h >>conftest.$ac_ext
37082 -cat >>conftest.$ac_ext <<_ACEOF
37083 -/* end confdefs.h. */
37084 -
37085 -#include <stdlib.h>
37086 -#include <iconv.h>
37087 -extern
37088 -#ifdef __cplusplus
37089 -"C"
37090 -#endif
37091 -#if defined(__STDC__) || defined(__cplusplus)
37092 -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
37093 -#else
37094 -size_t iconv();
37095 -#endif
37096 -
37097 -int
37098 -main ()
37099 -{
37100 -
37101 - ;
37102 - return 0;
37103 -}
37104 -_ACEOF
37105 -rm -f conftest.$ac_objext
37106 -if { (ac_try="$ac_compile"
37107 -case "(($ac_try" in
37108 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
37109 - *) ac_try_echo=$ac_try;;
37110 -esac
37111 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
37112 -$as_echo "$ac_try_echo") >&5
37113 - (eval "$ac_compile") 2>conftest.er1
37114 - ac_status=$?
37115 - grep -v '^ *+' conftest.er1 >conftest.err
37116 - rm -f conftest.er1
37117 - cat conftest.err >&5
37118 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
37119 - (exit $ac_status); } && {
37120 - test -z "$ac_c_werror_flag" ||
37121 - test ! -s conftest.err
37122 - } && test -s conftest.$ac_objext; then
37123 - am_cv_proto_iconv_arg1=""
37124 -else
37125 - $as_echo "$as_me: failed program was:" >&5
37126 -sed 's/^/| /' conftest.$ac_ext >&5
37127 -
37128 - am_cv_proto_iconv_arg1="const"
37129 -fi
37130 -
37131 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
37132 - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
37133 -fi
37134 -
37135 - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
37136 - { $as_echo "$as_me:$LINENO: result: ${ac_t:-
37137 - }$am_cv_proto_iconv" >&5
37138 -$as_echo "${ac_t:-
37139 - }$am_cv_proto_iconv" >&6; }
37140 -
37141 -cat >>confdefs.h <<_ACEOF
37142 -#define ICONV_CONST $am_cv_proto_iconv_arg1
37143 -_ACEOF
37144 -
37145 - fi
37146 -
37147 -
37148 - { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
37149 -$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
37150 -if test "${am_cv_langinfo_codeset+set}" = set; then
37151 - $as_echo_n "(cached) " >&6
37152 -else
37153 - cat >conftest.$ac_ext <<_ACEOF
37154 -/* confdefs.h. */
37155 -_ACEOF
37156 -cat confdefs.h >>conftest.$ac_ext
37157 -cat >>conftest.$ac_ext <<_ACEOF
37158 -/* end confdefs.h. */
37159 -#include <langinfo.h>
37160 -int
37161 -main ()
37162 -{
37163 -char* cs = nl_langinfo(CODESET);
37164 - ;
37165 - return 0;
37166 -}
37167 -_ACEOF
37168 -rm -f conftest.$ac_objext conftest$ac_exeext
37169 -if { (ac_try="$ac_link"
37170 -case "(($ac_try" in
37171 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
37172 - *) ac_try_echo=$ac_try;;
37173 -esac
37174 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
37175 -$as_echo "$ac_try_echo") >&5
37176 - (eval "$ac_link") 2>conftest.er1
37177 - ac_status=$?
37178 - grep -v '^ *+' conftest.er1 >conftest.err
37179 - rm -f conftest.er1
37180 - cat conftest.err >&5
37181 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
37182 - (exit $ac_status); } && {
37183 - test -z "$ac_c_werror_flag" ||
37184 - test ! -s conftest.err
37185 - } && test -s conftest$ac_exeext && {
37186 - test "$cross_compiling" = yes ||
37187 - $as_test_x conftest$ac_exeext
37188 - }; then
37189 - am_cv_langinfo_codeset=yes
37190 -else
37191 - $as_echo "$as_me: failed program was:" >&5
37192 -sed 's/^/| /' conftest.$ac_ext >&5
37193 -
37194 - am_cv_langinfo_codeset=no
37195 -fi
37196 -
37197 -rm -rf conftest.dSYM
37198 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
37199 - conftest$ac_exeext conftest.$ac_ext
37200 -
37201 -fi
37202 -{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
37203 -$as_echo "$am_cv_langinfo_codeset" >&6; }
37204 - if test $am_cv_langinfo_codeset = yes; then
37205 -
37206 -cat >>confdefs.h <<\_ACEOF
37207 -#define HAVE_LANGINFO_CODESET 1
37208 -_ACEOF
37209 -
37210 - fi
37211 -
37212 - if test $ac_cv_header_locale_h = yes; then
37213 -
37214 - { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
37215 -$as_echo_n "checking for LC_MESSAGES... " >&6; }
37216 -if test "${am_cv_val_LC_MESSAGES+set}" = set; then
37217 - $as_echo_n "(cached) " >&6
37218 -else
37219 - cat >conftest.$ac_ext <<_ACEOF
37220 -/* confdefs.h. */
37221 -_ACEOF
37222 -cat confdefs.h >>conftest.$ac_ext
37223 -cat >>conftest.$ac_ext <<_ACEOF
37224 -/* end confdefs.h. */
37225 -#include <locale.h>
37226 -int
37227 -main ()
37228 -{
37229 -return LC_MESSAGES
37230 - ;
37231 - return 0;
37232 -}
37233 -_ACEOF
37234 -rm -f conftest.$ac_objext conftest$ac_exeext
37235 -if { (ac_try="$ac_link"
37236 -case "(($ac_try" in
37237 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
37238 - *) ac_try_echo=$ac_try;;
37239 -esac
37240 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
37241 -$as_echo "$ac_try_echo") >&5
37242 - (eval "$ac_link") 2>conftest.er1
37243 - ac_status=$?
37244 - grep -v '^ *+' conftest.er1 >conftest.err
37245 - rm -f conftest.er1
37246 - cat conftest.err >&5
37247 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
37248 - (exit $ac_status); } && {
37249 - test -z "$ac_c_werror_flag" ||
37250 - test ! -s conftest.err
37251 - } && test -s conftest$ac_exeext && {
37252 - test "$cross_compiling" = yes ||
37253 - $as_test_x conftest$ac_exeext
37254 - }; then
37255 - am_cv_val_LC_MESSAGES=yes
37256 -else
37257 - $as_echo "$as_me: failed program was:" >&5
37258 -sed 's/^/| /' conftest.$ac_ext >&5
37259 -
37260 - am_cv_val_LC_MESSAGES=no
37261 -fi
37262 -
37263 -rm -rf conftest.dSYM
37264 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
37265 - conftest$ac_exeext conftest.$ac_ext
37266 -fi
37267 -{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
37268 -$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
37269 - if test $am_cv_val_LC_MESSAGES = yes; then
37270 -
37271 -cat >>confdefs.h <<\_ACEOF
37272 -#define HAVE_LC_MESSAGES 1
37273 -_ACEOF
37274 -
37275 - fi
37276 -
37277 - fi
37278 -
37279 - for ac_prog in bison
37280 -do
37281 - # Extract the first word of "$ac_prog", so it can be a program name with args.
37282 -set dummy $ac_prog; ac_word=$2
37283 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
37284 -$as_echo_n "checking for $ac_word... " >&6; }
37285 -if test "${ac_cv_prog_INTLBISON+set}" = set; then
37286 - $as_echo_n "(cached) " >&6
37287 -else
37288 - if test -n "$INTLBISON"; then
37289 - ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
37290 -else
37291 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
37292 -for as_dir in $PATH
37293 -do
37294 - IFS=$as_save_IFS
37295 - test -z "$as_dir" && as_dir=.
37296 - for ac_exec_ext in '' $ac_executable_extensions; do
37297 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
37298 - ac_cv_prog_INTLBISON="$ac_prog"
37299 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
37300 - break 2
37301 - fi
37302 -done
37303 -done
37304 -IFS=$as_save_IFS
37305 -
37306 -fi
37307 -fi
37308 -INTLBISON=$ac_cv_prog_INTLBISON
37309 -if test -n "$INTLBISON"; then
37310 - { $as_echo "$as_me:$LINENO: result: $INTLBISON" >&5
37311 -$as_echo "$INTLBISON" >&6; }
37312 -else
37313 - { $as_echo "$as_me:$LINENO: result: no" >&5
37314 -$as_echo "no" >&6; }
37315 -fi
37316 -
37317 -
37318 - test -n "$INTLBISON" && break
37319 -done
37320 -
37321 - if test -z "$INTLBISON"; then
37322 - ac_verc_fail=yes
37323 - else
37324 - { $as_echo "$as_me:$LINENO: checking version of bison" >&5
37325 -$as_echo_n "checking version of bison... " >&6; }
37326 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
37327 - case $ac_prog_version in
37328 - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
37329 - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
37330 - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
37331 - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
37332 - esac
37333 - { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5
37334 -$as_echo "$ac_prog_version" >&6; }
37335 - fi
37336 - if test $ac_verc_fail = yes; then
37337 - INTLBISON=:
37338 - fi
37339 -
37340 -
37341 -
37342 -
37343 -
37344 -
37345 -
37346 -
37347 -
37348 -
37349 -
37350 -
37351 -
37352 -
37353 -
37354 -
37355 - { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
37356 -$as_echo_n "checking whether NLS is requested... " >&6; }
37357 - # Check whether --enable-nls was given.
37358 -if test "${enable_nls+set}" = set; then
37359 - enableval=$enable_nls; USE_NLS=$enableval
37360 -else
37361 - USE_NLS=yes
37362 -fi
37363 -
37364 - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
37365 -$as_echo "$USE_NLS" >&6; }
37366 -
37367 -
37368 -
37369 -
37370 - BUILD_INCLUDED_LIBINTL=no
37371 - USE_INCLUDED_LIBINTL=no
37372 -
37373 - LIBINTL=
37374 - LTLIBINTL=
37375 - POSUB=
37376 -
37377 - if test "$USE_NLS" = "yes"; then
37378 - gt_use_preinstalled_gnugettext=no
37379 -
37380 - { $as_echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
37381 -$as_echo_n "checking whether included gettext is requested... " >&6; }
37382 -
37383 -# Check whether --with-included-gettext was given.
37384 -if test "${with_included_gettext+set}" = set; then
37385 - withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
37386 -else
37387 - nls_cv_force_use_gnu_gettext=no
37388 -fi
37389 -
37390 - { $as_echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
37391 -$as_echo "$nls_cv_force_use_gnu_gettext" >&6; }
37392 -
37393 - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
37394 - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
37395 -
37396 -
37397 -
37398 -
37399 -
37400 -
37401 - { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
37402 -$as_echo_n "checking for GNU gettext in libc... " >&6; }
37403 -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
37404 - $as_echo_n "(cached) " >&6
37405 -else
37406 - cat >conftest.$ac_ext <<_ACEOF
37407 -/* confdefs.h. */
37408 -_ACEOF
37409 -cat confdefs.h >>conftest.$ac_ext
37410 -cat >>conftest.$ac_ext <<_ACEOF
37411 -/* end confdefs.h. */
37412 -#include <libintl.h>
37413 -extern int _nl_msg_cat_cntr;
37414 -extern int *_nl_domain_bindings;
37415 -int
37416 -main ()
37417 -{
37418 -bindtextdomain ("", "");
37419 -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
37420 - ;
37421 - return 0;
37422 -}
37423 -_ACEOF
37424 -rm -f conftest.$ac_objext conftest$ac_exeext
37425 -if { (ac_try="$ac_link"
37426 -case "(($ac_try" in
37427 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
37428 - *) ac_try_echo=$ac_try;;
37429 -esac
37430 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
37431 -$as_echo "$ac_try_echo") >&5
37432 - (eval "$ac_link") 2>conftest.er1
37433 - ac_status=$?
37434 - grep -v '^ *+' conftest.er1 >conftest.err
37435 - rm -f conftest.er1
37436 - cat conftest.err >&5
37437 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
37438 - (exit $ac_status); } && {
37439 - test -z "$ac_c_werror_flag" ||
37440 - test ! -s conftest.err
37441 - } && test -s conftest$ac_exeext && {
37442 - test "$cross_compiling" = yes ||
37443 - $as_test_x conftest$ac_exeext
37444 - }; then
37445 - gt_cv_func_gnugettext1_libc=yes
37446 -else
37447 - $as_echo "$as_me: failed program was:" >&5
37448 -sed 's/^/| /' conftest.$ac_ext >&5
37449 -
37450 - gt_cv_func_gnugettext1_libc=no
37451 -fi
37452 -
37453 -rm -rf conftest.dSYM
37454 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
37455 - conftest$ac_exeext conftest.$ac_ext
37456 -fi
37457 -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
37458 -$as_echo "$gt_cv_func_gnugettext1_libc" >&6; }
37459 -
37460 - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
37461 -
37462 -
37463 -
37464 - use_additional=yes
37465 -
37466 - acl_save_prefix="$prefix"
37467 - prefix="$acl_final_prefix"
37468 - acl_save_exec_prefix="$exec_prefix"
37469 - exec_prefix="$acl_final_exec_prefix"
37470 -
37471 - eval additional_includedir=\"$includedir\"
37472 - eval additional_libdir=\"$libdir\"
37473 -
37474 - exec_prefix="$acl_save_exec_prefix"
37475 - prefix="$acl_save_prefix"
37476 -
37477 -
37478 -# Check whether --with-libintl-prefix was given.
37479 -if test "${with_libintl_prefix+set}" = set; then
37480 - withval=$with_libintl_prefix;
37481 - if test "X$withval" = "Xno"; then
37482 - use_additional=no
37483 - else
37484 - if test "X$withval" = "X"; then
37485 -
37486 - acl_save_prefix="$prefix"
37487 - prefix="$acl_final_prefix"
37488 - acl_save_exec_prefix="$exec_prefix"
37489 - exec_prefix="$acl_final_exec_prefix"
37490 -
37491 - eval additional_includedir=\"$includedir\"
37492 - eval additional_libdir=\"$libdir\"
37493 -
37494 - exec_prefix="$acl_save_exec_prefix"
37495 - prefix="$acl_save_prefix"
37496 -
37497 - else
37498 - additional_includedir="$withval/include"
37499 - additional_libdir="$withval/lib"
37500 - fi
37501 - fi
37502 -
37503 -fi
37504 -
37505 - LIBINTL=
37506 - LTLIBINTL=
37507 - INCINTL=
37508 - rpathdirs=
37509 - ltrpathdirs=
37510 - names_already_handled=
37511 - names_next_round='intl '
37512 - while test -n "$names_next_round"; do
37513 - names_this_round="$names_next_round"
37514 - names_next_round=
37515 - for name in $names_this_round; do
37516 - already_handled=
37517 - for n in $names_already_handled; do
37518 - if test "$n" = "$name"; then
37519 - already_handled=yes
37520 - break
37521 - fi
37522 - done
37523 - if test -z "$already_handled"; then
37524 - names_already_handled="$names_already_handled $name"
37525 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
37526 - eval value=\"\$HAVE_LIB$uppername\"
37527 - if test -n "$value"; then
37528 - if test "$value" = yes; then
37529 - eval value=\"\$LIB$uppername\"
37530 - test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
37531 - eval value=\"\$LTLIB$uppername\"
37532 - test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
37533 - else
37534 - :
37535 - fi
37536 - else
37537 - found_dir=
37538 - found_la=
37539 - found_so=
37540 - found_a=
37541 - if test $use_additional = yes; then
37542 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
37543 - found_dir="$additional_libdir"
37544 - found_so="$additional_libdir/lib$name.$shlibext"
37545 - if test -f "$additional_libdir/lib$name.la"; then
37546 - found_la="$additional_libdir/lib$name.la"
37547 - fi
37548 - else
37549 - if test -f "$additional_libdir/lib$name.$libext"; then
37550 - found_dir="$additional_libdir"
37551 - found_a="$additional_libdir/lib$name.$libext"
37552 - if test -f "$additional_libdir/lib$name.la"; then
37553 - found_la="$additional_libdir/lib$name.la"
37554 - fi
37555 - fi
37556 - fi
37557 - fi
37558 - if test "X$found_dir" = "X"; then
37559 - for x in $LDFLAGS $LTLIBINTL; do
37560 -
37561 - acl_save_prefix="$prefix"
37562 - prefix="$acl_final_prefix"
37563 - acl_save_exec_prefix="$exec_prefix"
37564 - exec_prefix="$acl_final_exec_prefix"
37565 - eval x=\"$x\"
37566 - exec_prefix="$acl_save_exec_prefix"
37567 - prefix="$acl_save_prefix"
37568 -
37569 - case "$x" in
37570 - -L*)
37571 - dir=`echo "X$x" | sed -e 's/^X-L//'`
37572 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
37573 - found_dir="$dir"
37574 - found_so="$dir/lib$name.$shlibext"
37575 - if test -f "$dir/lib$name.la"; then
37576 - found_la="$dir/lib$name.la"
37577 - fi
37578 - else
37579 - if test -f "$dir/lib$name.$libext"; then
37580 - found_dir="$dir"
37581 - found_a="$dir/lib$name.$libext"
37582 - if test -f "$dir/lib$name.la"; then
37583 - found_la="$dir/lib$name.la"
37584 - fi
37585 - fi
37586 - fi
37587 - ;;
37588 - esac
37589 - if test "X$found_dir" != "X"; then
37590 - break
37591 - fi
37592 - done
37593 - fi
37594 - if test "X$found_dir" != "X"; then
37595 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
37596 - if test "X$found_so" != "X"; then
37597 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
37598 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
37599 - else
37600 - haveit=
37601 - for x in $ltrpathdirs; do
37602 - if test "X$x" = "X$found_dir"; then
37603 - haveit=yes
37604 - break
37605 - fi
37606 - done
37607 - if test -z "$haveit"; then
37608 - ltrpathdirs="$ltrpathdirs $found_dir"
37609 - fi
37610 - if test "$hardcode_direct" = yes; then
37611 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
37612 - else
37613 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
37614 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
37615 - haveit=
37616 - for x in $rpathdirs; do
37617 - if test "X$x" = "X$found_dir"; then
37618 - haveit=yes
37619 - break
37620 - fi
37621 - done
37622 - if test -z "$haveit"; then
37623 - rpathdirs="$rpathdirs $found_dir"
37624 - fi
37625 - else
37626 - haveit=
37627 - for x in $LDFLAGS $LIBINTL; do
37628 -
37629 - acl_save_prefix="$prefix"
37630 - prefix="$acl_final_prefix"
37631 - acl_save_exec_prefix="$exec_prefix"
37632 - exec_prefix="$acl_final_exec_prefix"
37633 - eval x=\"$x\"
37634 - exec_prefix="$acl_save_exec_prefix"
37635 - prefix="$acl_save_prefix"
37636 -
37637 - if test "X$x" = "X-L$found_dir"; then
37638 - haveit=yes
37639 - break
37640 - fi
37641 - done
37642 - if test -z "$haveit"; then
37643 - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
37644 - fi
37645 - if test "$hardcode_minus_L" != no; then
37646 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
37647 - else
37648 - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
37649 - fi
37650 - fi
37651 - fi
37652 - fi
37653 - else
37654 - if test "X$found_a" != "X"; then
37655 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
37656 - else
37657 - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
37658 - fi
37659 - fi
37660 - additional_includedir=
37661 - case "$found_dir" in
37662 - */lib | */lib/)
37663 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
37664 - additional_includedir="$basedir/include"
37665 - ;;
37666 - esac
37667 - if test "X$additional_includedir" != "X"; then
37668 - if test "X$additional_includedir" != "X/usr/include"; then
37669 - haveit=
37670 - if test "X$additional_includedir" = "X/usr/local/include"; then
37671 - if test -n "$GCC"; then
37672 - case $host_os in
37673 - linux*) haveit=yes;;
37674 - esac
37675 - fi
37676 - fi
37677 - if test -z "$haveit"; then
37678 - for x in $CPPFLAGS $INCINTL; do
37679 -
37680 - acl_save_prefix="$prefix"
37681 - prefix="$acl_final_prefix"
37682 - acl_save_exec_prefix="$exec_prefix"
37683 - exec_prefix="$acl_final_exec_prefix"
37684 - eval x=\"$x\"
37685 - exec_prefix="$acl_save_exec_prefix"
37686 - prefix="$acl_save_prefix"
37687 -
37688 - if test "X$x" = "X-I$additional_includedir"; then
37689 - haveit=yes
37690 - break
37691 - fi
37692 - done
37693 - if test -z "$haveit"; then
37694 - if test -d "$additional_includedir"; then
37695 - INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
37696 - fi
37697 - fi
37698 - fi
37699 - fi
37700 - fi
37701 - if test -n "$found_la"; then
37702 - save_libdir="$libdir"
37703 - case "$found_la" in
37704 - */* | *\\*) . "$found_la" ;;
37705 - *) . "./$found_la" ;;
37706 - esac
37707 - libdir="$save_libdir"
37708 - for dep in $dependency_libs; do
37709 - case "$dep" in
37710 - -L*)
37711 - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
37712 - if test "X$additional_libdir" != "X/usr/lib"; then
37713 - haveit=
37714 - if test "X$additional_libdir" = "X/usr/local/lib"; then
37715 - if test -n "$GCC"; then
37716 - case $host_os in
37717 - linux*) haveit=yes;;
37718 - esac
37719 - fi
37720 - fi
37721 - if test -z "$haveit"; then
37722 - haveit=
37723 - for x in $LDFLAGS $LIBINTL; do
37724 -
37725 - acl_save_prefix="$prefix"
37726 - prefix="$acl_final_prefix"
37727 - acl_save_exec_prefix="$exec_prefix"
37728 - exec_prefix="$acl_final_exec_prefix"
37729 - eval x=\"$x\"
37730 - exec_prefix="$acl_save_exec_prefix"
37731 - prefix="$acl_save_prefix"
37732 -
37733 - if test "X$x" = "X-L$additional_libdir"; then
37734 - haveit=yes
37735 - break
37736 - fi
37737 - done
37738 - if test -z "$haveit"; then
37739 - if test -d "$additional_libdir"; then
37740 - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
37741 - fi
37742 - fi
37743 - haveit=
37744 - for x in $LDFLAGS $LTLIBINTL; do
37745 -
37746 - acl_save_prefix="$prefix"
37747 - prefix="$acl_final_prefix"
37748 - acl_save_exec_prefix="$exec_prefix"
37749 - exec_prefix="$acl_final_exec_prefix"
37750 - eval x=\"$x\"
37751 - exec_prefix="$acl_save_exec_prefix"
37752 - prefix="$acl_save_prefix"
37753 -
37754 - if test "X$x" = "X-L$additional_libdir"; then
37755 - haveit=yes
37756 - break
37757 - fi
37758 - done
37759 - if test -z "$haveit"; then
37760 - if test -d "$additional_libdir"; then
37761 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
37762 - fi
37763 - fi
37764 - fi
37765 - fi
37766 - ;;
37767 - -R*)
37768 - dir=`echo "X$dep" | sed -e 's/^X-R//'`
37769 - if test "$enable_rpath" != no; then
37770 - haveit=
37771 - for x in $rpathdirs; do
37772 - if test "X$x" = "X$dir"; then
37773 - haveit=yes
37774 - break
37775 - fi
37776 - done
37777 - if test -z "$haveit"; then
37778 - rpathdirs="$rpathdirs $dir"
37779 - fi
37780 - haveit=
37781 - for x in $ltrpathdirs; do
37782 - if test "X$x" = "X$dir"; then
37783 - haveit=yes
37784 - break
37785 - fi
37786 - done
37787 - if test -z "$haveit"; then
37788 - ltrpathdirs="$ltrpathdirs $dir"
37789 - fi
37790 - fi
37791 - ;;
37792 - -l*)
37793 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
37794 - ;;
37795 - *.la)
37796 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
37797 - ;;
37798 - *)
37799 - LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
37800 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
37801 - ;;
37802 - esac
37803 - done
37804 - fi
37805 - else
37806 - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
37807 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
37808 - fi
37809 - fi
37810 - fi
37811 - done
37812 - done
37813 - if test "X$rpathdirs" != "X"; then
37814 - if test -n "$hardcode_libdir_separator"; then
37815 - alldirs=
37816 - for found_dir in $rpathdirs; do
37817 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
37818 - done
37819 - acl_save_libdir="$libdir"
37820 - libdir="$alldirs"
37821 - eval flag=\"$hardcode_libdir_flag_spec\"
37822 - libdir="$acl_save_libdir"
37823 - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
37824 - else
37825 - for found_dir in $rpathdirs; do
37826 - acl_save_libdir="$libdir"
37827 - libdir="$found_dir"
37828 - eval flag=\"$hardcode_libdir_flag_spec\"
37829 - libdir="$acl_save_libdir"
37830 - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
37831 - done
37832 - fi
37833 - fi
37834 - if test "X$ltrpathdirs" != "X"; then
37835 - for found_dir in $ltrpathdirs; do
37836 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
37837 - done
37838 - fi
37839 -
37840 - { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
37841 -$as_echo_n "checking for GNU gettext in libintl... " >&6; }
37842 -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
37843 - $as_echo_n "(cached) " >&6
37844 -else
37845 - gt_save_CPPFLAGS="$CPPFLAGS"
37846 - CPPFLAGS="$CPPFLAGS $INCINTL"
37847 - gt_save_LIBS="$LIBS"
37848 - LIBS="$LIBS $LIBINTL"
37849 - cat >conftest.$ac_ext <<_ACEOF
37850 -/* confdefs.h. */
37851 -_ACEOF
37852 -cat confdefs.h >>conftest.$ac_ext
37853 -cat >>conftest.$ac_ext <<_ACEOF
37854 -/* end confdefs.h. */
37855 -#include <libintl.h>
37856 -extern int _nl_msg_cat_cntr;
37857 -extern
37858 -#ifdef __cplusplus
37859 -"C"
37860 -#endif
37861 -const char *_nl_expand_alias ();
37862 -int
37863 -main ()
37864 -{
37865 -bindtextdomain ("", "");
37866 -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
37867 - ;
37868 - return 0;
37869 -}
37870 -_ACEOF
37871 -rm -f conftest.$ac_objext conftest$ac_exeext
37872 -if { (ac_try="$ac_link"
37873 -case "(($ac_try" in
37874 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
37875 - *) ac_try_echo=$ac_try;;
37876 -esac
37877 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
37878 -$as_echo "$ac_try_echo") >&5
37879 - (eval "$ac_link") 2>conftest.er1
37880 - ac_status=$?
37881 - grep -v '^ *+' conftest.er1 >conftest.err
37882 - rm -f conftest.er1
37883 - cat conftest.err >&5
37884 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
37885 - (exit $ac_status); } && {
37886 - test -z "$ac_c_werror_flag" ||
37887 - test ! -s conftest.err
37888 - } && test -s conftest$ac_exeext && {
37889 - test "$cross_compiling" = yes ||
37890 - $as_test_x conftest$ac_exeext
37891 - }; then
37892 - gt_cv_func_gnugettext1_libintl=yes
37893 -else
37894 - $as_echo "$as_me: failed program was:" >&5
37895 -sed 's/^/| /' conftest.$ac_ext >&5
37896 -
37897 - gt_cv_func_gnugettext1_libintl=no
37898 -fi
37899 -
37900 -rm -rf conftest.dSYM
37901 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
37902 - conftest$ac_exeext conftest.$ac_ext
37903 - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
37904 - LIBS="$LIBS $LIBICONV"
37905 - cat >conftest.$ac_ext <<_ACEOF
37906 -/* confdefs.h. */
37907 -_ACEOF
37908 -cat confdefs.h >>conftest.$ac_ext
37909 -cat >>conftest.$ac_ext <<_ACEOF
37910 -/* end confdefs.h. */
37911 -#include <libintl.h>
37912 -extern int _nl_msg_cat_cntr;
37913 -extern
37914 -#ifdef __cplusplus
37915 -"C"
37916 -#endif
37917 -const char *_nl_expand_alias ();
37918 -int
37919 -main ()
37920 -{
37921 -bindtextdomain ("", "");
37922 -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
37923 - ;
37924 - return 0;
37925 -}
37926 -_ACEOF
37927 -rm -f conftest.$ac_objext conftest$ac_exeext
37928 -if { (ac_try="$ac_link"
37929 -case "(($ac_try" in
37930 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
37931 - *) ac_try_echo=$ac_try;;
37932 -esac
37933 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
37934 -$as_echo "$ac_try_echo") >&5
37935 - (eval "$ac_link") 2>conftest.er1
37936 - ac_status=$?
37937 - grep -v '^ *+' conftest.er1 >conftest.err
37938 - rm -f conftest.er1
37939 - cat conftest.err >&5
37940 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
37941 - (exit $ac_status); } && {
37942 - test -z "$ac_c_werror_flag" ||
37943 - test ! -s conftest.err
37944 - } && test -s conftest$ac_exeext && {
37945 - test "$cross_compiling" = yes ||
37946 - $as_test_x conftest$ac_exeext
37947 - }; then
37948 - LIBINTL="$LIBINTL $LIBICONV"
37949 - LTLIBINTL="$LTLIBINTL $LTLIBICONV"
37950 - gt_cv_func_gnugettext1_libintl=yes
37951 -
37952 -else
37953 - $as_echo "$as_me: failed program was:" >&5
37954 -sed 's/^/| /' conftest.$ac_ext >&5
37955 -
37956 -
37957 -fi
37958 -
37959 -rm -rf conftest.dSYM
37960 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
37961 - conftest$ac_exeext conftest.$ac_ext
37962 - fi
37963 - CPPFLAGS="$gt_save_CPPFLAGS"
37964 - LIBS="$gt_save_LIBS"
37965 -fi
37966 -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
37967 -$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; }
37968 - fi
37969 -
37970 - if test "$gt_cv_func_gnugettext1_libc" = "yes" \
37971 - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
37972 - && test "$PACKAGE" != gettext-runtime \
37973 - && test "$PACKAGE" != gettext-tools; }; then
37974 - gt_use_preinstalled_gnugettext=yes
37975 - else
37976 - LIBINTL=
37977 - LTLIBINTL=
37978 - INCINTL=
37979 - fi
37980 -
37981 -
37982 - if test "$gt_use_preinstalled_gnugettext" != "yes"; then
37983 - nls_cv_use_gnu_gettext=yes
37984 - fi
37985 - fi
37986 -
37987 - if test "$nls_cv_use_gnu_gettext" = "yes"; then
37988 - BUILD_INCLUDED_LIBINTL=yes
37989 - USE_INCLUDED_LIBINTL=yes
37990 - LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
37991 - LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
37992 - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
37993 - fi
37994 -
37995 - if test "$gt_use_preinstalled_gnugettext" = "yes" \
37996 - || test "$nls_cv_use_gnu_gettext" = "yes"; then
37997 - CATOBJEXT=.gmo
37998 - fi
37999 -
38000 -
38001 - if test "$gt_use_preinstalled_gnugettext" = "yes" \
38002 - || test "$nls_cv_use_gnu_gettext" = "yes"; then
38003 -
38004 -cat >>confdefs.h <<\_ACEOF
38005 -#define ENABLE_NLS 1
38006 -_ACEOF
38007 -
38008 - else
38009 - USE_NLS=no
38010 - fi
38011 - fi
38012 -
38013 - { $as_echo "$as_me:$LINENO: checking whether to use NLS" >&5
38014 -$as_echo_n "checking whether to use NLS... " >&6; }
38015 - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
38016 -$as_echo "$USE_NLS" >&6; }
38017 - if test "$USE_NLS" = "yes"; then
38018 - { $as_echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
38019 -$as_echo_n "checking where the gettext function comes from... " >&6; }
38020 - if test "$gt_use_preinstalled_gnugettext" = "yes"; then
38021 - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
38022 - gt_source="external libintl"
38023 - else
38024 - gt_source="libc"
38025 - fi
38026 - else
38027 - gt_source="included intl directory"
38028 - fi
38029 - { $as_echo "$as_me:$LINENO: result: $gt_source" >&5
38030 -$as_echo "$gt_source" >&6; }
38031 - fi
38032 -
38033 - if test "$USE_NLS" = "yes"; then
38034 -
38035 - if test "$gt_use_preinstalled_gnugettext" = "yes"; then
38036 - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
38037 - { $as_echo "$as_me:$LINENO: checking how to link with libintl" >&5
38038 -$as_echo_n "checking how to link with libintl... " >&6; }
38039 - { $as_echo "$as_me:$LINENO: result: $LIBINTL" >&5
38040 -$as_echo "$LIBINTL" >&6; }
38041 -
38042 - for element in $INCINTL; do
38043 - haveit=
38044 - for x in $CPPFLAGS; do
38045 -
38046 - acl_save_prefix="$prefix"
38047 - prefix="$acl_final_prefix"
38048 - acl_save_exec_prefix="$exec_prefix"
38049 - exec_prefix="$acl_final_exec_prefix"
38050 - eval x=\"$x\"
38051 - exec_prefix="$acl_save_exec_prefix"
38052 - prefix="$acl_save_prefix"
38053 -
38054 - if test "X$x" = "X$element"; then
38055 - haveit=yes
38056 - break
38057 - fi
38058 - done
38059 - if test -z "$haveit"; then
38060 - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
38061 - fi
38062 - done
38063 -
38064 - fi
38065 -
38066 -
38067 -cat >>confdefs.h <<\_ACEOF
38068 -#define HAVE_GETTEXT 1
38069 -_ACEOF
38070 -
38071 -
38072 -cat >>confdefs.h <<\_ACEOF
38073 -#define HAVE_DCGETTEXT 1
38074 -_ACEOF
38075 -
38076 - fi
38077 -
38078 - POSUB=po
38079 - fi
38080 -
38081 -
38082 - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
38083 - BUILD_INCLUDED_LIBINTL=yes
38084 - fi
38085 -
38086 -
38087 -
38088 -
38089 -
38090 - nls_cv_header_intl=
38091 - nls_cv_header_libgt=
38092 -
38093 - DATADIRNAME=share
38094 -
38095 -
38096 - INSTOBJEXT=.mo
38097 -
38098 -
38099 - GENCAT=gencat
38100 -
38101 -
38102 - if test "$USE_INCLUDED_LIBINTL" = yes; then
38103 - INTLOBJS="\$(GETTOBJS)"
38104 - fi
38105 -
38106 -
38107 - INTL_LIBTOOL_SUFFIX_PREFIX=
38108 -
38109 -
38110 -
38111 - INTLLIBS="$LIBINTL"
38112 -
38113 -
38114 -
38115 -
38116 -
38117 -
38118 -
38119 -
38120 -
38121 -case "$am__api_version" in
38122 - 1.01234)
38123 - { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
38124 -$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
38125 - { (exit 1); exit 1; }; }
38126 - ;;
38127 - *)
38128 - ;;
38129 -esac
38130 -
38131 -if test -n ""; then
38132 - { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5
38133 -$as_echo_n "checking for intltool >= ... " >&6; }
38134 -
38135 - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
38136 - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
38137 - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
38138 -
38139 - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
38140 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
38141 - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
38142 - { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
38143 -$as_echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
38144 - { (exit 1); exit 1; }; }
38145 -fi
38146 -
38147 -# Extract the first word of "intltool-update", so it can be a program name with args.
38148 -set dummy intltool-update; ac_word=$2
38149 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38150 -$as_echo_n "checking for $ac_word... " >&6; }
38151 -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
38152 - $as_echo_n "(cached) " >&6
38153 -else
38154 - case $INTLTOOL_UPDATE in
38155 - [\\/]* | ?:[\\/]*)
38156 - ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
38157 - ;;
38158 - *)
38159 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38160 -for as_dir in $PATH
38161 -do
38162 - IFS=$as_save_IFS
38163 - test -z "$as_dir" && as_dir=.
38164 - for ac_exec_ext in '' $ac_executable_extensions; do
38165 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38166 - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
38167 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38168 - break 2
38169 - fi
38170 -done
38171 -done
38172 -IFS=$as_save_IFS
38173 -
38174 - ;;
38175 -esac
38176 -fi
38177 -INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
38178 -if test -n "$INTLTOOL_UPDATE"; then
38179 - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
38180 -$as_echo "$INTLTOOL_UPDATE" >&6; }
38181 -else
38182 - { $as_echo "$as_me:$LINENO: result: no" >&5
38183 -$as_echo "no" >&6; }
38184 -fi
38185 -
38186 -
38187 -# Extract the first word of "intltool-merge", so it can be a program name with args.
38188 -set dummy intltool-merge; ac_word=$2
38189 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38190 -$as_echo_n "checking for $ac_word... " >&6; }
38191 -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
38192 - $as_echo_n "(cached) " >&6
38193 -else
38194 - case $INTLTOOL_MERGE in
38195 - [\\/]* | ?:[\\/]*)
38196 - ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
38197 - ;;
38198 - *)
38199 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38200 -for as_dir in $PATH
38201 -do
38202 - IFS=$as_save_IFS
38203 - test -z "$as_dir" && as_dir=.
38204 - for ac_exec_ext in '' $ac_executable_extensions; do
38205 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38206 - ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
38207 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38208 - break 2
38209 - fi
38210 -done
38211 -done
38212 -IFS=$as_save_IFS
38213 -
38214 - ;;
38215 -esac
38216 -fi
38217 -INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
38218 -if test -n "$INTLTOOL_MERGE"; then
38219 - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
38220 -$as_echo "$INTLTOOL_MERGE" >&6; }
38221 -else
38222 - { $as_echo "$as_me:$LINENO: result: no" >&5
38223 -$as_echo "no" >&6; }
38224 -fi
38225 -
38226 -
38227 -# Extract the first word of "intltool-extract", so it can be a program name with args.
38228 -set dummy intltool-extract; ac_word=$2
38229 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38230 -$as_echo_n "checking for $ac_word... " >&6; }
38231 -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
38232 - $as_echo_n "(cached) " >&6
38233 -else
38234 - case $INTLTOOL_EXTRACT in
38235 - [\\/]* | ?:[\\/]*)
38236 - ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
38237 - ;;
38238 - *)
38239 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38240 -for as_dir in $PATH
38241 -do
38242 - IFS=$as_save_IFS
38243 - test -z "$as_dir" && as_dir=.
38244 - for ac_exec_ext in '' $ac_executable_extensions; do
38245 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38246 - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
38247 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38248 - break 2
38249 - fi
38250 -done
38251 -done
38252 -IFS=$as_save_IFS
38253 -
38254 - ;;
38255 -esac
38256 -fi
38257 -INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
38258 -if test -n "$INTLTOOL_EXTRACT"; then
38259 - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
38260 -$as_echo "$INTLTOOL_EXTRACT" >&6; }
38261 -else
38262 - { $as_echo "$as_me:$LINENO: result: no" >&5
38263 -$as_echo "no" >&6; }
38264 -fi
38265 -
38266 -
38267 -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
38268 - { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
38269 -$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
38270 - { (exit 1); exit 1; }; }
38271 -fi
38272 -
38273 - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38274 -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38275 - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38276 - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38277 - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
38278 - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38279 - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38280 - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38281 -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38282 - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38283 - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38284 - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
38285 - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38286 - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38287 - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38288 - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38289 - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38290 - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38291 - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
38292 -
38293 -
38294 -
38295 -
38296 -
38297 -
38298 -
38299 -
38300 -
38301 -
38302 -
38303 -
38304 -
38305 -
38306 -
38307 -
38308 -
38309 -
38310 -
38311 -
38312 -
38313 -
38314 -
38315 -
38316 -
38317 -
38318 -
38319 -
38320 -
38321 -
38322 -
38323 -
38324 -
38325 -
38326 -
38327 -
38328 -
38329 -
38330 -
38331 -
38332 -
38333 -
38334 -
38335 -
38336 -
38337 -
38338 -
38339 -
38340 -
38341 -
38342 -
38343 -
38344 -
38345 -
38346 -
38347 -
38348 -
38349 -
38350 -
38351 -
38352 -
38353 -
38354 -
38355 -
38356 -
38357 -
38358 -
38359 -
38360 -
38361 -
38362 -
38363 -
38364 -
38365 -
38366 -
38367 -
38368 -
38369 -
38370 -
38371 -
38372 -
38373 -
38374 -
38375 -
38376 -
38377 -
38378 -
38379 -
38380 -
38381 -
38382 -
38383 -
38384 -
38385 -
38386 -
38387 -
38388 -
38389 -# Check the gettext tools to make sure they are GNU
38390 -# Extract the first word of "xgettext", so it can be a program name with args.
38391 -set dummy xgettext; ac_word=$2
38392 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38393 -$as_echo_n "checking for $ac_word... " >&6; }
38394 -if test "${ac_cv_path_XGETTEXT+set}" = set; then
38395 - $as_echo_n "(cached) " >&6
38396 -else
38397 - case $XGETTEXT in
38398 - [\\/]* | ?:[\\/]*)
38399 - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
38400 - ;;
38401 - *)
38402 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38403 -for as_dir in $PATH
38404 -do
38405 - IFS=$as_save_IFS
38406 - test -z "$as_dir" && as_dir=.
38407 - for ac_exec_ext in '' $ac_executable_extensions; do
38408 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38409 - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
38410 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38411 - break 2
38412 - fi
38413 -done
38414 -done
38415 -IFS=$as_save_IFS
38416 -
38417 - ;;
38418 -esac
38419 -fi
38420 -XGETTEXT=$ac_cv_path_XGETTEXT
38421 -if test -n "$XGETTEXT"; then
38422 - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
38423 -$as_echo "$XGETTEXT" >&6; }
38424 -else
38425 - { $as_echo "$as_me:$LINENO: result: no" >&5
38426 -$as_echo "no" >&6; }
38427 -fi
38428 -
38429 -
38430 -# Extract the first word of "msgmerge", so it can be a program name with args.
38431 -set dummy msgmerge; ac_word=$2
38432 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38433 -$as_echo_n "checking for $ac_word... " >&6; }
38434 -if test "${ac_cv_path_MSGMERGE+set}" = set; then
38435 - $as_echo_n "(cached) " >&6
38436 -else
38437 - case $MSGMERGE in
38438 - [\\/]* | ?:[\\/]*)
38439 - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
38440 - ;;
38441 - *)
38442 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38443 -for as_dir in $PATH
38444 -do
38445 - IFS=$as_save_IFS
38446 - test -z "$as_dir" && as_dir=.
38447 - for ac_exec_ext in '' $ac_executable_extensions; do
38448 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38449 - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
38450 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38451 - break 2
38452 - fi
38453 -done
38454 -done
38455 -IFS=$as_save_IFS
38456 -
38457 - ;;
38458 -esac
38459 -fi
38460 -MSGMERGE=$ac_cv_path_MSGMERGE
38461 -if test -n "$MSGMERGE"; then
38462 - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
38463 -$as_echo "$MSGMERGE" >&6; }
38464 -else
38465 - { $as_echo "$as_me:$LINENO: result: no" >&5
38466 -$as_echo "no" >&6; }
38467 -fi
38468 -
38469 -
38470 -# Extract the first word of "msgfmt", so it can be a program name with args.
38471 -set dummy msgfmt; ac_word=$2
38472 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38473 -$as_echo_n "checking for $ac_word... " >&6; }
38474 -if test "${ac_cv_path_MSGFMT+set}" = set; then
38475 - $as_echo_n "(cached) " >&6
38476 -else
38477 - case $MSGFMT in
38478 - [\\/]* | ?:[\\/]*)
38479 - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
38480 - ;;
38481 - *)
38482 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38483 -for as_dir in $PATH
38484 -do
38485 - IFS=$as_save_IFS
38486 - test -z "$as_dir" && as_dir=.
38487 - for ac_exec_ext in '' $ac_executable_extensions; do
38488 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38489 - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
38490 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38491 - break 2
38492 - fi
38493 -done
38494 -done
38495 -IFS=$as_save_IFS
38496 -
38497 - ;;
38498 -esac
38499 -fi
38500 -MSGFMT=$ac_cv_path_MSGFMT
38501 -if test -n "$MSGFMT"; then
38502 - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
38503 -$as_echo "$MSGFMT" >&6; }
38504 -else
38505 - { $as_echo "$as_me:$LINENO: result: no" >&5
38506 -$as_echo "no" >&6; }
38507 -fi
38508 -
38509 -
38510 -# Extract the first word of "gmsgfmt", so it can be a program name with args.
38511 -set dummy gmsgfmt; ac_word=$2
38512 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38513 -$as_echo_n "checking for $ac_word... " >&6; }
38514 -if test "${ac_cv_path_GMSGFMT+set}" = set; then
38515 - $as_echo_n "(cached) " >&6
38516 -else
38517 - case $GMSGFMT in
38518 - [\\/]* | ?:[\\/]*)
38519 - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
38520 - ;;
38521 - *)
38522 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38523 -for as_dir in $PATH
38524 -do
38525 - IFS=$as_save_IFS
38526 - test -z "$as_dir" && as_dir=.
38527 - for ac_exec_ext in '' $ac_executable_extensions; do
38528 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38529 - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
38530 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38531 - break 2
38532 - fi
38533 -done
38534 -done
38535 -IFS=$as_save_IFS
38536 -
38537 - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
38538 - ;;
38539 -esac
38540 -fi
38541 -GMSGFMT=$ac_cv_path_GMSGFMT
38542 -if test -n "$GMSGFMT"; then
38543 - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
38544 -$as_echo "$GMSGFMT" >&6; }
38545 -else
38546 - { $as_echo "$as_me:$LINENO: result: no" >&5
38547 -$as_echo "no" >&6; }
38548 -fi
38549 -
38550 -
38551 -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
38552 - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
38553 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
38554 - { (exit 1); exit 1; }; }
38555 -fi
38556 -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
38557 -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
38558 -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
38559 -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
38560 - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
38561 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
38562 - { (exit 1); exit 1; }; }
38563 -fi
38564 -
38565 -# Extract the first word of "perl", so it can be a program name with args.
38566 -set dummy perl; ac_word=$2
38567 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38568 -$as_echo_n "checking for $ac_word... " >&6; }
38569 -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
38570 - $as_echo_n "(cached) " >&6
38571 -else
38572 - case $INTLTOOL_PERL in
38573 - [\\/]* | ?:[\\/]*)
38574 - ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
38575 - ;;
38576 - *)
38577 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38578 -for as_dir in $PATH
38579 -do
38580 - IFS=$as_save_IFS
38581 - test -z "$as_dir" && as_dir=.
38582 - for ac_exec_ext in '' $ac_executable_extensions; do
38583 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38584 - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
38585 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38586 - break 2
38587 - fi
38588 -done
38589 -done
38590 -IFS=$as_save_IFS
38591 -
38592 - ;;
38593 -esac
38594 -fi
38595 -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
38596 -if test -n "$INTLTOOL_PERL"; then
38597 - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
38598 -$as_echo "$INTLTOOL_PERL" >&6; }
38599 -else
38600 - { $as_echo "$as_me:$LINENO: result: no" >&5
38601 -$as_echo "no" >&6; }
38602 -fi
38603 -
38604 -
38605 -if test -z "$INTLTOOL_PERL"; then
38606 - { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
38607 -$as_echo "$as_me: error: perl not found" >&2;}
38608 - { (exit 1); exit 1; }; }
38609 -fi
38610 -{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
38611 -$as_echo_n "checking for perl >= 5.8.1... " >&6; }
38612 -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
38613 -if test $? -ne 0; then
38614 - { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
38615 -$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
38616 - { (exit 1); exit 1; }; }
38617 -else
38618 - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
38619 - { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
38620 -$as_echo "$IT_PERL_VERSION" >&6; }
38621 -fi
38622 -if test "x" != "xno-xml"; then
38623 - { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
38624 -$as_echo_n "checking for XML::Parser... " >&6; }
38625 - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
38626 - { $as_echo "$as_me:$LINENO: result: ok" >&5
38627 -$as_echo "ok" >&6; }
38628 - else
38629 - { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
38630 -$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
38631 - { (exit 1); exit 1; }; }
38632 - fi
38633 -fi
38634 -
38635 -# Substitute ALL_LINGUAS so we can use it in po/Makefile
38636 -
38637 -
38638 -# Set DATADIRNAME correctly if it is not set yet
38639 -# (copied from glib-gettext.m4)
38640 -if test -z "$DATADIRNAME"; then
38641 - cat >conftest.$ac_ext <<_ACEOF
38642 -/* confdefs.h. */
38643 -_ACEOF
38644 -cat confdefs.h >>conftest.$ac_ext
38645 -cat >>conftest.$ac_ext <<_ACEOF
38646 -/* end confdefs.h. */
38647 -
38648 -int
38649 -main ()
38650 -{
38651 -extern int _nl_msg_cat_cntr;
38652 - return _nl_msg_cat_cntr
38653 - ;
38654 - return 0;
38655 -}
38656 -_ACEOF
38657 -rm -f conftest.$ac_objext conftest$ac_exeext
38658 -if { (ac_try="$ac_link"
38659 -case "(($ac_try" in
38660 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
38661 - *) ac_try_echo=$ac_try;;
38662 -esac
38663 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
38664 -$as_echo "$ac_try_echo") >&5
38665 - (eval "$ac_link") 2>conftest.er1
38666 - ac_status=$?
38667 - grep -v '^ *+' conftest.er1 >conftest.err
38668 - rm -f conftest.er1
38669 - cat conftest.err >&5
38670 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
38671 - (exit $ac_status); } && {
38672 - test -z "$ac_c_werror_flag" ||
38673 - test ! -s conftest.err
38674 - } && test -s conftest$ac_exeext && {
38675 - test "$cross_compiling" = yes ||
38676 - $as_test_x conftest$ac_exeext
38677 - }; then
38678 - DATADIRNAME=share
38679 -else
38680 - $as_echo "$as_me: failed program was:" >&5
38681 -sed 's/^/| /' conftest.$ac_ext >&5
38682 -
38683 - case $host in
38684 - *-*-solaris*)
38685 - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
38686 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
38687 -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
38688 - $as_echo_n "(cached) " >&6
38689 -else
38690 - cat >conftest.$ac_ext <<_ACEOF
38691 -/* confdefs.h. */
38692 -_ACEOF
38693 -cat confdefs.h >>conftest.$ac_ext
38694 -cat >>conftest.$ac_ext <<_ACEOF
38695 -/* end confdefs.h. */
38696 -/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
38697 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
38698 -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
38699 -
38700 -/* System header to define __stub macros and hopefully few prototypes,
38701 - which can conflict with char bind_textdomain_codeset (); below.
38702 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
38703 - <limits.h> exists even on freestanding compilers. */
38704 -
38705 -#ifdef __STDC__
38706 -# include <limits.h>
38707 -#else
38708 -# include <assert.h>
38709 -#endif
38710 -
38711 -#undef bind_textdomain_codeset
38712 -
38713 -/* Override any GCC internal prototype to avoid an error.
38714 - Use char because int might match the return type of a GCC
38715 - builtin and then its argument prototype would still apply. */
38716 -#ifdef __cplusplus
38717 -extern "C"
38718 -#endif
38719 -char bind_textdomain_codeset ();
38720 -/* The GNU C library defines this for functions which it implements
38721 - to always fail with ENOSYS. Some functions are actually named
38722 - something starting with __ and the normal name is an alias. */
38723 -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
38724 -choke me
38725 -#endif
38726 -
38727 -int
38728 -main ()
38729 -{
38730 -return bind_textdomain_codeset ();
38731 - ;
38732 - return 0;
38733 -}
38734 -_ACEOF
38735 -rm -f conftest.$ac_objext conftest$ac_exeext
38736 -if { (ac_try="$ac_link"
38737 -case "(($ac_try" in
38738 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
38739 - *) ac_try_echo=$ac_try;;
38740 -esac
38741 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
38742 -$as_echo "$ac_try_echo") >&5
38743 - (eval "$ac_link") 2>conftest.er1
38744 - ac_status=$?
38745 - grep -v '^ *+' conftest.er1 >conftest.err
38746 - rm -f conftest.er1
38747 - cat conftest.err >&5
38748 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
38749 - (exit $ac_status); } && {
38750 - test -z "$ac_c_werror_flag" ||
38751 - test ! -s conftest.err
38752 - } && test -s conftest$ac_exeext && {
38753 - test "$cross_compiling" = yes ||
38754 - $as_test_x conftest$ac_exeext
38755 - }; then
38756 - ac_cv_func_bind_textdomain_codeset=yes
38757 -else
38758 - $as_echo "$as_me: failed program was:" >&5
38759 -sed 's/^/| /' conftest.$ac_ext >&5
38760 -
38761 - ac_cv_func_bind_textdomain_codeset=no
38762 -fi
38763 -
38764 -rm -rf conftest.dSYM
38765 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
38766 - conftest$ac_exeext conftest.$ac_ext
38767 -fi
38768 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
38769 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
38770 -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
38771 - DATADIRNAME=share
38772 -else
38773 - DATADIRNAME=lib
38774 -fi
38775 -
38776 - ;;
38777 - *)
38778 - DATADIRNAME=lib
38779 - ;;
38780 - esac
38781 -fi
38782 -
38783 -rm -rf conftest.dSYM
38784 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
38785 - conftest$ac_exeext conftest.$ac_ext
38786 -fi
38787 -
38788 -
38789 -
38790 -
38791 -
38792 -
38793 -
38794 -
38795 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
38796 - if test -n "$ac_tool_prefix"; then
38797 - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
38798 -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
38799 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38800 -$as_echo_n "checking for $ac_word... " >&6; }
38801 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
38802 - $as_echo_n "(cached) " >&6
38803 -else
38804 - case $PKG_CONFIG in
38805 - [\\/]* | ?:[\\/]*)
38806 - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
38807 - ;;
38808 - *)
38809 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38810 -for as_dir in $PATH
38811 -do
38812 - IFS=$as_save_IFS
38813 - test -z "$as_dir" && as_dir=.
38814 - for ac_exec_ext in '' $ac_executable_extensions; do
38815 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38816 - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
38817 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38818 - break 2
38819 - fi
38820 -done
38821 -done
38822 -IFS=$as_save_IFS
38823 -
38824 - ;;
38825 -esac
38826 -fi
38827 -PKG_CONFIG=$ac_cv_path_PKG_CONFIG
38828 -if test -n "$PKG_CONFIG"; then
38829 - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
38830 -$as_echo "$PKG_CONFIG" >&6; }
38831 -else
38832 - { $as_echo "$as_me:$LINENO: result: no" >&5
38833 -$as_echo "no" >&6; }
38834 -fi
38835 -
38836 -
38837 -fi
38838 -if test -z "$ac_cv_path_PKG_CONFIG"; then
38839 - ac_pt_PKG_CONFIG=$PKG_CONFIG
38840 - # Extract the first word of "pkg-config", so it can be a program name with args.
38841 -set dummy pkg-config; ac_word=$2
38842 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
38843 -$as_echo_n "checking for $ac_word... " >&6; }
38844 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
38845 - $as_echo_n "(cached) " >&6
38846 -else
38847 - case $ac_pt_PKG_CONFIG in
38848 - [\\/]* | ?:[\\/]*)
38849 - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
38850 - ;;
38851 - *)
38852 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
38853 -for as_dir in $PATH
38854 -do
38855 - IFS=$as_save_IFS
38856 - test -z "$as_dir" && as_dir=.
38857 - for ac_exec_ext in '' $ac_executable_extensions; do
38858 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
38859 - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
38860 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38861 - break 2
38862 - fi
38863 -done
38864 -done
38865 -IFS=$as_save_IFS
38866 -
38867 - ;;
38868 -esac
38869 -fi
38870 -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
38871 -if test -n "$ac_pt_PKG_CONFIG"; then
38872 - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
38873 -$as_echo "$ac_pt_PKG_CONFIG" >&6; }
38874 -else
38875 - { $as_echo "$as_me:$LINENO: result: no" >&5
38876 -$as_echo "no" >&6; }
38877 -fi
38878 -
38879 - if test "x$ac_pt_PKG_CONFIG" = x; then
38880 - PKG_CONFIG=""
38881 - else
38882 - case $cross_compiling:$ac_tool_warned in
38883 -yes:)
38884 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
38885 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
38886 -ac_tool_warned=yes ;;
38887 -esac
38888 - PKG_CONFIG=$ac_pt_PKG_CONFIG
38889 - fi
38890 -else
38891 - PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
38892 -fi
38893 -
38894 -fi
38895 -if test -n "$PKG_CONFIG"; then
38896 - _pkg_min_version=0.9.0
38897 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
38898 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
38899 - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
38900 - { $as_echo "$as_me:$LINENO: result: yes" >&5
38901 -$as_echo "yes" >&6; }
38902 - else
38903 - { $as_echo "$as_me:$LINENO: result: no" >&5
38904 -$as_echo "no" >&6; }
38905 - PKG_CONFIG=""
38906 - fi
38907 -
38908 -fi
38909 -
38910 -pkg_failed=no
38911 -{ $as_echo "$as_me:$LINENO: checking for GLIB2" >&5
38912 -$as_echo_n "checking for GLIB2... " >&6; }
38913 -
38914 -if test -n "$PKG_CONFIG"; then
38915 - if test -n "$GLIB2_CFLAGS"; then
38916 - pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS"
38917 - else
38918 - if test -n "$PKG_CONFIG" && \
38919 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5
38920 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
38921 - ac_status=$?
38922 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
38923 - (exit $ac_status); }; then
38924 - pkg_cv_GLIB2_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
38925 -else
38926 - pkg_failed=yes
38927 -fi
38928 - fi
38929 -else
38930 - pkg_failed=untried
38931 -fi
38932 -if test -n "$PKG_CONFIG"; then
38933 - if test -n "$GLIB2_LIBS"; then
38934 - pkg_cv_GLIB2_LIBS="$GLIB2_LIBS"
38935 - else
38936 - if test -n "$PKG_CONFIG" && \
38937 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5
38938 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
38939 - ac_status=$?
38940 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
38941 - (exit $ac_status); }; then
38942 - pkg_cv_GLIB2_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
38943 -else
38944 - pkg_failed=yes
38945 -fi
38946 - fi
38947 -else
38948 - pkg_failed=untried
38949 -fi
38950 -
38951 -
38952 -
38953 -if test $pkg_failed = yes; then
38954 -
38955 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
38956 - _pkg_short_errors_supported=yes
38957 -else
38958 - _pkg_short_errors_supported=no
38959 -fi
38960 - if test $_pkg_short_errors_supported = yes; then
38961 - GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`
38962 - else
38963 - GLIB2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
38964 - fi
38965 - # Put the nasty error message in config.log where it belongs
38966 - echo "$GLIB2_PKG_ERRORS" >&5
38967 -
38968 - { $as_echo "$as_me:$LINENO: result: no" >&5
38969 -$as_echo "no" >&6; }
38970 - { { $as_echo "$as_me:$LINENO: error: *** glib2 not found!" >&5
38971 -$as_echo "$as_me: error: *** glib2 not found!" >&2;}
38972 - { (exit 1); exit 1; }; }
38973 -elif test $pkg_failed = untried; then
38974 - { { $as_echo "$as_me:$LINENO: error: *** glib2 not found!" >&5
38975 -$as_echo "$as_me: error: *** glib2 not found!" >&2;}
38976 - { (exit 1); exit 1; }; }
38977 -else
38978 - GLIB2_CFLAGS=$pkg_cv_GLIB2_CFLAGS
38979 - GLIB2_LIBS=$pkg_cv_GLIB2_LIBS
38980 - { $as_echo "$as_me:$LINENO: result: yes" >&5
38981 -$as_echo "yes" >&6; }
38982 - :
38983 -fi
38984 -
38985 -pkg_failed=no
38986 -{ $as_echo "$as_me:$LINENO: checking for GTK2" >&5
38987 -$as_echo_n "checking for GTK2... " >&6; }
38988 -
38989 -if test -n "$PKG_CONFIG"; then
38990 - if test -n "$GTK2_CFLAGS"; then
38991 - pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
38992 - else
38993 - if test -n "$PKG_CONFIG" && \
38994 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
38995 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
38996 - ac_status=$?
38997 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
38998 - (exit $ac_status); }; then
38999 - pkg_cv_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
39000 -else
39001 - pkg_failed=yes
39002 -fi
39003 - fi
39004 -else
39005 - pkg_failed=untried
39006 -fi
39007 -if test -n "$PKG_CONFIG"; then
39008 - if test -n "$GTK2_LIBS"; then
39009 - pkg_cv_GTK2_LIBS="$GTK2_LIBS"
39010 - else
39011 - if test -n "$PKG_CONFIG" && \
39012 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
39013 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
39014 - ac_status=$?
39015 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39016 - (exit $ac_status); }; then
39017 - pkg_cv_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
39018 -else
39019 - pkg_failed=yes
39020 -fi
39021 - fi
39022 -else
39023 - pkg_failed=untried
39024 -fi
39025 -
39026 -
39027 -
39028 -if test $pkg_failed = yes; then
39029 -
39030 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
39031 - _pkg_short_errors_supported=yes
39032 -else
39033 - _pkg_short_errors_supported=no
39034 -fi
39035 - if test $_pkg_short_errors_supported = yes; then
39036 - GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`
39037 - else
39038 - GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
39039 - fi
39040 - # Put the nasty error message in config.log where it belongs
39041 - echo "$GTK2_PKG_ERRORS" >&5
39042 -
39043 - { $as_echo "$as_me:$LINENO: result: no" >&5
39044 -$as_echo "no" >&6; }
39045 - { { $as_echo "$as_me:$LINENO: error: *** libgtk2 not found!" >&5
39046 -$as_echo "$as_me: error: *** libgtk2 not found!" >&2;}
39047 - { (exit 1); exit 1; }; }
39048 -elif test $pkg_failed = untried; then
39049 - { { $as_echo "$as_me:$LINENO: error: *** libgtk2 not found!" >&5
39050 -$as_echo "$as_me: error: *** libgtk2 not found!" >&2;}
39051 - { (exit 1); exit 1; }; }
39052 -else
39053 - GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
39054 - GTK2_LIBS=$pkg_cv_GTK2_LIBS
39055 - { $as_echo "$as_me:$LINENO: result: yes" >&5
39056 -$as_echo "yes" >&6; }
39057 - :
39058 -fi
39059 -
39060 -pkg_failed=no
39061 -{ $as_echo "$as_me:$LINENO: checking for GLADE2" >&5
39062 -$as_echo_n "checking for GLADE2... " >&6; }
39063 -
39064 -if test -n "$PKG_CONFIG"; then
39065 - if test -n "$GLADE2_CFLAGS"; then
39066 - pkg_cv_GLADE2_CFLAGS="$GLADE2_CFLAGS"
39067 - else
39068 - if test -n "$PKG_CONFIG" && \
39069 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0\"") >&5
39070 - ($PKG_CONFIG --exists --print-errors "libglade-2.0") 2>&5
39071 - ac_status=$?
39072 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39073 - (exit $ac_status); }; then
39074 - pkg_cv_GLADE2_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0" 2>/dev/null`
39075 -else
39076 - pkg_failed=yes
39077 -fi
39078 - fi
39079 -else
39080 - pkg_failed=untried
39081 -fi
39082 -if test -n "$PKG_CONFIG"; then
39083 - if test -n "$GLADE2_LIBS"; then
39084 - pkg_cv_GLADE2_LIBS="$GLADE2_LIBS"
39085 - else
39086 - if test -n "$PKG_CONFIG" && \
39087 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0\"") >&5
39088 - ($PKG_CONFIG --exists --print-errors "libglade-2.0") 2>&5
39089 - ac_status=$?
39090 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39091 - (exit $ac_status); }; then
39092 - pkg_cv_GLADE2_LIBS=`$PKG_CONFIG --libs "libglade-2.0" 2>/dev/null`
39093 -else
39094 - pkg_failed=yes
39095 -fi
39096 - fi
39097 -else
39098 - pkg_failed=untried
39099 -fi
39100 -
39101 -
39102 -
39103 -if test $pkg_failed = yes; then
39104 -
39105 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
39106 - _pkg_short_errors_supported=yes
39107 -else
39108 - _pkg_short_errors_supported=no
39109 -fi
39110 - if test $_pkg_short_errors_supported = yes; then
39111 - GLADE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglade-2.0"`
39112 - else
39113 - GLADE2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0"`
39114 - fi
39115 - # Put the nasty error message in config.log where it belongs
39116 - echo "$GLADE2_PKG_ERRORS" >&5
39117 -
39118 - { $as_echo "$as_me:$LINENO: result: no" >&5
39119 -$as_echo "no" >&6; }
39120 - { { $as_echo "$as_me:$LINENO: error: *** libglade2 not found!" >&5
39121 -$as_echo "$as_me: error: *** libglade2 not found!" >&2;}
39122 - { (exit 1); exit 1; }; }
39123 -elif test $pkg_failed = untried; then
39124 - { { $as_echo "$as_me:$LINENO: error: *** libglade2 not found!" >&5
39125 -$as_echo "$as_me: error: *** libglade2 not found!" >&2;}
39126 - { (exit 1); exit 1; }; }
39127 -else
39128 - GLADE2_CFLAGS=$pkg_cv_GLADE2_CFLAGS
39129 - GLADE2_LIBS=$pkg_cv_GLADE2_LIBS
39130 - { $as_echo "$as_me:$LINENO: result: yes" >&5
39131 -$as_echo "yes" >&6; }
39132 - :
39133 -fi
39134 -
39135 -pkg_failed=no
39136 -{ $as_echo "$as_me:$LINENO: checking for GIO2" >&5
39137 -$as_echo_n "checking for GIO2... " >&6; }
39138 -
39139 -if test -n "$PKG_CONFIG"; then
39140 - if test -n "$GIO2_CFLAGS"; then
39141 - pkg_cv_GIO2_CFLAGS="$GIO2_CFLAGS"
39142 - else
39143 - if test -n "$PKG_CONFIG" && \
39144 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
39145 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
39146 - ac_status=$?
39147 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39148 - (exit $ac_status); }; then
39149 - pkg_cv_GIO2_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null`
39150 -else
39151 - pkg_failed=yes
39152 -fi
39153 - fi
39154 -else
39155 - pkg_failed=untried
39156 -fi
39157 -if test -n "$PKG_CONFIG"; then
39158 - if test -n "$GIO2_LIBS"; then
39159 - pkg_cv_GIO2_LIBS="$GIO2_LIBS"
39160 - else
39161 - if test -n "$PKG_CONFIG" && \
39162 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
39163 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
39164 - ac_status=$?
39165 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39166 - (exit $ac_status); }; then
39167 - pkg_cv_GIO2_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null`
39168 -else
39169 - pkg_failed=yes
39170 -fi
39171 - fi
39172 -else
39173 - pkg_failed=untried
39174 -fi
39175 -
39176 -
39177 -
39178 -if test $pkg_failed = yes; then
39179 -
39180 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
39181 - _pkg_short_errors_supported=yes
39182 -else
39183 - _pkg_short_errors_supported=no
39184 -fi
39185 - if test $_pkg_short_errors_supported = yes; then
39186 - GIO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gio-2.0"`
39187 - else
39188 - GIO2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0"`
39189 - fi
39190 - # Put the nasty error message in config.log where it belongs
39191 - echo "$GIO2_PKG_ERRORS" >&5
39192 -
39193 - { $as_echo "$as_me:$LINENO: result: no" >&5
39194 -$as_echo "no" >&6; }
39195 - { { $as_echo "$as_me:$LINENO: error: *** gio2 not found!" >&5
39196 -$as_echo "$as_me: error: *** gio2 not found!" >&2;}
39197 - { (exit 1); exit 1; }; }
39198 -elif test $pkg_failed = untried; then
39199 - { { $as_echo "$as_me:$LINENO: error: *** gio2 not found!" >&5
39200 -$as_echo "$as_me: error: *** gio2 not found!" >&2;}
39201 - { (exit 1); exit 1; }; }
39202 -else
39203 - GIO2_CFLAGS=$pkg_cv_GIO2_CFLAGS
39204 - GIO2_LIBS=$pkg_cv_GIO2_LIBS
39205 - { $as_echo "$as_me:$LINENO: result: yes" >&5
39206 -$as_echo "yes" >&6; }
39207 - :
39208 -fi
39209 -# Check whether --enable-nautilusburn was given.
39210 -if test "${enable_nautilusburn+set}" = set; then
39211 - enableval=$enable_nautilusburn; NAUTILUS_BURN="$enableval"
39212 -else
39213 - NAUTILUS_BURN="yes"
39214 -fi
39215 -
39216 - if test "x$NAUTILUS_BURN" = xyes; then
39217 - ENABLE_NAUTILUSBURN_TRUE=
39218 - ENABLE_NAUTILUSBURN_FALSE='#'
39219 -else
39220 - ENABLE_NAUTILUSBURN_TRUE='#'
39221 - ENABLE_NAUTILUSBURN_FALSE=
39222 -fi
39223 -
39224 -if test "$NAUTILUS_BURN" = "yes"; then
39225 -
39226 -pkg_failed=no
39227 -{ $as_echo "$as_me:$LINENO: checking for BURN" >&5
39228 -$as_echo_n "checking for BURN... " >&6; }
39229 -
39230 -if test -n "$PKG_CONFIG"; then
39231 - if test -n "$BURN_CFLAGS"; then
39232 - pkg_cv_BURN_CFLAGS="$BURN_CFLAGS"
39233 - else
39234 - if test -n "$PKG_CONFIG" && \
39235 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-burn >= 2.15.3\"") >&5
39236 - ($PKG_CONFIG --exists --print-errors "libnautilus-burn >= 2.15.3") 2>&5
39237 - ac_status=$?
39238 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39239 - (exit $ac_status); }; then
39240 - pkg_cv_BURN_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-burn >= 2.15.3" 2>/dev/null`
39241 -else
39242 - pkg_failed=yes
39243 -fi
39244 - fi
39245 -else
39246 - pkg_failed=untried
39247 -fi
39248 -if test -n "$PKG_CONFIG"; then
39249 - if test -n "$BURN_LIBS"; then
39250 - pkg_cv_BURN_LIBS="$BURN_LIBS"
39251 - else
39252 - if test -n "$PKG_CONFIG" && \
39253 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-burn >= 2.15.3\"") >&5
39254 - ($PKG_CONFIG --exists --print-errors "libnautilus-burn >= 2.15.3") 2>&5
39255 - ac_status=$?
39256 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39257 - (exit $ac_status); }; then
39258 - pkg_cv_BURN_LIBS=`$PKG_CONFIG --libs "libnautilus-burn >= 2.15.3" 2>/dev/null`
39259 -else
39260 - pkg_failed=yes
39261 -fi
39262 - fi
39263 -else
39264 - pkg_failed=untried
39265 -fi
39266 -
39267 -
39268 -
39269 -if test $pkg_failed = yes; then
39270 -
39271 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
39272 - _pkg_short_errors_supported=yes
39273 -else
39274 - _pkg_short_errors_supported=no
39275 -fi
39276 - if test $_pkg_short_errors_supported = yes; then
39277 - BURN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-burn >= 2.15.3"`
39278 - else
39279 - BURN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-burn >= 2.15.3"`
39280 - fi
39281 - # Put the nasty error message in config.log where it belongs
39282 - echo "$BURN_PKG_ERRORS" >&5
39283 -
39284 - { $as_echo "$as_me:$LINENO: result: no" >&5
39285 -$as_echo "no" >&6; }
39286 - { { $as_echo "$as_me:$LINENO: error: *** libnautilus-burn not found!" >&5
39287 -$as_echo "$as_me: error: *** libnautilus-burn not found!" >&2;}
39288 - { (exit 1); exit 1; }; }
39289 -elif test $pkg_failed = untried; then
39290 - { { $as_echo "$as_me:$LINENO: error: *** libnautilus-burn not found!" >&5
39291 -$as_echo "$as_me: error: *** libnautilus-burn not found!" >&2;}
39292 - { (exit 1); exit 1; }; }
39293 -else
39294 - BURN_CFLAGS=$pkg_cv_BURN_CFLAGS
39295 - BURN_LIBS=$pkg_cv_BURN_LIBS
39296 - { $as_echo "$as_me:$LINENO: result: yes" >&5
39297 -$as_echo "yes" >&6; }
39298 - :
39299 -fi
39300 - fi
39301 -
39302 -
39303 -
39304 -
39305 -
39306 -
39307 -
39308 -
39309 -
39310 -
39311 -
39312 -ac_config_files="$ac_config_files Makefile data/Makefile doc/Makefile intl/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile plugins/dfiso/Makefile plugins/dfOpenGL/Makefile plugins/dfbinimage2/Makefile pixmaps/Makefile po/Makefile.in"
39313 -
39314 -
39315 -
39316 -# Check whether --enable-alsa was given.
39317 -if test "${enable_alsa+set}" = set; then
39318 - enableval=$enable_alsa; BUILD_ALSA="$enableval"
39319 -else
39320 - BUILD_ALSA="yes"
39321 -fi
39322 -
39323 -
39324 -if test "$BUILD_ALSA" = "yes"; then
39325 - { $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
39326 -$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
39327 -if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
39328 - $as_echo_n "(cached) " >&6
39329 -else
39330 - ac_check_lib_save_LIBS=$LIBS
39331 -LIBS="-lasound $LIBS"
39332 -cat >conftest.$ac_ext <<_ACEOF
39333 -/* confdefs.h. */
39334 -_ACEOF
39335 -cat confdefs.h >>conftest.$ac_ext
39336 -cat >>conftest.$ac_ext <<_ACEOF
39337 -/* end confdefs.h. */
39338 -
39339 -/* Override any GCC internal prototype to avoid an error.
39340 - Use char because int might match the return type of a GCC
39341 - builtin and then its argument prototype would still apply. */
39342 -#ifdef __cplusplus
39343 -extern "C"
39344 -#endif
39345 -char snd_pcm_open ();
39346 -int
39347 -main ()
39348 -{
39349 -return snd_pcm_open ();
39350 - ;
39351 - return 0;
39352 -}
39353 -_ACEOF
39354 -rm -f conftest.$ac_objext conftest$ac_exeext
39355 -if { (ac_try="$ac_link"
39356 -case "(($ac_try" in
39357 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39358 - *) ac_try_echo=$ac_try;;
39359 -esac
39360 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39361 -$as_echo "$ac_try_echo") >&5
39362 - (eval "$ac_link") 2>conftest.er1
39363 - ac_status=$?
39364 - grep -v '^ *+' conftest.er1 >conftest.err
39365 - rm -f conftest.er1
39366 - cat conftest.err >&5
39367 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39368 - (exit $ac_status); } && {
39369 - test -z "$ac_c_werror_flag" ||
39370 - test ! -s conftest.err
39371 - } && test -s conftest$ac_exeext && {
39372 - test "$cross_compiling" = yes ||
39373 - $as_test_x conftest$ac_exeext
39374 - }; then
39375 - ac_cv_lib_asound_snd_pcm_open=yes
39376 -else
39377 - $as_echo "$as_me: failed program was:" >&5
39378 -sed 's/^/| /' conftest.$ac_ext >&5
39379 -
39380 - ac_cv_lib_asound_snd_pcm_open=no
39381 -fi
39382 -
39383 -rm -rf conftest.dSYM
39384 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
39385 - conftest$ac_exeext conftest.$ac_ext
39386 -LIBS=$ac_check_lib_save_LIBS
39387 -fi
39388 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
39389 -$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
39390 -if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
39391 - have_alsa=yes
39392 -else
39393 - have_alsa=no
39394 -fi
39395 -
39396 - if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
39397 - { $as_echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
39398 -$as_echo_n "checking for alsa/asoundlib.h... " >&6; }
39399 -if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
39400 - $as_echo_n "(cached) " >&6
39401 -fi
39402 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
39403 -$as_echo "$ac_cv_header_alsa_asoundlib_h" >&6; }
39404 -else
39405 - # Is the header compilable?
39406 -{ $as_echo "$as_me:$LINENO: checking alsa/asoundlib.h usability" >&5
39407 -$as_echo_n "checking alsa/asoundlib.h usability... " >&6; }
39408 -cat >conftest.$ac_ext <<_ACEOF
39409 -/* confdefs.h. */
39410 -_ACEOF
39411 -cat confdefs.h >>conftest.$ac_ext
39412 -cat >>conftest.$ac_ext <<_ACEOF
39413 -/* end confdefs.h. */
39414 -$ac_includes_default
39415 -#include <alsa/asoundlib.h>
39416 -_ACEOF
39417 -rm -f conftest.$ac_objext
39418 -if { (ac_try="$ac_compile"
39419 -case "(($ac_try" in
39420 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39421 - *) ac_try_echo=$ac_try;;
39422 -esac
39423 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39424 -$as_echo "$ac_try_echo") >&5
39425 - (eval "$ac_compile") 2>conftest.er1
39426 - ac_status=$?
39427 - grep -v '^ *+' conftest.er1 >conftest.err
39428 - rm -f conftest.er1
39429 - cat conftest.err >&5
39430 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39431 - (exit $ac_status); } && {
39432 - test -z "$ac_c_werror_flag" ||
39433 - test ! -s conftest.err
39434 - } && test -s conftest.$ac_objext; then
39435 - ac_header_compiler=yes
39436 -else
39437 - $as_echo "$as_me: failed program was:" >&5
39438 -sed 's/^/| /' conftest.$ac_ext >&5
39439 -
39440 - ac_header_compiler=no
39441 -fi
39442 -
39443 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
39444 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
39445 -$as_echo "$ac_header_compiler" >&6; }
39446 -
39447 -# Is the header present?
39448 -{ $as_echo "$as_me:$LINENO: checking alsa/asoundlib.h presence" >&5
39449 -$as_echo_n "checking alsa/asoundlib.h presence... " >&6; }
39450 -cat >conftest.$ac_ext <<_ACEOF
39451 -/* confdefs.h. */
39452 -_ACEOF
39453 -cat confdefs.h >>conftest.$ac_ext
39454 -cat >>conftest.$ac_ext <<_ACEOF
39455 -/* end confdefs.h. */
39456 -#include <alsa/asoundlib.h>
39457 -_ACEOF
39458 -if { (ac_try="$ac_cpp conftest.$ac_ext"
39459 -case "(($ac_try" in
39460 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39461 - *) ac_try_echo=$ac_try;;
39462 -esac
39463 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39464 -$as_echo "$ac_try_echo") >&5
39465 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
39466 - ac_status=$?
39467 - grep -v '^ *+' conftest.er1 >conftest.err
39468 - rm -f conftest.er1
39469 - cat conftest.err >&5
39470 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39471 - (exit $ac_status); } >/dev/null && {
39472 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
39473 - test ! -s conftest.err
39474 - }; then
39475 - ac_header_preproc=yes
39476 -else
39477 - $as_echo "$as_me: failed program was:" >&5
39478 -sed 's/^/| /' conftest.$ac_ext >&5
39479 -
39480 - ac_header_preproc=no
39481 -fi
39482 -
39483 -rm -f conftest.err conftest.$ac_ext
39484 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
39485 -$as_echo "$ac_header_preproc" >&6; }
39486 -
39487 -# So? What about this header?
39488 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
39489 - yes:no: )
39490 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
39491 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
39492 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&5
39493 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&2;}
39494 - ac_header_preproc=yes
39495 - ;;
39496 - no:yes:* )
39497 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&5
39498 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&2;}
39499 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: check for missing prerequisite headers?" >&5
39500 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: check for missing prerequisite headers?" >&2;}
39501 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&5
39502 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&2;}
39503 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&5
39504 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
39505 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&5
39506 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;}
39507 - { $as_echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&5
39508 -$as_echo "$as_me: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&2;}
39509 -
39510 - ;;
39511 -esac
39512 -{ $as_echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
39513 -$as_echo_n "checking for alsa/asoundlib.h... " >&6; }
39514 -if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
39515 - $as_echo_n "(cached) " >&6
39516 -else
39517 - ac_cv_header_alsa_asoundlib_h=$ac_header_preproc
39518 -fi
39519 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5
39520 -$as_echo "$ac_cv_header_alsa_asoundlib_h" >&6; }
39521 -
39522 -fi
39523 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then
39524 - :
39525 -else
39526 - have_alsa=no
39527 -fi
39528 -
39529 -
39530 -fi
39531 -
39532 -if test "x$have_alsa" = xyes; then
39533 - ALSA_LIBS="-lasound"
39534 -else
39535 - ALSA_LIBS=""
39536 -fi
39537 - if test "x$have_alsa" = xyes; then
39538 - HAVE_ALSA_TRUE=
39539 - HAVE_ALSA_FALSE='#'
39540 -else
39541 - HAVE_ALSA_TRUE='#'
39542 - HAVE_ALSA_FALSE=
39543 -fi
39544 -
39545 -
39546 -
39547 -if test "${ac_cv_header_zlib_h+set}" = set; then
39548 - { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
39549 -$as_echo_n "checking for zlib.h... " >&6; }
39550 -if test "${ac_cv_header_zlib_h+set}" = set; then
39551 - $as_echo_n "(cached) " >&6
39552 -fi
39553 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
39554 -$as_echo "$ac_cv_header_zlib_h" >&6; }
39555 -else
39556 - # Is the header compilable?
39557 -{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
39558 -$as_echo_n "checking zlib.h usability... " >&6; }
39559 -cat >conftest.$ac_ext <<_ACEOF
39560 -/* confdefs.h. */
39561 -_ACEOF
39562 -cat confdefs.h >>conftest.$ac_ext
39563 -cat >>conftest.$ac_ext <<_ACEOF
39564 -/* end confdefs.h. */
39565 -$ac_includes_default
39566 -#include <zlib.h>
39567 -_ACEOF
39568 -rm -f conftest.$ac_objext
39569 -if { (ac_try="$ac_compile"
39570 -case "(($ac_try" in
39571 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39572 - *) ac_try_echo=$ac_try;;
39573 -esac
39574 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39575 -$as_echo "$ac_try_echo") >&5
39576 - (eval "$ac_compile") 2>conftest.er1
39577 - ac_status=$?
39578 - grep -v '^ *+' conftest.er1 >conftest.err
39579 - rm -f conftest.er1
39580 - cat conftest.err >&5
39581 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39582 - (exit $ac_status); } && {
39583 - test -z "$ac_c_werror_flag" ||
39584 - test ! -s conftest.err
39585 - } && test -s conftest.$ac_objext; then
39586 - ac_header_compiler=yes
39587 -else
39588 - $as_echo "$as_me: failed program was:" >&5
39589 -sed 's/^/| /' conftest.$ac_ext >&5
39590 -
39591 - ac_header_compiler=no
39592 -fi
39593 -
39594 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
39595 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
39596 -$as_echo "$ac_header_compiler" >&6; }
39597 -
39598 -# Is the header present?
39599 -{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
39600 -$as_echo_n "checking zlib.h presence... " >&6; }
39601 -cat >conftest.$ac_ext <<_ACEOF
39602 -/* confdefs.h. */
39603 -_ACEOF
39604 -cat confdefs.h >>conftest.$ac_ext
39605 -cat >>conftest.$ac_ext <<_ACEOF
39606 -/* end confdefs.h. */
39607 -#include <zlib.h>
39608 -_ACEOF
39609 -if { (ac_try="$ac_cpp conftest.$ac_ext"
39610 -case "(($ac_try" in
39611 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39612 - *) ac_try_echo=$ac_try;;
39613 -esac
39614 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39615 -$as_echo "$ac_try_echo") >&5
39616 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
39617 - ac_status=$?
39618 - grep -v '^ *+' conftest.er1 >conftest.err
39619 - rm -f conftest.er1
39620 - cat conftest.err >&5
39621 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39622 - (exit $ac_status); } >/dev/null && {
39623 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
39624 - test ! -s conftest.err
39625 - }; then
39626 - ac_header_preproc=yes
39627 -else
39628 - $as_echo "$as_me: failed program was:" >&5
39629 -sed 's/^/| /' conftest.$ac_ext >&5
39630 -
39631 - ac_header_preproc=no
39632 -fi
39633 -
39634 -rm -f conftest.err conftest.$ac_ext
39635 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
39636 -$as_echo "$ac_header_preproc" >&6; }
39637 -
39638 -# So? What about this header?
39639 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
39640 - yes:no: )
39641 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
39642 -$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
39643 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
39644 -$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
39645 - ac_header_preproc=yes
39646 - ;;
39647 - no:yes:* )
39648 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
39649 -$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
39650 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
39651 -$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
39652 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
39653 -$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
39654 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
39655 -$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
39656 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
39657 -$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
39658 - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
39659 -$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
39660 -
39661 - ;;
39662 -esac
39663 -{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
39664 -$as_echo_n "checking for zlib.h... " >&6; }
39665 -if test "${ac_cv_header_zlib_h+set}" = set; then
39666 - $as_echo_n "(cached) " >&6
39667 -else
39668 - ac_cv_header_zlib_h=$ac_header_preproc
39669 -fi
39670 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
39671 -$as_echo "$ac_cv_header_zlib_h" >&6; }
39672 -
39673 -fi
39674 -if test "x$ac_cv_header_zlib_h" = x""yes; then
39675 - have_zlib=yes
39676 -else
39677 - have_zlib=no
39678 -fi
39679 -
39680 -
39681 -if test "x$have_zlib" = xno; then
39682 - { { $as_echo "$as_me:$LINENO: error: unable to find libz headers" >&5
39683 -$as_echo "$as_me: error: unable to find libz headers" >&2;}
39684 - { (exit 1); exit 1; }; }
39685 -fi
39686 -if test "${ac_cv_header_bzlib_h+set}" = set; then
39687 - { $as_echo "$as_me:$LINENO: checking for bzlib.h" >&5
39688 -$as_echo_n "checking for bzlib.h... " >&6; }
39689 -if test "${ac_cv_header_bzlib_h+set}" = set; then
39690 - $as_echo_n "(cached) " >&6
39691 -fi
39692 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
39693 -$as_echo "$ac_cv_header_bzlib_h" >&6; }
39694 -else
39695 - # Is the header compilable?
39696 -{ $as_echo "$as_me:$LINENO: checking bzlib.h usability" >&5
39697 -$as_echo_n "checking bzlib.h usability... " >&6; }
39698 -cat >conftest.$ac_ext <<_ACEOF
39699 -/* confdefs.h. */
39700 -_ACEOF
39701 -cat confdefs.h >>conftest.$ac_ext
39702 -cat >>conftest.$ac_ext <<_ACEOF
39703 -/* end confdefs.h. */
39704 -$ac_includes_default
39705 -#include <bzlib.h>
39706 -_ACEOF
39707 -rm -f conftest.$ac_objext
39708 -if { (ac_try="$ac_compile"
39709 -case "(($ac_try" in
39710 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39711 - *) ac_try_echo=$ac_try;;
39712 -esac
39713 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39714 -$as_echo "$ac_try_echo") >&5
39715 - (eval "$ac_compile") 2>conftest.er1
39716 - ac_status=$?
39717 - grep -v '^ *+' conftest.er1 >conftest.err
39718 - rm -f conftest.er1
39719 - cat conftest.err >&5
39720 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39721 - (exit $ac_status); } && {
39722 - test -z "$ac_c_werror_flag" ||
39723 - test ! -s conftest.err
39724 - } && test -s conftest.$ac_objext; then
39725 - ac_header_compiler=yes
39726 -else
39727 - $as_echo "$as_me: failed program was:" >&5
39728 -sed 's/^/| /' conftest.$ac_ext >&5
39729 -
39730 - ac_header_compiler=no
39731 -fi
39732 -
39733 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
39734 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
39735 -$as_echo "$ac_header_compiler" >&6; }
39736 -
39737 -# Is the header present?
39738 -{ $as_echo "$as_me:$LINENO: checking bzlib.h presence" >&5
39739 -$as_echo_n "checking bzlib.h presence... " >&6; }
39740 -cat >conftest.$ac_ext <<_ACEOF
39741 -/* confdefs.h. */
39742 -_ACEOF
39743 -cat confdefs.h >>conftest.$ac_ext
39744 -cat >>conftest.$ac_ext <<_ACEOF
39745 -/* end confdefs.h. */
39746 -#include <bzlib.h>
39747 -_ACEOF
39748 -if { (ac_try="$ac_cpp conftest.$ac_ext"
39749 -case "(($ac_try" in
39750 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39751 - *) ac_try_echo=$ac_try;;
39752 -esac
39753 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39754 -$as_echo "$ac_try_echo") >&5
39755 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
39756 - ac_status=$?
39757 - grep -v '^ *+' conftest.er1 >conftest.err
39758 - rm -f conftest.er1
39759 - cat conftest.err >&5
39760 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39761 - (exit $ac_status); } >/dev/null && {
39762 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
39763 - test ! -s conftest.err
39764 - }; then
39765 - ac_header_preproc=yes
39766 -else
39767 - $as_echo "$as_me: failed program was:" >&5
39768 -sed 's/^/| /' conftest.$ac_ext >&5
39769 -
39770 - ac_header_preproc=no
39771 -fi
39772 -
39773 -rm -f conftest.err conftest.$ac_ext
39774 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
39775 -$as_echo "$ac_header_preproc" >&6; }
39776 -
39777 -# So? What about this header?
39778 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
39779 - yes:no: )
39780 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
39781 -$as_echo "$as_me: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
39782 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the compiler's result" >&5
39783 -$as_echo "$as_me: WARNING: bzlib.h: proceeding with the compiler's result" >&2;}
39784 - ac_header_preproc=yes
39785 - ;;
39786 - no:yes:* )
39787 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: present but cannot be compiled" >&5
39788 -$as_echo "$as_me: WARNING: bzlib.h: present but cannot be compiled" >&2;}
39789 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: check for missing prerequisite headers?" >&5
39790 -$as_echo "$as_me: WARNING: bzlib.h: check for missing prerequisite headers?" >&2;}
39791 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: see the Autoconf documentation" >&5
39792 -$as_echo "$as_me: WARNING: bzlib.h: see the Autoconf documentation" >&2;}
39793 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: section \"Present But Cannot Be Compiled\"" >&5
39794 -$as_echo "$as_me: WARNING: bzlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
39795 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the preprocessor's result" >&5
39796 -$as_echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;}
39797 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5
39798 -$as_echo "$as_me: WARNING: bzlib.h: in the future, the compiler will take precedence" >&2;}
39799 -
39800 - ;;
39801 -esac
39802 -{ $as_echo "$as_me:$LINENO: checking for bzlib.h" >&5
39803 -$as_echo_n "checking for bzlib.h... " >&6; }
39804 -if test "${ac_cv_header_bzlib_h+set}" = set; then
39805 - $as_echo_n "(cached) " >&6
39806 -else
39807 - ac_cv_header_bzlib_h=$ac_header_preproc
39808 -fi
39809 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
39810 -$as_echo "$ac_cv_header_bzlib_h" >&6; }
39811 -
39812 -fi
39813 -if test "x$ac_cv_header_bzlib_h" = x""yes; then
39814 - have_bzlib=yes
39815 -else
39816 - have_bzlib=no
39817 -fi
39818 -
39819 -
39820 -if test "x$have_bzlib" = xno; then
39821 - { { $as_echo "$as_me:$LINENO: error: unable to find libbz2 headers" >&5
39822 -$as_echo "$as_me: error: unable to find libbz2 headers" >&2;}
39823 - { (exit 1); exit 1; }; }
39824 -fi
39825 -
39826 -# Check whether --enable-dfbinimage was given.
39827 -if test "${enable_dfbinimage+set}" = set; then
39828 - enableval=$enable_dfbinimage; BUILD_DFBINIMAGE="$enableval"
39829 -else
39830 - BUILD_DFBINIMAGE="no"
39831 -fi
39832 -
39833 -
39834 -DFBINIMAGE=""
39835 -
39836 -if test "$BUILD_DFBINIMAGE" = "yes"; then
39837 - # Extract the first word of "fltk-config", so it can be a program name with args.
39838 -set dummy fltk-config; ac_word=$2
39839 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
39840 -$as_echo_n "checking for $ac_word... " >&6; }
39841 -if test "${ac_cv_prog_FLTKCONFIG+set}" = set; then
39842 - $as_echo_n "(cached) " >&6
39843 -else
39844 - if test -n "$FLTKCONFIG"; then
39845 - ac_cv_prog_FLTKCONFIG="$FLTKCONFIG" # Let the user override the test.
39846 -else
39847 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
39848 -for as_dir in $PATH
39849 -do
39850 - IFS=$as_save_IFS
39851 - test -z "$as_dir" && as_dir=.
39852 - for ac_exec_ext in '' $ac_executable_extensions; do
39853 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
39854 - ac_cv_prog_FLTKCONFIG="fltk-config"
39855 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
39856 - break 2
39857 - fi
39858 -done
39859 -done
39860 -IFS=$as_save_IFS
39861 -
39862 -fi
39863 -fi
39864 -FLTKCONFIG=$ac_cv_prog_FLTKCONFIG
39865 -if test -n "$FLTKCONFIG"; then
39866 - { $as_echo "$as_me:$LINENO: result: $FLTKCONFIG" >&5
39867 -$as_echo "$FLTKCONFIG" >&6; }
39868 -else
39869 - { $as_echo "$as_me:$LINENO: result: no" >&5
39870 -$as_echo "no" >&6; }
39871 -fi
39872 -
39873 -
39874 - fltk_cxxflags=`fltk-config --cxxflags`
39875 - fltk_ldflags=`fltk-config --ldflags`
39876 - FLTK_CXXFLAGS="$fltk_cxxflags"
39877 - FLTK_LDFLAGS="$fltk_ldflags"
39878 -
39879 -
39880 -
39881 - if test "${ac_cv_header_portaudio_h+set}" = set; then
39882 - { $as_echo "$as_me:$LINENO: checking for portaudio.h" >&5
39883 -$as_echo_n "checking for portaudio.h... " >&6; }
39884 -if test "${ac_cv_header_portaudio_h+set}" = set; then
39885 - $as_echo_n "(cached) " >&6
39886 -fi
39887 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_portaudio_h" >&5
39888 -$as_echo "$ac_cv_header_portaudio_h" >&6; }
39889 -else
39890 - # Is the header compilable?
39891 -{ $as_echo "$as_me:$LINENO: checking portaudio.h usability" >&5
39892 -$as_echo_n "checking portaudio.h usability... " >&6; }
39893 -cat >conftest.$ac_ext <<_ACEOF
39894 -/* confdefs.h. */
39895 -_ACEOF
39896 -cat confdefs.h >>conftest.$ac_ext
39897 -cat >>conftest.$ac_ext <<_ACEOF
39898 -/* end confdefs.h. */
39899 -$ac_includes_default
39900 -#include <portaudio.h>
39901 -_ACEOF
39902 -rm -f conftest.$ac_objext
39903 -if { (ac_try="$ac_compile"
39904 -case "(($ac_try" in
39905 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39906 - *) ac_try_echo=$ac_try;;
39907 -esac
39908 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39909 -$as_echo "$ac_try_echo") >&5
39910 - (eval "$ac_compile") 2>conftest.er1
39911 - ac_status=$?
39912 - grep -v '^ *+' conftest.er1 >conftest.err
39913 - rm -f conftest.er1
39914 - cat conftest.err >&5
39915 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39916 - (exit $ac_status); } && {
39917 - test -z "$ac_c_werror_flag" ||
39918 - test ! -s conftest.err
39919 - } && test -s conftest.$ac_objext; then
39920 - ac_header_compiler=yes
39921 -else
39922 - $as_echo "$as_me: failed program was:" >&5
39923 -sed 's/^/| /' conftest.$ac_ext >&5
39924 -
39925 - ac_header_compiler=no
39926 -fi
39927 -
39928 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
39929 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
39930 -$as_echo "$ac_header_compiler" >&6; }
39931 -
39932 -# Is the header present?
39933 -{ $as_echo "$as_me:$LINENO: checking portaudio.h presence" >&5
39934 -$as_echo_n "checking portaudio.h presence... " >&6; }
39935 -cat >conftest.$ac_ext <<_ACEOF
39936 -/* confdefs.h. */
39937 -_ACEOF
39938 -cat confdefs.h >>conftest.$ac_ext
39939 -cat >>conftest.$ac_ext <<_ACEOF
39940 -/* end confdefs.h. */
39941 -#include <portaudio.h>
39942 -_ACEOF
39943 -if { (ac_try="$ac_cpp conftest.$ac_ext"
39944 -case "(($ac_try" in
39945 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
39946 - *) ac_try_echo=$ac_try;;
39947 -esac
39948 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
39949 -$as_echo "$ac_try_echo") >&5
39950 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
39951 - ac_status=$?
39952 - grep -v '^ *+' conftest.er1 >conftest.err
39953 - rm -f conftest.er1
39954 - cat conftest.err >&5
39955 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
39956 - (exit $ac_status); } >/dev/null && {
39957 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
39958 - test ! -s conftest.err
39959 - }; then
39960 - ac_header_preproc=yes
39961 -else
39962 - $as_echo "$as_me: failed program was:" >&5
39963 -sed 's/^/| /' conftest.$ac_ext >&5
39964 -
39965 - ac_header_preproc=no
39966 -fi
39967 -
39968 -rm -f conftest.err conftest.$ac_ext
39969 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
39970 -$as_echo "$ac_header_preproc" >&6; }
39971 -
39972 -# So? What about this header?
39973 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
39974 - yes:no: )
39975 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
39976 -$as_echo "$as_me: WARNING: portaudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
39977 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: proceeding with the compiler's result" >&5
39978 -$as_echo "$as_me: WARNING: portaudio.h: proceeding with the compiler's result" >&2;}
39979 - ac_header_preproc=yes
39980 - ;;
39981 - no:yes:* )
39982 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: present but cannot be compiled" >&5
39983 -$as_echo "$as_me: WARNING: portaudio.h: present but cannot be compiled" >&2;}
39984 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: check for missing prerequisite headers?" >&5
39985 -$as_echo "$as_me: WARNING: portaudio.h: check for missing prerequisite headers?" >&2;}
39986 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: see the Autoconf documentation" >&5
39987 -$as_echo "$as_me: WARNING: portaudio.h: see the Autoconf documentation" >&2;}
39988 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: section \"Present But Cannot Be Compiled\"" >&5
39989 -$as_echo "$as_me: WARNING: portaudio.h: section \"Present But Cannot Be Compiled\"" >&2;}
39990 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: proceeding with the preprocessor's result" >&5
39991 -$as_echo "$as_me: WARNING: portaudio.h: proceeding with the preprocessor's result" >&2;}
39992 - { $as_echo "$as_me:$LINENO: WARNING: portaudio.h: in the future, the compiler will take precedence" >&5
39993 -$as_echo "$as_me: WARNING: portaudio.h: in the future, the compiler will take precedence" >&2;}
39994 -
39995 - ;;
39996 -esac
39997 -{ $as_echo "$as_me:$LINENO: checking for portaudio.h" >&5
39998 -$as_echo_n "checking for portaudio.h... " >&6; }
39999 -if test "${ac_cv_header_portaudio_h+set}" = set; then
40000 - $as_echo_n "(cached) " >&6
40001 -else
40002 - ac_cv_header_portaudio_h=$ac_header_preproc
40003 -fi
40004 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_portaudio_h" >&5
40005 -$as_echo "$ac_cv_header_portaudio_h" >&6; }
40006 -
40007 -fi
40008 -if test "x$ac_cv_header_portaudio_h" = x""yes; then
40009 - have_portaudio=yes
40010 -else
40011 - have_portaudio=no
40012 -fi
40013 -
40014 -
40015 - if test "x$have_portaudio" = xno; then
40016 - { { $as_echo "$as_me:$LINENO: error: unable to find libportaudio headers" >&5
40017 -$as_echo "$as_me: error: unable to find libportaudio headers" >&2;}
40018 - { (exit 1); exit 1; }; }
40019 - fi
40020 - if test "${ac_cv_header_bzlib_h+set}" = set; then
40021 - { $as_echo "$as_me:$LINENO: checking for bzlib.h" >&5
40022 -$as_echo_n "checking for bzlib.h... " >&6; }
40023 -if test "${ac_cv_header_bzlib_h+set}" = set; then
40024 - $as_echo_n "(cached) " >&6
40025 -fi
40026 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
40027 -$as_echo "$ac_cv_header_bzlib_h" >&6; }
40028 -else
40029 - # Is the header compilable?
40030 -{ $as_echo "$as_me:$LINENO: checking bzlib.h usability" >&5
40031 -$as_echo_n "checking bzlib.h usability... " >&6; }
40032 -cat >conftest.$ac_ext <<_ACEOF
40033 -/* confdefs.h. */
40034 -_ACEOF
40035 -cat confdefs.h >>conftest.$ac_ext
40036 -cat >>conftest.$ac_ext <<_ACEOF
40037 -/* end confdefs.h. */
40038 -$ac_includes_default
40039 -#include <bzlib.h>
40040 -_ACEOF
40041 -rm -f conftest.$ac_objext
40042 -if { (ac_try="$ac_compile"
40043 -case "(($ac_try" in
40044 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40045 - *) ac_try_echo=$ac_try;;
40046 -esac
40047 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40048 -$as_echo "$ac_try_echo") >&5
40049 - (eval "$ac_compile") 2>conftest.er1
40050 - ac_status=$?
40051 - grep -v '^ *+' conftest.er1 >conftest.err
40052 - rm -f conftest.er1
40053 - cat conftest.err >&5
40054 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40055 - (exit $ac_status); } && {
40056 - test -z "$ac_c_werror_flag" ||
40057 - test ! -s conftest.err
40058 - } && test -s conftest.$ac_objext; then
40059 - ac_header_compiler=yes
40060 -else
40061 - $as_echo "$as_me: failed program was:" >&5
40062 -sed 's/^/| /' conftest.$ac_ext >&5
40063 -
40064 - ac_header_compiler=no
40065 -fi
40066 -
40067 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40068 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
40069 -$as_echo "$ac_header_compiler" >&6; }
40070 -
40071 -# Is the header present?
40072 -{ $as_echo "$as_me:$LINENO: checking bzlib.h presence" >&5
40073 -$as_echo_n "checking bzlib.h presence... " >&6; }
40074 -cat >conftest.$ac_ext <<_ACEOF
40075 -/* confdefs.h. */
40076 -_ACEOF
40077 -cat confdefs.h >>conftest.$ac_ext
40078 -cat >>conftest.$ac_ext <<_ACEOF
40079 -/* end confdefs.h. */
40080 -#include <bzlib.h>
40081 -_ACEOF
40082 -if { (ac_try="$ac_cpp conftest.$ac_ext"
40083 -case "(($ac_try" in
40084 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40085 - *) ac_try_echo=$ac_try;;
40086 -esac
40087 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40088 -$as_echo "$ac_try_echo") >&5
40089 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
40090 - ac_status=$?
40091 - grep -v '^ *+' conftest.er1 >conftest.err
40092 - rm -f conftest.er1
40093 - cat conftest.err >&5
40094 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40095 - (exit $ac_status); } >/dev/null && {
40096 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
40097 - test ! -s conftest.err
40098 - }; then
40099 - ac_header_preproc=yes
40100 -else
40101 - $as_echo "$as_me: failed program was:" >&5
40102 -sed 's/^/| /' conftest.$ac_ext >&5
40103 -
40104 - ac_header_preproc=no
40105 -fi
40106 -
40107 -rm -f conftest.err conftest.$ac_ext
40108 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
40109 -$as_echo "$ac_header_preproc" >&6; }
40110 -
40111 -# So? What about this header?
40112 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
40113 - yes:no: )
40114 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
40115 -$as_echo "$as_me: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
40116 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the compiler's result" >&5
40117 -$as_echo "$as_me: WARNING: bzlib.h: proceeding with the compiler's result" >&2;}
40118 - ac_header_preproc=yes
40119 - ;;
40120 - no:yes:* )
40121 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: present but cannot be compiled" >&5
40122 -$as_echo "$as_me: WARNING: bzlib.h: present but cannot be compiled" >&2;}
40123 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: check for missing prerequisite headers?" >&5
40124 -$as_echo "$as_me: WARNING: bzlib.h: check for missing prerequisite headers?" >&2;}
40125 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: see the Autoconf documentation" >&5
40126 -$as_echo "$as_me: WARNING: bzlib.h: see the Autoconf documentation" >&2;}
40127 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: section \"Present But Cannot Be Compiled\"" >&5
40128 -$as_echo "$as_me: WARNING: bzlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
40129 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the preprocessor's result" >&5
40130 -$as_echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;}
40131 - { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5
40132 -$as_echo "$as_me: WARNING: bzlib.h: in the future, the compiler will take precedence" >&2;}
40133 -
40134 - ;;
40135 -esac
40136 -{ $as_echo "$as_me:$LINENO: checking for bzlib.h" >&5
40137 -$as_echo_n "checking for bzlib.h... " >&6; }
40138 -if test "${ac_cv_header_bzlib_h+set}" = set; then
40139 - $as_echo_n "(cached) " >&6
40140 -else
40141 - ac_cv_header_bzlib_h=$ac_header_preproc
40142 -fi
40143 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
40144 -$as_echo "$ac_cv_header_bzlib_h" >&6; }
40145 -
40146 -fi
40147 -if test "x$ac_cv_header_bzlib_h" = x""yes; then
40148 - have_bzlib=yes
40149 -else
40150 - have_bzlib=no
40151 -fi
40152 -
40153 -
40154 - if test "x$have_bzlib" = xno; then
40155 - { { $as_echo "$as_me:$LINENO: error: unable to find libbz2 headers" >&5
40156 -$as_echo "$as_me: error: unable to find libbz2 headers" >&2;}
40157 - { (exit 1); exit 1; }; }
40158 - fi
40159 -
40160 - DFBINIMAGE="plugins/dfbinimage"
40161 -
40162 - ac_config_files="$ac_config_files plugins/dfbinimage/Makefile"
40163 -
40164 -fi
40165 -
40166 -if test "${ac_cv_header_X11_extensions_Xv_h+set}" = set; then
40167 - { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xv.h" >&5
40168 -$as_echo_n "checking for X11/extensions/Xv.h... " >&6; }
40169 -if test "${ac_cv_header_X11_extensions_Xv_h+set}" = set; then
40170 - $as_echo_n "(cached) " >&6
40171 -fi
40172 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xv_h" >&5
40173 -$as_echo "$ac_cv_header_X11_extensions_Xv_h" >&6; }
40174 -else
40175 - # Is the header compilable?
40176 -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xv.h usability" >&5
40177 -$as_echo_n "checking X11/extensions/Xv.h usability... " >&6; }
40178 -cat >conftest.$ac_ext <<_ACEOF
40179 -/* confdefs.h. */
40180 -_ACEOF
40181 -cat confdefs.h >>conftest.$ac_ext
40182 -cat >>conftest.$ac_ext <<_ACEOF
40183 -/* end confdefs.h. */
40184 -$ac_includes_default
40185 -#include <X11/extensions/Xv.h>
40186 -_ACEOF
40187 -rm -f conftest.$ac_objext
40188 -if { (ac_try="$ac_compile"
40189 -case "(($ac_try" in
40190 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40191 - *) ac_try_echo=$ac_try;;
40192 -esac
40193 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40194 -$as_echo "$ac_try_echo") >&5
40195 - (eval "$ac_compile") 2>conftest.er1
40196 - ac_status=$?
40197 - grep -v '^ *+' conftest.er1 >conftest.err
40198 - rm -f conftest.er1
40199 - cat conftest.err >&5
40200 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40201 - (exit $ac_status); } && {
40202 - test -z "$ac_c_werror_flag" ||
40203 - test ! -s conftest.err
40204 - } && test -s conftest.$ac_objext; then
40205 - ac_header_compiler=yes
40206 -else
40207 - $as_echo "$as_me: failed program was:" >&5
40208 -sed 's/^/| /' conftest.$ac_ext >&5
40209 -
40210 - ac_header_compiler=no
40211 -fi
40212 -
40213 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40214 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
40215 -$as_echo "$ac_header_compiler" >&6; }
40216 -
40217 -# Is the header present?
40218 -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xv.h presence" >&5
40219 -$as_echo_n "checking X11/extensions/Xv.h presence... " >&6; }
40220 -cat >conftest.$ac_ext <<_ACEOF
40221 -/* confdefs.h. */
40222 -_ACEOF
40223 -cat confdefs.h >>conftest.$ac_ext
40224 -cat >>conftest.$ac_ext <<_ACEOF
40225 -/* end confdefs.h. */
40226 -#include <X11/extensions/Xv.h>
40227 -_ACEOF
40228 -if { (ac_try="$ac_cpp conftest.$ac_ext"
40229 -case "(($ac_try" in
40230 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40231 - *) ac_try_echo=$ac_try;;
40232 -esac
40233 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40234 -$as_echo "$ac_try_echo") >&5
40235 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
40236 - ac_status=$?
40237 - grep -v '^ *+' conftest.er1 >conftest.err
40238 - rm -f conftest.er1
40239 - cat conftest.err >&5
40240 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40241 - (exit $ac_status); } >/dev/null && {
40242 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
40243 - test ! -s conftest.err
40244 - }; then
40245 - ac_header_preproc=yes
40246 -else
40247 - $as_echo "$as_me: failed program was:" >&5
40248 -sed 's/^/| /' conftest.$ac_ext >&5
40249 -
40250 - ac_header_preproc=no
40251 -fi
40252 -
40253 -rm -f conftest.err conftest.$ac_ext
40254 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
40255 -$as_echo "$ac_header_preproc" >&6; }
40256 -
40257 -# So? What about this header?
40258 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
40259 - yes:no: )
40260 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: accepted by the compiler, rejected by the preprocessor!" >&5
40261 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
40262 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: proceeding with the compiler's result" >&5
40263 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: proceeding with the compiler's result" >&2;}
40264 - ac_header_preproc=yes
40265 - ;;
40266 - no:yes:* )
40267 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: present but cannot be compiled" >&5
40268 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: present but cannot be compiled" >&2;}
40269 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: check for missing prerequisite headers?" >&5
40270 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: check for missing prerequisite headers?" >&2;}
40271 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: see the Autoconf documentation" >&5
40272 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: see the Autoconf documentation" >&2;}
40273 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: section \"Present But Cannot Be Compiled\"" >&5
40274 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: section \"Present But Cannot Be Compiled\"" >&2;}
40275 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: proceeding with the preprocessor's result" >&5
40276 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: proceeding with the preprocessor's result" >&2;}
40277 - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: in the future, the compiler will take precedence" >&5
40278 -$as_echo "$as_me: WARNING: X11/extensions/Xv.h: in the future, the compiler will take precedence" >&2;}
40279 -
40280 - ;;
40281 -esac
40282 -{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xv.h" >&5
40283 -$as_echo_n "checking for X11/extensions/Xv.h... " >&6; }
40284 -if test "${ac_cv_header_X11_extensions_Xv_h+set}" = set; then
40285 - $as_echo_n "(cached) " >&6
40286 -else
40287 - ac_cv_header_X11_extensions_Xv_h=$ac_header_preproc
40288 -fi
40289 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xv_h" >&5
40290 -$as_echo "$ac_cv_header_X11_extensions_Xv_h" >&6; }
40291 -
40292 -fi
40293 -if test "x$ac_cv_header_X11_extensions_Xv_h" = x""yes; then
40294 - have_xv=yes
40295 -else
40296 - have_xv=no
40297 -fi
40298 -
40299 -
40300 -if test "x$have_xv" = xno; then
40301 - { { $as_echo "$as_me:$LINENO: error: unable to find xv headers" >&5
40302 -$as_echo "$as_me: error: unable to find xv headers" >&2;}
40303 - { (exit 1); exit 1; }; }
40304 -fi
40305 -
40306 - if false; then
40307 - ARCH_X86_TRUE=
40308 - ARCH_X86_FALSE='#'
40309 -else
40310 - ARCH_X86_TRUE='#'
40311 - ARCH_X86_FALSE=
40312 -fi
40313 -
40314 - if false; then
40315 - ARCH_X86_64_TRUE=
40316 - ARCH_X86_64_FALSE='#'
40317 -else
40318 - ARCH_X86_64_TRUE='#'
40319 - ARCH_X86_64_FALSE=
40320 -fi
40321 -
40322 - if false; then
40323 - ARCH_PPC_TRUE=
40324 - ARCH_PPC_FALSE='#'
40325 -else
40326 - ARCH_PPC_TRUE='#'
40327 - ARCH_PPC_FALSE=
40328 -fi
40329 -
40330 -
40331 -# Check whether --enable-dynarec was given.
40332 -if test "${enable_dynarec+set}" = set; then
40333 - enableval=$enable_dynarec; DYNAREC="$enableval"
40334 -else
40335 - DYNAREC="auto"
40336 -fi
40337 -
40338 -
40339 -
40340 -if test "x$DYNAREC" = xauto; then
40341 - DYNARECSEL="auto"
40342 -else if test "x$DYNAREC" = xx86; then
40343 - DYNARECSEL="x86"
40344 -else if test "x$DYNAREC" = xx86_64; then
40345 - DYNARECSEL="x86_64"
40346 -else if test "x$DYNAREC" = xppc; then
40347 - DYNARECSEL="ppc"
40348 -else
40349 - { $as_echo "$as_me:$LINENO: WARNING: Dynamic Recompiler \"$DYNAREC\" not found. Autodetecting..." >&5
40350 -$as_echo "$as_me: WARNING: Dynamic Recompiler \"$DYNAREC\" not found. Autodetecting..." >&2;}
40351 - DYNARECSEL="auto"
40352 -fi
40353 -fi
40354 -fi
40355 -fi
40356 -
40357 -if test "x$DYNARECSEL" = xauto; then
40358 - if expr x"$target_cpu" : 'xi.86' > /dev/null; then
40359 - DYNARECSEL="x86"
40360 - fi
40361 -
40362 - if expr x"$target_cpu" : 'xx86_64' > /dev/null; then
40363 - DYNARECSEL="x86_64"
40364 - fi
40365 -
40366 - if expr x"$target_cpu" : 'xpowerpc' > /dev/null; then
40367 - DYNARECSEL="ppc"
40368 - fi
40369 -fi
40370 -
40371 -if test "x$DYNARECSEL" = xx86; then
40372 -
40373 -cat >>confdefs.h <<\_ACEOF
40374 -#define __i386__ 1
40375 -_ACEOF
40376 -
40377 - if true; then
40378 - ARCH_X86_TRUE=
40379 - ARCH_X86_FALSE='#'
40380 -else
40381 - ARCH_X86_TRUE='#'
40382 - ARCH_X86_FALSE=
40383 -fi
40384 -
40385 -
40386 - # Extract the first word of "nasm", so it can be a program name with args.
40387 -set dummy nasm; ac_word=$2
40388 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
40389 -$as_echo_n "checking for $ac_word... " >&6; }
40390 -if test "${ac_cv_path_NASM+set}" = set; then
40391 - $as_echo_n "(cached) " >&6
40392 -else
40393 - case $NASM in
40394 - [\\/]* | ?:[\\/]*)
40395 - ac_cv_path_NASM="$NASM" # Let the user override the test with a path.
40396 - ;;
40397 - *)
40398 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
40399 -for as_dir in $PATH
40400 -do
40401 - IFS=$as_save_IFS
40402 - test -z "$as_dir" && as_dir=.
40403 - for ac_exec_ext in '' $ac_executable_extensions; do
40404 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
40405 - ac_cv_path_NASM="$as_dir/$ac_word$ac_exec_ext"
40406 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
40407 - break 2
40408 - fi
40409 -done
40410 -done
40411 -IFS=$as_save_IFS
40412 -
40413 - test -z "$ac_cv_path_NASM" && ac_cv_path_NASM="missing"
40414 - ;;
40415 -esac
40416 -fi
40417 -NASM=$ac_cv_path_NASM
40418 -if test -n "$NASM"; then
40419 - { $as_echo "$as_me:$LINENO: result: $NASM" >&5
40420 -$as_echo "$NASM" >&6; }
40421 -else
40422 - { $as_echo "$as_me:$LINENO: result: no" >&5
40423 -$as_echo "no" >&6; }
40424 -fi
40425 -
40426 -
40427 - if test "$NASM" = "missing"; then
40428 - { { $as_echo "$as_me:$LINENO: error: unable to find nasm, needed to build dfx11video" >&5
40429 -$as_echo "$as_me: error: unable to find nasm, needed to build dfx11video" >&2;}
40430 - { (exit 1); exit 1; }; }
40431 - fi
40432 - { $as_echo "$as_me:$LINENO: result: Dynamic Recompiler selected: x86" >&5
40433 -$as_echo "Dynamic Recompiler selected: x86" >&6; }
40434 -fi
40435 -
40436 -if test "x$DYNARECSEL" = xx86_64; then
40437 -
40438 -cat >>confdefs.h <<\_ACEOF
40439 -#define __x86_64__ 1
40440 -_ACEOF
40441 -
40442 - if true; then
40443 - ARCH_X86_64_TRUE=
40444 - ARCH_X86_64_FALSE='#'
40445 -else
40446 - ARCH_X86_64_TRUE='#'
40447 - ARCH_X86_64_FALSE=
40448 -fi
40449 -
40450 - { $as_echo "$as_me:$LINENO: result: Dynamic Recompiler selected: x86_64" >&5
40451 -$as_echo "Dynamic Recompiler selected: x86_64" >&6; }
40452 -fi
40453 -
40454 -if test "x$DYNARECSEL" = xppc; then
40455 -
40456 -cat >>confdefs.h <<\_ACEOF
40457 -#define __ppc__ 1
40458 -_ACEOF
40459 -
40460 - if true; then
40461 - ARCH_PPC_TRUE=
40462 - ARCH_PPC_FALSE='#'
40463 -else
40464 - ARCH_PPC_TRUE='#'
40465 - ARCH_PPC_FALSE=
40466 -fi
40467 -
40468 - { $as_echo "$as_me:$LINENO: result: Dynamic Recompiler selected: ppc" >&5
40469 -$as_echo "Dynamic Recompiler selected: ppc" >&6; }
40470 -fi
40471 -
40472 -
40473 -
40474 -
40475 - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
40476 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
40477 -if test "${ac_cv_c_bigendian+set}" = set; then
40478 - $as_echo_n "(cached) " >&6
40479 -else
40480 - ac_cv_c_bigendian=unknown
40481 - # See if we're dealing with a universal compiler.
40482 - cat >conftest.$ac_ext <<_ACEOF
40483 -/* confdefs.h. */
40484 -_ACEOF
40485 -cat confdefs.h >>conftest.$ac_ext
40486 -cat >>conftest.$ac_ext <<_ACEOF
40487 -/* end confdefs.h. */
40488 -#ifndef __APPLE_CC__
40489 - not a universal capable compiler
40490 - #endif
40491 - typedef int dummy;
40492 -
40493 -_ACEOF
40494 -rm -f conftest.$ac_objext
40495 -if { (ac_try="$ac_compile"
40496 -case "(($ac_try" in
40497 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40498 - *) ac_try_echo=$ac_try;;
40499 -esac
40500 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40501 -$as_echo "$ac_try_echo") >&5
40502 - (eval "$ac_compile") 2>conftest.er1
40503 - ac_status=$?
40504 - grep -v '^ *+' conftest.er1 >conftest.err
40505 - rm -f conftest.er1
40506 - cat conftest.err >&5
40507 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40508 - (exit $ac_status); } && {
40509 - test -z "$ac_c_werror_flag" ||
40510 - test ! -s conftest.err
40511 - } && test -s conftest.$ac_objext; then
40512 -
40513 - # Check for potential -arch flags. It is not universal unless
40514 - # there are some -arch flags. Note that *ppc* also matches
40515 - # ppc64. This check is also rather less than ideal.
40516 - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
40517 - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
40518 - esac
40519 -else
40520 - $as_echo "$as_me: failed program was:" >&5
40521 -sed 's/^/| /' conftest.$ac_ext >&5
40522 -
40523 -
40524 -fi
40525 -
40526 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40527 - if test $ac_cv_c_bigendian = unknown; then
40528 - # See if sys/param.h defines the BYTE_ORDER macro.
40529 - cat >conftest.$ac_ext <<_ACEOF
40530 -/* confdefs.h. */
40531 -_ACEOF
40532 -cat confdefs.h >>conftest.$ac_ext
40533 -cat >>conftest.$ac_ext <<_ACEOF
40534 -/* end confdefs.h. */
40535 -#include <sys/types.h>
40536 - #include <sys/param.h>
40537 -
40538 -int
40539 -main ()
40540 -{
40541 -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
40542 - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
40543 - && LITTLE_ENDIAN)
40544 - bogus endian macros
40545 - #endif
40546 -
40547 - ;
40548 - return 0;
40549 -}
40550 -_ACEOF
40551 -rm -f conftest.$ac_objext
40552 -if { (ac_try="$ac_compile"
40553 -case "(($ac_try" in
40554 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40555 - *) ac_try_echo=$ac_try;;
40556 -esac
40557 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40558 -$as_echo "$ac_try_echo") >&5
40559 - (eval "$ac_compile") 2>conftest.er1
40560 - ac_status=$?
40561 - grep -v '^ *+' conftest.er1 >conftest.err
40562 - rm -f conftest.er1
40563 - cat conftest.err >&5
40564 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40565 - (exit $ac_status); } && {
40566 - test -z "$ac_c_werror_flag" ||
40567 - test ! -s conftest.err
40568 - } && test -s conftest.$ac_objext; then
40569 - # It does; now see whether it defined to BIG_ENDIAN or not.
40570 - cat >conftest.$ac_ext <<_ACEOF
40571 -/* confdefs.h. */
40572 -_ACEOF
40573 -cat confdefs.h >>conftest.$ac_ext
40574 -cat >>conftest.$ac_ext <<_ACEOF
40575 -/* end confdefs.h. */
40576 -#include <sys/types.h>
40577 - #include <sys/param.h>
40578 -
40579 -int
40580 -main ()
40581 -{
40582 -#if BYTE_ORDER != BIG_ENDIAN
40583 - not big endian
40584 - #endif
40585 -
40586 - ;
40587 - return 0;
40588 -}
40589 -_ACEOF
40590 -rm -f conftest.$ac_objext
40591 -if { (ac_try="$ac_compile"
40592 -case "(($ac_try" in
40593 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40594 - *) ac_try_echo=$ac_try;;
40595 -esac
40596 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40597 -$as_echo "$ac_try_echo") >&5
40598 - (eval "$ac_compile") 2>conftest.er1
40599 - ac_status=$?
40600 - grep -v '^ *+' conftest.er1 >conftest.err
40601 - rm -f conftest.er1
40602 - cat conftest.err >&5
40603 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40604 - (exit $ac_status); } && {
40605 - test -z "$ac_c_werror_flag" ||
40606 - test ! -s conftest.err
40607 - } && test -s conftest.$ac_objext; then
40608 - ac_cv_c_bigendian=yes
40609 -else
40610 - $as_echo "$as_me: failed program was:" >&5
40611 -sed 's/^/| /' conftest.$ac_ext >&5
40612 -
40613 - ac_cv_c_bigendian=no
40614 -fi
40615 -
40616 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40617 -else
40618 - $as_echo "$as_me: failed program was:" >&5
40619 -sed 's/^/| /' conftest.$ac_ext >&5
40620 -
40621 -
40622 -fi
40623 -
40624 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40625 - fi
40626 - if test $ac_cv_c_bigendian = unknown; then
40627 - # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
40628 - cat >conftest.$ac_ext <<_ACEOF
40629 -/* confdefs.h. */
40630 -_ACEOF
40631 -cat confdefs.h >>conftest.$ac_ext
40632 -cat >>conftest.$ac_ext <<_ACEOF
40633 -/* end confdefs.h. */
40634 -#include <limits.h>
40635 -
40636 -int
40637 -main ()
40638 -{
40639 -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
40640 - bogus endian macros
40641 - #endif
40642 -
40643 - ;
40644 - return 0;
40645 -}
40646 -_ACEOF
40647 -rm -f conftest.$ac_objext
40648 -if { (ac_try="$ac_compile"
40649 -case "(($ac_try" in
40650 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40651 - *) ac_try_echo=$ac_try;;
40652 -esac
40653 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40654 -$as_echo "$ac_try_echo") >&5
40655 - (eval "$ac_compile") 2>conftest.er1
40656 - ac_status=$?
40657 - grep -v '^ *+' conftest.er1 >conftest.err
40658 - rm -f conftest.er1
40659 - cat conftest.err >&5
40660 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40661 - (exit $ac_status); } && {
40662 - test -z "$ac_c_werror_flag" ||
40663 - test ! -s conftest.err
40664 - } && test -s conftest.$ac_objext; then
40665 - # It does; now see whether it defined to _BIG_ENDIAN or not.
40666 - cat >conftest.$ac_ext <<_ACEOF
40667 -/* confdefs.h. */
40668 -_ACEOF
40669 -cat confdefs.h >>conftest.$ac_ext
40670 -cat >>conftest.$ac_ext <<_ACEOF
40671 -/* end confdefs.h. */
40672 -#include <limits.h>
40673 -
40674 -int
40675 -main ()
40676 -{
40677 -#ifndef _BIG_ENDIAN
40678 - not big endian
40679 - #endif
40680 -
40681 - ;
40682 - return 0;
40683 -}
40684 -_ACEOF
40685 -rm -f conftest.$ac_objext
40686 -if { (ac_try="$ac_compile"
40687 -case "(($ac_try" in
40688 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40689 - *) ac_try_echo=$ac_try;;
40690 -esac
40691 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40692 -$as_echo "$ac_try_echo") >&5
40693 - (eval "$ac_compile") 2>conftest.er1
40694 - ac_status=$?
40695 - grep -v '^ *+' conftest.er1 >conftest.err
40696 - rm -f conftest.er1
40697 - cat conftest.err >&5
40698 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40699 - (exit $ac_status); } && {
40700 - test -z "$ac_c_werror_flag" ||
40701 - test ! -s conftest.err
40702 - } && test -s conftest.$ac_objext; then
40703 - ac_cv_c_bigendian=yes
40704 -else
40705 - $as_echo "$as_me: failed program was:" >&5
40706 -sed 's/^/| /' conftest.$ac_ext >&5
40707 -
40708 - ac_cv_c_bigendian=no
40709 -fi
40710 -
40711 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40712 -else
40713 - $as_echo "$as_me: failed program was:" >&5
40714 -sed 's/^/| /' conftest.$ac_ext >&5
40715 -
40716 -
40717 -fi
40718 -
40719 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40720 - fi
40721 - if test $ac_cv_c_bigendian = unknown; then
40722 - # Compile a test program.
40723 - if test "$cross_compiling" = yes; then
40724 - # Try to guess by grepping values from an object file.
40725 - cat >conftest.$ac_ext <<_ACEOF
40726 -/* confdefs.h. */
40727 -_ACEOF
40728 -cat confdefs.h >>conftest.$ac_ext
40729 -cat >>conftest.$ac_ext <<_ACEOF
40730 -/* end confdefs.h. */
40731 -short int ascii_mm[] =
40732 - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
40733 - short int ascii_ii[] =
40734 - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
40735 - int use_ascii (int i) {
40736 - return ascii_mm[i] + ascii_ii[i];
40737 - }
40738 - short int ebcdic_ii[] =
40739 - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
40740 - short int ebcdic_mm[] =
40741 - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
40742 - int use_ebcdic (int i) {
40743 - return ebcdic_mm[i] + ebcdic_ii[i];
40744 - }
40745 - extern int foo;
40746 -
40747 -int
40748 -main ()
40749 -{
40750 -return use_ascii (foo) == use_ebcdic (foo);
40751 - ;
40752 - return 0;
40753 -}
40754 -_ACEOF
40755 -rm -f conftest.$ac_objext
40756 -if { (ac_try="$ac_compile"
40757 -case "(($ac_try" in
40758 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40759 - *) ac_try_echo=$ac_try;;
40760 -esac
40761 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40762 -$as_echo "$ac_try_echo") >&5
40763 - (eval "$ac_compile") 2>conftest.er1
40764 - ac_status=$?
40765 - grep -v '^ *+' conftest.er1 >conftest.err
40766 - rm -f conftest.er1
40767 - cat conftest.err >&5
40768 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40769 - (exit $ac_status); } && {
40770 - test -z "$ac_c_werror_flag" ||
40771 - test ! -s conftest.err
40772 - } && test -s conftest.$ac_objext; then
40773 - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
40774 - ac_cv_c_bigendian=yes
40775 - fi
40776 - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
40777 - if test "$ac_cv_c_bigendian" = unknown; then
40778 - ac_cv_c_bigendian=no
40779 - else
40780 - # finding both strings is unlikely to happen, but who knows?
40781 - ac_cv_c_bigendian=unknown
40782 - fi
40783 - fi
40784 -else
40785 - $as_echo "$as_me: failed program was:" >&5
40786 -sed 's/^/| /' conftest.$ac_ext >&5
40787 -
40788 -
40789 -fi
40790 -
40791 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40792 -else
40793 - cat >conftest.$ac_ext <<_ACEOF
40794 -/* confdefs.h. */
40795 -_ACEOF
40796 -cat confdefs.h >>conftest.$ac_ext
40797 -cat >>conftest.$ac_ext <<_ACEOF
40798 -/* end confdefs.h. */
40799 -$ac_includes_default
40800 -int
40801 -main ()
40802 -{
40803 -
40804 - /* Are we little or big endian? From Harbison&Steele. */
40805 - union
40806 - {
40807 - long int l;
40808 - char c[sizeof (long int)];
40809 - } u;
40810 - u.l = 1;
40811 - return u.c[sizeof (long int) - 1] == 1;
40812 -
40813 - ;
40814 - return 0;
40815 -}
40816 -_ACEOF
40817 -rm -f conftest$ac_exeext
40818 -if { (ac_try="$ac_link"
40819 -case "(($ac_try" in
40820 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40821 - *) ac_try_echo=$ac_try;;
40822 -esac
40823 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40824 -$as_echo "$ac_try_echo") >&5
40825 - (eval "$ac_link") 2>&5
40826 - ac_status=$?
40827 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40828 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
40829 - { (case "(($ac_try" in
40830 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
40831 - *) ac_try_echo=$ac_try;;
40832 -esac
40833 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
40834 -$as_echo "$ac_try_echo") >&5
40835 - (eval "$ac_try") 2>&5
40836 - ac_status=$?
40837 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
40838 - (exit $ac_status); }; }; then
40839 - ac_cv_c_bigendian=no
40840 -else
40841 - $as_echo "$as_me: program exited with status $ac_status" >&5
40842 -$as_echo "$as_me: failed program was:" >&5
40843 -sed 's/^/| /' conftest.$ac_ext >&5
40844 -
40845 -( exit $ac_status )
40846 -ac_cv_c_bigendian=yes
40847 -fi
40848 -rm -rf conftest.dSYM
40849 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
40850 -fi
40851 -
40852 -
40853 - fi
40854 -fi
40855 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
40856 -$as_echo "$ac_cv_c_bigendian" >&6; }
40857 - case $ac_cv_c_bigendian in #(
40858 - yes)
40859 -
40860 -cat >>confdefs.h <<\_ACEOF
40861 -#define __BIGENDIAN__ /**/
40862 -_ACEOF
40863 -;; #(
40864 - no)
40865 - ;; #(
40866 - universal)
40867 -
40868 -cat >>confdefs.h <<\_ACEOF
40869 -#define AC_APPLE_UNIVERSAL_BUILD 1
40870 -_ACEOF
40871 -
40872 - ;; #(
40873 - *)
40874 - { { $as_echo "$as_me:$LINENO: error: unknown endianness
40875 - presetting ac_cv_c_bigendian=no (or yes) will help" >&5
40876 -$as_echo "$as_me: error: unknown endianness
40877 - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
40878 - { (exit 1); exit 1; }; } ;;
40879 - esac
40880 -
40881 -
40882 -
40883 -cat >>confdefs.h <<\_ACEOF
40884 -#define __LINUX__ 1
40885 -_ACEOF
40886 -
40887 -
40888 -cat >>confdefs.h <<\_ACEOF
40889 -#define MAXPATHLEN 4096
40890 -_ACEOF
40891 -
40892 -
40893 -LD_FLAGS="-lm"
40894 -
40895 -cat >confcache <<\_ACEOF
40896 -# This file is a shell script that caches the results of configure
40897 -# tests run on this system so they can be shared between configure
40898 -# scripts and configure runs, see configure's option --config-cache.
40899 -# It is not useful on other systems. If it contains results you don't
40900 -# want to keep, you may remove or edit it.
40901 -#
40902 -# config.status only pays attention to the cache file if you give it
40903 -# the --recheck option to rerun configure.
40904 -#
40905 -# `ac_cv_env_foo' variables (set or unset) will be overridden when
40906 -# loading this file, other *unset* `ac_cv_foo' will be assigned the
40907 -# following values.
40908 -
40909 -_ACEOF
40910 -
40911 -# The following way of writing the cache mishandles newlines in values,
40912 -# but we know of no workaround that is simple, portable, and efficient.
40913 -# So, we kill variables containing newlines.
40914 -# Ultrix sh set writes to stderr and can't be redirected directly,
40915 -# and sets the high bit in the cache file unless we assign to the vars.
40916 -(
40917 - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
40918 - eval ac_val=\$$ac_var
40919 - case $ac_val in #(
40920 - *${as_nl}*)
40921 - case $ac_var in #(
40922 - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
40923 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
40924 - esac
40925 - case $ac_var in #(
40926 - _ | IFS | as_nl) ;; #(
40927 - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
40928 - *) $as_unset $ac_var ;;
40929 - esac ;;
40930 - esac
40931 - done
40932 -
40933 - (set) 2>&1 |
40934 - case $as_nl`(ac_space=' '; set) 2>&1` in #(
40935 - *${as_nl}ac_space=\ *)
40936 - # `set' does not quote correctly, so add quotes (double-quote
40937 - # substitution turns \\\\ into \\, and sed turns \\ into \).
40938 - sed -n \
40939 - "s/'/'\\\\''/g;
40940 - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
40941 - ;; #(
40942 - *)
40943 - # `set' quotes correctly as required by POSIX, so do not add quotes.
40944 - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
40945 - ;;
40946 - esac |
40947 - sort
40948 -) |
40949 - sed '
40950 - /^ac_cv_env_/b end
40951 - t clear
40952 - :clear
40953 - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
40954 - t end
40955 - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
40956 - :end' >>confcache
40957 -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
40958 - if test -w "$cache_file"; then
40959 - test "x$cache_file" != "x/dev/null" &&
40960 - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
40961 -$as_echo "$as_me: updating cache $cache_file" >&6;}
40962 - cat confcache >$cache_file
40963 - else
40964 - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
40965 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
40966 - fi
40967 -fi
40968 -rm -f confcache
40969 -
40970 -test "x$prefix" = xNONE && prefix=$ac_default_prefix
40971 -# Let make expand exec_prefix.
40972 -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
40973 -
40974 -DEFS=-DHAVE_CONFIG_H
40975 -
40976 -ac_libobjs=
40977 -ac_ltlibobjs=
40978 -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
40979 - # 1. Remove the extension, and $U if already installed.
40980 - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
40981 - ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
40982 - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
40983 - # will be set to the directory where LIBOBJS objects are built.
40984 - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
40985 - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
40986 -done
40987 -LIBOBJS=$ac_libobjs
40988 -
40989 -LTLIBOBJS=$ac_ltlibobjs
40990 -
40991 -
40992 -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
40993 - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
40994 -Usually this means the macro was only invoked conditionally." >&5
40995 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
40996 -Usually this means the macro was only invoked conditionally." >&2;}
40997 - { (exit 1); exit 1; }; }
40998 -fi
40999 -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
41000 - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
41001 -Usually this means the macro was only invoked conditionally." >&5
41002 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
41003 -Usually this means the macro was only invoked conditionally." >&2;}
41004 - { (exit 1); exit 1; }; }
41005 -fi
41006 -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
41007 - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
41008 -Usually this means the macro was only invoked conditionally." >&5
41009 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
41010 -Usually this means the macro was only invoked conditionally." >&2;}
41011 - { (exit 1); exit 1; }; }
41012 -fi
41013 -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
41014 - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
41015 -Usually this means the macro was only invoked conditionally." >&5
41016 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
41017 -Usually this means the macro was only invoked conditionally." >&2;}
41018 - { (exit 1); exit 1; }; }
41019 -fi
41020 -if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
41021 - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined.
41022 -Usually this means the macro was only invoked conditionally." >&5
41023 -$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined.
41024 -Usually this means the macro was only invoked conditionally." >&2;}
41025 - { (exit 1); exit 1; }; }
41026 -fi
41027 -
41028 - ac_config_commands="$ac_config_commands po/stamp-it"
41029 -
41030 -
41031 -if test -z "${ENABLE_NAUTILUSBURN_TRUE}" && test -z "${ENABLE_NAUTILUSBURN_FALSE}"; then
41032 - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_NAUTILUSBURN\" was never defined.
41033 -Usually this means the macro was only invoked conditionally." >&5
41034 -$as_echo "$as_me: error: conditional \"ENABLE_NAUTILUSBURN\" was never defined.
41035 -Usually this means the macro was only invoked conditionally." >&2;}
41036 - { (exit 1); exit 1; }; }
41037 -fi
41038 -if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
41039 - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ALSA\" was never defined.
41040 -Usually this means the macro was only invoked conditionally." >&5
41041 -$as_echo "$as_me: error: conditional \"HAVE_ALSA\" was never defined.
41042 -Usually this means the macro was only invoked conditionally." >&2;}
41043 - { (exit 1); exit 1; }; }
41044 -fi
41045 -if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then
41046 - { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86\" was never defined.
41047 -Usually this means the macro was only invoked conditionally." >&5
41048 -$as_echo "$as_me: error: conditional \"ARCH_X86\" was never defined.
41049 -Usually this means the macro was only invoked conditionally." >&2;}
41050 - { (exit 1); exit 1; }; }
41051 -fi
41052 -if test -z "${ARCH_X86_64_TRUE}" && test -z "${ARCH_X86_64_FALSE}"; then
41053 - { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86_64\" was never defined.
41054 -Usually this means the macro was only invoked conditionally." >&5
41055 -$as_echo "$as_me: error: conditional \"ARCH_X86_64\" was never defined.
41056 -Usually this means the macro was only invoked conditionally." >&2;}
41057 - { (exit 1); exit 1; }; }
41058 -fi
41059 -if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
41060 - { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_PPC\" was never defined.
41061 -Usually this means the macro was only invoked conditionally." >&5
41062 -$as_echo "$as_me: error: conditional \"ARCH_PPC\" was never defined.
41063 -Usually this means the macro was only invoked conditionally." >&2;}
41064 - { (exit 1); exit 1; }; }
41065 -fi
41066 -if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then
41067 - { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86\" was never defined.
41068 -Usually this means the macro was only invoked conditionally." >&5
41069 -$as_echo "$as_me: error: conditional \"ARCH_X86\" was never defined.
41070 -Usually this means the macro was only invoked conditionally." >&2;}
41071 - { (exit 1); exit 1; }; }
41072 -fi
41073 -if test -z "${ARCH_X86_64_TRUE}" && test -z "${ARCH_X86_64_FALSE}"; then
41074 - { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86_64\" was never defined.
41075 -Usually this means the macro was only invoked conditionally." >&5
41076 -$as_echo "$as_me: error: conditional \"ARCH_X86_64\" was never defined.
41077 -Usually this means the macro was only invoked conditionally." >&2;}
41078 - { (exit 1); exit 1; }; }
41079 -fi
41080 -if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
41081 - { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_PPC\" was never defined.
41082 -Usually this means the macro was only invoked conditionally." >&5
41083 -$as_echo "$as_me: error: conditional \"ARCH_PPC\" was never defined.
41084 -Usually this means the macro was only invoked conditionally." >&2;}
41085 - { (exit 1); exit 1; }; }
41086 -fi
41087 -
41088 -
41089 -: ${CONFIG_STATUS=./config.status}
41090 -ac_write_fail=0
41091 -ac_clean_files_save=$ac_clean_files
41092 -ac_clean_files="$ac_clean_files $CONFIG_STATUS"
41093 -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
41094 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
41095 -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41096 -#! $SHELL
41097 -# Generated by $as_me.
41098 -# Run this file to recreate the current configuration.
41099 -# Compiler output produced by configure, useful for debugging
41100 -# configure, is in config.log if it exists.
41101 -
41102 -debug=false
41103 -ac_cs_recheck=false
41104 -ac_cs_silent=false
41105 -SHELL=\${CONFIG_SHELL-$SHELL}
41106 -_ACEOF
41107 -
41108 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41109 -## --------------------- ##
41110 -## M4sh Initialization. ##
41111 -## --------------------- ##
41112 -
41113 -# Be more Bourne compatible
41114 -DUALCASE=1; export DUALCASE # for MKS sh
41115 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
41116 - emulate sh
41117 - NULLCMD=:
41118 - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
41119 - # is contrary to our usage. Disable this feature.
41120 - alias -g '${1+"$@"}'='"$@"'
41121 - setopt NO_GLOB_SUBST
41122 -else
41123 - case `(set -o) 2>/dev/null` in
41124 - *posix*) set -o posix ;;
41125 -esac
41126 -
41127 -fi
41128 -
41129 -
41130 -
41131 -
41132 -# PATH needs CR
41133 -# Avoid depending upon Character Ranges.
41134 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
41135 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
41136 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
41137 -as_cr_digits='0123456789'
41138 -as_cr_alnum=$as_cr_Letters$as_cr_digits
41139 -
41140 -as_nl='
41141 -'
41142 -export as_nl
41143 -# Printing a long string crashes Solaris 7 /usr/bin/printf.
41144 -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
41145 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
41146 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
41147 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
41148 - as_echo='printf %s\n'
41149 - as_echo_n='printf %s'
41150 -else
41151 - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
41152 - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
41153 - as_echo_n='/usr/ucb/echo -n'
41154 - else
41155 - as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
41156 - as_echo_n_body='eval
41157 - arg=$1;
41158 - case $arg in
41159 - *"$as_nl"*)
41160 - expr "X$arg" : "X\\(.*\\)$as_nl";
41161 - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
41162 - esac;
41163 - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
41164 - '
41165 - export as_echo_n_body
41166 - as_echo_n='sh -c $as_echo_n_body as_echo'
41167 - fi
41168 - export as_echo_body
41169 - as_echo='sh -c $as_echo_body as_echo'
41170 -fi
41171 -
41172 -# The user is always right.
41173 -if test "${PATH_SEPARATOR+set}" != set; then
41174 - PATH_SEPARATOR=:
41175 - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
41176 - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
41177 - PATH_SEPARATOR=';'
41178 - }
41179 -fi
41180 -
41181 -# Support unset when possible.
41182 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
41183 - as_unset=unset
41184 -else
41185 - as_unset=false
41186 -fi
41187 -
41188 -
41189 -# IFS
41190 -# We need space, tab and new line, in precisely that order. Quoting is
41191 -# there to prevent editors from complaining about space-tab.
41192 -# (If _AS_PATH_WALK were called with IFS unset, it would disable word
41193 -# splitting by setting IFS to empty value.)
41194 -IFS=" "" $as_nl"
41195 -
41196 -# Find who we are. Look in the path if we contain no directory separator.
41197 -case $0 in
41198 - *[\\/]* ) as_myself=$0 ;;
41199 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
41200 -for as_dir in $PATH
41201 -do
41202 - IFS=$as_save_IFS
41203 - test -z "$as_dir" && as_dir=.
41204 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
41205 -done
41206 -IFS=$as_save_IFS
41207 -
41208 - ;;
41209 -esac
41210 -# We did not find ourselves, most probably we were run as `sh COMMAND'
41211 -# in which case we are not to be found in the path.
41212 -if test "x$as_myself" = x; then
41213 - as_myself=$0
41214 -fi
41215 -if test ! -f "$as_myself"; then
41216 - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
41217 - { (exit 1); exit 1; }
41218 -fi
41219 -
41220 -# Work around bugs in pre-3.0 UWIN ksh.
41221 -for as_var in ENV MAIL MAILPATH
41222 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
41223 -done
41224 -PS1='$ '
41225 -PS2='> '
41226 -PS4='+ '
41227 -
41228 -# NLS nuisances.
41229 -LC_ALL=C
41230 -export LC_ALL
41231 -LANGUAGE=C
41232 -export LANGUAGE
41233 -
41234 -# Required to use basename.
41235 -if expr a : '\(a\)' >/dev/null 2>&1 &&
41236 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
41237 - as_expr=expr
41238 -else
41239 - as_expr=false
41240 -fi
41241 -
41242 -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
41243 - as_basename=basename
41244 -else
41245 - as_basename=false
41246 -fi
41247 -
41248 -
41249 -# Name of the executable.
41250 -as_me=`$as_basename -- "$0" ||
41251 -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
41252 - X"$0" : 'X\(//\)$' \| \
41253 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
41254 -$as_echo X/"$0" |
41255 - sed '/^.*\/\([^/][^/]*\)\/*$/{
41256 - s//\1/
41257 - q
41258 - }
41259 - /^X\/\(\/\/\)$/{
41260 - s//\1/
41261 - q
41262 - }
41263 - /^X\/\(\/\).*/{
41264 - s//\1/
41265 - q
41266 - }
41267 - s/.*/./; q'`
41268 -
41269 -# CDPATH.
41270 -$as_unset CDPATH
41271 -
41272 -
41273 -
41274 - as_lineno_1=$LINENO
41275 - as_lineno_2=$LINENO
41276 - test "x$as_lineno_1" != "x$as_lineno_2" &&
41277 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
41278 -
41279 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
41280 - # uniformly replaced by the line number. The first 'sed' inserts a
41281 - # line-number line after each line using $LINENO; the second 'sed'
41282 - # does the real work. The second script uses 'N' to pair each
41283 - # line-number line with the line containing $LINENO, and appends
41284 - # trailing '-' during substitution so that $LINENO is not a special
41285 - # case at line end.
41286 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
41287 - # scripts with optimization help from Paolo Bonzini. Blame Lee
41288 - # E. McMahon (1931-1989) for sed's syntax. :-)
41289 - sed -n '
41290 - p
41291 - /[$]LINENO/=
41292 - ' <$as_myself |
41293 - sed '
41294 - s/[$]LINENO.*/&-/
41295 - t lineno
41296 - b
41297 - :lineno
41298 - N
41299 - :loop
41300 - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
41301 - t loop
41302 - s/-\n.*//
41303 - ' >$as_me.lineno &&
41304 - chmod +x "$as_me.lineno" ||
41305 - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
41306 - { (exit 1); exit 1; }; }
41307 -
41308 - # Don't try to exec as it changes $[0], causing all sort of problems
41309 - # (the dirname of $[0] is not the place where we might find the
41310 - # original and so on. Autoconf is especially sensitive to this).
41311 - . "./$as_me.lineno"
41312 - # Exit status is that of the last command.
41313 - exit
41314 -}
41315 -
41316 -
41317 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
41318 - as_dirname=dirname
41319 -else
41320 - as_dirname=false
41321 -fi
41322 -
41323 -ECHO_C= ECHO_N= ECHO_T=
41324 -case `echo -n x` in
41325 --n*)
41326 - case `echo 'x\c'` in
41327 - *c*) ECHO_T=' ';; # ECHO_T is single tab character.
41328 - *) ECHO_C='\c';;
41329 - esac;;
41330 -*)
41331 - ECHO_N='-n';;
41332 -esac
41333 -if expr a : '\(a\)' >/dev/null 2>&1 &&
41334 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
41335 - as_expr=expr
41336 -else
41337 - as_expr=false
41338 -fi
41339 -
41340 -rm -f conf$$ conf$$.exe conf$$.file
41341 -if test -d conf$$.dir; then
41342 - rm -f conf$$.dir/conf$$.file
41343 -else
41344 - rm -f conf$$.dir
41345 - mkdir conf$$.dir 2>/dev/null
41346 -fi
41347 -if (echo >conf$$.file) 2>/dev/null; then
41348 - if ln -s conf$$.file conf$$ 2>/dev/null; then
41349 - as_ln_s='ln -s'
41350 - # ... but there are two gotchas:
41351 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
41352 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
41353 - # In both cases, we have to default to `cp -p'.
41354 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
41355 - as_ln_s='cp -p'
41356 - elif ln conf$$.file conf$$ 2>/dev/null; then
41357 - as_ln_s=ln
41358 - else
41359 - as_ln_s='cp -p'
41360 - fi
41361 -else
41362 - as_ln_s='cp -p'
41363 -fi
41364 -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
41365 -rmdir conf$$.dir 2>/dev/null
41366 -
41367 -if mkdir -p . 2>/dev/null; then
41368 - as_mkdir_p=:
41369 -else
41370 - test -d ./-p && rmdir ./-p
41371 - as_mkdir_p=false
41372 -fi
41373 -
41374 -if test -x / >/dev/null 2>&1; then
41375 - as_test_x='test -x'
41376 -else
41377 - if ls -dL / >/dev/null 2>&1; then
41378 - as_ls_L_option=L
41379 - else
41380 - as_ls_L_option=
41381 - fi
41382 - as_test_x='
41383 - eval sh -c '\''
41384 - if test -d "$1"; then
41385 - test -d "$1/.";
41386 - else
41387 - case $1 in
41388 - -*)set "./$1";;
41389 - esac;
41390 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
41391 - ???[sx]*):;;*)false;;esac;fi
41392 - '\'' sh
41393 - '
41394 -fi
41395 -as_executable_p=$as_test_x
41396 -
41397 -# Sed expression to map a string onto a valid CPP name.
41398 -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
41399 -
41400 -# Sed expression to map a string onto a valid variable name.
41401 -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
41402 -
41403 -
41404 -exec 6>&1
41405 -
41406 -# Save the log message, to keep $[0] and so on meaningful, and to
41407 -# report actual input values of CONFIG_FILES etc. instead of their
41408 -# values after options handling.
41409 -ac_log="
41410 -This file was extended by $as_me, which was
41411 -generated by GNU Autoconf 2.63. Invocation command line was
41412 -
41413 - CONFIG_FILES = $CONFIG_FILES
41414 - CONFIG_HEADERS = $CONFIG_HEADERS
41415 - CONFIG_LINKS = $CONFIG_LINKS
41416 - CONFIG_COMMANDS = $CONFIG_COMMANDS
41417 - $ $0 $@
41418 -
41419 -on `(hostname || uname -n) 2>/dev/null | sed 1q`
41420 -"
41421 -
41422 -_ACEOF
41423 -
41424 -case $ac_config_files in *"
41425 -"*) set x $ac_config_files; shift; ac_config_files=$*;;
41426 -esac
41427 -
41428 -case $ac_config_headers in *"
41429 -"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
41430 -esac
41431 -
41432 -
41433 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41434 -# Files that config.status was made for.
41435 -config_files="$ac_config_files"
41436 -config_headers="$ac_config_headers"
41437 -config_commands="$ac_config_commands"
41438 -
41439 -_ACEOF
41440 -
41441 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41442 -ac_cs_usage="\
41443 -\`$as_me' instantiates files from templates according to the
41444 -current configuration.
41445 -
41446 -Usage: $0 [OPTION]... [FILE]...
41447 -
41448 - -h, --help print this help, then exit
41449 - -V, --version print version number and configuration settings, then exit
41450 - -q, --quiet, --silent
41451 - do not print progress messages
41452 - -d, --debug don't remove temporary files
41453 - --recheck update $as_me by reconfiguring in the same conditions
41454 - --file=FILE[:TEMPLATE]
41455 - instantiate the configuration file FILE
41456 - --header=FILE[:TEMPLATE]
41457 - instantiate the configuration header FILE
41458 -
41459 -Configuration files:
41460 -$config_files
41461 -
41462 -Configuration headers:
41463 -$config_headers
41464 -
41465 -Configuration commands:
41466 -$config_commands
41467 -
41468 -Report bugs to <bug-autoconf@gnu.org>."
41469 -
41470 -_ACEOF
41471 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41472 -ac_cs_version="\\
41473 -config.status
41474 -configured by $0, generated by GNU Autoconf 2.63,
41475 - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
41476 -
41477 -Copyright (C) 2008 Free Software Foundation, Inc.
41478 -This config.status script is free software; the Free Software Foundation
41479 -gives unlimited permission to copy, distribute and modify it."
41480 -
41481 -ac_pwd='$ac_pwd'
41482 -srcdir='$srcdir'
41483 -INSTALL='$INSTALL'
41484 -MKDIR_P='$MKDIR_P'
41485 -AWK='$AWK'
41486 -test -n "\$AWK" || AWK=awk
41487 -_ACEOF
41488 -
41489 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41490 -# The default lists apply if the user does not specify any file.
41491 -ac_need_defaults=:
41492 -while test $# != 0
41493 -do
41494 - case $1 in
41495 - --*=*)
41496 - ac_option=`expr "X$1" : 'X\([^=]*\)='`
41497 - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
41498 - ac_shift=:
41499 - ;;
41500 - *)
41501 - ac_option=$1
41502 - ac_optarg=$2
41503 - ac_shift=shift
41504 - ;;
41505 - esac
41506 -
41507 - case $ac_option in
41508 - # Handling of the options.
41509 - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
41510 - ac_cs_recheck=: ;;
41511 - --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
41512 - $as_echo "$ac_cs_version"; exit ;;
41513 - --debug | --debu | --deb | --de | --d | -d )
41514 - debug=: ;;
41515 - --file | --fil | --fi | --f )
41516 - $ac_shift
41517 - case $ac_optarg in
41518 - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
41519 - esac
41520 - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
41521 - ac_need_defaults=false;;
41522 - --header | --heade | --head | --hea )
41523 - $ac_shift
41524 - case $ac_optarg in
41525 - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
41526 - esac
41527 - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
41528 - ac_need_defaults=false;;
41529 - --he | --h)
41530 - # Conflict between --help and --header
41531 - { $as_echo "$as_me: error: ambiguous option: $1
41532 -Try \`$0 --help' for more information." >&2
41533 - { (exit 1); exit 1; }; };;
41534 - --help | --hel | -h )
41535 - $as_echo "$ac_cs_usage"; exit ;;
41536 - -q | -quiet | --quiet | --quie | --qui | --qu | --q \
41537 - | -silent | --silent | --silen | --sile | --sil | --si | --s)
41538 - ac_cs_silent=: ;;
41539 -
41540 - # This is an error.
41541 - -*) { $as_echo "$as_me: error: unrecognized option: $1
41542 -Try \`$0 --help' for more information." >&2
41543 - { (exit 1); exit 1; }; } ;;
41544 -
41545 - *) ac_config_targets="$ac_config_targets $1"
41546 - ac_need_defaults=false ;;
41547 -
41548 - esac
41549 - shift
41550 -done
41551 -
41552 -ac_configure_extra_args=
41553 -
41554 -if $ac_cs_silent; then
41555 - exec 6>/dev/null
41556 - ac_configure_extra_args="$ac_configure_extra_args --silent"
41557 -fi
41558 -
41559 -_ACEOF
41560 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41561 -if \$ac_cs_recheck; then
41562 - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
41563 - shift
41564 - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
41565 - CONFIG_SHELL='$SHELL'
41566 - export CONFIG_SHELL
41567 - exec "\$@"
41568 -fi
41569 -
41570 -_ACEOF
41571 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41572 -exec 5>>config.log
41573 -{
41574 - echo
41575 - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
41576 -## Running $as_me. ##
41577 -_ASBOX
41578 - $as_echo "$ac_log"
41579 -} >&5
41580 -
41581 -_ACEOF
41582 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41583 -#
41584 -# INIT-COMMANDS
41585 -#
41586 -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
41587 -# Capture the value of obsolete ALL_LINGUAS because we need it to compute
41588 - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
41589 - # from automake.
41590 - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
41591 - # Capture the value of LINGUAS because we need it to compute CATALOGS.
41592 - LINGUAS="${LINGUAS-%UNSET%}"
41593 -
41594 -
41595 -_ACEOF
41596 -
41597 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41598 -
41599 -# Handling of arguments.
41600 -for ac_config_target in $ac_config_targets
41601 -do
41602 - case $ac_config_target in
41603 - "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h:include/config.h.in" ;;
41604 - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
41605 - "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
41606 - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
41607 - "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
41608 - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
41609 - "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
41610 - "libpcsxcore/Makefile") CONFIG_FILES="$CONFIG_FILES libpcsxcore/Makefile" ;;
41611 - "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;;
41612 - "plugins/dfinput/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfinput/Makefile" ;;
41613 - "plugins/dfsound/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfsound/Makefile" ;;
41614 - "plugins/dfxvideo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfxvideo/Makefile" ;;
41615 - "plugins/dfcdrom/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfcdrom/Makefile" ;;
41616 - "plugins/dfiso/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfiso/Makefile" ;;
41617 - "plugins/dfOpenGL/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfOpenGL/Makefile" ;;
41618 - "plugins/dfbinimage2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfbinimage2/Makefile" ;;
41619 - "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
41620 - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
41621 - "plugins/dfbinimage/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfbinimage/Makefile" ;;
41622 - "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
41623 -
41624 - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
41625 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
41626 - { (exit 1); exit 1; }; };;
41627 - esac
41628 -done
41629 -
41630 -
41631 -# If the user did not use the arguments to specify the items to instantiate,
41632 -# then the envvar interface is used. Set only those that are not.
41633 -# We use the long form for the default assignment because of an extremely
41634 -# bizarre bug on SunOS 4.1.3.
41635 -if $ac_need_defaults; then
41636 - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
41637 - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
41638 - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
41639 -fi
41640 -
41641 -# Have a temporary directory for convenience. Make it in the build tree
41642 -# simply because there is no reason against having it here, and in addition,
41643 -# creating and moving files from /tmp can sometimes cause problems.
41644 -# Hook for its removal unless debugging.
41645 -# Note that there is a small window in which the directory will not be cleaned:
41646 -# after its creation but before its name has been assigned to `$tmp'.
41647 -$debug ||
41648 -{
41649 - tmp=
41650 - trap 'exit_status=$?
41651 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
41652 -' 0
41653 - trap '{ (exit 1); exit 1; }' 1 2 13 15
41654 -}
41655 -# Create a (secure) tmp directory for tmp files.
41656 -
41657 -{
41658 - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
41659 - test -n "$tmp" && test -d "$tmp"
41660 -} ||
41661 -{
41662 - tmp=./conf$$-$RANDOM
41663 - (umask 077 && mkdir "$tmp")
41664 -} ||
41665 -{
41666 - $as_echo "$as_me: cannot create a temporary directory in ." >&2
41667 - { (exit 1); exit 1; }
41668 -}
41669 -
41670 -# Set up the scripts for CONFIG_FILES section.
41671 -# No need to generate them if there are no CONFIG_FILES.
41672 -# This happens for instance with `./config.status config.h'.
41673 -if test -n "$CONFIG_FILES"; then
41674 -
41675 -
41676 -ac_cr=' '
41677 -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
41678 -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
41679 - ac_cs_awk_cr='\\r'
41680 -else
41681 - ac_cs_awk_cr=$ac_cr
41682 -fi
41683 -
41684 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
41685 -_ACEOF
41686 -
41687 -
41688 -{
41689 - echo "cat >conf$$subs.awk <<_ACEOF" &&
41690 - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
41691 - echo "_ACEOF"
41692 -} >conf$$subs.sh ||
41693 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
41694 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
41695 - { (exit 1); exit 1; }; }
41696 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
41697 -ac_delim='%!_!# '
41698 -for ac_last_try in false false false false false :; do
41699 - . ./conf$$subs.sh ||
41700 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
41701 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
41702 - { (exit 1); exit 1; }; }
41703 -
41704 - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
41705 - if test $ac_delim_n = $ac_delim_num; then
41706 - break
41707 - elif $ac_last_try; then
41708 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
41709 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
41710 - { (exit 1); exit 1; }; }
41711 - else
41712 - ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
41713 - fi
41714 -done
41715 -rm -f conf$$subs.sh
41716 -
41717 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41718 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
41719 -_ACEOF
41720 -sed -n '
41721 -h
41722 -s/^/S["/; s/!.*/"]=/
41723 -p
41724 -g
41725 -s/^[^!]*!//
41726 -:repl
41727 -t repl
41728 -s/'"$ac_delim"'$//
41729 -t delim
41730 -:nl
41731 -h
41732 -s/\(.\{148\}\).*/\1/
41733 -t more1
41734 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
41735 -p
41736 -n
41737 -b repl
41738 -:more1
41739 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/
41740 -p
41741 -g
41742 -s/.\{148\}//
41743 -t nl
41744 -:delim
41745 -h
41746 -s/\(.\{148\}\).*/\1/
41747 -t more2
41748 -s/["\\]/\\&/g; s/^/"/; s/$/"/
41749 -p
41750 -b
41751 -:more2
41752 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/
41753 -p
41754 -g
41755 -s/.\{148\}//
41756 -t delim
41757 -' <conf$$subs.awk | sed '
41758 -/^[^""]/{
41759 - N
41760 - s/\n//
41761 -}
41762 -' >>$CONFIG_STATUS || ac_write_fail=1
41763 -rm -f conf$$subs.awk
41764 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41765 -_ACAWK
41766 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
41767 - for (key in S) S_is_set[key] = 1
41768 - FS = "\a"
41769 -
41770 -}
41771 -{
41772 - line = $ 0
41773 - nfields = split(line, field, "@")
41774 - substed = 0
41775 - len = length(field[1])
41776 - for (i = 2; i < nfields; i++) {
41777 - key = field[i]
41778 - keylen = length(key)
41779 - if (S_is_set[key]) {
41780 - value = S[key]
41781 - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
41782 - len += length(value) + length(field[++i])
41783 - substed = 1
41784 - } else
41785 - len += 1 + keylen
41786 - }
41787 -
41788 - print line
41789 -}
41790 -
41791 -_ACAWK
41792 -_ACEOF
41793 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41794 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
41795 - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
41796 -else
41797 - cat
41798 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
41799 - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
41800 -$as_echo "$as_me: error: could not setup config files machinery" >&2;}
41801 - { (exit 1); exit 1; }; }
41802 -_ACEOF
41803 -
41804 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
41805 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
41806 -# trailing colons and then remove the whole line if VPATH becomes empty
41807 -# (actually we leave an empty line to preserve line numbers).
41808 -if test "x$srcdir" = x.; then
41809 - ac_vpsub='/^[ ]*VPATH[ ]*=/{
41810 -s/:*\$(srcdir):*/:/
41811 -s/:*\${srcdir}:*/:/
41812 -s/:*@srcdir@:*/:/
41813 -s/^\([^=]*=[ ]*\):*/\1/
41814 -s/:*$//
41815 -s/^[^=]*=[ ]*$//
41816 -}'
41817 -fi
41818 -
41819 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41820 -fi # test -n "$CONFIG_FILES"
41821 -
41822 -# Set up the scripts for CONFIG_HEADERS section.
41823 -# No need to generate them if there are no CONFIG_HEADERS.
41824 -# This happens for instance with `./config.status Makefile'.
41825 -if test -n "$CONFIG_HEADERS"; then
41826 -cat >"$tmp/defines.awk" <<\_ACAWK ||
41827 -BEGIN {
41828 -_ACEOF
41829 -
41830 -# Transform confdefs.h into an awk script `defines.awk', embedded as
41831 -# here-document in config.status, that substitutes the proper values into
41832 -# config.h.in to produce config.h.
41833 -
41834 -# Create a delimiter string that does not exist in confdefs.h, to ease
41835 -# handling of long lines.
41836 -ac_delim='%!_!# '
41837 -for ac_last_try in false false :; do
41838 - ac_t=`sed -n "/$ac_delim/p" confdefs.h`
41839 - if test -z "$ac_t"; then
41840 - break
41841 - elif $ac_last_try; then
41842 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
41843 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
41844 - { (exit 1); exit 1; }; }
41845 - else
41846 - ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
41847 - fi
41848 -done
41849 -
41850 -# For the awk script, D is an array of macro values keyed by name,
41851 -# likewise P contains macro parameters if any. Preserve backslash
41852 -# newline sequences.
41853 -
41854 -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
41855 -sed -n '
41856 -s/.\{148\}/&'"$ac_delim"'/g
41857 -t rset
41858 -:rset
41859 -s/^[ ]*#[ ]*define[ ][ ]*/ /
41860 -t def
41861 -d
41862 -:def
41863 -s/\\$//
41864 -t bsnl
41865 -s/["\\]/\\&/g
41866 -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
41867 -D["\1"]=" \3"/p
41868 -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
41869 -d
41870 -:bsnl
41871 -s/["\\]/\\&/g
41872 -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
41873 -D["\1"]=" \3\\\\\\n"\\/p
41874 -t cont
41875 -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
41876 -t cont
41877 -d
41878 -:cont
41879 -n
41880 -s/.\{148\}/&'"$ac_delim"'/g
41881 -t clear
41882 -:clear
41883 -s/\\$//
41884 -t bsnlc
41885 -s/["\\]/\\&/g; s/^/"/; s/$/"/p
41886 -d
41887 -:bsnlc
41888 -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
41889 -b cont
41890 -' <confdefs.h | sed '
41891 -s/'"$ac_delim"'/"\\\
41892 -"/g' >>$CONFIG_STATUS || ac_write_fail=1
41893 -
41894 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
41895 - for (key in D) D_is_set[key] = 1
41896 - FS = "\a"
41897 -}
41898 -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
41899 - line = \$ 0
41900 - split(line, arg, " ")
41901 - if (arg[1] == "#") {
41902 - defundef = arg[2]
41903 - mac1 = arg[3]
41904 - } else {
41905 - defundef = substr(arg[1], 2)
41906 - mac1 = arg[2]
41907 - }
41908 - split(mac1, mac2, "(") #)
41909 - macro = mac2[1]
41910 - prefix = substr(line, 1, index(line, defundef) - 1)
41911 - if (D_is_set[macro]) {
41912 - # Preserve the white space surrounding the "#".
41913 - print prefix "define", macro P[macro] D[macro]
41914 - next
41915 - } else {
41916 - # Replace #undef with comments. This is necessary, for example,
41917 - # in the case of _POSIX_SOURCE, which is predefined and required
41918 - # on some systems where configure will not decide to define it.
41919 - if (defundef == "undef") {
41920 - print "/*", prefix defundef, macro, "*/"
41921 - next
41922 - }
41923 - }
41924 -}
41925 -{ print }
41926 -_ACAWK
41927 -_ACEOF
41928 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
41929 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
41930 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
41931 - { (exit 1); exit 1; }; }
41932 -fi # test -n "$CONFIG_HEADERS"
41933 -
41934 -
41935 -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
41936 -shift
41937 -for ac_tag
41938 -do
41939 - case $ac_tag in
41940 - :[FHLC]) ac_mode=$ac_tag; continue;;
41941 - esac
41942 - case $ac_mode$ac_tag in
41943 - :[FHL]*:*);;
41944 - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
41945 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
41946 - { (exit 1); exit 1; }; };;
41947 - :[FH]-) ac_tag=-:-;;
41948 - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
41949 - esac
41950 - ac_save_IFS=$IFS
41951 - IFS=:
41952 - set x $ac_tag
41953 - IFS=$ac_save_IFS
41954 - shift
41955 - ac_file=$1
41956 - shift
41957 -
41958 - case $ac_mode in
41959 - :L) ac_source=$1;;
41960 - :[FH])
41961 - ac_file_inputs=
41962 - for ac_f
41963 - do
41964 - case $ac_f in
41965 - -) ac_f="$tmp/stdin";;
41966 - *) # Look for the file first in the build tree, then in the source tree
41967 - # (if the path is not absolute). The absolute path cannot be DOS-style,
41968 - # because $ac_f cannot contain `:'.
41969 - test -f "$ac_f" ||
41970 - case $ac_f in
41971 - [\\/$]*) false;;
41972 - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
41973 - esac ||
41974 - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
41975 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
41976 - { (exit 1); exit 1; }; };;
41977 - esac
41978 - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
41979 - ac_file_inputs="$ac_file_inputs '$ac_f'"
41980 - done
41981 -
41982 - # Let's still pretend it is `configure' which instantiates (i.e., don't
41983 - # use $as_me), people would be surprised to read:
41984 - # /* config.h. Generated by config.status. */
41985 - configure_input='Generated from '`
41986 - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
41987 - `' by configure.'
41988 - if test x"$ac_file" != x-; then
41989 - configure_input="$ac_file. $configure_input"
41990 - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
41991 -$as_echo "$as_me: creating $ac_file" >&6;}
41992 - fi
41993 - # Neutralize special characters interpreted by sed in replacement strings.
41994 - case $configure_input in #(
41995 - *\&* | *\|* | *\\* )
41996 - ac_sed_conf_input=`$as_echo "$configure_input" |
41997 - sed 's/[\\\\&|]/\\\\&/g'`;; #(
41998 - *) ac_sed_conf_input=$configure_input;;
41999 - esac
42000 -
42001 - case $ac_tag in
42002 - *:-:* | *:-) cat >"$tmp/stdin" \
42003 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
42004 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
42005 - { (exit 1); exit 1; }; } ;;
42006 - esac
42007 - ;;
42008 - esac
42009 -
42010 - ac_dir=`$as_dirname -- "$ac_file" ||
42011 -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
42012 - X"$ac_file" : 'X\(//\)[^/]' \| \
42013 - X"$ac_file" : 'X\(//\)$' \| \
42014 - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
42015 -$as_echo X"$ac_file" |
42016 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
42017 - s//\1/
42018 - q
42019 - }
42020 - /^X\(\/\/\)[^/].*/{
42021 - s//\1/
42022 - q
42023 - }
42024 - /^X\(\/\/\)$/{
42025 - s//\1/
42026 - q
42027 - }
42028 - /^X\(\/\).*/{
42029 - s//\1/
42030 - q
42031 - }
42032 - s/.*/./; q'`
42033 - { as_dir="$ac_dir"
42034 - case $as_dir in #(
42035 - -*) as_dir=./$as_dir;;
42036 - esac
42037 - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
42038 - as_dirs=
42039 - while :; do
42040 - case $as_dir in #(
42041 - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
42042 - *) as_qdir=$as_dir;;
42043 - esac
42044 - as_dirs="'$as_qdir' $as_dirs"
42045 - as_dir=`$as_dirname -- "$as_dir" ||
42046 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
42047 - X"$as_dir" : 'X\(//\)[^/]' \| \
42048 - X"$as_dir" : 'X\(//\)$' \| \
42049 - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
42050 -$as_echo X"$as_dir" |
42051 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
42052 - s//\1/
42053 - q
42054 - }
42055 - /^X\(\/\/\)[^/].*/{
42056 - s//\1/
42057 - q
42058 - }
42059 - /^X\(\/\/\)$/{
42060 - s//\1/
42061 - q
42062 - }
42063 - /^X\(\/\).*/{
42064 - s//\1/
42065 - q
42066 - }
42067 - s/.*/./; q'`
42068 - test -d "$as_dir" && break
42069 - done
42070 - test -z "$as_dirs" || eval "mkdir $as_dirs"
42071 - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
42072 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
42073 - { (exit 1); exit 1; }; }; }
42074 - ac_builddir=.
42075 -
42076 -case "$ac_dir" in
42077 -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
42078 -*)
42079 - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
42080 - # A ".." for each directory in $ac_dir_suffix.
42081 - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
42082 - case $ac_top_builddir_sub in
42083 - "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
42084 - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
42085 - esac ;;
42086 -esac
42087 -ac_abs_top_builddir=$ac_pwd
42088 -ac_abs_builddir=$ac_pwd$ac_dir_suffix
42089 -# for backward compatibility:
42090 -ac_top_builddir=$ac_top_build_prefix
42091 -
42092 -case $srcdir in
42093 - .) # We are building in place.
42094 - ac_srcdir=.
42095 - ac_top_srcdir=$ac_top_builddir_sub
42096 - ac_abs_top_srcdir=$ac_pwd ;;
42097 - [\\/]* | ?:[\\/]* ) # Absolute name.
42098 - ac_srcdir=$srcdir$ac_dir_suffix;
42099 - ac_top_srcdir=$srcdir
42100 - ac_abs_top_srcdir=$srcdir ;;
42101 - *) # Relative name.
42102 - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
42103 - ac_top_srcdir=$ac_top_build_prefix$srcdir
42104 - ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
42105 -esac
42106 -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
42107 -
42108 -
42109 - case $ac_mode in
42110 - :F)
42111 - #
42112 - # CONFIG_FILE
42113 - #
42114 -
42115 - case $INSTALL in
42116 - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
42117 - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
42118 - esac
42119 - ac_MKDIR_P=$MKDIR_P
42120 - case $MKDIR_P in
42121 - [\\/$]* | ?:[\\/]* ) ;;
42122 - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
42123 - esac
42124 -_ACEOF
42125 -
42126 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
42127 -# If the template does not know about datarootdir, expand it.
42128 -# FIXME: This hack should be removed a few years after 2.60.
42129 -ac_datarootdir_hack=; ac_datarootdir_seen=
42130 -
42131 -ac_sed_dataroot='
42132 -/datarootdir/ {
42133 - p
42134 - q
42135 -}
42136 -/@datadir@/p
42137 -/@docdir@/p
42138 -/@infodir@/p
42139 -/@localedir@/p
42140 -/@mandir@/p
42141 -'
42142 -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
42143 -*datarootdir*) ac_datarootdir_seen=yes;;
42144 -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
42145 - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
42146 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
42147 -_ACEOF
42148 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
42149 - ac_datarootdir_hack='
42150 - s&@datadir@&$datadir&g
42151 - s&@docdir@&$docdir&g
42152 - s&@infodir@&$infodir&g
42153 - s&@localedir@&$localedir&g
42154 - s&@mandir@&$mandir&g
42155 - s&\\\${datarootdir}&$datarootdir&g' ;;
42156 -esac
42157 -_ACEOF
42158 -
42159 -# Neutralize VPATH when `$srcdir' = `.'.
42160 -# Shell code in configure.ac might set extrasub.
42161 -# FIXME: do we really want to maintain this feature?
42162 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
42163 -ac_sed_extra="$ac_vpsub
42164 -$extrasub
42165 -_ACEOF
42166 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
42167 -:t
42168 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
42169 -s|@configure_input@|$ac_sed_conf_input|;t t
42170 -s&@top_builddir@&$ac_top_builddir_sub&;t t
42171 -s&@top_build_prefix@&$ac_top_build_prefix&;t t
42172 -s&@srcdir@&$ac_srcdir&;t t
42173 -s&@abs_srcdir@&$ac_abs_srcdir&;t t
42174 -s&@top_srcdir@&$ac_top_srcdir&;t t
42175 -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
42176 -s&@builddir@&$ac_builddir&;t t
42177 -s&@abs_builddir@&$ac_abs_builddir&;t t
42178 -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
42179 -s&@INSTALL@&$ac_INSTALL&;t t
42180 -s&@MKDIR_P@&$ac_MKDIR_P&;t t
42181 -$ac_datarootdir_hack
42182 -"
42183 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
42184 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
42185 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
42186 - { (exit 1); exit 1; }; }
42187 -
42188 -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
42189 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
42190 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
42191 - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
42192 -which seems to be undefined. Please make sure it is defined." >&5
42193 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
42194 -which seems to be undefined. Please make sure it is defined." >&2;}
42195 -
42196 - rm -f "$tmp/stdin"
42197 - case $ac_file in
42198 - -) cat "$tmp/out" && rm -f "$tmp/out";;
42199 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
42200 - esac \
42201 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
42202 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
42203 - { (exit 1); exit 1; }; }
42204 - ;;
42205 - :H)
42206 - #
42207 - # CONFIG_HEADER
42208 - #
42209 - if test x"$ac_file" != x-; then
42210 - {
42211 - $as_echo "/* $configure_input */" \
42212 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
42213 - } >"$tmp/config.h" \
42214 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
42215 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
42216 - { (exit 1); exit 1; }; }
42217 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
42218 - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
42219 -$as_echo "$as_me: $ac_file is unchanged" >&6;}
42220 - else
42221 - rm -f "$ac_file"
42222 - mv "$tmp/config.h" "$ac_file" \
42223 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
42224 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
42225 - { (exit 1); exit 1; }; }
42226 - fi
42227 - else
42228 - $as_echo "/* $configure_input */" \
42229 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
42230 - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
42231 -$as_echo "$as_me: error: could not create -" >&2;}
42232 - { (exit 1); exit 1; }; }
42233 - fi
42234 -# Compute "$ac_file"'s index in $config_headers.
42235 -_am_arg="$ac_file"
42236 -_am_stamp_count=1
42237 -for _am_header in $config_headers :; do
42238 - case $_am_header in
42239 - $_am_arg | $_am_arg:* )
42240 - break ;;
42241 - * )
42242 - _am_stamp_count=`expr $_am_stamp_count + 1` ;;
42243 - esac
42244 -done
42245 -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
42246 -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
42247 - X"$_am_arg" : 'X\(//\)[^/]' \| \
42248 - X"$_am_arg" : 'X\(//\)$' \| \
42249 - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
42250 -$as_echo X"$_am_arg" |
42251 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
42252 - s//\1/
42253 - q
42254 - }
42255 - /^X\(\/\/\)[^/].*/{
42256 - s//\1/
42257 - q
42258 - }
42259 - /^X\(\/\/\)$/{
42260 - s//\1/
42261 - q
42262 - }
42263 - /^X\(\/\).*/{
42264 - s//\1/
42265 - q
42266 - }
42267 - s/.*/./; q'`/stamp-h$_am_stamp_count
42268 - ;;
42269 -
42270 - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
42271 -$as_echo "$as_me: executing $ac_file commands" >&6;}
42272 - ;;
42273 - esac
42274 -
42275 -
42276 - case $ac_file$ac_mode in
42277 - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
42278 - # Strip MF so we end up with the name of the file.
42279 - mf=`echo "$mf" | sed -e 's/:.*$//'`
42280 - # Check whether this is an Automake generated Makefile or not.
42281 - # We used to match only the files named `Makefile.in', but
42282 - # some people rename them; so instead we look at the file content.
42283 - # Grep'ing the first line is not enough: some people post-process
42284 - # each Makefile.in and add a new line on top of each file to say so.
42285 - # Grep'ing the whole file is not good either: AIX grep has a line
42286 - # limit of 2048, but all sed's we know have understand at least 4000.
42287 - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
42288 - dirpart=`$as_dirname -- "$mf" ||
42289 -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
42290 - X"$mf" : 'X\(//\)[^/]' \| \
42291 - X"$mf" : 'X\(//\)$' \| \
42292 - X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
42293 -$as_echo X"$mf" |
42294 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
42295 - s//\1/
42296 - q
42297 - }
42298 - /^X\(\/\/\)[^/].*/{
42299 - s//\1/
42300 - q
42301 - }
42302 - /^X\(\/\/\)$/{
42303 - s//\1/
42304 - q
42305 - }
42306 - /^X\(\/\).*/{
42307 - s//\1/
42308 - q
42309 - }
42310 - s/.*/./; q'`
42311 - else
42312 - continue
42313 - fi
42314 - # Extract the definition of DEPDIR, am__include, and am__quote
42315 - # from the Makefile without running `make'.
42316 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
42317 - test -z "$DEPDIR" && continue
42318 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
42319 - test -z "am__include" && continue
42320 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
42321 - # When using ansi2knr, U may be empty or an underscore; expand it
42322 - U=`sed -n 's/^U = //p' < "$mf"`
42323 - # Find all dependency output files, they are included files with
42324 - # $(DEPDIR) in their names. We invoke sed twice because it is the
42325 - # simplest approach to changing $(DEPDIR) to its actual value in the
42326 - # expansion.
42327 - for file in `sed -n "
42328 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
42329 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
42330 - # Make sure the directory exists.
42331 - test -f "$dirpart/$file" && continue
42332 - fdir=`$as_dirname -- "$file" ||
42333 -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
42334 - X"$file" : 'X\(//\)[^/]' \| \
42335 - X"$file" : 'X\(//\)$' \| \
42336 - X"$file" : 'X\(/\)' \| . 2>/dev/null ||
42337 -$as_echo X"$file" |
42338 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
42339 - s//\1/
42340 - q
42341 - }
42342 - /^X\(\/\/\)[^/].*/{
42343 - s//\1/
42344 - q
42345 - }
42346 - /^X\(\/\/\)$/{
42347 - s//\1/
42348 - q
42349 - }
42350 - /^X\(\/\).*/{
42351 - s//\1/
42352 - q
42353 - }
42354 - s/.*/./; q'`
42355 - { as_dir=$dirpart/$fdir
42356 - case $as_dir in #(
42357 - -*) as_dir=./$as_dir;;
42358 - esac
42359 - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
42360 - as_dirs=
42361 - while :; do
42362 - case $as_dir in #(
42363 - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
42364 - *) as_qdir=$as_dir;;
42365 - esac
42366 - as_dirs="'$as_qdir' $as_dirs"
42367 - as_dir=`$as_dirname -- "$as_dir" ||
42368 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
42369 - X"$as_dir" : 'X\(//\)[^/]' \| \
42370 - X"$as_dir" : 'X\(//\)$' \| \
42371 - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
42372 -$as_echo X"$as_dir" |
42373 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
42374 - s//\1/
42375 - q
42376 - }
42377 - /^X\(\/\/\)[^/].*/{
42378 - s//\1/
42379 - q
42380 - }
42381 - /^X\(\/\/\)$/{
42382 - s//\1/
42383 - q
42384 - }
42385 - /^X\(\/\).*/{
42386 - s//\1/
42387 - q
42388 - }
42389 - s/.*/./; q'`
42390 - test -d "$as_dir" && break
42391 - done
42392 - test -z "$as_dirs" || eval "mkdir $as_dirs"
42393 - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
42394 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
42395 - { (exit 1); exit 1; }; }; }
42396 - # echo "creating $dirpart/$file"
42397 - echo '# dummy' > "$dirpart/$file"
42398 - done
42399 -done
42400 - ;;
42401 - "default-1":C)
42402 - for ac_file in $CONFIG_FILES; do
42403 - # Support "outfile[:infile[:infile...]]"
42404 - case "$ac_file" in
42405 - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
42406 - esac
42407 - # PO directories have a Makefile.in generated from Makefile.in.in.
42408 - case "$ac_file" in */Makefile.in)
42409 - # Adjust a relative srcdir.
42410 - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
42411 - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
42412 - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
42413 - # In autoconf-2.13 it is called $ac_given_srcdir.
42414 - # In autoconf-2.50 it is called $srcdir.
42415 - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
42416 - case "$ac_given_srcdir" in
42417 - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
42418 - /*) top_srcdir="$ac_given_srcdir" ;;
42419 - *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
42420 - esac
42421 - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
42422 - rm -f "$ac_dir/POTFILES"
42423 - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
42424 - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
42425 - POMAKEFILEDEPS="POTFILES.in"
42426 - # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
42427 - # on $ac_dir but don't depend on user-specified configuration
42428 - # parameters.
42429 - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
42430 - # The LINGUAS file contains the set of available languages.
42431 - if test -n "$OBSOLETE_ALL_LINGUAS"; then
42432 - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
42433 - fi
42434 - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
42435 - # Hide the ALL_LINGUAS assigment from automake.
42436 - eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
42437 - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
42438 - else
42439 - # The set of available languages was given in configure.in.
42440 - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
42441 - fi
42442 - case "$ac_given_srcdir" in
42443 - .) srcdirpre= ;;
42444 - *) srcdirpre='$(srcdir)/' ;;
42445 - esac
42446 - POFILES=
42447 - GMOFILES=
42448 - UPDATEPOFILES=
42449 - DUMMYPOFILES=
42450 - for lang in $ALL_LINGUAS; do
42451 - POFILES="$POFILES $srcdirpre$lang.po"
42452 - GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
42453 - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
42454 - DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
42455 - done
42456 - # CATALOGS depends on both $ac_dir and the user's LINGUAS
42457 - # environment variable.
42458 - INST_LINGUAS=
42459 - if test -n "$ALL_LINGUAS"; then
42460 - for presentlang in $ALL_LINGUAS; do
42461 - useit=no
42462 - if test "%UNSET%" != "$LINGUAS"; then
42463 - desiredlanguages="$LINGUAS"
42464 - else
42465 - desiredlanguages="$ALL_LINGUAS"
42466 - fi
42467 - for desiredlang in $desiredlanguages; do
42468 - # Use the presentlang catalog if desiredlang is
42469 - # a. equal to presentlang, or
42470 - # b. a variant of presentlang (because in this case,
42471 - # presentlang can be used as a fallback for messages
42472 - # which are not translated in the desiredlang catalog).
42473 - case "$desiredlang" in
42474 - "$presentlang"*) useit=yes;;
42475 - esac
42476 - done
42477 - if test $useit = yes; then
42478 - INST_LINGUAS="$INST_LINGUAS $presentlang"
42479 - fi
42480 - done
42481 - fi
42482 - CATALOGS=
42483 - if test -n "$INST_LINGUAS"; then
42484 - for lang in $INST_LINGUAS; do
42485 - CATALOGS="$CATALOGS $lang.gmo"
42486 - done
42487 - fi
42488 - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
42489 - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
42490 - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
42491 - if test -f "$f"; then
42492 - case "$f" in
42493 - *.orig | *.bak | *~) ;;
42494 - *) cat "$f" >> "$ac_dir/Makefile" ;;
42495 - esac
42496 - fi
42497 - done
42498 - fi
42499 - ;;
42500 - esac
42501 - done ;;
42502 - "po/stamp-it":C)
42503 - if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
42504 - { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
42505 -$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
42506 - { (exit 1); exit 1; }; }
42507 - fi
42508 - rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
42509 - >"po/stamp-it.tmp"
42510 - sed '/^#/d
42511 - s/^[[].*] *//
42512 - /^[ ]*$/d
42513 - '"s|^| $ac_top_srcdir/|" \
42514 - "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
42515 -
42516 - sed '/^POTFILES =/,/[^\\]$/ {
42517 - /^POTFILES =/!d
42518 - r po/POTFILES
42519 - }
42520 - ' "po/Makefile.in" >"po/Makefile"
42521 - rm -f "po/Makefile.tmp"
42522 - mv "po/stamp-it.tmp" "po/stamp-it"
42523 - ;;
42524 -
42525 - esac
42526 -done # for ac_tag
42527 -
42528 -
42529 -{ (exit 0); exit 0; }
42530 -_ACEOF
42531 -chmod +x $CONFIG_STATUS
42532 -ac_clean_files=$ac_clean_files_save
42533 -
42534 -test $ac_write_fail = 0 ||
42535 - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
42536 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
42537 - { (exit 1); exit 1; }; }
42538 -
42539 -
42540 -# configure is writing to config.log, and then calls config.status.
42541 -# config.status does its own redirection, appending to config.log.
42542 -# Unfortunately, on DOS this fails, as config.log is still kept open
42543 -# by configure, so config.status won't be able to write to it; its
42544 -# output is simply discarded. So we exec the FD to /dev/null,
42545 -# effectively closing config.log, so it can be properly (re)opened and
42546 -# appended to by config.status. When coming back to configure, we
42547 -# need to make the FD available again.
42548 -if test "$no_create" != yes; then
42549 - ac_cs_success=:
42550 - ac_config_status_args=
42551 - test "$silent" = yes &&
42552 - ac_config_status_args="$ac_config_status_args --quiet"
42553 - exec 5>/dev/null
42554 - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
42555 - exec 5>>config.log
42556 - # Use ||, not &&, to avoid exiting from the if with $? = 1, which
42557 - # would make configure fail if this is the last instruction.
42558 - $ac_cs_success || { (exit 1); exit 1; }
42559 -fi
42560 -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
42561 - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
42562 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
42563 -fi
42564 -
42565 -
42566 diff -rupN original/data/Makefile.am new/data/Makefile.am
42567 --- original/data/Makefile.am 2008-11-29 01:59:36.000000000 -0430
42568 +++ new/data/Makefile.am 2009-04-01 04:21:41.000000000 -0430
42569 @@ -2,6 +2,8 @@ glade_DATA = pcsx.glade2 pcsx_config.gla
42570 gladedir = $(datadir)/pcsx
42571
42572 desktopdir = $(datadir)/applications
42573 -desktop_DATA = pcsx.desktop
42574 +desktop_in_files = pcsx.desktop.in
42575 +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
42576 +@INTLTOOL_DESKTOP_RULE@
42577
42578 -EXTRA_DIST = $(glade_DATA) pcsx.desktop
42579 +EXTRA_DIST = $(glade_DATA) pcsx.desktop.in
42580 diff -rupN original/data/Makefile.in new/data/Makefile.in
42581 --- original/data/Makefile.in 2009-03-29 01:17:40.000000000 -0430
42582 +++ new/data/Makefile.in 1969-12-31 20:00:00.000000000 -0400
42583 @@ -1,443 +0,0 @@
42584 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
42585 -# @configure_input@
42586 -
42587 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
42588 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
42589 -# This Makefile.in is free software; the Free Software Foundation
42590 -# gives unlimited permission to copy and/or distribute it,
42591 -# with or without modifications, as long as this notice is preserved.
42592 -
42593 -# This program is distributed in the hope that it will be useful,
42594 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
42595 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
42596 -# PARTICULAR PURPOSE.
42597 -
42598 -@SET_MAKE@
42599 -
42600 -VPATH = @srcdir@
42601 -pkgdatadir = $(datadir)/@PACKAGE@
42602 -pkglibdir = $(libdir)/@PACKAGE@
42603 -pkgincludedir = $(includedir)/@PACKAGE@
42604 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
42605 -install_sh_DATA = $(install_sh) -c -m 644
42606 -install_sh_PROGRAM = $(install_sh) -c
42607 -install_sh_SCRIPT = $(install_sh) -c
42608 -INSTALL_HEADER = $(INSTALL_DATA)
42609 -transform = $(program_transform_name)
42610 -NORMAL_INSTALL = :
42611 -PRE_INSTALL = :
42612 -POST_INSTALL = :
42613 -NORMAL_UNINSTALL = :
42614 -PRE_UNINSTALL = :
42615 -POST_UNINSTALL = :
42616 -build_triplet = @build@
42617 -host_triplet = @host@
42618 -target_triplet = @target@
42619 -subdir = data
42620 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
42621 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
42622 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
42623 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
42624 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
42625 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
42626 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
42627 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
42628 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
42629 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
42630 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
42631 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
42632 - $(top_srcdir)/configure.ac
42633 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
42634 - $(ACLOCAL_M4)
42635 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
42636 -CONFIG_HEADER = $(top_builddir)/include/config.h
42637 -CONFIG_CLEAN_FILES =
42638 -SOURCES =
42639 -DIST_SOURCES =
42640 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
42641 -am__vpath_adj = case $$p in \
42642 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
42643 - *) f=$$p;; \
42644 - esac;
42645 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
42646 -am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"
42647 -desktopDATA_INSTALL = $(INSTALL_DATA)
42648 -gladeDATA_INSTALL = $(INSTALL_DATA)
42649 -DATA = $(desktop_DATA) $(glade_DATA)
42650 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
42651 -ACLOCAL = @ACLOCAL@
42652 -ALLOCA = @ALLOCA@
42653 -ALL_LINGUAS = @ALL_LINGUAS@
42654 -ALSA_LIBS = @ALSA_LIBS@
42655 -AMTAR = @AMTAR@
42656 -AR = @AR@
42657 -AUTOCONF = @AUTOCONF@
42658 -AUTOHEADER = @AUTOHEADER@
42659 -AUTOMAKE = @AUTOMAKE@
42660 -AWK = @AWK@
42661 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
42662 -BURN_CFLAGS = @BURN_CFLAGS@
42663 -BURN_LIBS = @BURN_LIBS@
42664 -CATOBJEXT = @CATOBJEXT@
42665 -CC = @CC@
42666 -CCAS = @CCAS@
42667 -CCASDEPMODE = @CCASDEPMODE@
42668 -CCASFLAGS = @CCASFLAGS@
42669 -CCDEPMODE = @CCDEPMODE@
42670 -CFLAGS = @CFLAGS@
42671 -CPP = @CPP@
42672 -CPPFLAGS = @CPPFLAGS@
42673 -CXX = @CXX@
42674 -CXXCPP = @CXXCPP@
42675 -CXXDEPMODE = @CXXDEPMODE@
42676 -CXXFLAGS = @CXXFLAGS@
42677 -CYGPATH_W = @CYGPATH_W@
42678 -DATADIRNAME = @DATADIRNAME@
42679 -DEFS = @DEFS@
42680 -DEPDIR = @DEPDIR@
42681 -DFBINIMAGE = @DFBINIMAGE@
42682 -DSYMUTIL = @DSYMUTIL@
42683 -ECHO = @ECHO@
42684 -ECHO_C = @ECHO_C@
42685 -ECHO_N = @ECHO_N@
42686 -ECHO_T = @ECHO_T@
42687 -EGREP = @EGREP@
42688 -EXEEXT = @EXEEXT@
42689 -F77 = @F77@
42690 -FFLAGS = @FFLAGS@
42691 -FLTKCONFIG = @FLTKCONFIG@
42692 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
42693 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
42694 -GENCAT = @GENCAT@
42695 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
42696 -GIO2_CFLAGS = @GIO2_CFLAGS@
42697 -GIO2_LIBS = @GIO2_LIBS@
42698 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
42699 -GLADE2_LIBS = @GLADE2_LIBS@
42700 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
42701 -GLIB2_LIBS = @GLIB2_LIBS@
42702 -GLIBC21 = @GLIBC21@
42703 -GMSGFMT = @GMSGFMT@
42704 -GREP = @GREP@
42705 -GTK2_CFLAGS = @GTK2_CFLAGS@
42706 -GTK2_LIBS = @GTK2_LIBS@
42707 -INSTALL = @INSTALL@
42708 -INSTALL_DATA = @INSTALL_DATA@
42709 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
42710 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
42711 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
42712 -INSTOBJEXT = @INSTOBJEXT@
42713 -INTLBISON = @INTLBISON@
42714 -INTLLIBS = @INTLLIBS@
42715 -INTLOBJS = @INTLOBJS@
42716 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
42717 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
42718 -INTLTOOL_PERL = @INTLTOOL_PERL@
42719 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
42720 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
42721 -LDFLAGS = @LDFLAGS@
42722 -LIBICONV = @LIBICONV@
42723 -LIBINTL = @LIBINTL@
42724 -LIBOBJS = @LIBOBJS@
42725 -LIBS = @LIBS@
42726 -LIBTOOL = @LIBTOOL@
42727 -LN_S = @LN_S@
42728 -LTLIBICONV = @LTLIBICONV@
42729 -LTLIBINTL = @LTLIBINTL@
42730 -LTLIBOBJS = @LTLIBOBJS@
42731 -MAINT = @MAINT@
42732 -MAKEINFO = @MAKEINFO@
42733 -MKDIR_P = @MKDIR_P@
42734 -MKINSTALLDIRS = @MKINSTALLDIRS@
42735 -MSGFMT = @MSGFMT@
42736 -MSGMERGE = @MSGMERGE@
42737 -NASM = @NASM@
42738 -NMEDIT = @NMEDIT@
42739 -OBJEXT = @OBJEXT@
42740 -PACKAGE = @PACKAGE@
42741 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
42742 -PACKAGE_NAME = @PACKAGE_NAME@
42743 -PACKAGE_STRING = @PACKAGE_STRING@
42744 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
42745 -PACKAGE_VERSION = @PACKAGE_VERSION@
42746 -PATH_SEPARATOR = @PATH_SEPARATOR@
42747 -PKG_CONFIG = @PKG_CONFIG@
42748 -POSUB = @POSUB@
42749 -RANLIB = @RANLIB@
42750 -SED = @SED@
42751 -SET_MAKE = @SET_MAKE@
42752 -SHELL = @SHELL@
42753 -STRIP = @STRIP@
42754 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
42755 -USE_NLS = @USE_NLS@
42756 -VERSION = @VERSION@
42757 -XGETTEXT = @XGETTEXT@
42758 -abs_builddir = @abs_builddir@
42759 -abs_srcdir = @abs_srcdir@
42760 -abs_top_builddir = @abs_top_builddir@
42761 -abs_top_srcdir = @abs_top_srcdir@
42762 -ac_ct_CC = @ac_ct_CC@
42763 -ac_ct_CXX = @ac_ct_CXX@
42764 -ac_ct_F77 = @ac_ct_F77@
42765 -am__include = @am__include@
42766 -am__leading_dot = @am__leading_dot@
42767 -am__quote = @am__quote@
42768 -am__tar = @am__tar@
42769 -am__untar = @am__untar@
42770 -bindir = @bindir@
42771 -build = @build@
42772 -build_alias = @build_alias@
42773 -build_cpu = @build_cpu@
42774 -build_os = @build_os@
42775 -build_vendor = @build_vendor@
42776 -builddir = @builddir@
42777 -datadir = @datadir@
42778 -datarootdir = @datarootdir@
42779 -docdir = @docdir@
42780 -dvidir = @dvidir@
42781 -exec_prefix = @exec_prefix@
42782 -host = @host@
42783 -host_alias = @host_alias@
42784 -host_cpu = @host_cpu@
42785 -host_os = @host_os@
42786 -host_vendor = @host_vendor@
42787 -htmldir = @htmldir@
42788 -includedir = @includedir@
42789 -infodir = @infodir@
42790 -install_sh = @install_sh@
42791 -libdir = @libdir@
42792 -libexecdir = @libexecdir@
42793 -localedir = @localedir@
42794 -localstatedir = @localstatedir@
42795 -mandir = @mandir@
42796 -mkdir_p = @mkdir_p@
42797 -oldincludedir = @oldincludedir@
42798 -pdfdir = @pdfdir@
42799 -prefix = @prefix@
42800 -program_transform_name = @program_transform_name@
42801 -psdir = @psdir@
42802 -sbindir = @sbindir@
42803 -sharedstatedir = @sharedstatedir@
42804 -srcdir = @srcdir@
42805 -sysconfdir = @sysconfdir@
42806 -target = @target@
42807 -target_alias = @target_alias@
42808 -target_cpu = @target_cpu@
42809 -target_os = @target_os@
42810 -target_vendor = @target_vendor@
42811 -top_build_prefix = @top_build_prefix@
42812 -top_builddir = @top_builddir@
42813 -top_srcdir = @top_srcdir@
42814 -glade_DATA = pcsx.glade2 pcsx_config.glade
42815 -gladedir = $(datadir)/pcsx
42816 -desktopdir = $(datadir)/applications
42817 -desktop_DATA = pcsx.desktop
42818 -EXTRA_DIST = $(glade_DATA) pcsx.desktop
42819 -all: all-am
42820 -
42821 -.SUFFIXES:
42822 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
42823 - @for dep in $?; do \
42824 - case '$(am__configure_deps)' in \
42825 - *$$dep*) \
42826 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
42827 - && exit 0; \
42828 - exit 1;; \
42829 - esac; \
42830 - done; \
42831 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
42832 - cd $(top_srcdir) && \
42833 - $(AUTOMAKE) --gnu data/Makefile
42834 -.PRECIOUS: Makefile
42835 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
42836 - @case '$?' in \
42837 - *config.status*) \
42838 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
42839 - *) \
42840 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
42841 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
42842 - esac;
42843 -
42844 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
42845 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
42846 -
42847 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
42848 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
42849 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
42850 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
42851 -
42852 -mostlyclean-libtool:
42853 - -rm -f *.lo
42854 -
42855 -clean-libtool:
42856 - -rm -rf .libs _libs
42857 -install-desktopDATA: $(desktop_DATA)
42858 - @$(NORMAL_INSTALL)
42859 - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
42860 - @list='$(desktop_DATA)'; for p in $$list; do \
42861 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
42862 - f=$(am__strip_dir) \
42863 - echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
42864 - $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
42865 - done
42866 -
42867 -uninstall-desktopDATA:
42868 - @$(NORMAL_UNINSTALL)
42869 - @list='$(desktop_DATA)'; for p in $$list; do \
42870 - f=$(am__strip_dir) \
42871 - echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
42872 - rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
42873 - done
42874 -install-gladeDATA: $(glade_DATA)
42875 - @$(NORMAL_INSTALL)
42876 - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
42877 - @list='$(glade_DATA)'; for p in $$list; do \
42878 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
42879 - f=$(am__strip_dir) \
42880 - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
42881 - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
42882 - done
42883 -
42884 -uninstall-gladeDATA:
42885 - @$(NORMAL_UNINSTALL)
42886 - @list='$(glade_DATA)'; for p in $$list; do \
42887 - f=$(am__strip_dir) \
42888 - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
42889 - rm -f "$(DESTDIR)$(gladedir)/$$f"; \
42890 - done
42891 -tags: TAGS
42892 -TAGS:
42893 -
42894 -ctags: CTAGS
42895 -CTAGS:
42896 -
42897 -
42898 -distdir: $(DISTFILES)
42899 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
42900 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
42901 - list='$(DISTFILES)'; \
42902 - dist_files=`for file in $$list; do echo $$file; done | \
42903 - sed -e "s|^$$srcdirstrip/||;t" \
42904 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
42905 - case $$dist_files in \
42906 - */*) $(MKDIR_P) `echo "$$dist_files" | \
42907 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
42908 - sort -u` ;; \
42909 - esac; \
42910 - for file in $$dist_files; do \
42911 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
42912 - if test -d $$d/$$file; then \
42913 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
42914 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
42915 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
42916 - fi; \
42917 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
42918 - else \
42919 - test -f $(distdir)/$$file \
42920 - || cp -p $$d/$$file $(distdir)/$$file \
42921 - || exit 1; \
42922 - fi; \
42923 - done
42924 -check-am: all-am
42925 -check: check-am
42926 -all-am: Makefile $(DATA)
42927 -installdirs:
42928 - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"; do \
42929 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
42930 - done
42931 -install: install-am
42932 -install-exec: install-exec-am
42933 -install-data: install-data-am
42934 -uninstall: uninstall-am
42935 -
42936 -install-am: all-am
42937 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
42938 -
42939 -installcheck: installcheck-am
42940 -install-strip:
42941 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
42942 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
42943 - `test -z '$(STRIP)' || \
42944 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
42945 -mostlyclean-generic:
42946 -
42947 -clean-generic:
42948 -
42949 -distclean-generic:
42950 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
42951 -
42952 -maintainer-clean-generic:
42953 - @echo "This command is intended for maintainers to use"
42954 - @echo "it deletes files that may require special tools to rebuild."
42955 -clean: clean-am
42956 -
42957 -clean-am: clean-generic clean-libtool mostlyclean-am
42958 -
42959 -distclean: distclean-am
42960 - -rm -f Makefile
42961 -distclean-am: clean-am distclean-generic
42962 -
42963 -dvi: dvi-am
42964 -
42965 -dvi-am:
42966 -
42967 -html: html-am
42968 -
42969 -info: info-am
42970 -
42971 -info-am:
42972 -
42973 -install-data-am: install-desktopDATA install-gladeDATA
42974 -
42975 -install-dvi: install-dvi-am
42976 -
42977 -install-exec-am:
42978 -
42979 -install-html: install-html-am
42980 -
42981 -install-info: install-info-am
42982 -
42983 -install-man:
42984 -
42985 -install-pdf: install-pdf-am
42986 -
42987 -install-ps: install-ps-am
42988 -
42989 -installcheck-am:
42990 -
42991 -maintainer-clean: maintainer-clean-am
42992 - -rm -f Makefile
42993 -maintainer-clean-am: distclean-am maintainer-clean-generic
42994 -
42995 -mostlyclean: mostlyclean-am
42996 -
42997 -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
42998 -
42999 -pdf: pdf-am
43000 -
43001 -pdf-am:
43002 -
43003 -ps: ps-am
43004 -
43005 -ps-am:
43006 -
43007 -uninstall-am: uninstall-desktopDATA uninstall-gladeDATA
43008 -
43009 -.MAKE: install-am install-strip
43010 -
43011 -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
43012 - distclean distclean-generic distclean-libtool distdir dvi \
43013 - dvi-am html html-am info info-am install install-am \
43014 - install-data install-data-am install-desktopDATA install-dvi \
43015 - install-dvi-am install-exec install-exec-am install-gladeDATA \
43016 - install-html install-html-am install-info install-info-am \
43017 - install-man install-pdf install-pdf-am install-ps \
43018 - install-ps-am install-strip installcheck installcheck-am \
43019 - installdirs maintainer-clean maintainer-clean-generic \
43020 - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
43021 - ps ps-am uninstall uninstall-am uninstall-desktopDATA \
43022 - uninstall-gladeDATA
43023 -
43024 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
43025 -# Otherwise a system limit (for SysV at least) may be exceeded.
43026 -.NOEXPORT:
43027 diff -rupN original/data/pcsx.desktop new/data/pcsx.desktop
43028 --- original/data/pcsx.desktop 2007-10-08 17:13:27.000000000 -0400
43029 +++ new/data/pcsx.desktop 1969-12-31 20:00:00.000000000 -0400
43030 @@ -1,10 +0,0 @@
43031 -[Desktop Entry]
43032 -Version=1.0
43033 -Encoding=UTF-8
43034 -Type=Application
43035 -Name=PCSX
43036 -GenericName=Playstation Emulator
43037 -Comment=Sony Playstation emulator
43038 -Exec=pcsx
43039 -Icon=pcsx-icon.png
43040 -Categories=Application;Game;Emulator;GTK
43041 diff -rupN original/data/pcsx.desktop.in new/data/pcsx.desktop.in
43042 --- original/data/pcsx.desktop.in 1969-12-31 20:00:00.000000000 -0400
43043 +++ new/data/pcsx.desktop.in 2009-04-01 04:21:41.000000000 -0430
43044 @@ -0,0 +1,10 @@
43045 +[Desktop Entry]
43046 +Version=1.0
43047 +Encoding=UTF-8
43048 +Type=Application
43049 +_Name=PCSX
43050 +_GenericName=PlayStation Emulator
43051 +_Comment=Sony PlayStation emulator
43052 +Exec=pcsx
43053 +Icon=pcsx-icon.png
43054 +Categories=Application;Game;Emulator;GTK
43055 diff -rupN original/depcomp new/depcomp
43056 --- original/depcomp 2009-03-28 22:34:09.000000000 -0430
43057 +++ new/depcomp 1969-12-31 20:00:00.000000000 -0400
43058 @@ -1,589 +0,0 @@
43059 -#! /bin/sh
43060 -# depcomp - compile a program generating dependencies as side-effects
43061 -
43062 -scriptversion=2007-03-29.01
43063 -
43064 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
43065 -# Foundation, Inc.
43066 -
43067 -# This program is free software; you can redistribute it and/or modify
43068 -# it under the terms of the GNU General Public License as published by
43069 -# the Free Software Foundation; either version 2, or (at your option)
43070 -# any later version.
43071 -
43072 -# This program is distributed in the hope that it will be useful,
43073 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
43074 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
43075 -# GNU General Public License for more details.
43076 -
43077 -# You should have received a copy of the GNU General Public License
43078 -# along with this program; if not, write to the Free Software
43079 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
43080 -# 02110-1301, USA.
43081 -
43082 -# As a special exception to the GNU General Public License, if you
43083 -# distribute this file as part of a program that contains a
43084 -# configuration script generated by Autoconf, you may include it under
43085 -# the same distribution terms that you use for the rest of that program.
43086 -
43087 -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
43088 -
43089 -case $1 in
43090 - '')
43091 - echo "$0: No command. Try \`$0 --help' for more information." 1>&2
43092 - exit 1;
43093 - ;;
43094 - -h | --h*)
43095 - cat <<\EOF
43096 -Usage: depcomp [--help] [--version] PROGRAM [ARGS]
43097 -
43098 -Run PROGRAMS ARGS to compile a file, generating dependencies
43099 -as side-effects.
43100 -
43101 -Environment variables:
43102 - depmode Dependency tracking mode.
43103 - source Source file read by `PROGRAMS ARGS'.
43104 - object Object file output by `PROGRAMS ARGS'.
43105 - DEPDIR directory where to store dependencies.
43106 - depfile Dependency file to output.
43107 - tmpdepfile Temporary file to use when outputing dependencies.
43108 - libtool Whether libtool is used (yes/no).
43109 -
43110 -Report bugs to <bug-automake@gnu.org>.
43111 -EOF
43112 - exit $?
43113 - ;;
43114 - -v | --v*)
43115 - echo "depcomp $scriptversion"
43116 - exit $?
43117 - ;;
43118 -esac
43119 -
43120 -if test -z "$depmode" || test -z "$source" || test -z "$object"; then
43121 - echo "depcomp: Variables source, object and depmode must be set" 1>&2
43122 - exit 1
43123 -fi
43124 -
43125 -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
43126 -depfile=${depfile-`echo "$object" |
43127 - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
43128 -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
43129 -
43130 -rm -f "$tmpdepfile"
43131 -
43132 -# Some modes work just like other modes, but use different flags. We
43133 -# parameterize here, but still list the modes in the big case below,
43134 -# to make depend.m4 easier to write. Note that we *cannot* use a case
43135 -# here, because this file can only contain one case statement.
43136 -if test "$depmode" = hp; then
43137 - # HP compiler uses -M and no extra arg.
43138 - gccflag=-M
43139 - depmode=gcc
43140 -fi
43141 -
43142 -if test "$depmode" = dashXmstdout; then
43143 - # This is just like dashmstdout with a different argument.
43144 - dashmflag=-xM
43145 - depmode=dashmstdout
43146 -fi
43147 -
43148 -case "$depmode" in
43149 -gcc3)
43150 -## gcc 3 implements dependency tracking that does exactly what
43151 -## we want. Yay! Note: for some reason libtool 1.4 doesn't like
43152 -## it if -MD -MP comes after the -MF stuff. Hmm.
43153 -## Unfortunately, FreeBSD c89 acceptance of flags depends upon
43154 -## the command line argument order; so add the flags where they
43155 -## appear in depend2.am. Note that the slowdown incurred here
43156 -## affects only configure: in makefiles, %FASTDEP% shortcuts this.
43157 - for arg
43158 - do
43159 - case $arg in
43160 - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
43161 - *) set fnord "$@" "$arg" ;;
43162 - esac
43163 - shift # fnord
43164 - shift # $arg
43165 - done
43166 - "$@"
43167 - stat=$?
43168 - if test $stat -eq 0; then :
43169 - else
43170 - rm -f "$tmpdepfile"
43171 - exit $stat
43172 - fi
43173 - mv "$tmpdepfile" "$depfile"
43174 - ;;
43175 -
43176 -gcc)
43177 -## There are various ways to get dependency output from gcc. Here's
43178 -## why we pick this rather obscure method:
43179 -## - Don't want to use -MD because we'd like the dependencies to end
43180 -## up in a subdir. Having to rename by hand is ugly.
43181 -## (We might end up doing this anyway to support other compilers.)
43182 -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
43183 -## -MM, not -M (despite what the docs say).
43184 -## - Using -M directly means running the compiler twice (even worse
43185 -## than renaming).
43186 - if test -z "$gccflag"; then
43187 - gccflag=-MD,
43188 - fi
43189 - "$@" -Wp,"$gccflag$tmpdepfile"
43190 - stat=$?
43191 - if test $stat -eq 0; then :
43192 - else
43193 - rm -f "$tmpdepfile"
43194 - exit $stat
43195 - fi
43196 - rm -f "$depfile"
43197 - echo "$object : \\" > "$depfile"
43198 - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
43199 -## The second -e expression handles DOS-style file names with drive letters.
43200 - sed -e 's/^[^:]*: / /' \
43201 - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
43202 -## This next piece of magic avoids the `deleted header file' problem.
43203 -## The problem is that when a header file which appears in a .P file
43204 -## is deleted, the dependency causes make to die (because there is
43205 -## typically no way to rebuild the header). We avoid this by adding
43206 -## dummy dependencies for each header file. Too bad gcc doesn't do
43207 -## this for us directly.
43208 - tr ' ' '
43209 -' < "$tmpdepfile" |
43210 -## Some versions of gcc put a space before the `:'. On the theory
43211 -## that the space means something, we add a space to the output as
43212 -## well.
43213 -## Some versions of the HPUX 10.20 sed can't process this invocation
43214 -## correctly. Breaking it into two sed invocations is a workaround.
43215 - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
43216 - rm -f "$tmpdepfile"
43217 - ;;
43218 -
43219 -hp)
43220 - # This case exists only to let depend.m4 do its work. It works by
43221 - # looking at the text of this script. This case will never be run,
43222 - # since it is checked for above.
43223 - exit 1
43224 - ;;
43225 -
43226 -sgi)
43227 - if test "$libtool" = yes; then
43228 - "$@" "-Wp,-MDupdate,$tmpdepfile"
43229 - else
43230 - "$@" -MDupdate "$tmpdepfile"
43231 - fi
43232 - stat=$?
43233 - if test $stat -eq 0; then :
43234 - else
43235 - rm -f "$tmpdepfile"
43236 - exit $stat
43237 - fi
43238 - rm -f "$depfile"
43239 -
43240 - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
43241 - echo "$object : \\" > "$depfile"
43242 -
43243 - # Clip off the initial element (the dependent). Don't try to be
43244 - # clever and replace this with sed code, as IRIX sed won't handle
43245 - # lines with more than a fixed number of characters (4096 in
43246 - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
43247 - # the IRIX cc adds comments like `#:fec' to the end of the
43248 - # dependency line.
43249 - tr ' ' '
43250 -' < "$tmpdepfile" \
43251 - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
43252 - tr '
43253 -' ' ' >> $depfile
43254 - echo >> $depfile
43255 -
43256 - # The second pass generates a dummy entry for each header file.
43257 - tr ' ' '
43258 -' < "$tmpdepfile" \
43259 - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
43260 - >> $depfile
43261 - else
43262 - # The sourcefile does not contain any dependencies, so just
43263 - # store a dummy comment line, to avoid errors with the Makefile
43264 - # "include basename.Plo" scheme.
43265 - echo "#dummy" > "$depfile"
43266 - fi
43267 - rm -f "$tmpdepfile"
43268 - ;;
43269 -
43270 -aix)
43271 - # The C for AIX Compiler uses -M and outputs the dependencies
43272 - # in a .u file. In older versions, this file always lives in the
43273 - # current directory. Also, the AIX compiler puts `$object:' at the
43274 - # start of each line; $object doesn't have directory information.
43275 - # Version 6 uses the directory in both cases.
43276 - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
43277 - test "x$dir" = "x$object" && dir=
43278 - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
43279 - if test "$libtool" = yes; then
43280 - tmpdepfile1=$dir$base.u
43281 - tmpdepfile2=$base.u
43282 - tmpdepfile3=$dir.libs/$base.u
43283 - "$@" -Wc,-M
43284 - else
43285 - tmpdepfile1=$dir$base.u
43286 - tmpdepfile2=$dir$base.u
43287 - tmpdepfile3=$dir$base.u
43288 - "$@" -M
43289 - fi
43290 - stat=$?
43291 -
43292 - if test $stat -eq 0; then :
43293 - else
43294 - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
43295 - exit $stat
43296 - fi
43297 -
43298 - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
43299 - do
43300 - test -f "$tmpdepfile" && break
43301 - done
43302 - if test -f "$tmpdepfile"; then
43303 - # Each line is of the form `foo.o: dependent.h'.
43304 - # Do two passes, one to just change these to
43305 - # `$object: dependent.h' and one to simply `dependent.h:'.
43306 - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
43307 - # That's a tab and a space in the [].
43308 - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
43309 - else
43310 - # The sourcefile does not contain any dependencies, so just
43311 - # store a dummy comment line, to avoid errors with the Makefile
43312 - # "include basename.Plo" scheme.
43313 - echo "#dummy" > "$depfile"
43314 - fi
43315 - rm -f "$tmpdepfile"
43316 - ;;
43317 -
43318 -icc)
43319 - # Intel's C compiler understands `-MD -MF file'. However on
43320 - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
43321 - # ICC 7.0 will fill foo.d with something like
43322 - # foo.o: sub/foo.c
43323 - # foo.o: sub/foo.h
43324 - # which is wrong. We want:
43325 - # sub/foo.o: sub/foo.c
43326 - # sub/foo.o: sub/foo.h
43327 - # sub/foo.c:
43328 - # sub/foo.h:
43329 - # ICC 7.1 will output
43330 - # foo.o: sub/foo.c sub/foo.h
43331 - # and will wrap long lines using \ :
43332 - # foo.o: sub/foo.c ... \
43333 - # sub/foo.h ... \
43334 - # ...
43335 -
43336 - "$@" -MD -MF "$tmpdepfile"
43337 - stat=$?
43338 - if test $stat -eq 0; then :
43339 - else
43340 - rm -f "$tmpdepfile"
43341 - exit $stat
43342 - fi
43343 - rm -f "$depfile"
43344 - # Each line is of the form `foo.o: dependent.h',
43345 - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
43346 - # Do two passes, one to just change these to
43347 - # `$object: dependent.h' and one to simply `dependent.h:'.
43348 - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
43349 - # Some versions of the HPUX 10.20 sed can't process this invocation
43350 - # correctly. Breaking it into two sed invocations is a workaround.
43351 - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
43352 - sed -e 's/$/ :/' >> "$depfile"
43353 - rm -f "$tmpdepfile"
43354 - ;;
43355 -
43356 -hp2)
43357 - # The "hp" stanza above does not work with aCC (C++) and HP's ia64
43358 - # compilers, which have integrated preprocessors. The correct option
43359 - # to use with these is +Maked; it writes dependencies to a file named
43360 - # 'foo.d', which lands next to the object file, wherever that
43361 - # happens to be.
43362 - # Much of this is similar to the tru64 case; see comments there.
43363 - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
43364 - test "x$dir" = "x$object" && dir=
43365 - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
43366 - if test "$libtool" = yes; then
43367 - tmpdepfile1=$dir$base.d
43368 - tmpdepfile2=$dir.libs/$base.d
43369 - "$@" -Wc,+Maked
43370 - else
43371 - tmpdepfile1=$dir$base.d
43372 - tmpdepfile2=$dir$base.d
43373 - "$@" +Maked
43374 - fi
43375 - stat=$?
43376 - if test $stat -eq 0; then :
43377 - else
43378 - rm -f "$tmpdepfile1" "$tmpdepfile2"
43379 - exit $stat
43380 - fi
43381 -
43382 - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
43383 - do
43384 - test -f "$tmpdepfile" && break
43385 - done
43386 - if test -f "$tmpdepfile"; then
43387 - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
43388 - # Add `dependent.h:' lines.
43389 - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
43390 - else
43391 - echo "#dummy" > "$depfile"
43392 - fi
43393 - rm -f "$tmpdepfile" "$tmpdepfile2"
43394 - ;;
43395 -
43396 -tru64)
43397 - # The Tru64 compiler uses -MD to generate dependencies as a side
43398 - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
43399 - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
43400 - # dependencies in `foo.d' instead, so we check for that too.
43401 - # Subdirectories are respected.
43402 - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
43403 - test "x$dir" = "x$object" && dir=
43404 - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
43405 -
43406 - if test "$libtool" = yes; then
43407 - # With Tru64 cc, shared objects can also be used to make a
43408 - # static library. This mechanism is used in libtool 1.4 series to
43409 - # handle both shared and static libraries in a single compilation.
43410 - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
43411 - #
43412 - # With libtool 1.5 this exception was removed, and libtool now
43413 - # generates 2 separate objects for the 2 libraries. These two
43414 - # compilations output dependencies in $dir.libs/$base.o.d and
43415 - # in $dir$base.o.d. We have to check for both files, because
43416 - # one of the two compilations can be disabled. We should prefer
43417 - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
43418 - # automatically cleaned when .libs/ is deleted, while ignoring
43419 - # the former would cause a distcleancheck panic.
43420 - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
43421 - tmpdepfile2=$dir$base.o.d # libtool 1.5
43422 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
43423 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
43424 - "$@" -Wc,-MD
43425 - else
43426 - tmpdepfile1=$dir$base.o.d
43427 - tmpdepfile2=$dir$base.d
43428 - tmpdepfile3=$dir$base.d
43429 - tmpdepfile4=$dir$base.d
43430 - "$@" -MD
43431 - fi
43432 -
43433 - stat=$?
43434 - if test $stat -eq 0; then :
43435 - else
43436 - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
43437 - exit $stat
43438 - fi
43439 -
43440 - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
43441 - do
43442 - test -f "$tmpdepfile" && break
43443 - done
43444 - if test -f "$tmpdepfile"; then
43445 - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
43446 - # That's a tab and a space in the [].
43447 - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
43448 - else
43449 - echo "#dummy" > "$depfile"
43450 - fi
43451 - rm -f "$tmpdepfile"
43452 - ;;
43453 -
43454 -#nosideeffect)
43455 - # This comment above is used by automake to tell side-effect
43456 - # dependency tracking mechanisms from slower ones.
43457 -
43458 -dashmstdout)
43459 - # Important note: in order to support this mode, a compiler *must*
43460 - # always write the preprocessed file to stdout, regardless of -o.
43461 - "$@" || exit $?
43462 -
43463 - # Remove the call to Libtool.
43464 - if test "$libtool" = yes; then
43465 - while test $1 != '--mode=compile'; do
43466 - shift
43467 - done
43468 - shift
43469 - fi
43470 -
43471 - # Remove `-o $object'.
43472 - IFS=" "
43473 - for arg
43474 - do
43475 - case $arg in
43476 - -o)
43477 - shift
43478 - ;;
43479 - $object)
43480 - shift
43481 - ;;
43482 - *)
43483 - set fnord "$@" "$arg"
43484 - shift # fnord
43485 - shift # $arg
43486 - ;;
43487 - esac
43488 - done
43489 -
43490 - test -z "$dashmflag" && dashmflag=-M
43491 - # Require at least two characters before searching for `:'
43492 - # in the target name. This is to cope with DOS-style filenames:
43493 - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
43494 - "$@" $dashmflag |
43495 - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
43496 - rm -f "$depfile"
43497 - cat < "$tmpdepfile" > "$depfile"
43498 - tr ' ' '
43499 -' < "$tmpdepfile" | \
43500 -## Some versions of the HPUX 10.20 sed can't process this invocation
43501 -## correctly. Breaking it into two sed invocations is a workaround.
43502 - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
43503 - rm -f "$tmpdepfile"
43504 - ;;
43505 -
43506 -dashXmstdout)
43507 - # This case only exists to satisfy depend.m4. It is never actually
43508 - # run, as this mode is specially recognized in the preamble.
43509 - exit 1
43510 - ;;
43511 -
43512 -makedepend)
43513 - "$@" || exit $?
43514 - # Remove any Libtool call
43515 - if test "$libtool" = yes; then
43516 - while test $1 != '--mode=compile'; do
43517 - shift
43518 - done
43519 - shift
43520 - fi
43521 - # X makedepend
43522 - shift
43523 - cleared=no
43524 - for arg in "$@"; do
43525 - case $cleared in
43526 - no)
43527 - set ""; shift
43528 - cleared=yes ;;
43529 - esac
43530 - case "$arg" in
43531 - -D*|-I*)
43532 - set fnord "$@" "$arg"; shift ;;
43533 - # Strip any option that makedepend may not understand. Remove
43534 - # the object too, otherwise makedepend will parse it as a source file.
43535 - -*|$object)
43536 - ;;
43537 - *)
43538 - set fnord "$@" "$arg"; shift ;;
43539 - esac
43540 - done
43541 - obj_suffix="`echo $object | sed 's/^.*\././'`"
43542 - touch "$tmpdepfile"
43543 - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
43544 - rm -f "$depfile"
43545 - cat < "$tmpdepfile" > "$depfile"
43546 - sed '1,2d' "$tmpdepfile" | tr ' ' '
43547 -' | \
43548 -## Some versions of the HPUX 10.20 sed can't process this invocation
43549 -## correctly. Breaking it into two sed invocations is a workaround.
43550 - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
43551 - rm -f "$tmpdepfile" "$tmpdepfile".bak
43552 - ;;
43553 -
43554 -cpp)
43555 - # Important note: in order to support this mode, a compiler *must*
43556 - # always write the preprocessed file to stdout.
43557 - "$@" || exit $?
43558 -
43559 - # Remove the call to Libtool.
43560 - if test "$libtool" = yes; then
43561 - while test $1 != '--mode=compile'; do
43562 - shift
43563 - done
43564 - shift
43565 - fi
43566 -
43567 - # Remove `-o $object'.
43568 - IFS=" "
43569 - for arg
43570 - do
43571 - case $arg in
43572 - -o)
43573 - shift
43574 - ;;
43575 - $object)
43576 - shift
43577 - ;;
43578 - *)
43579 - set fnord "$@" "$arg"
43580 - shift # fnord
43581 - shift # $arg
43582 - ;;
43583 - esac
43584 - done
43585 -
43586 - "$@" -E |
43587 - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
43588 - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
43589 - sed '$ s: \\$::' > "$tmpdepfile"
43590 - rm -f "$depfile"
43591 - echo "$object : \\" > "$depfile"
43592 - cat < "$tmpdepfile" >> "$depfile"
43593 - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
43594 - rm -f "$tmpdepfile"
43595 - ;;
43596 -
43597 -msvisualcpp)
43598 - # Important note: in order to support this mode, a compiler *must*
43599 - # always write the preprocessed file to stdout, regardless of -o,
43600 - # because we must use -o when running libtool.
43601 - "$@" || exit $?
43602 - IFS=" "
43603 - for arg
43604 - do
43605 - case "$arg" in
43606 - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
43607 - set fnord "$@"
43608 - shift
43609 - shift
43610 - ;;
43611 - *)
43612 - set fnord "$@" "$arg"
43613 - shift
43614 - shift
43615 - ;;
43616 - esac
43617 - done
43618 - "$@" -E |
43619 - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
43620 - rm -f "$depfile"
43621 - echo "$object : \\" > "$depfile"
43622 - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
43623 - echo " " >> "$depfile"
43624 - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
43625 - rm -f "$tmpdepfile"
43626 - ;;
43627 -
43628 -none)
43629 - exec "$@"
43630 - ;;
43631 -
43632 -*)
43633 - echo "Unknown depmode $depmode" 1>&2
43634 - exit 1
43635 - ;;
43636 -esac
43637 -
43638 -exit 0
43639 -
43640 -# Local Variables:
43641 -# mode: shell-script
43642 -# sh-indentation: 2
43643 -# eval: (add-hook 'write-file-hooks 'time-stamp)
43644 -# time-stamp-start: "scriptversion="
43645 -# time-stamp-format: "%:y-%02m-%02d.%02H"
43646 -# time-stamp-end: "$"
43647 -# End:
43648 diff -rupN original/doc/Makefile.in new/doc/Makefile.in
43649 --- original/doc/Makefile.in 2009-03-29 01:17:40.000000000 -0430
43650 +++ new/doc/Makefile.in 1969-12-31 20:00:00.000000000 -0400
43651 @@ -1,445 +0,0 @@
43652 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
43653 -# @configure_input@
43654 -
43655 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
43656 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
43657 -# This Makefile.in is free software; the Free Software Foundation
43658 -# gives unlimited permission to copy and/or distribute it,
43659 -# with or without modifications, as long as this notice is preserved.
43660 -
43661 -# This program is distributed in the hope that it will be useful,
43662 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
43663 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
43664 -# PARTICULAR PURPOSE.
43665 -
43666 -@SET_MAKE@
43667 -VPATH = @srcdir@
43668 -pkgdatadir = $(datadir)/@PACKAGE@
43669 -pkglibdir = $(libdir)/@PACKAGE@
43670 -pkgincludedir = $(includedir)/@PACKAGE@
43671 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
43672 -install_sh_DATA = $(install_sh) -c -m 644
43673 -install_sh_PROGRAM = $(install_sh) -c
43674 -install_sh_SCRIPT = $(install_sh) -c
43675 -INSTALL_HEADER = $(INSTALL_DATA)
43676 -transform = $(program_transform_name)
43677 -NORMAL_INSTALL = :
43678 -PRE_INSTALL = :
43679 -POST_INSTALL = :
43680 -NORMAL_UNINSTALL = :
43681 -PRE_UNINSTALL = :
43682 -POST_UNINSTALL = :
43683 -build_triplet = @build@
43684 -host_triplet = @host@
43685 -target_triplet = @target@
43686 -subdir = doc
43687 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
43688 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
43689 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
43690 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
43691 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
43692 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
43693 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
43694 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
43695 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
43696 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
43697 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
43698 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
43699 - $(top_srcdir)/configure.ac
43700 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
43701 - $(ACLOCAL_M4)
43702 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
43703 -CONFIG_HEADER = $(top_builddir)/include/config.h
43704 -CONFIG_CLEAN_FILES =
43705 -SOURCES =
43706 -DIST_SOURCES =
43707 -man1dir = $(mandir)/man1
43708 -am__installdirs = "$(DESTDIR)$(man1dir)"
43709 -NROFF = nroff
43710 -MANS = $(man_MANS)
43711 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
43712 -ACLOCAL = @ACLOCAL@
43713 -ALLOCA = @ALLOCA@
43714 -ALL_LINGUAS = @ALL_LINGUAS@
43715 -ALSA_LIBS = @ALSA_LIBS@
43716 -AMTAR = @AMTAR@
43717 -AR = @AR@
43718 -AUTOCONF = @AUTOCONF@
43719 -AUTOHEADER = @AUTOHEADER@
43720 -AUTOMAKE = @AUTOMAKE@
43721 -AWK = @AWK@
43722 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
43723 -BURN_CFLAGS = @BURN_CFLAGS@
43724 -BURN_LIBS = @BURN_LIBS@
43725 -CATOBJEXT = @CATOBJEXT@
43726 -CC = @CC@
43727 -CCAS = @CCAS@
43728 -CCASDEPMODE = @CCASDEPMODE@
43729 -CCASFLAGS = @CCASFLAGS@
43730 -CCDEPMODE = @CCDEPMODE@
43731 -CFLAGS = @CFLAGS@
43732 -CPP = @CPP@
43733 -CPPFLAGS = @CPPFLAGS@
43734 -CXX = @CXX@
43735 -CXXCPP = @CXXCPP@
43736 -CXXDEPMODE = @CXXDEPMODE@
43737 -CXXFLAGS = @CXXFLAGS@
43738 -CYGPATH_W = @CYGPATH_W@
43739 -DATADIRNAME = @DATADIRNAME@
43740 -DEFS = @DEFS@
43741 -DEPDIR = @DEPDIR@
43742 -DFBINIMAGE = @DFBINIMAGE@
43743 -DSYMUTIL = @DSYMUTIL@
43744 -ECHO = @ECHO@
43745 -ECHO_C = @ECHO_C@
43746 -ECHO_N = @ECHO_N@
43747 -ECHO_T = @ECHO_T@
43748 -EGREP = @EGREP@
43749 -EXEEXT = @EXEEXT@
43750 -F77 = @F77@
43751 -FFLAGS = @FFLAGS@
43752 -FLTKCONFIG = @FLTKCONFIG@
43753 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
43754 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
43755 -GENCAT = @GENCAT@
43756 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
43757 -GIO2_CFLAGS = @GIO2_CFLAGS@
43758 -GIO2_LIBS = @GIO2_LIBS@
43759 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
43760 -GLADE2_LIBS = @GLADE2_LIBS@
43761 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
43762 -GLIB2_LIBS = @GLIB2_LIBS@
43763 -GLIBC21 = @GLIBC21@
43764 -GMSGFMT = @GMSGFMT@
43765 -GREP = @GREP@
43766 -GTK2_CFLAGS = @GTK2_CFLAGS@
43767 -GTK2_LIBS = @GTK2_LIBS@
43768 -INSTALL = @INSTALL@
43769 -INSTALL_DATA = @INSTALL_DATA@
43770 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
43771 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
43772 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
43773 -INSTOBJEXT = @INSTOBJEXT@
43774 -INTLBISON = @INTLBISON@
43775 -INTLLIBS = @INTLLIBS@
43776 -INTLOBJS = @INTLOBJS@
43777 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
43778 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
43779 -INTLTOOL_PERL = @INTLTOOL_PERL@
43780 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
43781 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
43782 -LDFLAGS = @LDFLAGS@
43783 -LIBICONV = @LIBICONV@
43784 -LIBINTL = @LIBINTL@
43785 -LIBOBJS = @LIBOBJS@
43786 -LIBS = @LIBS@
43787 -LIBTOOL = @LIBTOOL@
43788 -LN_S = @LN_S@
43789 -LTLIBICONV = @LTLIBICONV@
43790 -LTLIBINTL = @LTLIBINTL@
43791 -LTLIBOBJS = @LTLIBOBJS@
43792 -MAINT = @MAINT@
43793 -MAKEINFO = @MAKEINFO@
43794 -MKDIR_P = @MKDIR_P@
43795 -MKINSTALLDIRS = @MKINSTALLDIRS@
43796 -MSGFMT = @MSGFMT@
43797 -MSGMERGE = @MSGMERGE@
43798 -NASM = @NASM@
43799 -NMEDIT = @NMEDIT@
43800 -OBJEXT = @OBJEXT@
43801 -PACKAGE = @PACKAGE@
43802 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
43803 -PACKAGE_NAME = @PACKAGE_NAME@
43804 -PACKAGE_STRING = @PACKAGE_STRING@
43805 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
43806 -PACKAGE_VERSION = @PACKAGE_VERSION@
43807 -PATH_SEPARATOR = @PATH_SEPARATOR@
43808 -PKG_CONFIG = @PKG_CONFIG@
43809 -POSUB = @POSUB@
43810 -RANLIB = @RANLIB@
43811 -SED = @SED@
43812 -SET_MAKE = @SET_MAKE@
43813 -SHELL = @SHELL@
43814 -STRIP = @STRIP@
43815 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
43816 -USE_NLS = @USE_NLS@
43817 -VERSION = @VERSION@
43818 -XGETTEXT = @XGETTEXT@
43819 -abs_builddir = @abs_builddir@
43820 -abs_srcdir = @abs_srcdir@
43821 -abs_top_builddir = @abs_top_builddir@
43822 -abs_top_srcdir = @abs_top_srcdir@
43823 -ac_ct_CC = @ac_ct_CC@
43824 -ac_ct_CXX = @ac_ct_CXX@
43825 -ac_ct_F77 = @ac_ct_F77@
43826 -am__include = @am__include@
43827 -am__leading_dot = @am__leading_dot@
43828 -am__quote = @am__quote@
43829 -am__tar = @am__tar@
43830 -am__untar = @am__untar@
43831 -bindir = @bindir@
43832 -build = @build@
43833 -build_alias = @build_alias@
43834 -build_cpu = @build_cpu@
43835 -build_os = @build_os@
43836 -build_vendor = @build_vendor@
43837 -builddir = @builddir@
43838 -datadir = @datadir@
43839 -datarootdir = @datarootdir@
43840 -docdir = @docdir@
43841 -dvidir = @dvidir@
43842 -exec_prefix = @exec_prefix@
43843 -host = @host@
43844 -host_alias = @host_alias@
43845 -host_cpu = @host_cpu@
43846 -host_os = @host_os@
43847 -host_vendor = @host_vendor@
43848 -htmldir = @htmldir@
43849 -includedir = @includedir@
43850 -infodir = @infodir@
43851 -install_sh = @install_sh@
43852 -libdir = @libdir@
43853 -libexecdir = @libexecdir@
43854 -localedir = @localedir@
43855 -localstatedir = @localstatedir@
43856 -mandir = @mandir@
43857 -mkdir_p = @mkdir_p@
43858 -oldincludedir = @oldincludedir@
43859 -pdfdir = @pdfdir@
43860 -prefix = @prefix@
43861 -program_transform_name = @program_transform_name@
43862 -psdir = @psdir@
43863 -sbindir = @sbindir@
43864 -sharedstatedir = @sharedstatedir@
43865 -srcdir = @srcdir@
43866 -sysconfdir = @sysconfdir@
43867 -target = @target@
43868 -target_alias = @target_alias@
43869 -target_cpu = @target_cpu@
43870 -target_os = @target_os@
43871 -target_vendor = @target_vendor@
43872 -top_build_prefix = @top_build_prefix@
43873 -top_builddir = @top_builddir@
43874 -top_srcdir = @top_srcdir@
43875 -EXTRA_DIST = keys.txt tweaks.txt pcsx.1
43876 -man_MANS = pcsx.1
43877 -all: all-am
43878 -
43879 -.SUFFIXES:
43880 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
43881 - @for dep in $?; do \
43882 - case '$(am__configure_deps)' in \
43883 - *$$dep*) \
43884 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
43885 - && exit 0; \
43886 - exit 1;; \
43887 - esac; \
43888 - done; \
43889 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
43890 - cd $(top_srcdir) && \
43891 - $(AUTOMAKE) --gnu doc/Makefile
43892 -.PRECIOUS: Makefile
43893 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
43894 - @case '$?' in \
43895 - *config.status*) \
43896 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
43897 - *) \
43898 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
43899 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
43900 - esac;
43901 -
43902 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
43903 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
43904 -
43905 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
43906 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
43907 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
43908 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
43909 -
43910 -mostlyclean-libtool:
43911 - -rm -f *.lo
43912 -
43913 -clean-libtool:
43914 - -rm -rf .libs _libs
43915 -install-man1: $(man1_MANS) $(man_MANS)
43916 - @$(NORMAL_INSTALL)
43917 - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
43918 - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
43919 - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
43920 - for i in $$l2; do \
43921 - case "$$i" in \
43922 - *.1*) list="$$list $$i" ;; \
43923 - esac; \
43924 - done; \
43925 - for i in $$list; do \
43926 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
43927 - else file=$$i; fi; \
43928 - ext=`echo $$i | sed -e 's/^.*\\.//'`; \
43929 - case "$$ext" in \
43930 - 1*) ;; \
43931 - *) ext='1' ;; \
43932 - esac; \
43933 - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
43934 - inst=`echo $$inst | sed -e 's/^.*\///'`; \
43935 - inst=`echo $$inst | sed '$(transform)'`.$$ext; \
43936 - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
43937 - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
43938 - done
43939 -uninstall-man1:
43940 - @$(NORMAL_UNINSTALL)
43941 - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
43942 - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
43943 - for i in $$l2; do \
43944 - case "$$i" in \
43945 - *.1*) list="$$list $$i" ;; \
43946 - esac; \
43947 - done; \
43948 - for i in $$list; do \
43949 - ext=`echo $$i | sed -e 's/^.*\\.//'`; \
43950 - case "$$ext" in \
43951 - 1*) ;; \
43952 - *) ext='1' ;; \
43953 - esac; \
43954 - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
43955 - inst=`echo $$inst | sed -e 's/^.*\///'`; \
43956 - inst=`echo $$inst | sed '$(transform)'`.$$ext; \
43957 - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
43958 - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
43959 - done
43960 -tags: TAGS
43961 -TAGS:
43962 -
43963 -ctags: CTAGS
43964 -CTAGS:
43965 -
43966 -
43967 -distdir: $(DISTFILES)
43968 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
43969 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
43970 - list='$(DISTFILES)'; \
43971 - dist_files=`for file in $$list; do echo $$file; done | \
43972 - sed -e "s|^$$srcdirstrip/||;t" \
43973 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
43974 - case $$dist_files in \
43975 - */*) $(MKDIR_P) `echo "$$dist_files" | \
43976 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
43977 - sort -u` ;; \
43978 - esac; \
43979 - for file in $$dist_files; do \
43980 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
43981 - if test -d $$d/$$file; then \
43982 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
43983 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
43984 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
43985 - fi; \
43986 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
43987 - else \
43988 - test -f $(distdir)/$$file \
43989 - || cp -p $$d/$$file $(distdir)/$$file \
43990 - || exit 1; \
43991 - fi; \
43992 - done
43993 -check-am: all-am
43994 -check: check-am
43995 -all-am: Makefile $(MANS)
43996 -installdirs:
43997 - for dir in "$(DESTDIR)$(man1dir)"; do \
43998 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
43999 - done
44000 -install: install-am
44001 -install-exec: install-exec-am
44002 -install-data: install-data-am
44003 -uninstall: uninstall-am
44004 -
44005 -install-am: all-am
44006 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
44007 -
44008 -installcheck: installcheck-am
44009 -install-strip:
44010 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
44011 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
44012 - `test -z '$(STRIP)' || \
44013 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
44014 -mostlyclean-generic:
44015 -
44016 -clean-generic:
44017 -
44018 -distclean-generic:
44019 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
44020 -
44021 -maintainer-clean-generic:
44022 - @echo "This command is intended for maintainers to use"
44023 - @echo "it deletes files that may require special tools to rebuild."
44024 -clean: clean-am
44025 -
44026 -clean-am: clean-generic clean-libtool mostlyclean-am
44027 -
44028 -distclean: distclean-am
44029 - -rm -f Makefile
44030 -distclean-am: clean-am distclean-generic
44031 -
44032 -dvi: dvi-am
44033 -
44034 -dvi-am:
44035 -
44036 -html: html-am
44037 -
44038 -info: info-am
44039 -
44040 -info-am:
44041 -
44042 -install-data-am: install-man
44043 -
44044 -install-dvi: install-dvi-am
44045 -
44046 -install-exec-am:
44047 -
44048 -install-html: install-html-am
44049 -
44050 -install-info: install-info-am
44051 -
44052 -install-man: install-man1
44053 -
44054 -install-pdf: install-pdf-am
44055 -
44056 -install-ps: install-ps-am
44057 -
44058 -installcheck-am:
44059 -
44060 -maintainer-clean: maintainer-clean-am
44061 - -rm -f Makefile
44062 -maintainer-clean-am: distclean-am maintainer-clean-generic
44063 -
44064 -mostlyclean: mostlyclean-am
44065 -
44066 -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
44067 -
44068 -pdf: pdf-am
44069 -
44070 -pdf-am:
44071 -
44072 -ps: ps-am
44073 -
44074 -ps-am:
44075 -
44076 -uninstall-am: uninstall-man
44077 -
44078 -uninstall-man: uninstall-man1
44079 -
44080 -.MAKE: install-am install-strip
44081 -
44082 -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
44083 - distclean distclean-generic distclean-libtool distdir dvi \
44084 - dvi-am html html-am info info-am install install-am \
44085 - install-data install-data-am install-dvi install-dvi-am \
44086 - install-exec install-exec-am install-html install-html-am \
44087 - install-info install-info-am install-man install-man1 \
44088 - install-pdf install-pdf-am install-ps install-ps-am \
44089 - install-strip installcheck installcheck-am installdirs \
44090 - maintainer-clean maintainer-clean-generic mostlyclean \
44091 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
44092 - uninstall uninstall-am uninstall-man uninstall-man1
44093 -
44094 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
44095 -# Otherwise a system limit (for SysV at least) may be exceeded.
44096 -.NOEXPORT:
44097 diff -rupN original/doc/pcsx.1 new/doc/pcsx.1
44098 --- original/doc/pcsx.1 2009-03-29 00:59:32.000000000 -0430
44099 +++ new/doc/pcsx.1 2007-10-08 17:13:29.000000000 -0400
44100 @@ -9,31 +9,25 @@ pcsx - Playstation emulator
44101 PCSX-df is a plugin-based Playstation emulator able to play most PSX games. It provides CPU, BIOS, and basic system emulation and relies on plugins for sound, input, and graphics emulation.
44102 .PP
44103 .SH OPTIONS
44104 -.B --runcd
44105 +.B -runcd
44106 Runs CD-ROM from drive
44107 .TP
44108 -.B --runcdbios
44109 +.B -runcdbios
44110 Runs CD-ROM from drive through PSX BIOS
44111 .TP
44112 -.B --nogui
44113 +.B -nogui
44114 Don't load the GUI
44115 .TP
44116 -.\Temporarily disabled .B -cfg FILE
44117 -.\Temporarily disabled Specify a different config file
44118 +.B -cfg FILE
44119 +Specify a different config file
44120 .TP
44121 -.B --psxout
44122 +.B -psxout
44123 Enable PSX output
44124 .TP
44125 -.B --load STATENUM
44126 -Load savestate STATENUM
44127 +.B -load STATENUM
44128 +Loads savestate STATENUM
44129 .TP
44130 -.B --exefile FILE
44131 -Load PSX executable
44132 -.TP
44133 -.B --cdfile FILE
44134 -Load PSX ISO/BIN image
44135 -.TP
44136 -.B --help (-h)
44137 +.B -help (-h)
44138 Display help message
44139 .TP
44140 .SH AUTHOR
44141 diff -rupN original/gui/Makefile.am new/gui/Makefile.am
44142 --- original/gui/Makefile.am 2009-03-28 21:55:29.000000000 -0430
44143 +++ new/gui/Makefile.am 2009-04-09 20:42:47.000000000 -0430
44144 @@ -24,7 +24,7 @@ pcsx_SOURCES = \
44145 hdebug.c hdebug.h
44146
44147 pcsx_LDADD = \
44148 - $(GTK2_LIBS) $(GIO2_LIBS) $(GLADE2_LIBS) ../libpcsxcore/libpcsxcore.la
44149 + $(GTK2_LIBS) $(GIO2_LIBS) $(GLADE2_LIBS) ../libpcsxcore/libpcsxcore.la -lpthread
44150
44151 pcsx_ui_DATA = pcsx-ui.xml
44152 pcsx_uidir = $(datadir)/pcsx
44153 diff -rupN original/gui/Makefile.in new/gui/Makefile.in
44154 --- original/gui/Makefile.in 2009-03-29 01:17:40.000000000 -0430
44155 +++ new/gui/Makefile.in 1969-12-31 20:00:00.000000000 -0400
44156 @@ -1,592 +0,0 @@
44157 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
44158 -# @configure_input@
44159 -
44160 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
44161 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
44162 -# This Makefile.in is free software; the Free Software Foundation
44163 -# gives unlimited permission to copy and/or distribute it,
44164 -# with or without modifications, as long as this notice is preserved.
44165 -
44166 -# This program is distributed in the hope that it will be useful,
44167 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
44168 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
44169 -# PARTICULAR PURPOSE.
44170 -
44171 -@SET_MAKE@
44172 -
44173 -
44174 -VPATH = @srcdir@
44175 -pkgdatadir = $(datadir)/@PACKAGE@
44176 -pkglibdir = $(libdir)/@PACKAGE@
44177 -pkgincludedir = $(includedir)/@PACKAGE@
44178 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
44179 -install_sh_DATA = $(install_sh) -c -m 644
44180 -install_sh_PROGRAM = $(install_sh) -c
44181 -install_sh_SCRIPT = $(install_sh) -c
44182 -INSTALL_HEADER = $(INSTALL_DATA)
44183 -transform = $(program_transform_name)
44184 -NORMAL_INSTALL = :
44185 -PRE_INSTALL = :
44186 -POST_INSTALL = :
44187 -NORMAL_UNINSTALL = :
44188 -PRE_UNINSTALL = :
44189 -POST_UNINSTALL = :
44190 -build_triplet = @build@
44191 -host_triplet = @host@
44192 -target_triplet = @target@
44193 -bin_PROGRAMS = pcsx$(EXEEXT)
44194 -subdir = gui
44195 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
44196 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44197 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
44198 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
44199 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
44200 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
44201 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
44202 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
44203 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
44204 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
44205 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
44206 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
44207 - $(top_srcdir)/configure.ac
44208 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
44209 - $(ACLOCAL_M4)
44210 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
44211 -CONFIG_HEADER = $(top_builddir)/include/config.h
44212 -CONFIG_CLEAN_FILES =
44213 -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pcsx_uidir)"
44214 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
44215 -PROGRAMS = $(bin_PROGRAMS)
44216 -am_pcsx_OBJECTS = LnxMain.$(OBJEXT) Plugin.$(OBJEXT) Config.$(OBJEXT) \
44217 - configure-dlg.$(OBJEXT) memcard-dlg.$(OBJEXT) \
44218 - plugin-file-handler.$(OBJEXT) pcsx-file-handler.$(OBJEXT) \
44219 - pcsx-memcard-handler.$(OBJEXT) Gtk2Gui.$(OBJEXT) \
44220 - pcsx-main-win.$(OBJEXT) hdebug.$(OBJEXT)
44221 -pcsx_OBJECTS = $(am_pcsx_OBJECTS)
44222 -am__DEPENDENCIES_1 =
44223 -pcsx_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
44224 - $(am__DEPENDENCIES_1) ../libpcsxcore/libpcsxcore.la
44225 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
44226 -depcomp = $(SHELL) $(top_srcdir)/depcomp
44227 -am__depfiles_maybe = depfiles
44228 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
44229 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
44230 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
44231 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
44232 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
44233 -CCLD = $(CC)
44234 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
44235 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
44236 - $(LDFLAGS) -o $@
44237 -SOURCES = $(pcsx_SOURCES)
44238 -DIST_SOURCES = $(pcsx_SOURCES)
44239 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
44240 -am__vpath_adj = case $$p in \
44241 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
44242 - *) f=$$p;; \
44243 - esac;
44244 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
44245 -pcsx_uiDATA_INSTALL = $(INSTALL_DATA)
44246 -DATA = $(pcsx_ui_DATA)
44247 -ETAGS = etags
44248 -CTAGS = ctags
44249 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
44250 -ACLOCAL = @ACLOCAL@
44251 -ALLOCA = @ALLOCA@
44252 -ALL_LINGUAS = @ALL_LINGUAS@
44253 -ALSA_LIBS = @ALSA_LIBS@
44254 -AMTAR = @AMTAR@
44255 -AR = @AR@
44256 -AUTOCONF = @AUTOCONF@
44257 -AUTOHEADER = @AUTOHEADER@
44258 -AUTOMAKE = @AUTOMAKE@
44259 -AWK = @AWK@
44260 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
44261 -BURN_CFLAGS = @BURN_CFLAGS@
44262 -BURN_LIBS = @BURN_LIBS@
44263 -CATOBJEXT = @CATOBJEXT@
44264 -CC = @CC@
44265 -CCAS = @CCAS@
44266 -CCASDEPMODE = @CCASDEPMODE@
44267 -CCASFLAGS = @CCASFLAGS@
44268 -CCDEPMODE = @CCDEPMODE@
44269 -CFLAGS = @CFLAGS@
44270 -CPP = @CPP@
44271 -CPPFLAGS = @CPPFLAGS@
44272 -CXX = @CXX@
44273 -CXXCPP = @CXXCPP@
44274 -CXXDEPMODE = @CXXDEPMODE@
44275 -CXXFLAGS = @CXXFLAGS@
44276 -CYGPATH_W = @CYGPATH_W@
44277 -DATADIRNAME = @DATADIRNAME@
44278 -DEFS = @DEFS@
44279 -DEPDIR = @DEPDIR@
44280 -DFBINIMAGE = @DFBINIMAGE@
44281 -DSYMUTIL = @DSYMUTIL@
44282 -ECHO = @ECHO@
44283 -ECHO_C = @ECHO_C@
44284 -ECHO_N = @ECHO_N@
44285 -ECHO_T = @ECHO_T@
44286 -EGREP = @EGREP@
44287 -EXEEXT = @EXEEXT@
44288 -F77 = @F77@
44289 -FFLAGS = @FFLAGS@
44290 -FLTKCONFIG = @FLTKCONFIG@
44291 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
44292 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
44293 -GENCAT = @GENCAT@
44294 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
44295 -GIO2_CFLAGS = @GIO2_CFLAGS@
44296 -GIO2_LIBS = @GIO2_LIBS@
44297 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
44298 -GLADE2_LIBS = @GLADE2_LIBS@
44299 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
44300 -GLIB2_LIBS = @GLIB2_LIBS@
44301 -GLIBC21 = @GLIBC21@
44302 -GMSGFMT = @GMSGFMT@
44303 -GREP = @GREP@
44304 -GTK2_CFLAGS = @GTK2_CFLAGS@
44305 -GTK2_LIBS = @GTK2_LIBS@
44306 -INSTALL = @INSTALL@
44307 -INSTALL_DATA = @INSTALL_DATA@
44308 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
44309 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
44310 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
44311 -INSTOBJEXT = @INSTOBJEXT@
44312 -INTLBISON = @INTLBISON@
44313 -INTLLIBS = @INTLLIBS@
44314 -INTLOBJS = @INTLOBJS@
44315 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
44316 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
44317 -INTLTOOL_PERL = @INTLTOOL_PERL@
44318 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
44319 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
44320 -LDFLAGS = @LDFLAGS@
44321 -LIBICONV = @LIBICONV@
44322 -LIBINTL = @LIBINTL@
44323 -LIBOBJS = @LIBOBJS@
44324 -LIBS = @LIBS@
44325 -LIBTOOL = @LIBTOOL@
44326 -LN_S = @LN_S@
44327 -LTLIBICONV = @LTLIBICONV@
44328 -LTLIBINTL = @LTLIBINTL@
44329 -LTLIBOBJS = @LTLIBOBJS@
44330 -MAINT = @MAINT@
44331 -MAKEINFO = @MAKEINFO@
44332 -MKDIR_P = @MKDIR_P@
44333 -MKINSTALLDIRS = @MKINSTALLDIRS@
44334 -MSGFMT = @MSGFMT@
44335 -MSGMERGE = @MSGMERGE@
44336 -NASM = @NASM@
44337 -NMEDIT = @NMEDIT@
44338 -OBJEXT = @OBJEXT@
44339 -PACKAGE = @PACKAGE@
44340 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
44341 -PACKAGE_NAME = @PACKAGE_NAME@
44342 -PACKAGE_STRING = @PACKAGE_STRING@
44343 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
44344 -PACKAGE_VERSION = @PACKAGE_VERSION@
44345 -PATH_SEPARATOR = @PATH_SEPARATOR@
44346 -PKG_CONFIG = @PKG_CONFIG@
44347 -POSUB = @POSUB@
44348 -RANLIB = @RANLIB@
44349 -SED = @SED@
44350 -SET_MAKE = @SET_MAKE@
44351 -SHELL = @SHELL@
44352 -STRIP = @STRIP@
44353 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
44354 -USE_NLS = @USE_NLS@
44355 -VERSION = @VERSION@
44356 -XGETTEXT = @XGETTEXT@
44357 -abs_builddir = @abs_builddir@
44358 -abs_srcdir = @abs_srcdir@
44359 -abs_top_builddir = @abs_top_builddir@
44360 -abs_top_srcdir = @abs_top_srcdir@
44361 -ac_ct_CC = @ac_ct_CC@
44362 -ac_ct_CXX = @ac_ct_CXX@
44363 -ac_ct_F77 = @ac_ct_F77@
44364 -am__include = @am__include@
44365 -am__leading_dot = @am__leading_dot@
44366 -am__quote = @am__quote@
44367 -am__tar = @am__tar@
44368 -am__untar = @am__untar@
44369 -bindir = @bindir@
44370 -build = @build@
44371 -build_alias = @build_alias@
44372 -build_cpu = @build_cpu@
44373 -build_os = @build_os@
44374 -build_vendor = @build_vendor@
44375 -builddir = @builddir@
44376 -datadir = @datadir@
44377 -datarootdir = @datarootdir@
44378 -docdir = @docdir@
44379 -dvidir = @dvidir@
44380 -exec_prefix = @exec_prefix@
44381 -host = @host@
44382 -host_alias = @host_alias@
44383 -host_cpu = @host_cpu@
44384 -host_os = @host_os@
44385 -host_vendor = @host_vendor@
44386 -htmldir = @htmldir@
44387 -includedir = @includedir@
44388 -infodir = @infodir@
44389 -install_sh = @install_sh@
44390 -libdir = @libdir@
44391 -libexecdir = @libexecdir@
44392 -localedir = @localedir@
44393 -localstatedir = @localstatedir@
44394 -mandir = @mandir@
44395 -mkdir_p = @mkdir_p@
44396 -oldincludedir = @oldincludedir@
44397 -pdfdir = @pdfdir@
44398 -prefix = @prefix@
44399 -program_transform_name = @program_transform_name@
44400 -psdir = @psdir@
44401 -sbindir = @sbindir@
44402 -sharedstatedir = @sharedstatedir@
44403 -srcdir = @srcdir@
44404 -sysconfdir = @sysconfdir@
44405 -target = @target@
44406 -target_alias = @target_alias@
44407 -target_cpu = @target_cpu@
44408 -target_os = @target_os@
44409 -target_vendor = @target_vendor@
44410 -top_build_prefix = @top_build_prefix@
44411 -top_builddir = @top_builddir@
44412 -top_srcdir = @top_srcdir@
44413 -INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
44414 - -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
44415 - -DLOCALE_DIR=\"${datadir}/locale/\" \
44416 - $(GTK2_CFLAGS) $(GIO2_CFLAGS) $(GLADE2_CFLAGS) \
44417 - -I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include
44418 -
44419 -pcsx_SOURCES = \
44420 - LnxMain.c \
44421 - Plugin.c \
44422 - Plugin.h \
44423 - Config.c Config.h \
44424 - Linux.h \
44425 - nopic.h \
44426 - configure-dlg.c configure-dlg.h \
44427 - memcard-dlg.c memcard-dlg.h \
44428 - plugin-file-handler.c plugin-file-handler.h \
44429 - pcsx-file-handler.c pcsx-file-handler.h \
44430 - pcsx-memcard-handler.c pcsx-memcard-handler.h \
44431 - Gtk2Gui.c Gtk2Gui.h \
44432 - pcsx-main-win.c pcsx-main-win.h \
44433 - hdebug.c hdebug.h
44434 -
44435 -pcsx_LDADD = \
44436 - $(GTK2_LIBS) $(GIO2_LIBS) $(GLADE2_LIBS) ../libpcsxcore/libpcsxcore.la
44437 -
44438 -pcsx_ui_DATA = pcsx-ui.xml
44439 -pcsx_uidir = $(datadir)/pcsx
44440 -EXTRA_DIST = $(pcsx_ui_DATA)
44441 -all: all-am
44442 -
44443 -.SUFFIXES:
44444 -.SUFFIXES: .c .lo .o .obj
44445 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
44446 - @for dep in $?; do \
44447 - case '$(am__configure_deps)' in \
44448 - *$$dep*) \
44449 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
44450 - && exit 0; \
44451 - exit 1;; \
44452 - esac; \
44453 - done; \
44454 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gui/Makefile'; \
44455 - cd $(top_srcdir) && \
44456 - $(AUTOMAKE) --gnu gui/Makefile
44457 -.PRECIOUS: Makefile
44458 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
44459 - @case '$?' in \
44460 - *config.status*) \
44461 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
44462 - *) \
44463 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
44464 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
44465 - esac;
44466 -
44467 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
44468 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
44469 -
44470 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
44471 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
44472 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
44473 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
44474 -install-binPROGRAMS: $(bin_PROGRAMS)
44475 - @$(NORMAL_INSTALL)
44476 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
44477 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
44478 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
44479 - if test -f $$p \
44480 - || test -f $$p1 \
44481 - ; then \
44482 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
44483 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
44484 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
44485 - else :; fi; \
44486 - done
44487 -
44488 -uninstall-binPROGRAMS:
44489 - @$(NORMAL_UNINSTALL)
44490 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
44491 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
44492 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
44493 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
44494 - done
44495 -
44496 -clean-binPROGRAMS:
44497 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
44498 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
44499 - echo " rm -f $$p $$f"; \
44500 - rm -f $$p $$f ; \
44501 - done
44502 -pcsx$(EXEEXT): $(pcsx_OBJECTS) $(pcsx_DEPENDENCIES)
44503 - @rm -f pcsx$(EXEEXT)
44504 - $(LINK) $(pcsx_OBJECTS) $(pcsx_LDADD) $(LIBS)
44505 -
44506 -mostlyclean-compile:
44507 - -rm -f *.$(OBJEXT)
44508 -
44509 -distclean-compile:
44510 - -rm -f *.tab.c
44511 -
44512 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Config.Po@am__quote@
44513 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gtk2Gui.Po@am__quote@
44514 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LnxMain.Po@am__quote@
44515 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Plugin.Po@am__quote@
44516 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configure-dlg.Po@am__quote@
44517 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdebug.Po@am__quote@
44518 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memcard-dlg.Po@am__quote@
44519 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcsx-file-handler.Po@am__quote@
44520 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcsx-main-win.Po@am__quote@
44521 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcsx-memcard-handler.Po@am__quote@
44522 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin-file-handler.Po@am__quote@
44523 -
44524 -.c.o:
44525 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
44526 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
44527 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
44528 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
44529 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
44530 -
44531 -.c.obj:
44532 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
44533 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
44534 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
44535 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
44536 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
44537 -
44538 -.c.lo:
44539 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
44540 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
44541 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
44542 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
44543 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
44544 -
44545 -mostlyclean-libtool:
44546 - -rm -f *.lo
44547 -
44548 -clean-libtool:
44549 - -rm -rf .libs _libs
44550 -install-pcsx_uiDATA: $(pcsx_ui_DATA)
44551 - @$(NORMAL_INSTALL)
44552 - test -z "$(pcsx_uidir)" || $(MKDIR_P) "$(DESTDIR)$(pcsx_uidir)"
44553 - @list='$(pcsx_ui_DATA)'; for p in $$list; do \
44554 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
44555 - f=$(am__strip_dir) \
44556 - echo " $(pcsx_uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcsx_uidir)/$$f'"; \
44557 - $(pcsx_uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcsx_uidir)/$$f"; \
44558 - done
44559 -
44560 -uninstall-pcsx_uiDATA:
44561 - @$(NORMAL_UNINSTALL)
44562 - @list='$(pcsx_ui_DATA)'; for p in $$list; do \
44563 - f=$(am__strip_dir) \
44564 - echo " rm -f '$(DESTDIR)$(pcsx_uidir)/$$f'"; \
44565 - rm -f "$(DESTDIR)$(pcsx_uidir)/$$f"; \
44566 - done
44567 -
44568 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
44569 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
44570 - unique=`for i in $$list; do \
44571 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
44572 - done | \
44573 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
44574 - END { if (nonempty) { for (i in files) print i; }; }'`; \
44575 - mkid -fID $$unique
44576 -tags: TAGS
44577 -
44578 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
44579 - $(TAGS_FILES) $(LISP)
44580 - tags=; \
44581 - here=`pwd`; \
44582 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
44583 - unique=`for i in $$list; do \
44584 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
44585 - done | \
44586 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
44587 - END { if (nonempty) { for (i in files) print i; }; }'`; \
44588 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
44589 - test -n "$$unique" || unique=$$empty_fix; \
44590 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
44591 - $$tags $$unique; \
44592 - fi
44593 -ctags: CTAGS
44594 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
44595 - $(TAGS_FILES) $(LISP)
44596 - tags=; \
44597 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
44598 - unique=`for i in $$list; do \
44599 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
44600 - done | \
44601 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
44602 - END { if (nonempty) { for (i in files) print i; }; }'`; \
44603 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
44604 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
44605 - $$tags $$unique
44606 -
44607 -GTAGS:
44608 - here=`$(am__cd) $(top_builddir) && pwd` \
44609 - && cd $(top_srcdir) \
44610 - && gtags -i $(GTAGS_ARGS) $$here
44611 -
44612 -distclean-tags:
44613 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
44614 -
44615 -distdir: $(DISTFILES)
44616 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
44617 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
44618 - list='$(DISTFILES)'; \
44619 - dist_files=`for file in $$list; do echo $$file; done | \
44620 - sed -e "s|^$$srcdirstrip/||;t" \
44621 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
44622 - case $$dist_files in \
44623 - */*) $(MKDIR_P) `echo "$$dist_files" | \
44624 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
44625 - sort -u` ;; \
44626 - esac; \
44627 - for file in $$dist_files; do \
44628 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
44629 - if test -d $$d/$$file; then \
44630 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
44631 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
44632 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
44633 - fi; \
44634 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
44635 - else \
44636 - test -f $(distdir)/$$file \
44637 - || cp -p $$d/$$file $(distdir)/$$file \
44638 - || exit 1; \
44639 - fi; \
44640 - done
44641 -check-am: all-am
44642 -check: check-am
44643 -all-am: Makefile $(PROGRAMS) $(DATA)
44644 -installdirs:
44645 - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pcsx_uidir)"; do \
44646 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
44647 - done
44648 -install: install-am
44649 -install-exec: install-exec-am
44650 -install-data: install-data-am
44651 -uninstall: uninstall-am
44652 -
44653 -install-am: all-am
44654 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
44655 -
44656 -installcheck: installcheck-am
44657 -install-strip:
44658 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
44659 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
44660 - `test -z '$(STRIP)' || \
44661 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
44662 -mostlyclean-generic:
44663 -
44664 -clean-generic:
44665 -
44666 -distclean-generic:
44667 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
44668 -
44669 -maintainer-clean-generic:
44670 - @echo "This command is intended for maintainers to use"
44671 - @echo "it deletes files that may require special tools to rebuild."
44672 -clean: clean-am
44673 -
44674 -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
44675 -
44676 -distclean: distclean-am
44677 - -rm -rf ./$(DEPDIR)
44678 - -rm -f Makefile
44679 -distclean-am: clean-am distclean-compile distclean-generic \
44680 - distclean-tags
44681 -
44682 -dvi: dvi-am
44683 -
44684 -dvi-am:
44685 -
44686 -html: html-am
44687 -
44688 -info: info-am
44689 -
44690 -info-am:
44691 -
44692 -install-data-am: install-pcsx_uiDATA
44693 -
44694 -install-dvi: install-dvi-am
44695 -
44696 -install-exec-am: install-binPROGRAMS
44697 -
44698 -install-html: install-html-am
44699 -
44700 -install-info: install-info-am
44701 -
44702 -install-man:
44703 -
44704 -install-pdf: install-pdf-am
44705 -
44706 -install-ps: install-ps-am
44707 -
44708 -installcheck-am:
44709 -
44710 -maintainer-clean: maintainer-clean-am
44711 - -rm -rf ./$(DEPDIR)
44712 - -rm -f Makefile
44713 -maintainer-clean-am: distclean-am maintainer-clean-generic
44714 -
44715 -mostlyclean: mostlyclean-am
44716 -
44717 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
44718 - mostlyclean-libtool
44719 -
44720 -pdf: pdf-am
44721 -
44722 -pdf-am:
44723 -
44724 -ps: ps-am
44725 -
44726 -ps-am:
44727 -
44728 -uninstall-am: uninstall-binPROGRAMS uninstall-pcsx_uiDATA
44729 -
44730 -.MAKE: install-am install-strip
44731 -
44732 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
44733 - clean-generic clean-libtool ctags distclean distclean-compile \
44734 - distclean-generic distclean-libtool distclean-tags distdir dvi \
44735 - dvi-am html html-am info info-am install install-am \
44736 - install-binPROGRAMS install-data install-data-am install-dvi \
44737 - install-dvi-am install-exec install-exec-am install-html \
44738 - install-html-am install-info install-info-am install-man \
44739 - install-pcsx_uiDATA install-pdf install-pdf-am install-ps \
44740 - install-ps-am install-strip installcheck installcheck-am \
44741 - installdirs maintainer-clean maintainer-clean-generic \
44742 - mostlyclean mostlyclean-compile mostlyclean-generic \
44743 - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
44744 - uninstall-am uninstall-binPROGRAMS uninstall-pcsx_uiDATA
44745 -
44746 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
44747 -# Otherwise a system limit (for SysV at least) may be exceeded.
44748 -.NOEXPORT:
44749 diff -rupN original/include/config.h.in new/include/config.h.in
44750 --- original/include/config.h.in 2009-03-28 22:34:08.000000000 -0430
44751 +++ new/include/config.h.in 2008-01-17 07:41:48.000000000 -0430
44752 @@ -1,16 +1,5 @@
44753 /* include/config.h.in. Generated from configure.ac by autoheader. */
44754
44755 -/* Define if building universal (internal helper macro) */
44756 -#undef AC_APPLE_UNIVERSAL_BUILD
44757 -
44758 -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
44759 - systems. This function is required for `alloca.c' support on those systems.
44760 - */
44761 -#undef CRAY_STACKSEG_END
44762 -
44763 -/* Define to 1 if using `alloca.c'. */
44764 -#undef C_ALLOCA
44765 -
44766 /* Define to 1 if translation of program messages to the user's native
44767 language is requested. */
44768 #undef ENABLE_NLS
44769 @@ -18,15 +7,13 @@
44770 /* gettext domain */
44771 #undef GETTEXT_PACKAGE
44772
44773 -/* Define to 1 if you have `alloca', as a function or macro. */
44774 -#undef HAVE_ALLOCA
44775 -
44776 -/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
44777 - */
44778 -#undef HAVE_ALLOCA_H
44779 -
44780 -/* Define to 1 if you have the <argz.h> header file. */
44781 -#undef HAVE_ARGZ_H
44782 +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
44783 + CoreFoundation framework. */
44784 +#undef HAVE_CFLOCALECOPYCURRENT
44785 +
44786 +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
44787 + the CoreFoundation framework. */
44788 +#undef HAVE_CFPREFERENCESCOPYAPPVALUE
44789
44790 /* Define if the GNU dcgettext() function is already present or preinstalled.
44791 */
44792 @@ -35,161 +22,42 @@
44793 /* Define to 1 if you have the <dlfcn.h> header file. */
44794 #undef HAVE_DLFCN_H
44795
44796 -/* Define to 1 if you have the `feof_unlocked' function. */
44797 -#undef HAVE_FEOF_UNLOCKED
44798 -
44799 -/* Define to 1 if you have the `fgets_unlocked' function. */
44800 -#undef HAVE_FGETS_UNLOCKED
44801 -
44802 -/* Define to 1 if you have the `getcwd' function. */
44803 -#undef HAVE_GETCWD
44804 -
44805 -/* Define to 1 if you have the `getc_unlocked' function. */
44806 -#undef HAVE_GETC_UNLOCKED
44807 -
44808 -/* Define to 1 if you have the `getegid' function. */
44809 -#undef HAVE_GETEGID
44810 -
44811 -/* Define to 1 if you have the `geteuid' function. */
44812 -#undef HAVE_GETEUID
44813 -
44814 -/* Define to 1 if you have the `getgid' function. */
44815 -#undef HAVE_GETGID
44816 -
44817 -/* Define to 1 if you have the `getpagesize' function. */
44818 -#undef HAVE_GETPAGESIZE
44819 -
44820 /* Define if the GNU gettext() function is already present or preinstalled. */
44821 #undef HAVE_GETTEXT
44822
44823 -/* Define to 1 if you have the `getuid' function. */
44824 -#undef HAVE_GETUID
44825 -
44826 -/* Define if you have the iconv() function. */
44827 +/* Define if you have the iconv() function and it works. */
44828 #undef HAVE_ICONV
44829
44830 -/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
44831 +/* Define to 1 if you have the <inttypes.h> header file. */
44832 #undef HAVE_INTTYPES_H
44833
44834 -/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
44835 - declares uintmax_t. */
44836 -#undef HAVE_INTTYPES_H_WITH_UINTMAX
44837 -
44838 -/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
44839 -#undef HAVE_LANGINFO_CODESET
44840 -
44841 -/* Define if your <locale.h> file defines LC_MESSAGES. */
44842 -#undef HAVE_LC_MESSAGES
44843 -
44844 -/* Define to 1 if you have the <limits.h> header file. */
44845 -#undef HAVE_LIMITS_H
44846 -
44847 -/* Define to 1 if you have the <locale.h> header file. */
44848 -#undef HAVE_LOCALE_H
44849 -
44850 -/* Define to 1 if you have the <malloc.h> header file. */
44851 -#undef HAVE_MALLOC_H
44852 -
44853 /* Define to 1 if you have the <memory.h> header file. */
44854 #undef HAVE_MEMORY_H
44855
44856 -/* Define to 1 if you have the `mempcpy' function. */
44857 -#undef HAVE_MEMPCPY
44858 -
44859 -/* Define to 1 if you have a working `mmap' system call. */
44860 -#undef HAVE_MMAP
44861 -
44862 -/* Define to 1 if you have the `munmap' function. */
44863 -#undef HAVE_MUNMAP
44864 -
44865 -/* Define to 1 if you have the <nl_types.h> header file. */
44866 -#undef HAVE_NL_TYPES_H
44867 -
44868 -/* Define to 1 if you have the `putenv' function. */
44869 -#undef HAVE_PUTENV
44870 -
44871 -/* Define to 1 if you have the `setenv' function. */
44872 -#undef HAVE_SETENV
44873 -
44874 -/* Define to 1 if you have the `setlocale' function. */
44875 -#undef HAVE_SETLOCALE
44876 -
44877 -/* Define to 1 if you have the <stddef.h> header file. */
44878 -#undef HAVE_STDDEF_H
44879 -
44880 /* Define to 1 if you have the <stdint.h> header file. */
44881 #undef HAVE_STDINT_H
44882
44883 -/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
44884 - uintmax_t. */
44885 -#undef HAVE_STDINT_H_WITH_UINTMAX
44886 -
44887 /* Define to 1 if you have the <stdlib.h> header file. */
44888 #undef HAVE_STDLIB_H
44889
44890 -/* Define to 1 if you have the `stpcpy' function. */
44891 -#undef HAVE_STPCPY
44892 -
44893 -/* Define to 1 if you have the `strcasecmp' function. */
44894 -#undef HAVE_STRCASECMP
44895 -
44896 -/* Define to 1 if you have the `strdup' function. */
44897 -#undef HAVE_STRDUP
44898 -
44899 /* Define to 1 if you have the <strings.h> header file. */
44900 #undef HAVE_STRINGS_H
44901
44902 /* Define to 1 if you have the <string.h> header file. */
44903 #undef HAVE_STRING_H
44904
44905 -/* Define to 1 if you have the `strtoul' function. */
44906 -#undef HAVE_STRTOUL
44907 -
44908 -/* Define to 1 if you have the <sys/param.h> header file. */
44909 -#undef HAVE_SYS_PARAM_H
44910 -
44911 /* Define to 1 if you have the <sys/stat.h> header file. */
44912 #undef HAVE_SYS_STAT_H
44913
44914 /* Define to 1 if you have the <sys/types.h> header file. */
44915 #undef HAVE_SYS_TYPES_H
44916
44917 -/* Define to 1 if you have the `tsearch' function. */
44918 -#undef HAVE_TSEARCH
44919 -
44920 -/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
44921 -#undef HAVE_UINTMAX_T
44922 -
44923 /* Define to 1 if you have the <unistd.h> header file. */
44924 #undef HAVE_UNISTD_H
44925
44926 -/* Define if you have the unsigned long long type. */
44927 -#undef HAVE_UNSIGNED_LONG_LONG
44928 -
44929 -/* Define to 1 if you have the `__argz_count' function. */
44930 -#undef HAVE___ARGZ_COUNT
44931 -
44932 -/* Define to 1 if you have the `__argz_next' function. */
44933 -#undef HAVE___ARGZ_NEXT
44934 -
44935 -/* Define to 1 if you have the `__argz_stringify' function. */
44936 -#undef HAVE___ARGZ_STRINGIFY
44937 -
44938 -/* Define to 1 if you have the `__fsetlocking' function. */
44939 -#undef HAVE___FSETLOCKING
44940 -
44941 -/* Define as const if the declaration of iconv() needs const. */
44942 -#undef ICONV_CONST
44943 -
44944 -/* Define if integer division by zero raises signal SIGFPE. */
44945 -#undef INTDIV0_RAISES_SIGFPE
44946 -
44947 /* Define to the maximum length of any path. */
44948 #undef MAXPATHLEN
44949
44950 -/* Define to 1 if your C compiler doesn't accept -c and -o together. */
44951 -#undef NO_MINUS_C_MINUS_O
44952 -
44953 /* Name of package */
44954 #undef PACKAGE
44955
44956 @@ -208,35 +76,12 @@
44957 /* Define to the version of this package. */
44958 #undef PACKAGE_VERSION
44959
44960 -/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
44961 -#undef PRI_MACROS_BROKEN
44962 -
44963 -/* If using the C implementation of alloca, define if you know the
44964 - direction of stack growth for your system; otherwise it will be
44965 - automatically deduced at runtime.
44966 - STACK_DIRECTION > 0 => grows toward higher addresses
44967 - STACK_DIRECTION < 0 => grows toward lower addresses
44968 - STACK_DIRECTION = 0 => direction of growth unknown */
44969 -#undef STACK_DIRECTION
44970 -
44971 /* Define to 1 if you have the ANSI C header files. */
44972 #undef STDC_HEADERS
44973
44974 /* Version number of package */
44975 #undef VERSION
44976
44977 -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
44978 - significant byte first (like Motorola and SPARC, unlike Intel). */
44979 -#if defined AC_APPLE_UNIVERSAL_BUILD
44980 -# if defined __BIG_ENDIAN__
44981 -# define WORDS_BIGENDIAN 1
44982 -# endif
44983 -#else
44984 -# ifndef WORDS_BIGENDIAN
44985 -# undef WORDS_BIGENDIAN
44986 -# endif
44987 -#endif
44988 -
44989 /* define on a big endian system */
44990 #undef __BIGENDIAN__
44991
44992 @@ -251,22 +96,3 @@
44993
44994 /* Define if we are compiling for x86_64 architectures. */
44995 #undef __x86_64__
44996 -
44997 -/* Define to empty if `const' does not conform to ANSI C. */
44998 -#undef const
44999 -
45000 -/* Define to `__inline__' or `__inline' if that's what the C compiler
45001 - calls it, or to nothing if 'inline' is not supported under any name. */
45002 -#ifndef __cplusplus
45003 -#undef inline
45004 -#endif
45005 -
45006 -/* Define to `long int' if <sys/types.h> does not define. */
45007 -#undef off_t
45008 -
45009 -/* Define to `unsigned int' if <sys/types.h> does not define. */
45010 -#undef size_t
45011 -
45012 -/* Define to unsigned long or unsigned long long if <stdint.h> and
45013 - <inttypes.h> don't define. */
45014 -#undef uintmax_t
45015 diff -rupN original/install-sh new/install-sh
45016 --- original/install-sh 2009-03-28 22:34:09.000000000 -0430
45017 +++ new/install-sh 1969-12-31 20:00:00.000000000 -0400
45018 @@ -1,519 +0,0 @@
45019 -#!/bin/sh
45020 -# install - install a program, script, or datafile
45021 -
45022 -scriptversion=2006-12-25.00
45023 -
45024 -# This originates from X11R5 (mit/util/scripts/install.sh), which was
45025 -# later released in X11R6 (xc/config/util/install.sh) with the
45026 -# following copyright and license.
45027 -#
45028 -# Copyright (C) 1994 X Consortium
45029 -#
45030 -# Permission is hereby granted, free of charge, to any person obtaining a copy
45031 -# of this software and associated documentation files (the "Software"), to
45032 -# deal in the Software without restriction, including without limitation the
45033 -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
45034 -# sell copies of the Software, and to permit persons to whom the Software is
45035 -# furnished to do so, subject to the following conditions:
45036 -#
45037 -# The above copyright notice and this permission notice shall be included in
45038 -# all copies or substantial portions of the Software.
45039 -#
45040 -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
45041 -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
45042 -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
45043 -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
45044 -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
45045 -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
45046 -#
45047 -# Except as contained in this notice, the name of the X Consortium shall not
45048 -# be used in advertising or otherwise to promote the sale, use or other deal-
45049 -# ings in this Software without prior written authorization from the X Consor-
45050 -# tium.
45051 -#
45052 -#
45053 -# FSF changes to this file are in the public domain.
45054 -#
45055 -# Calling this script install-sh is preferred over install.sh, to prevent
45056 -# `make' implicit rules from creating a file called install from it
45057 -# when there is no Makefile.
45058 -#
45059 -# This script is compatible with the BSD install script, but was written
45060 -# from scratch.
45061 -
45062 -nl='
45063 -'
45064 -IFS=" "" $nl"
45065 -
45066 -# set DOITPROG to echo to test this script
45067 -
45068 -# Don't use :- since 4.3BSD and earlier shells don't like it.
45069 -doit=${DOITPROG-}
45070 -if test -z "$doit"; then
45071 - doit_exec=exec
45072 -else
45073 - doit_exec=$doit
45074 -fi
45075 -
45076 -# Put in absolute file names if you don't have them in your path;
45077 -# or use environment vars.
45078 -
45079 -chgrpprog=${CHGRPPROG-chgrp}
45080 -chmodprog=${CHMODPROG-chmod}
45081 -chownprog=${CHOWNPROG-chown}
45082 -cmpprog=${CMPPROG-cmp}
45083 -cpprog=${CPPROG-cp}
45084 -mkdirprog=${MKDIRPROG-mkdir}
45085 -mvprog=${MVPROG-mv}
45086 -rmprog=${RMPROG-rm}
45087 -stripprog=${STRIPPROG-strip}
45088 -
45089 -posix_glob='?'
45090 -initialize_posix_glob='
45091 - test "$posix_glob" != "?" || {
45092 - if (set -f) 2>/dev/null; then
45093 - posix_glob=
45094 - else
45095 - posix_glob=:
45096 - fi
45097 - }
45098 -'
45099 -
45100 -posix_mkdir=
45101 -
45102 -# Desired mode of installed file.
45103 -mode=0755
45104 -
45105 -chgrpcmd=
45106 -chmodcmd=$chmodprog
45107 -chowncmd=
45108 -mvcmd=$mvprog
45109 -rmcmd="$rmprog -f"
45110 -stripcmd=
45111 -
45112 -src=
45113 -dst=
45114 -dir_arg=
45115 -dst_arg=
45116 -
45117 -copy_on_change=false
45118 -no_target_directory=
45119 -
45120 -usage="\
45121 -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
45122 - or: $0 [OPTION]... SRCFILES... DIRECTORY
45123 - or: $0 [OPTION]... -t DIRECTORY SRCFILES...
45124 - or: $0 [OPTION]... -d DIRECTORIES...
45125 -
45126 -In the 1st form, copy SRCFILE to DSTFILE.
45127 -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
45128 -In the 4th, create DIRECTORIES.
45129 -
45130 -Options:
45131 - --help display this help and exit.
45132 - --version display version info and exit.
45133 -
45134 - -c (ignored)
45135 - -C install only if different (preserve the last data modification time)
45136 - -d create directories instead of installing files.
45137 - -g GROUP $chgrpprog installed files to GROUP.
45138 - -m MODE $chmodprog installed files to MODE.
45139 - -o USER $chownprog installed files to USER.
45140 - -s $stripprog installed files.
45141 - -t DIRECTORY install into DIRECTORY.
45142 - -T report an error if DSTFILE is a directory.
45143 -
45144 -Environment variables override the default commands:
45145 - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
45146 - RMPROG STRIPPROG
45147 -"
45148 -
45149 -while test $# -ne 0; do
45150 - case $1 in
45151 - -c) ;;
45152 -
45153 - -C) copy_on_change=true;;
45154 -
45155 - -d) dir_arg=true;;
45156 -
45157 - -g) chgrpcmd="$chgrpprog $2"
45158 - shift;;
45159 -
45160 - --help) echo "$usage"; exit $?;;
45161 -
45162 - -m) mode=$2
45163 - case $mode in
45164 - *' '* | *' '* | *'
45165 -'* | *'*'* | *'?'* | *'['*)
45166 - echo "$0: invalid mode: $mode" >&2
45167 - exit 1;;
45168 - esac
45169 - shift;;
45170 -
45171 - -o) chowncmd="$chownprog $2"
45172 - shift;;
45173 -
45174 - -s) stripcmd=$stripprog;;
45175 -
45176 - -t) dst_arg=$2
45177 - shift;;
45178 -
45179 - -T) no_target_directory=true;;
45180 -
45181 - --version) echo "$0 $scriptversion"; exit $?;;
45182 -
45183 - --) shift
45184 - break;;
45185 -
45186 - -*) echo "$0: invalid option: $1" >&2
45187 - exit 1;;
45188 -
45189 - *) break;;
45190 - esac
45191 - shift
45192 -done
45193 -
45194 -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
45195 - # When -d is used, all remaining arguments are directories to create.
45196 - # When -t is used, the destination is already specified.
45197 - # Otherwise, the last argument is the destination. Remove it from $@.
45198 - for arg
45199 - do
45200 - if test -n "$dst_arg"; then
45201 - # $@ is not empty: it contains at least $arg.
45202 - set fnord "$@" "$dst_arg"
45203 - shift # fnord
45204 - fi
45205 - shift # arg
45206 - dst_arg=$arg
45207 - done
45208 -fi
45209 -
45210 -if test $# -eq 0; then
45211 - if test -z "$dir_arg"; then
45212 - echo "$0: no input file specified." >&2
45213 - exit 1
45214 - fi
45215 - # It's OK to call `install-sh -d' without argument.
45216 - # This can happen when creating conditional directories.
45217 - exit 0
45218 -fi
45219 -
45220 -if test -z "$dir_arg"; then
45221 - trap '(exit $?); exit' 1 2 13 15
45222 -
45223 - # Set umask so as not to create temps with too-generous modes.
45224 - # However, 'strip' requires both read and write access to temps.
45225 - case $mode in
45226 - # Optimize common cases.
45227 - *644) cp_umask=133;;
45228 - *755) cp_umask=22;;
45229 -
45230 - *[0-7])
45231 - if test -z "$stripcmd"; then
45232 - u_plus_rw=
45233 - else
45234 - u_plus_rw='% 200'
45235 - fi
45236 - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
45237 - *)
45238 - if test -z "$stripcmd"; then
45239 - u_plus_rw=
45240 - else
45241 - u_plus_rw=,u+rw
45242 - fi
45243 - cp_umask=$mode$u_plus_rw;;
45244 - esac
45245 -fi
45246 -
45247 -for src
45248 -do
45249 - # Protect names starting with `-'.
45250 - case $src in
45251 - -*) src=./$src;;
45252 - esac
45253 -
45254 - if test -n "$dir_arg"; then
45255 - dst=$src
45256 - dstdir=$dst
45257 - test -d "$dstdir"
45258 - dstdir_status=$?
45259 - else
45260 -
45261 - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
45262 - # might cause directories to be created, which would be especially bad
45263 - # if $src (and thus $dsttmp) contains '*'.
45264 - if test ! -f "$src" && test ! -d "$src"; then
45265 - echo "$0: $src does not exist." >&2
45266 - exit 1
45267 - fi
45268 -
45269 - if test -z "$dst_arg"; then
45270 - echo "$0: no destination specified." >&2
45271 - exit 1
45272 - fi
45273 -
45274 - dst=$dst_arg
45275 - # Protect names starting with `-'.
45276 - case $dst in
45277 - -*) dst=./$dst;;
45278 - esac
45279 -
45280 - # If destination is a directory, append the input filename; won't work
45281 - # if double slashes aren't ignored.
45282 - if test -d "$dst"; then
45283 - if test -n "$no_target_directory"; then
45284 - echo "$0: $dst_arg: Is a directory" >&2
45285 - exit 1
45286 - fi
45287 - dstdir=$dst
45288 - dst=$dstdir/`basename "$src"`
45289 - dstdir_status=0
45290 - else
45291 - # Prefer dirname, but fall back on a substitute if dirname fails.
45292 - dstdir=`
45293 - (dirname "$dst") 2>/dev/null ||
45294 - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
45295 - X"$dst" : 'X\(//\)[^/]' \| \
45296 - X"$dst" : 'X\(//\)$' \| \
45297 - X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
45298 - echo X"$dst" |
45299 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
45300 - s//\1/
45301 - q
45302 - }
45303 - /^X\(\/\/\)[^/].*/{
45304 - s//\1/
45305 - q
45306 - }
45307 - /^X\(\/\/\)$/{
45308 - s//\1/
45309 - q
45310 - }
45311 - /^X\(\/\).*/{
45312 - s//\1/
45313 - q
45314 - }
45315 - s/.*/./; q'
45316 - `
45317 -
45318 - test -d "$dstdir"
45319 - dstdir_status=$?
45320 - fi
45321 - fi
45322 -
45323 - obsolete_mkdir_used=false
45324 -
45325 - if test $dstdir_status != 0; then
45326 - case $posix_mkdir in
45327 - '')
45328 - # Create intermediate dirs using mode 755 as modified by the umask.
45329 - # This is like FreeBSD 'install' as of 1997-10-28.
45330 - umask=`umask`
45331 - case $stripcmd.$umask in
45332 - # Optimize common cases.
45333 - *[2367][2367]) mkdir_umask=$umask;;
45334 - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
45335 -
45336 - *[0-7])
45337 - mkdir_umask=`expr $umask + 22 \
45338 - - $umask % 100 % 40 + $umask % 20 \
45339 - - $umask % 10 % 4 + $umask % 2
45340 - `;;
45341 - *) mkdir_umask=$umask,go-w;;
45342 - esac
45343 -
45344 - # With -d, create the new directory with the user-specified mode.
45345 - # Otherwise, rely on $mkdir_umask.
45346 - if test -n "$dir_arg"; then
45347 - mkdir_mode=-m$mode
45348 - else
45349 - mkdir_mode=
45350 - fi
45351 -
45352 - posix_mkdir=false
45353 - case $umask in
45354 - *[123567][0-7][0-7])
45355 - # POSIX mkdir -p sets u+wx bits regardless of umask, which
45356 - # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
45357 - ;;
45358 - *)
45359 - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
45360 - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
45361 -
45362 - if (umask $mkdir_umask &&
45363 - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
45364 - then
45365 - if test -z "$dir_arg" || {
45366 - # Check for POSIX incompatibilities with -m.
45367 - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
45368 - # other-writeable bit of parent directory when it shouldn't.
45369 - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
45370 - ls_ld_tmpdir=`ls -ld "$tmpdir"`
45371 - case $ls_ld_tmpdir in
45372 - d????-?r-*) different_mode=700;;
45373 - d????-?--*) different_mode=755;;
45374 - *) false;;
45375 - esac &&
45376 - $mkdirprog -m$different_mode -p -- "$tmpdir" && {
45377 - ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
45378 - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
45379 - }
45380 - }
45381 - then posix_mkdir=:
45382 - fi
45383 - rmdir "$tmpdir/d" "$tmpdir"
45384 - else
45385 - # Remove any dirs left behind by ancient mkdir implementations.
45386 - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
45387 - fi
45388 - trap '' 0;;
45389 - esac;;
45390 - esac
45391 -
45392 - if
45393 - $posix_mkdir && (
45394 - umask $mkdir_umask &&
45395 - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
45396 - )
45397 - then :
45398 - else
45399 -
45400 - # The umask is ridiculous, or mkdir does not conform to POSIX,
45401 - # or it failed possibly due to a race condition. Create the
45402 - # directory the slow way, step by step, checking for races as we go.
45403 -
45404 - case $dstdir in
45405 - /*) prefix='/';;
45406 - -*) prefix='./';;
45407 - *) prefix='';;
45408 - esac
45409 -
45410 - eval "$initialize_posix_glob"
45411 -
45412 - oIFS=$IFS
45413 - IFS=/
45414 - $posix_glob set -f
45415 - set fnord $dstdir
45416 - shift
45417 - $posix_glob set +f
45418 - IFS=$oIFS
45419 -
45420 - prefixes=
45421 -
45422 - for d
45423 - do
45424 - test -z "$d" && continue
45425 -
45426 - prefix=$prefix$d
45427 - if test -d "$prefix"; then
45428 - prefixes=
45429 - else
45430 - if $posix_mkdir; then
45431 - (umask=$mkdir_umask &&
45432 - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
45433 - # Don't fail if two instances are running concurrently.
45434 - test -d "$prefix" || exit 1
45435 - else
45436 - case $prefix in
45437 - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
45438 - *) qprefix=$prefix;;
45439 - esac
45440 - prefixes="$prefixes '$qprefix'"
45441 - fi
45442 - fi
45443 - prefix=$prefix/
45444 - done
45445 -
45446 - if test -n "$prefixes"; then
45447 - # Don't fail if two instances are running concurrently.
45448 - (umask $mkdir_umask &&
45449 - eval "\$doit_exec \$mkdirprog $prefixes") ||
45450 - test -d "$dstdir" || exit 1
45451 - obsolete_mkdir_used=true
45452 - fi
45453 - fi
45454 - fi
45455 -
45456 - if test -n "$dir_arg"; then
45457 - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
45458 - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
45459 - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
45460 - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
45461 - else
45462 -
45463 - # Make a couple of temp file names in the proper directory.
45464 - dsttmp=$dstdir/_inst.$$_
45465 - rmtmp=$dstdir/_rm.$$_
45466 -
45467 - # Trap to clean up those temp files at exit.
45468 - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
45469 -
45470 - # Copy the file name to the temp name.
45471 - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
45472 -
45473 - # and set any options; do chmod last to preserve setuid bits.
45474 - #
45475 - # If any of these fail, we abort the whole thing. If we want to
45476 - # ignore errors from any of these, just make sure not to ignore
45477 - # errors from the above "$doit $cpprog $src $dsttmp" command.
45478 - #
45479 - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
45480 - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
45481 - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
45482 - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
45483 -
45484 - # If -C, don't bother to copy if it wouldn't change the file.
45485 - if $copy_on_change &&
45486 - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
45487 - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
45488 -
45489 - eval "$initialize_posix_glob" &&
45490 - $posix_glob set -f &&
45491 - set X $old && old=:$2:$4:$5:$6 &&
45492 - set X $new && new=:$2:$4:$5:$6 &&
45493 - $posix_glob set +f &&
45494 -
45495 - test "$old" = "$new" &&
45496 - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
45497 - then
45498 - rm -f "$dsttmp"
45499 - else
45500 - # Rename the file to the real destination.
45501 - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
45502 -
45503 - # The rename failed, perhaps because mv can't rename something else
45504 - # to itself, or perhaps because mv is so ancient that it does not
45505 - # support -f.
45506 - {
45507 - # Now remove or move aside any old file at destination location.
45508 - # We try this two ways since rm can't unlink itself on some
45509 - # systems and the destination file might be busy for other
45510 - # reasons. In this case, the final cleanup might fail but the new
45511 - # file should still install successfully.
45512 - {
45513 - test ! -f "$dst" ||
45514 - $doit $rmcmd -f "$dst" 2>/dev/null ||
45515 - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
45516 - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
45517 - } ||
45518 - { echo "$0: cannot unlink or rename $dst" >&2
45519 - (exit 1); exit 1
45520 - }
45521 - } &&
45522 -
45523 - # Now rename the file to the real destination.
45524 - $doit $mvcmd "$dsttmp" "$dst"
45525 - }
45526 - fi || exit 1
45527 -
45528 - trap '' 0
45529 - fi
45530 -done
45531 -
45532 -# Local variables:
45533 -# eval: (add-hook 'write-file-hooks 'time-stamp)
45534 -# time-stamp-start: "scriptversion="
45535 -# time-stamp-format: "%:y-%02m-%02d.%02H"
45536 -# time-stamp-end: "$"
45537 -# End:
45538 diff -rupN original/intl/ChangeLog new/intl/ChangeLog
45539 --- original/intl/ChangeLog 2009-03-28 22:33:59.000000000 -0430
45540 +++ new/intl/ChangeLog 1969-12-31 20:00:00.000000000 -0400
45541 @@ -1,4 +0,0 @@
45542 -2003-05-22 GNU <bug-gnu-gettext@gnu.org>
45543 -
45544 - * Version 0.12.1 released.
45545 -
45546 diff -rupN original/intl/Makefile.in new/intl/Makefile.in
45547 --- original/intl/Makefile.in 2009-03-28 22:33:59.000000000 -0430
45548 +++ new/intl/Makefile.in 1969-12-31 20:00:00.000000000 -0400
45549 @@ -1,479 +0,0 @@
45550 -# Makefile for directory with message catalog handling library of GNU gettext
45551 -# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
45552 -#
45553 -# This program is free software; you can redistribute it and/or modify it
45554 -# under the terms of the GNU Library General Public License as published
45555 -# by the Free Software Foundation; either version 2, or (at your option)
45556 -# any later version.
45557 -#
45558 -# This program is distributed in the hope that it will be useful,
45559 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
45560 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45561 -# Library General Public License for more details.
45562 -#
45563 -# You should have received a copy of the GNU Library General Public
45564 -# License along with this program; if not, write to the Free Software
45565 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
45566 -# USA.
45567 -
45568 -PACKAGE = @PACKAGE@
45569 -VERSION = @VERSION@
45570 -
45571 -SHELL = /bin/sh
45572 -
45573 -srcdir = @srcdir@
45574 -top_srcdir = @top_srcdir@
45575 -top_builddir = ..
45576 -VPATH = $(srcdir)
45577 -
45578 -prefix = @prefix@
45579 -exec_prefix = @exec_prefix@
45580 -transform = @program_transform_name@
45581 -libdir = @libdir@
45582 -includedir = @includedir@
45583 -datadir = @datadir@
45584 -localedir = $(datadir)/locale
45585 -gettextsrcdir = $(datadir)/gettext/intl
45586 -aliaspath = $(localedir)
45587 -subdir = intl
45588 -
45589 -INSTALL = @INSTALL@
45590 -INSTALL_DATA = @INSTALL_DATA@
45591 -MKINSTALLDIRS = @MKINSTALLDIRS@
45592 -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
45593 -
45594 -l = @INTL_LIBTOOL_SUFFIX_PREFIX@
45595 -
45596 -AR = ar
45597 -CC = @CC@
45598 -LIBTOOL = @LIBTOOL@
45599 -RANLIB = @RANLIB@
45600 -YACC = @INTLBISON@ -y -d
45601 -YFLAGS = --name-prefix=__gettext
45602 -
45603 -DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
45604 --DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
45605 --DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
45606 --Dset_relocation_prefix=libintl_set_relocation_prefix \
45607 --Drelocate=libintl_relocate \
45608 --DDEPENDS_ON_LIBICONV=1 @DEFS@
45609 -CPPFLAGS = @CPPFLAGS@
45610 -CFLAGS = @CFLAGS@
45611 -LDFLAGS = @LDFLAGS@
45612 -LIBS = @LIBS@
45613 -
45614 -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
45615 -
45616 -HEADERS = \
45617 - gmo.h \
45618 - gettextP.h \
45619 - hash-string.h \
45620 - loadinfo.h \
45621 - plural-exp.h \
45622 - eval-plural.h \
45623 - localcharset.h \
45624 - relocatable.h \
45625 - os2compat.h \
45626 - libgnuintl.h.in
45627 -SOURCES = \
45628 - bindtextdom.c \
45629 - dcgettext.c \
45630 - dgettext.c \
45631 - gettext.c \
45632 - finddomain.c \
45633 - loadmsgcat.c \
45634 - localealias.c \
45635 - textdomain.c \
45636 - l10nflist.c \
45637 - explodename.c \
45638 - dcigettext.c \
45639 - dcngettext.c \
45640 - dngettext.c \
45641 - ngettext.c \
45642 - plural.y \
45643 - plural-exp.c \
45644 - localcharset.c \
45645 - relocatable.c \
45646 - localename.c \
45647 - log.c \
45648 - osdep.c \
45649 - os2compat.c \
45650 - intl-compat.c
45651 -OBJECTS = \
45652 - bindtextdom.$lo \
45653 - dcgettext.$lo \
45654 - dgettext.$lo \
45655 - gettext.$lo \
45656 - finddomain.$lo \
45657 - loadmsgcat.$lo \
45658 - localealias.$lo \
45659 - textdomain.$lo \
45660 - l10nflist.$lo \
45661 - explodename.$lo \
45662 - dcigettext.$lo \
45663 - dcngettext.$lo \
45664 - dngettext.$lo \
45665 - ngettext.$lo \
45666 - plural.$lo \
45667 - plural-exp.$lo \
45668 - localcharset.$lo \
45669 - relocatable.$lo \
45670 - localename.$lo \
45671 - log.$lo \
45672 - osdep.$lo \
45673 - intl-compat.$lo
45674 -DISTFILES.common = Makefile.in \
45675 -config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
45676 -DISTFILES.generated = plural.c
45677 -DISTFILES.normal = VERSION
45678 -DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
45679 -Makefile.vms libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
45680 -DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
45681 -COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
45682 -
45683 -all: all-@USE_INCLUDED_LIBINTL@
45684 -all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
45685 -all-no: all-no-@BUILD_INCLUDED_LIBINTL@
45686 -all-no-yes: libgnuintl.$la
45687 -all-no-no:
45688 -
45689 -libintl.a libgnuintl.a: $(OBJECTS)
45690 - rm -f $@
45691 - $(AR) cru $@ $(OBJECTS)
45692 - $(RANLIB) $@
45693 -
45694 -libintl.la libgnuintl.la: $(OBJECTS)
45695 - $(LIBTOOL) --mode=link \
45696 - $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
45697 - $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
45698 - -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
45699 - -rpath $(libdir) \
45700 - -no-undefined
45701 -
45702 -# Libtool's library version information for libintl.
45703 -# Before making a gettext release, the gettext maintainer must change this
45704 -# according to the libtool documentation, section "Library interface versions".
45705 -# Maintainers of other packages that include the intl directory must *not*
45706 -# change these values.
45707 -LTV_CURRENT=5
45708 -LTV_REVISION=0
45709 -LTV_AGE=3
45710 -
45711 -.SUFFIXES:
45712 -.SUFFIXES: .c .y .o .lo .sin .sed
45713 -
45714 -.c.o:
45715 - $(COMPILE) $<
45716 -
45717 -.y.c:
45718 - $(YACC) $(YFLAGS) --output $@ $<
45719 - rm -f $*.h
45720 -
45721 -bindtextdom.lo: $(srcdir)/bindtextdom.c
45722 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
45723 -dcgettext.lo: $(srcdir)/dcgettext.c
45724 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
45725 -dgettext.lo: $(srcdir)/dgettext.c
45726 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
45727 -gettext.lo: $(srcdir)/gettext.c
45728 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
45729 -finddomain.lo: $(srcdir)/finddomain.c
45730 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
45731 -loadmsgcat.lo: $(srcdir)/loadmsgcat.c
45732 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
45733 -localealias.lo: $(srcdir)/localealias.c
45734 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
45735 -textdomain.lo: $(srcdir)/textdomain.c
45736 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
45737 -l10nflist.lo: $(srcdir)/l10nflist.c
45738 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
45739 -explodename.lo: $(srcdir)/explodename.c
45740 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
45741 -dcigettext.lo: $(srcdir)/dcigettext.c
45742 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
45743 -dcngettext.lo: $(srcdir)/dcngettext.c
45744 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
45745 -dngettext.lo: $(srcdir)/dngettext.c
45746 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
45747 -ngettext.lo: $(srcdir)/ngettext.c
45748 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
45749 -plural.lo: $(srcdir)/plural.c
45750 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
45751 -plural-exp.lo: $(srcdir)/plural-exp.c
45752 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
45753 -localcharset.lo: $(srcdir)/localcharset.c
45754 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
45755 -relocatable.lo: $(srcdir)/relocatable.c
45756 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
45757 -localename.lo: $(srcdir)/localename.c
45758 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
45759 -log.lo: $(srcdir)/log.c
45760 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
45761 -osdep.lo: $(srcdir)/osdep.c
45762 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
45763 -intl-compat.lo: $(srcdir)/intl-compat.c
45764 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
45765 -
45766 -ref-add.sed: $(srcdir)/ref-add.sin
45767 - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
45768 - mv t-ref-add.sed ref-add.sed
45769 -ref-del.sed: $(srcdir)/ref-del.sin
45770 - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
45771 - mv t-ref-del.sed ref-del.sed
45772 -
45773 -INCLUDES = -I. -I$(srcdir) -I..
45774 -
45775 -libgnuintl.h: $(srcdir)/libgnuintl.h.in
45776 - cp $(srcdir)/libgnuintl.h.in libgnuintl.h
45777 -
45778 -libintl.h: libgnuintl.h
45779 - cp libgnuintl.h libintl.h
45780 -
45781 -charset.alias: $(srcdir)/config.charset
45782 - $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
45783 - mv t-$@ $@
45784 -
45785 -check: all
45786 -
45787 -# We must not install the libintl.h/libintl.a files if we are on a
45788 -# system which has the GNU gettext() function in its C library or in a
45789 -# separate library.
45790 -# If you want to use the one which comes with this version of the
45791 -# package, you have to use `configure --with-included-gettext'.
45792 -install: install-exec install-data
45793 -install-exec: all
45794 - if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
45795 - && test '@USE_INCLUDED_LIBINTL@' = yes; then \
45796 - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
45797 - $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
45798 - $(LIBTOOL) --mode=install \
45799 - $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
45800 - if test "@RELOCATABLE@" = yes; then \
45801 - dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
45802 - if test -n "$dependencies"; then \
45803 - rm -f $(DESTDIR)$(libdir)/libintl.la; \
45804 - fi; \
45805 - fi; \
45806 - else \
45807 - : ; \
45808 - fi
45809 - if test "$(PACKAGE)" = "gettext-tools" \
45810 - && test '@USE_INCLUDED_LIBINTL@' = no; then \
45811 - $(mkinstalldirs) $(DESTDIR)$(libdir); \
45812 - $(LIBTOOL) --mode=install \
45813 - $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
45814 - rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
45815 - $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
45816 - $(LIBTOOL) --mode=uninstall \
45817 - rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
45818 - else \
45819 - : ; \
45820 - fi
45821 - if test '@USE_INCLUDED_LIBINTL@' = yes; then \
45822 - test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
45823 - temp=$(DESTDIR)$(libdir)/t-charset.alias; \
45824 - dest=$(DESTDIR)$(libdir)/charset.alias; \
45825 - if test -f $(DESTDIR)$(libdir)/charset.alias; then \
45826 - orig=$(DESTDIR)$(libdir)/charset.alias; \
45827 - sed -f ref-add.sed $$orig > $$temp; \
45828 - $(INSTALL_DATA) $$temp $$dest; \
45829 - rm -f $$temp; \
45830 - else \
45831 - if test @GLIBC21@ = no; then \
45832 - orig=charset.alias; \
45833 - sed -f ref-add.sed $$orig > $$temp; \
45834 - $(INSTALL_DATA) $$temp $$dest; \
45835 - rm -f $$temp; \
45836 - fi; \
45837 - fi; \
45838 - $(mkinstalldirs) $(DESTDIR)$(localedir); \
45839 - test -f $(DESTDIR)$(localedir)/locale.alias \
45840 - && orig=$(DESTDIR)$(localedir)/locale.alias \
45841 - || orig=$(srcdir)/locale.alias; \
45842 - temp=$(DESTDIR)$(localedir)/t-locale.alias; \
45843 - dest=$(DESTDIR)$(localedir)/locale.alias; \
45844 - sed -f ref-add.sed $$orig > $$temp; \
45845 - $(INSTALL_DATA) $$temp $$dest; \
45846 - rm -f $$temp; \
45847 - else \
45848 - : ; \
45849 - fi
45850 -install-data: all
45851 - if test "$(PACKAGE)" = "gettext-tools"; then \
45852 - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
45853 - $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
45854 - $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
45855 - dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
45856 - for file in $$dists; do \
45857 - $(INSTALL_DATA) $(srcdir)/$$file \
45858 - $(DESTDIR)$(gettextsrcdir)/$$file; \
45859 - done; \
45860 - chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
45861 - dists="$(DISTFILES.generated)"; \
45862 - for file in $$dists; do \
45863 - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
45864 - $(INSTALL_DATA) $$dir/$$file \
45865 - $(DESTDIR)$(gettextsrcdir)/$$file; \
45866 - done; \
45867 - dists="$(DISTFILES.obsolete)"; \
45868 - for file in $$dists; do \
45869 - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
45870 - done; \
45871 - else \
45872 - : ; \
45873 - fi
45874 -
45875 -install-strip: install
45876 -
45877 -installdirs:
45878 - if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
45879 - && test '@USE_INCLUDED_LIBINTL@' = yes; then \
45880 - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
45881 - else \
45882 - : ; \
45883 - fi
45884 - if test "$(PACKAGE)" = "gettext-tools" \
45885 - && test '@USE_INCLUDED_LIBINTL@' = no; then \
45886 - $(mkinstalldirs) $(DESTDIR)$(libdir); \
45887 - else \
45888 - : ; \
45889 - fi
45890 - if test '@USE_INCLUDED_LIBINTL@' = yes; then \
45891 - test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
45892 - $(mkinstalldirs) $(DESTDIR)$(localedir); \
45893 - else \
45894 - : ; \
45895 - fi
45896 - if test "$(PACKAGE)" = "gettext-tools"; then \
45897 - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
45898 - else \
45899 - : ; \
45900 - fi
45901 -
45902 -# Define this as empty until I found a useful application.
45903 -installcheck:
45904 -
45905 -uninstall:
45906 - if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
45907 - && test '@USE_INCLUDED_LIBINTL@' = yes; then \
45908 - rm -f $(DESTDIR)$(includedir)/libintl.h; \
45909 - $(LIBTOOL) --mode=uninstall \
45910 - rm -f $(DESTDIR)$(libdir)/libintl.$la; \
45911 - else \
45912 - : ; \
45913 - fi
45914 - if test "$(PACKAGE)" = "gettext-tools" \
45915 - && test '@USE_INCLUDED_LIBINTL@' = no; then \
45916 - rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
45917 - else \
45918 - : ; \
45919 - fi
45920 - if test '@USE_INCLUDED_LIBINTL@' = yes; then \
45921 - if test -f $(DESTDIR)$(libdir)/charset.alias; then \
45922 - temp=$(DESTDIR)$(libdir)/t-charset.alias; \
45923 - dest=$(DESTDIR)$(libdir)/charset.alias; \
45924 - sed -f ref-del.sed $$dest > $$temp; \
45925 - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
45926 - rm -f $$dest; \
45927 - else \
45928 - $(INSTALL_DATA) $$temp $$dest; \
45929 - fi; \
45930 - rm -f $$temp; \
45931 - fi; \
45932 - if test -f $(DESTDIR)$(localedir)/locale.alias; then \
45933 - temp=$(DESTDIR)$(localedir)/t-locale.alias; \
45934 - dest=$(DESTDIR)$(localedir)/locale.alias; \
45935 - sed -f ref-del.sed $$dest > $$temp; \
45936 - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
45937 - rm -f $$dest; \
45938 - else \
45939 - $(INSTALL_DATA) $$temp $$dest; \
45940 - fi; \
45941 - rm -f $$temp; \
45942 - fi; \
45943 - else \
45944 - : ; \
45945 - fi
45946 - if test "$(PACKAGE)" = "gettext-tools"; then \
45947 - for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
45948 - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
45949 - done; \
45950 - else \
45951 - : ; \
45952 - fi
45953 -
45954 -info dvi ps pdf html:
45955 -
45956 -$(OBJECTS): ../config.h libgnuintl.h
45957 -bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
45958 -dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
45959 -explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
45960 -dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
45961 -dcigettext.$lo: $(srcdir)/eval-plural.h
45962 -localcharset.$lo: $(srcdir)/localcharset.h
45963 -localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
45964 -
45965 -tags: TAGS
45966 -
45967 -TAGS: $(HEADERS) $(SOURCES)
45968 - here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
45969 -
45970 -ctags: CTAGS
45971 -
45972 -CTAGS: $(HEADERS) $(SOURCES)
45973 - here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
45974 -
45975 -id: ID
45976 -
45977 -ID: $(HEADERS) $(SOURCES)
45978 - here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
45979 -
45980 -
45981 -mostlyclean:
45982 - rm -f *.a *.la *.o *.obj *.lo core core.*
45983 - rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
45984 - rm -f -r .libs _libs
45985 -
45986 -clean: mostlyclean
45987 -
45988 -distclean: clean
45989 - rm -f Makefile ID TAGS
45990 - if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
45991 - rm -f ChangeLog.inst $(DISTFILES.normal); \
45992 - else \
45993 - : ; \
45994 - fi
45995 -
45996 -maintainer-clean: distclean
45997 - @echo "This command is intended for maintainers to use;"
45998 - @echo "it deletes files that may require special tools to rebuild."
45999 -
46000 -
46001 -# GNU gettext needs not contain the file `VERSION' but contains some
46002 -# other files which should not be distributed in other packages.
46003 -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
46004 -dist distdir: Makefile
46005 - if test "$(PACKAGE)" = "gettext-tools"; then \
46006 - : ; \
46007 - else \
46008 - if test "$(PACKAGE)" = "gettext-runtime"; then \
46009 - additional="$(DISTFILES.gettext)"; \
46010 - else \
46011 - additional="$(DISTFILES.normal)"; \
46012 - fi; \
46013 - $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
46014 - for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
46015 - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
46016 - cp -p $$dir/$$file $(distdir); \
46017 - done; \
46018 - fi
46019 -
46020 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
46021 - cd $(top_builddir) && $(SHELL) ./config.status
46022 -# This would be more efficient, but doesn't work any more with autoconf-2.57,
46023 -# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
46024 -# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
46025 -
46026 -# Tell versions [3.59,3.63) of GNU make not to export all variables.
46027 -# Otherwise a system limit (for SysV at least) may be exceeded.
46028 -.NOEXPORT:
46029 diff -rupN original/intl/VERSION new/intl/VERSION
46030 --- original/intl/VERSION 2009-03-28 22:33:59.000000000 -0430
46031 +++ new/intl/VERSION 1969-12-31 20:00:00.000000000 -0400
46032 @@ -1 +0,0 @@
46033 -GNU gettext library from gettext-0.12.1
46034 diff -rupN original/intl/bindtextdom.c new/intl/bindtextdom.c
46035 --- original/intl/bindtextdom.c 2009-03-28 22:33:59.000000000 -0430
46036 +++ new/intl/bindtextdom.c 1969-12-31 20:00:00.000000000 -0400
46037 @@ -1,374 +0,0 @@
46038 -/* Implementation of the bindtextdomain(3) function
46039 - Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
46040 -
46041 - This program is free software; you can redistribute it and/or modify it
46042 - under the terms of the GNU Library General Public License as published
46043 - by the Free Software Foundation; either version 2, or (at your option)
46044 - any later version.
46045 -
46046 - This program is distributed in the hope that it will be useful,
46047 - but WITHOUT ANY WARRANTY; without even the implied warranty of
46048 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
46049 - Library General Public License for more details.
46050 -
46051 - You should have received a copy of the GNU Library General Public
46052 - License along with this program; if not, write to the Free Software
46053 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
46054 - USA. */
46055 -
46056 -#ifdef HAVE_CONFIG_H
46057 -# include <config.h>
46058 -#endif
46059 -
46060 -#include <stddef.h>
46061 -#include <stdlib.h>
46062 -#include <string.h>
46063 -
46064 -#ifdef _LIBC
46065 -# include <libintl.h>
46066 -#else
46067 -# include "libgnuintl.h"
46068 -#endif
46069 -#include "gettextP.h"
46070 -
46071 -#ifdef _LIBC
46072 -/* We have to handle multi-threaded applications. */
46073 -# include <bits/libc-lock.h>
46074 -#else
46075 -/* Provide dummy implementation if this is outside glibc. */
46076 -# define __libc_rwlock_define(CLASS, NAME)
46077 -# define __libc_rwlock_wrlock(NAME)
46078 -# define __libc_rwlock_unlock(NAME)
46079 -#endif
46080 -
46081 -/* The internal variables in the standalone libintl.a must have different
46082 - names than the internal variables in GNU libc, otherwise programs
46083 - using libintl.a cannot be linked statically. */
46084 -#if !defined _LIBC
46085 -# define _nl_default_dirname libintl_nl_default_dirname
46086 -# define _nl_domain_bindings libintl_nl_domain_bindings
46087 -#endif
46088 -
46089 -/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
46090 -#ifndef offsetof
46091 -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
46092 -#endif
46093 -
46094 -/* @@ end of prolog @@ */
46095 -
46096 -/* Contains the default location of the message catalogs. */
46097 -extern const char _nl_default_dirname[];
46098 -#ifdef _LIBC
46099 -extern const char _nl_default_dirname_internal[] attribute_hidden;
46100 -#else
46101 -# define INTUSE(name) name
46102 -#endif
46103 -
46104 -/* List with bindings of specific domains. */
46105 -extern struct binding *_nl_domain_bindings;
46106 -
46107 -/* Lock variable to protect the global data in the gettext implementation. */
46108 -__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
46109 -
46110 -
46111 -/* Names for the libintl functions are a problem. They must not clash
46112 - with existing names and they should follow ANSI C. But this source
46113 - code is also used in GNU C Library where the names have a __
46114 - prefix. So we have to make a difference here. */
46115 -#ifdef _LIBC
46116 -# define BINDTEXTDOMAIN __bindtextdomain
46117 -# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
46118 -# ifndef strdup
46119 -# define strdup(str) __strdup (str)
46120 -# endif
46121 -#else
46122 -# define BINDTEXTDOMAIN libintl_bindtextdomain
46123 -# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
46124 -#endif
46125 -
46126 -/* Prototypes for local functions. */
46127 -static void set_binding_values PARAMS ((const char *domainname,
46128 - const char **dirnamep,
46129 - const char **codesetp));
46130 -
46131 -/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
46132 - to be used for the DOMAINNAME message catalog.
46133 - If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
46134 - modified, only the current value is returned.
46135 - If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
46136 - modified nor returned. */
46137 -static void
46138 -set_binding_values (domainname, dirnamep, codesetp)
46139 - const char *domainname;
46140 - const char **dirnamep;
46141 - const char **codesetp;
46142 -{
46143 - struct binding *binding;
46144 - int modified;
46145 -
46146 - /* Some sanity checks. */
46147 - if (domainname == NULL || domainname[0] == '\0')
46148 - {
46149 - if (dirnamep)
46150 - *dirnamep = NULL;
46151 - if (codesetp)
46152 - *codesetp = NULL;
46153 - return;
46154 - }
46155 -
46156 - __libc_rwlock_wrlock (_nl_state_lock);
46157 -
46158 - modified = 0;
46159 -
46160 - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
46161 - {
46162 - int compare = strcmp (domainname, binding->domainname);
46163 - if (compare == 0)
46164 - /* We found it! */
46165 - break;
46166 - if (compare < 0)
46167 - {
46168 - /* It is not in the list. */
46169 - binding = NULL;
46170 - break;
46171 - }
46172 - }
46173 -
46174 - if (binding != NULL)
46175 - {
46176 - if (dirnamep)
46177 - {
46178 - const char *dirname = *dirnamep;
46179 -
46180 - if (dirname == NULL)
46181 - /* The current binding has be to returned. */
46182 - *dirnamep = binding->dirname;
46183 - else
46184 - {
46185 - /* The domain is already bound. If the new value and the old
46186 - one are equal we simply do nothing. Otherwise replace the
46187 - old binding. */
46188 - char *result = binding->dirname;
46189 - if (strcmp (dirname, result) != 0)
46190 - {
46191 - if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
46192 - result = (char *) INTUSE(_nl_default_dirname);
46193 - else
46194 - {
46195 -#if defined _LIBC || defined HAVE_STRDUP
46196 - result = strdup (dirname);
46197 -#else
46198 - size_t len = strlen (dirname) + 1;
46199 - result = (char *) malloc (len);
46200 - if (__builtin_expect (result != NULL, 1))
46201 - memcpy (result, dirname, len);
46202 -#endif
46203 - }
46204 -
46205 - if (__builtin_expect (result != NULL, 1))
46206 - {
46207 - if (binding->dirname != INTUSE(_nl_default_dirname))
46208 - free (binding->dirname);
46209 -
46210 - binding->dirname = result;
46211 - modified = 1;
46212 - }
46213 - }
46214 - *dirnamep = result;
46215 - }
46216 - }
46217 -
46218 - if (codesetp)
46219 - {
46220 - const char *codeset = *codesetp;
46221 -
46222 - if (codeset == NULL)
46223 - /* The current binding has be to returned. */
46224 - *codesetp = binding->codeset;
46225 - else
46226 - {
46227 - /* The domain is already bound. If the new value and the old
46228 - one are equal we simply do nothing. Otherwise replace the
46229 - old binding. */
46230 - char *result = binding->codeset;
46231 - if (result == NULL || strcmp (codeset, result) != 0)
46232 - {
46233 -#if defined _LIBC || defined HAVE_STRDUP
46234 - result = strdup (codeset);
46235 -#else
46236 - size_t len = strlen (codeset) + 1;
46237 - result = (char *) malloc (len);
46238 - if (__builtin_expect (result != NULL, 1))
46239 - memcpy (result, codeset, len);
46240 -#endif
46241 -
46242 - if (__builtin_expect (result != NULL, 1))
46243 - {
46244 - if (binding->codeset != NULL)
46245 - free (binding->codeset);
46246 -
46247 - binding->codeset = result;
46248 - binding->codeset_cntr++;
46249 - modified = 1;
46250 - }
46251 - }
46252 - *codesetp = result;
46253 - }
46254 - }
46255 - }
46256 - else if ((dirnamep == NULL || *dirnamep == NULL)
46257 - && (codesetp == NULL || *codesetp == NULL))
46258 - {
46259 - /* Simply return the default values. */
46260 - if (dirnamep)
46261 - *dirnamep = INTUSE(_nl_default_dirname);
46262 - if (codesetp)
46263 - *codesetp = NULL;
46264 - }
46265 - else
46266 - {
46267 - /* We have to create a new binding. */
46268 - size_t len = strlen (domainname) + 1;
46269 - struct binding *new_binding =
46270 - (struct binding *) malloc (offsetof (struct binding, domainname) + len);
46271 -
46272 - if (__builtin_expect (new_binding == NULL, 0))
46273 - goto failed;
46274 -
46275 - memcpy (new_binding->domainname, domainname, len);
46276 -
46277 - if (dirnamep)
46278 - {
46279 - const char *dirname = *dirnamep;
46280 -
46281 - if (dirname == NULL)
46282 - /* The default value. */
46283 - dirname = INTUSE(_nl_default_dirname);
46284 - else
46285 - {
46286 - if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
46287 - dirname = INTUSE(_nl_default_dirname);
46288 - else
46289 - {
46290 - char *result;
46291 -#if defined _LIBC || defined HAVE_STRDUP
46292 - result = strdup (dirname);
46293 - if (__builtin_expect (result == NULL, 0))
46294 - goto failed_dirname;
46295 -#else
46296 - size_t len = strlen (dirname) + 1;
46297 - result = (char *) malloc (len);
46298 - if (__builtin_expect (result == NULL, 0))
46299 - goto failed_dirname;
46300 - memcpy (result, dirname, len);
46301 -#endif
46302 - dirname = result;
46303 - }
46304 - }
46305 - *dirnamep = dirname;
46306 - new_binding->dirname = (char *) dirname;
46307 - }
46308 - else
46309 - /* The default value. */
46310 - new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
46311 -
46312 - new_binding->codeset_cntr = 0;
46313 -
46314 - if (codesetp)
46315 - {
46316 - const char *codeset = *codesetp;
46317 -
46318 - if (codeset != NULL)
46319 - {
46320 - char *result;
46321 -
46322 -#if defined _LIBC || defined HAVE_STRDUP
46323 - result = strdup (codeset);
46324 - if (__builtin_expect (result == NULL, 0))
46325 - goto failed_codeset;
46326 -#else
46327 - size_t len = strlen (codeset) + 1;
46328 - result = (char *) malloc (len);
46329 - if (__builtin_expect (result == NULL, 0))
46330 - goto failed_codeset;
46331 - memcpy (result, codeset, len);
46332 -#endif
46333 - codeset = result;
46334 - new_binding->codeset_cntr++;
46335 - }
46336 - *codesetp = codeset;
46337 - new_binding->codeset = (char *) codeset;
46338 - }
46339 - else
46340 - new_binding->codeset = NULL;
46341 -
46342 - /* Now enqueue it. */
46343 - if (_nl_domain_bindings == NULL
46344 - || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
46345 - {
46346 - new_binding->next = _nl_domain_bindings;
46347 - _nl_domain_bindings = new_binding;
46348 - }
46349 - else
46350 - {
46351 - binding = _nl_domain_bindings;
46352 - while (binding->next != NULL
46353 - && strcmp (domainname, binding->next->domainname) > 0)
46354 - binding = binding->next;
46355 -
46356 - new_binding->next = binding->next;
46357 - binding->next = new_binding;
46358 - }
46359 -
46360 - modified = 1;
46361 -
46362 - /* Here we deal with memory allocation failures. */
46363 - if (0)
46364 - {
46365 - failed_codeset:
46366 - if (new_binding->dirname != INTUSE(_nl_default_dirname))
46367 - free (new_binding->dirname);
46368 - failed_dirname:
46369 - free (new_binding);
46370 - failed:
46371 - if (dirnamep)
46372 - *dirnamep = NULL;
46373 - if (codesetp)
46374 - *codesetp = NULL;
46375 - }
46376 - }
46377 -
46378 - /* If we modified any binding, we flush the caches. */
46379 - if (modified)
46380 - ++_nl_msg_cat_cntr;
46381 -
46382 - __libc_rwlock_unlock (_nl_state_lock);
46383 -}
46384 -
46385 -/* Specify that the DOMAINNAME message catalog will be found
46386 - in DIRNAME rather than in the system locale data base. */
46387 -char *
46388 -BINDTEXTDOMAIN (domainname, dirname)
46389 - const char *domainname;
46390 - const char *dirname;
46391 -{
46392 - set_binding_values (domainname, &dirname, NULL);
46393 - return (char *) dirname;
46394 -}
46395 -
46396 -/* Specify the character encoding in which the messages from the
46397 - DOMAINNAME message catalog will be returned. */
46398 -char *
46399 -BIND_TEXTDOMAIN_CODESET (domainname, codeset)
46400 - const char *domainname;
46401 - const char *codeset;
46402 -{
46403 - set_binding_values (domainname, NULL, &codeset);
46404 - return (char *) codeset;
46405 -}
46406 -
46407 -#ifdef _LIBC
46408 -/* Aliases for function names in GNU C Library. */
46409 -weak_alias (__bindtextdomain, bindtextdomain);
46410 -weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
46411 -#endif
46412 diff -rupN original/intl/config.charset new/intl/config.charset
46413 --- original/intl/config.charset 2009-03-28 22:33:59.000000000 -0430
46414 +++ new/intl/config.charset 1969-12-31 20:00:00.000000000 -0400
46415 @@ -1,467 +0,0 @@
46416 -#! /bin/sh
46417 -# Output a system dependent table of character encoding aliases.
46418 -#
46419 -# Copyright (C) 2000-2003 Free Software Foundation, Inc.
46420 -#
46421 -# This program is free software; you can redistribute it and/or modify it
46422 -# under the terms of the GNU Library General Public License as published
46423 -# by the Free Software Foundation; either version 2, or (at your option)
46424 -# any later version.
46425 -#
46426 -# This program is distributed in the hope that it will be useful,
46427 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
46428 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
46429 -# Library General Public License for more details.
46430 -#
46431 -# You should have received a copy of the GNU Library General Public
46432 -# License along with this program; if not, write to the Free Software
46433 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
46434 -# USA.
46435 -#
46436 -# The table consists of lines of the form
46437 -# ALIAS CANONICAL
46438 -#
46439 -# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
46440 -# ALIAS is compared in a case sensitive way.
46441 -#
46442 -# CANONICAL is the GNU canonical name for this character encoding.
46443 -# It must be an encoding supported by libiconv. Support by GNU libc is
46444 -# also desirable. CANONICAL is case insensitive. Usually an upper case
46445 -# MIME charset name is preferred.
46446 -# The current list of GNU canonical charset names is as follows.
46447 -#
46448 -# name used by which systems a MIME name?
46449 -# ASCII, ANSI_X3.4-1968 glibc solaris freebsd
46450 -# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes
46451 -# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes
46452 -# ISO-8859-3 glibc solaris yes
46453 -# ISO-8859-4 osf solaris freebsd yes
46454 -# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes
46455 -# ISO-8859-6 glibc aix hpux solaris yes
46456 -# ISO-8859-7 glibc aix hpux irix osf solaris yes
46457 -# ISO-8859-8 glibc aix hpux osf solaris yes
46458 -# ISO-8859-9 glibc aix hpux irix osf solaris yes
46459 -# ISO-8859-13 glibc
46460 -# ISO-8859-14 glibc
46461 -# ISO-8859-15 glibc aix osf solaris freebsd
46462 -# KOI8-R glibc solaris freebsd yes
46463 -# KOI8-U glibc freebsd yes
46464 -# KOI8-T glibc
46465 -# CP437 dos
46466 -# CP775 dos
46467 -# CP850 aix osf dos
46468 -# CP852 dos
46469 -# CP855 dos
46470 -# CP856 aix
46471 -# CP857 dos
46472 -# CP861 dos
46473 -# CP862 dos
46474 -# CP864 dos
46475 -# CP865 dos
46476 -# CP866 freebsd dos
46477 -# CP869 dos
46478 -# CP874 woe32 dos
46479 -# CP922 aix
46480 -# CP932 aix woe32 dos
46481 -# CP943 aix
46482 -# CP949 osf woe32 dos
46483 -# CP950 woe32 dos
46484 -# CP1046 aix
46485 -# CP1124 aix
46486 -# CP1125 dos
46487 -# CP1129 aix
46488 -# CP1250 woe32
46489 -# CP1251 glibc solaris woe32
46490 -# CP1252 aix woe32
46491 -# CP1253 woe32
46492 -# CP1254 woe32
46493 -# CP1255 glibc woe32
46494 -# CP1256 woe32
46495 -# CP1257 woe32
46496 -# GB2312 glibc aix hpux irix solaris freebsd yes
46497 -# EUC-JP glibc aix hpux irix osf solaris freebsd yes
46498 -# EUC-KR glibc aix hpux irix osf solaris freebsd yes
46499 -# EUC-TW glibc aix hpux irix osf solaris
46500 -# BIG5 glibc aix hpux osf solaris freebsd yes
46501 -# BIG5-HKSCS glibc solaris
46502 -# GBK glibc aix osf solaris woe32 dos
46503 -# GB18030 glibc solaris
46504 -# SHIFT_JIS hpux osf solaris freebsd yes
46505 -# JOHAB glibc solaris woe32
46506 -# TIS-620 glibc aix hpux osf solaris
46507 -# VISCII glibc yes
46508 -# TCVN5712-1 glibc
46509 -# GEORGIAN-PS glibc
46510 -# HP-ROMAN8 hpux
46511 -# HP-ARABIC8 hpux
46512 -# HP-GREEK8 hpux
46513 -# HP-HEBREW8 hpux
46514 -# HP-TURKISH8 hpux
46515 -# HP-KANA8 hpux
46516 -# DEC-KANJI osf
46517 -# DEC-HANYU osf
46518 -# UTF-8 glibc aix hpux osf solaris yes
46519 -#
46520 -# Note: Names which are not marked as being a MIME name should not be used in
46521 -# Internet protocols for information interchange (mail, news, etc.).
46522 -#
46523 -# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
46524 -# must understand both names and treat them as equivalent.
46525 -#
46526 -# The first argument passed to this file is the canonical host specification,
46527 -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
46528 -# or
46529 -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
46530 -
46531 -host="$1"
46532 -os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
46533 -echo "# This file contains a table of character encoding aliases,"
46534 -echo "# suitable for operating system '${os}'."
46535 -echo "# It was automatically generated from config.charset."
46536 -# List of references, updated during installation:
46537 -echo "# Packages using this file: "
46538 -case "$os" in
46539 - linux* | *-gnu*)
46540 - # With glibc-2.1 or newer, we don't need any canonicalization,
46541 - # because glibc has iconv and both glibc and libiconv support all
46542 - # GNU canonical names directly. Therefore, the Makefile does not
46543 - # need to install the alias file at all.
46544 - # The following applies only to glibc-2.0.x and older libcs.
46545 - echo "ISO_646.IRV:1983 ASCII"
46546 - ;;
46547 - aix*)
46548 - echo "ISO8859-1 ISO-8859-1"
46549 - echo "ISO8859-2 ISO-8859-2"
46550 - echo "ISO8859-5 ISO-8859-5"
46551 - echo "ISO8859-6 ISO-8859-6"
46552 - echo "ISO8859-7 ISO-8859-7"
46553 - echo "ISO8859-8 ISO-8859-8"
46554 - echo "ISO8859-9 ISO-8859-9"
46555 - echo "ISO8859-15 ISO-8859-15"
46556 - echo "IBM-850 CP850"
46557 - echo "IBM-856 CP856"
46558 - echo "IBM-921 ISO-8859-13"
46559 - echo "IBM-922 CP922"
46560 - echo "IBM-932 CP932"
46561 - echo "IBM-943 CP943"
46562 - echo "IBM-1046 CP1046"
46563 - echo "IBM-1124 CP1124"
46564 - echo "IBM-1129 CP1129"
46565 - echo "IBM-1252 CP1252"
46566 - echo "IBM-eucCN GB2312"
46567 - echo "IBM-eucJP EUC-JP"
46568 - echo "IBM-eucKR EUC-KR"
46569 - echo "IBM-eucTW EUC-TW"
46570 - echo "big5 BIG5"
46571 - echo "GBK GBK"
46572 - echo "TIS-620 TIS-620"
46573 - echo "UTF-8 UTF-8"
46574 - ;;
46575 - hpux*)
46576 - echo "iso88591 ISO-8859-1"
46577 - echo "iso88592 ISO-8859-2"
46578 - echo "iso88595 ISO-8859-5"
46579 - echo "iso88596 ISO-8859-6"
46580 - echo "iso88597 ISO-8859-7"
46581 - echo "iso88598 ISO-8859-8"
46582 - echo "iso88599 ISO-8859-9"
46583 - echo "iso885915 ISO-8859-15"
46584 - echo "roman8 HP-ROMAN8"
46585 - echo "arabic8 HP-ARABIC8"
46586 - echo "greek8 HP-GREEK8"
46587 - echo "hebrew8 HP-HEBREW8"
46588 - echo "turkish8 HP-TURKISH8"
46589 - echo "kana8 HP-KANA8"
46590 - echo "tis620 TIS-620"
46591 - echo "big5 BIG5"
46592 - echo "eucJP EUC-JP"
46593 - echo "eucKR EUC-KR"
46594 - echo "eucTW EUC-TW"
46595 - echo "hp15CN GB2312"
46596 - #echo "ccdc ?" # what is this?
46597 - echo "SJIS SHIFT_JIS"
46598 - echo "utf8 UTF-8"
46599 - ;;
46600 - irix*)
46601 - echo "ISO8859-1 ISO-8859-1"
46602 - echo "ISO8859-2 ISO-8859-2"
46603 - echo "ISO8859-5 ISO-8859-5"
46604 - echo "ISO8859-7 ISO-8859-7"
46605 - echo "ISO8859-9 ISO-8859-9"
46606 - echo "eucCN GB2312"
46607 - echo "eucJP EUC-JP"
46608 - echo "eucKR EUC-KR"
46609 - echo "eucTW EUC-TW"
46610 - ;;
46611 - osf*)
46612 - echo "ISO8859-1 ISO-8859-1"
46613 - echo "ISO8859-2 ISO-8859-2"
46614 - echo "ISO8859-4 ISO-8859-4"
46615 - echo "ISO8859-5 ISO-8859-5"
46616 - echo "ISO8859-7 ISO-8859-7"
46617 - echo "ISO8859-8 ISO-8859-8"
46618 - echo "ISO8859-9 ISO-8859-9"
46619 - echo "ISO8859-15 ISO-8859-15"
46620 - echo "cp850 CP850"
46621 - echo "big5 BIG5"
46622 - echo "dechanyu DEC-HANYU"
46623 - echo "dechanzi GB2312"
46624 - echo "deckanji DEC-KANJI"
46625 - echo "deckorean EUC-KR"
46626 - echo "eucJP EUC-JP"
46627 - echo "eucKR EUC-KR"
46628 - echo "eucTW EUC-TW"
46629 - echo "GBK GBK"
46630 - echo "KSC5601 CP949"
46631 - echo "sdeckanji EUC-JP"
46632 - echo "SJIS SHIFT_JIS"
46633 - echo "TACTIS TIS-620"
46634 - echo "UTF-8 UTF-8"
46635 - ;;
46636 - solaris*)
46637 - echo "646 ASCII"
46638 - echo "ISO8859-1 ISO-8859-1"
46639 - echo "ISO8859-2 ISO-8859-2"
46640 - echo "ISO8859-3 ISO-8859-3"
46641 - echo "ISO8859-4 ISO-8859-4"
46642 - echo "ISO8859-5 ISO-8859-5"
46643 - echo "ISO8859-6 ISO-8859-6"
46644 - echo "ISO8859-7 ISO-8859-7"
46645 - echo "ISO8859-8 ISO-8859-8"
46646 - echo "ISO8859-9 ISO-8859-9"
46647 - echo "ISO8859-15 ISO-8859-15"
46648 - echo "koi8-r KOI8-R"
46649 - echo "ansi-1251 CP1251"
46650 - echo "BIG5 BIG5"
46651 - echo "Big5-HKSCS BIG5-HKSCS"
46652 - echo "gb2312 GB2312"
46653 - echo "GBK GBK"
46654 - echo "GB18030 GB18030"
46655 - echo "cns11643 EUC-TW"
46656 - echo "5601 EUC-KR"
46657 - echo "ko_KR.johap92 JOHAB"
46658 - echo "eucJP EUC-JP"
46659 - echo "PCK SHIFT_JIS"
46660 - echo "TIS620.2533 TIS-620"
46661 - #echo "sun_eu_greek ?" # what is this?
46662 - echo "UTF-8 UTF-8"
46663 - ;;
46664 - freebsd* | os2*)
46665 - # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
46666 - # localcharset.c falls back to using the full locale name
46667 - # from the environment variables.
46668 - # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
46669 - # reuse FreeBSD's locale data for OS/2.
46670 - echo "C ASCII"
46671 - echo "US-ASCII ASCII"
46672 - for l in la_LN lt_LN; do
46673 - echo "$l.ASCII ASCII"
46674 - done
46675 - for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
46676 - fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
46677 - lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
46678 - echo "$l.ISO_8859-1 ISO-8859-1"
46679 - echo "$l.DIS_8859-15 ISO-8859-15"
46680 - done
46681 - for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
46682 - echo "$l.ISO_8859-2 ISO-8859-2"
46683 - done
46684 - for l in la_LN lt_LT; do
46685 - echo "$l.ISO_8859-4 ISO-8859-4"
46686 - done
46687 - for l in ru_RU ru_SU; do
46688 - echo "$l.KOI8-R KOI8-R"
46689 - echo "$l.ISO_8859-5 ISO-8859-5"
46690 - echo "$l.CP866 CP866"
46691 - done
46692 - echo "uk_UA.KOI8-U KOI8-U"
46693 - echo "zh_TW.BIG5 BIG5"
46694 - echo "zh_TW.Big5 BIG5"
46695 - echo "zh_CN.EUC GB2312"
46696 - echo "ja_JP.EUC EUC-JP"
46697 - echo "ja_JP.SJIS SHIFT_JIS"
46698 - echo "ja_JP.Shift_JIS SHIFT_JIS"
46699 - echo "ko_KR.EUC EUC-KR"
46700 - ;;
46701 - netbsd*)
46702 - echo "646 ASCII"
46703 - echo "ISO8859-1 ISO-8859-1"
46704 - echo "ISO8859-2 ISO-8859-2"
46705 - echo "ISO8859-4 ISO-8859-4"
46706 - echo "ISO8859-5 ISO-8859-5"
46707 - echo "ISO8859-15 ISO-8859-15"
46708 - echo "eucCN GB2312"
46709 - echo "eucJP EUC-JP"
46710 - echo "eucKR EUC-KR"
46711 - echo "eucTW EUC-TW"
46712 - echo "BIG5 BIG5"
46713 - echo "SJIS SHIFT_JIS"
46714 - ;;
46715 - beos*)
46716 - # BeOS has a single locale, and it has UTF-8 encoding.
46717 - echo "* UTF-8"
46718 - ;;
46719 - msdosdjgpp*)
46720 - # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
46721 - # localcharset.c falls back to using the full locale name
46722 - # from the environment variables.
46723 - echo "#"
46724 - echo "# The encodings given here may not all be correct."
46725 - echo "# If you find that the encoding given for your language and"
46726 - echo "# country is not the one your DOS machine actually uses, just"
46727 - echo "# correct it in this file, and send a mail to"
46728 - echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
46729 - echo "# and Bruno Haible <bruno@clisp.org>."
46730 - echo "#"
46731 - echo "C ASCII"
46732 - # ISO-8859-1 languages
46733 - echo "ca CP850"
46734 - echo "ca_ES CP850"
46735 - echo "da CP865" # not CP850 ??
46736 - echo "da_DK CP865" # not CP850 ??
46737 - echo "de CP850"
46738 - echo "de_AT CP850"
46739 - echo "de_CH CP850"
46740 - echo "de_DE CP850"
46741 - echo "en CP850"
46742 - echo "en_AU CP850" # not CP437 ??
46743 - echo "en_CA CP850"
46744 - echo "en_GB CP850"
46745 - echo "en_NZ CP437"
46746 - echo "en_US CP437"
46747 - echo "en_ZA CP850" # not CP437 ??
46748 - echo "es CP850"
46749 - echo "es_AR CP850"
46750 - echo "es_BO CP850"
46751 - echo "es_CL CP850"
46752 - echo "es_CO CP850"
46753 - echo "es_CR CP850"
46754 - echo "es_CU CP850"
46755 - echo "es_DO CP850"
46756 - echo "es_EC CP850"
46757 - echo "es_ES CP850"
46758 - echo "es_GT CP850"
46759 - echo "es_HN CP850"
46760 - echo "es_MX CP850"
46761 - echo "es_NI CP850"
46762 - echo "es_PA CP850"
46763 - echo "es_PY CP850"
46764 - echo "es_PE CP850"
46765 - echo "es_SV CP850"
46766 - echo "es_UY CP850"
46767 - echo "es_VE CP850"
46768 - echo "et CP850"
46769 - echo "et_EE CP850"
46770 - echo "eu CP850"
46771 - echo "eu_ES CP850"
46772 - echo "fi CP850"
46773 - echo "fi_FI CP850"
46774 - echo "fr CP850"
46775 - echo "fr_BE CP850"
46776 - echo "fr_CA CP850"
46777 - echo "fr_CH CP850"
46778 - echo "fr_FR CP850"
46779 - echo "ga CP850"
46780 - echo "ga_IE CP850"
46781 - echo "gd CP850"
46782 - echo "gd_GB CP850"
46783 - echo "gl CP850"
46784 - echo "gl_ES CP850"
46785 - echo "id CP850" # not CP437 ??
46786 - echo "id_ID CP850" # not CP437 ??
46787 - echo "is CP861" # not CP850 ??
46788 - echo "is_IS CP861" # not CP850 ??
46789 - echo "it CP850"
46790 - echo "it_CH CP850"
46791 - echo "it_IT CP850"
46792 - echo "lt CP775"
46793 - echo "lt_LT CP775"
46794 - echo "lv CP775"
46795 - echo "lv_LV CP775"
46796 - echo "nb CP865" # not CP850 ??
46797 - echo "nb_NO CP865" # not CP850 ??
46798 - echo "nl CP850"
46799 - echo "nl_BE CP850"
46800 - echo "nl_NL CP850"
46801 - echo "nn CP865" # not CP850 ??
46802 - echo "nn_NO CP865" # not CP850 ??
46803 - echo "no CP865" # not CP850 ??
46804 - echo "no_NO CP865" # not CP850 ??
46805 - echo "pt CP850"
46806 - echo "pt_BR CP850"
46807 - echo "pt_PT CP850"
46808 - echo "sv CP850"
46809 - echo "sv_SE CP850"
46810 - # ISO-8859-2 languages
46811 - echo "cs CP852"
46812 - echo "cs_CZ CP852"
46813 - echo "hr CP852"
46814 - echo "hr_HR CP852"
46815 - echo "hu CP852"
46816 - echo "hu_HU CP852"
46817 - echo "pl CP852"
46818 - echo "pl_PL CP852"
46819 - echo "ro CP852"
46820 - echo "ro_RO CP852"
46821 - echo "sk CP852"
46822 - echo "sk_SK CP852"
46823 - echo "sl CP852"
46824 - echo "sl_SI CP852"
46825 - echo "sq CP852"
46826 - echo "sq_AL CP852"
46827 - echo "sr CP852" # CP852 or CP866 or CP855 ??
46828 - echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
46829 - # ISO-8859-3 languages
46830 - echo "mt CP850"
46831 - echo "mt_MT CP850"
46832 - # ISO-8859-5 languages
46833 - echo "be CP866"
46834 - echo "be_BE CP866"
46835 - echo "bg CP866" # not CP855 ??
46836 - echo "bg_BG CP866" # not CP855 ??
46837 - echo "mk CP866" # not CP855 ??
46838 - echo "mk_MK CP866" # not CP855 ??
46839 - echo "ru CP866"
46840 - echo "ru_RU CP866"
46841 - echo "uk CP1125"
46842 - echo "uk_UA CP1125"
46843 - # ISO-8859-6 languages
46844 - echo "ar CP864"
46845 - echo "ar_AE CP864"
46846 - echo "ar_DZ CP864"
46847 - echo "ar_EG CP864"
46848 - echo "ar_IQ CP864"
46849 - echo "ar_IR CP864"
46850 - echo "ar_JO CP864"
46851 - echo "ar_KW CP864"
46852 - echo "ar_MA CP864"
46853 - echo "ar_OM CP864"
46854 - echo "ar_QA CP864"
46855 - echo "ar_SA CP864"
46856 - echo "ar_SY CP864"
46857 - # ISO-8859-7 languages
46858 - echo "el CP869"
46859 - echo "el_GR CP869"
46860 - # ISO-8859-8 languages
46861 - echo "he CP862"
46862 - echo "he_IL CP862"
46863 - # ISO-8859-9 languages
46864 - echo "tr CP857"
46865 - echo "tr_TR CP857"
46866 - # Japanese
46867 - echo "ja CP932"
46868 - echo "ja_JP CP932"
46869 - # Chinese
46870 - echo "zh_CN GBK"
46871 - echo "zh_TW CP950" # not CP938 ??
46872 - # Korean
46873 - echo "kr CP949" # not CP934 ??
46874 - echo "kr_KR CP949" # not CP934 ??
46875 - # Thai
46876 - echo "th CP874"
46877 - echo "th_TH CP874"
46878 - # Other
46879 - echo "eo CP850"
46880 - echo "eo_EO CP850"
46881 - ;;
46882 -esac
46883 diff -rupN original/intl/dcgettext.c new/intl/dcgettext.c
46884 --- original/intl/dcgettext.c 2009-03-28 22:33:59.000000000 -0430
46885 +++ new/intl/dcgettext.c 1969-12-31 20:00:00.000000000 -0400
46886 @@ -1,59 +0,0 @@
46887 -/* Implementation of the dcgettext(3) function.
46888 - Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
46889 -
46890 - This program is free software; you can redistribute it and/or modify it
46891 - under the terms of the GNU Library General Public License as published
46892 - by the Free Software Foundation; either version 2, or (at your option)
46893 - any later version.
46894 -
46895 - This program is distributed in the hope that it will be useful,
46896 - but WITHOUT ANY WARRANTY; without even the implied warranty of
46897 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
46898 - Library General Public License for more details.
46899 -
46900 - You should have received a copy of the GNU Library General Public
46901 - License along with this program; if not, write to the Free Software
46902 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
46903 - USA. */
46904 -
46905 -#ifdef HAVE_CONFIG_H
46906 -# include <config.h>
46907 -#endif
46908 -
46909 -#include "gettextP.h"
46910 -#ifdef _LIBC
46911 -# include <libintl.h>
46912 -#else
46913 -# include "libgnuintl.h"
46914 -#endif
46915 -
46916 -/* @@ end of prolog @@ */
46917 -
46918 -/* Names for the libintl functions are a problem. They must not clash
46919 - with existing names and they should follow ANSI C. But this source
46920 - code is also used in GNU C Library where the names have a __
46921 - prefix. So we have to make a difference here. */
46922 -#ifdef _LIBC
46923 -# define DCGETTEXT __dcgettext
46924 -# define DCIGETTEXT __dcigettext
46925 -#else
46926 -# define DCGETTEXT libintl_dcgettext
46927 -# define DCIGETTEXT libintl_dcigettext
46928 -#endif
46929 -
46930 -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
46931 - locale. */
46932 -char *
46933 -DCGETTEXT (domainname, msgid, category)
46934 - const char *domainname;
46935 - const char *msgid;
46936 - int category;
46937 -{
46938 - return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
46939 -}
46940 -
46941 -#ifdef _LIBC
46942 -/* Alias for function name in GNU C Library. */
46943 -INTDEF(__dcgettext)
46944 -weak_alias (__dcgettext, dcgettext);
46945 -#endif
46946 diff -rupN original/intl/dcigettext.c new/intl/dcigettext.c
46947 --- original/intl/dcigettext.c 2009-03-28 22:33:59.000000000 -0430
46948 +++ new/intl/dcigettext.c 1969-12-31 20:00:00.000000000 -0400
46949 @@ -1,1238 +0,0 @@
46950 -/* Implementation of the internal dcigettext function.
46951 - Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
46952 -
46953 - This program is free software; you can redistribute it and/or modify it
46954 - under the terms of the GNU Library General Public License as published
46955 - by the Free Software Foundation; either version 2, or (at your option)
46956 - any later version.
46957 -
46958 - This program is distributed in the hope that it will be useful,
46959 - but WITHOUT ANY WARRANTY; without even the implied warranty of
46960 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
46961 - Library General Public License for more details.
46962 -
46963 - You should have received a copy of the GNU Library General Public
46964 - License along with this program; if not, write to the Free Software
46965 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
46966 - USA. */
46967 -
46968 -/* Tell glibc's <string.h> to provide a prototype for mempcpy().
46969 - This must come before <config.h> because <config.h> may include
46970 - <features.h>, and once <features.h> has been included, it's too late. */
46971 -#ifndef _GNU_SOURCE
46972 -# define _GNU_SOURCE 1
46973 -#endif
46974 -
46975 -#ifdef HAVE_CONFIG_H
46976 -# include <config.h>
46977 -#endif
46978 -
46979 -#include <sys/types.h>
46980 -
46981 -#ifdef __GNUC__
46982 -# define alloca __builtin_alloca
46983 -# define HAVE_ALLOCA 1
46984 -#else
46985 -# ifdef _MSC_VER
46986 -# include <malloc.h>
46987 -# define alloca _alloca
46988 -# else
46989 -# if defined HAVE_ALLOCA_H || defined _LIBC
46990 -# include <alloca.h>
46991 -# else
46992 -# ifdef _AIX
46993 - #pragma alloca
46994 -# else
46995 -# ifndef alloca
46996 -char *alloca ();
46997 -# endif
46998 -# endif
46999 -# endif
47000 -# endif
47001 -#endif
47002 -
47003 -#include <errno.h>
47004 -#ifndef errno
47005 -extern int errno;
47006 -#endif
47007 -#ifndef __set_errno
47008 -# define __set_errno(val) errno = (val)
47009 -#endif
47010 -
47011 -#include <stddef.h>
47012 -#include <stdlib.h>
47013 -#include <string.h>
47014 -
47015 -#if defined HAVE_UNISTD_H || defined _LIBC
47016 -# include <unistd.h>
47017 -#endif
47018 -
47019 -#include <locale.h>
47020 -
47021 -#ifdef _LIBC
47022 - /* Guess whether integer division by zero raises signal SIGFPE.
47023 - Set to 1 only if you know for sure. In case of doubt, set to 0. */
47024 -# if defined __alpha__ || defined __arm__ || defined __i386__ \
47025 - || defined __m68k__ || defined __s390__
47026 -# define INTDIV0_RAISES_SIGFPE 1
47027 -# else
47028 -# define INTDIV0_RAISES_SIGFPE 0
47029 -# endif
47030 -#endif
47031 -#if !INTDIV0_RAISES_SIGFPE
47032 -# include <signal.h>
47033 -#endif
47034 -
47035 -#if defined HAVE_SYS_PARAM_H || defined _LIBC
47036 -# include <sys/param.h>
47037 -#endif
47038 -
47039 -#include "gettextP.h"
47040 -#include "plural-exp.h"
47041 -#ifdef _LIBC
47042 -# include <libintl.h>
47043 -#else
47044 -# include "libgnuintl.h"
47045 -#endif
47046 -#include "hash-string.h"
47047 -
47048 -/* Thread safetyness. */
47049 -#ifdef _LIBC
47050 -# include <bits/libc-lock.h>
47051 -#else
47052 -/* Provide dummy implementation if this is outside glibc. */
47053 -# define __libc_lock_define_initialized(CLASS, NAME)
47054 -# define __libc_lock_lock(NAME)
47055 -# define __libc_lock_unlock(NAME)
47056 -# define __libc_rwlock_define_initialized(CLASS, NAME)
47057 -# define __libc_rwlock_rdlock(NAME)
47058 -# define __libc_rwlock_unlock(NAME)
47059 -#endif
47060 -
47061 -/* Alignment of types. */
47062 -#if defined __GNUC__ && __GNUC__ >= 2
47063 -# define alignof(TYPE) __alignof__ (TYPE)
47064 -#else
47065 -# define alignof(TYPE) \
47066 - ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
47067 -#endif
47068 -
47069 -/* The internal variables in the standalone libintl.a must have different
47070 - names than the internal variables in GNU libc, otherwise programs
47071 - using libintl.a cannot be linked statically. */
47072 -#if !defined _LIBC
47073 -# define _nl_default_default_domain libintl_nl_default_default_domain
47074 -# define _nl_current_default_domain libintl_nl_current_default_domain
47075 -# define _nl_default_dirname libintl_nl_default_dirname
47076 -# define _nl_domain_bindings libintl_nl_domain_bindings
47077 -#endif
47078 -
47079 -/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
47080 -#ifndef offsetof
47081 -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
47082 -#endif
47083 -
47084 -/* @@ end of prolog @@ */
47085 -
47086 -#ifdef _LIBC
47087 -/* Rename the non ANSI C functions. This is required by the standard
47088 - because some ANSI C functions will require linking with this object
47089 - file and the name space must not be polluted. */
47090 -# define getcwd __getcwd
47091 -# ifndef stpcpy
47092 -# define stpcpy __stpcpy
47093 -# endif
47094 -# define tfind __tfind
47095 -#else
47096 -# if !defined HAVE_GETCWD
47097 -char *getwd ();
47098 -# define getcwd(buf, max) getwd (buf)
47099 -# else
47100 -char *getcwd ();
47101 -# endif
47102 -# ifndef HAVE_STPCPY
47103 -static char *stpcpy PARAMS ((char *dest, const char *src));
47104 -# endif
47105 -# ifndef HAVE_MEMPCPY
47106 -static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
47107 -# endif
47108 -#endif
47109 -
47110 -/* Amount to increase buffer size by in each try. */
47111 -#define PATH_INCR 32
47112 -
47113 -/* The following is from pathmax.h. */
47114 -/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
47115 - PATH_MAX but might cause redefinition warnings when sys/param.h is
47116 - later included (as on MORE/BSD 4.3). */
47117 -#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
47118 -# include <limits.h>
47119 -#endif
47120 -
47121 -#ifndef _POSIX_PATH_MAX
47122 -# define _POSIX_PATH_MAX 255
47123 -#endif
47124 -
47125 -#if !defined PATH_MAX && defined _PC_PATH_MAX
47126 -# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
47127 -#endif
47128 -
47129 -/* Don't include sys/param.h if it already has been. */
47130 -#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
47131 -# include <sys/param.h>
47132 -#endif
47133 -
47134 -#if !defined PATH_MAX && defined MAXPATHLEN
47135 -# define PATH_MAX MAXPATHLEN
47136 -#endif
47137 -
47138 -#ifndef PATH_MAX
47139 -# define PATH_MAX _POSIX_PATH_MAX
47140 -#endif
47141 -
47142 -/* Pathname support.
47143 - ISSLASH(C) tests whether C is a directory separator character.
47144 - IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
47145 - it may be concatenated to a directory pathname.
47146 - IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
47147 - */
47148 -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
47149 - /* Win32, OS/2, DOS */
47150 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
47151 -# define HAS_DEVICE(P) \
47152 - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
47153 - && (P)[1] == ':')
47154 -# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
47155 -# define IS_PATH_WITH_DIR(P) \
47156 - (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
47157 -#else
47158 - /* Unix */
47159 -# define ISSLASH(C) ((C) == '/')
47160 -# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
47161 -# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
47162 -#endif
47163 -
47164 -/* This is the type used for the search tree where known translations
47165 - are stored. */
47166 -struct known_translation_t
47167 -{
47168 - /* Domain in which to search. */
47169 - char *domainname;
47170 -
47171 - /* The category. */
47172 - int category;
47173 -
47174 - /* State of the catalog counter at the point the string was found. */
47175 - int counter;
47176 -
47177 - /* Catalog where the string was found. */
47178 - struct loaded_l10nfile *domain;
47179 -
47180 - /* And finally the translation. */
47181 - const char *translation;
47182 - size_t translation_length;
47183 -
47184 - /* Pointer to the string in question. */
47185 - char msgid[ZERO];
47186 -};
47187 -
47188 -/* Root of the search tree with known translations. We can use this
47189 - only if the system provides the `tsearch' function family. */
47190 -#if defined HAVE_TSEARCH || defined _LIBC
47191 -# include <search.h>
47192 -
47193 -static void *root;
47194 -
47195 -# ifdef _LIBC
47196 -# define tsearch __tsearch
47197 -# endif
47198 -
47199 -/* Function to compare two entries in the table of known translations. */
47200 -static int transcmp PARAMS ((const void *p1, const void *p2));
47201 -static int
47202 -transcmp (p1, p2)
47203 - const void *p1;
47204 - const void *p2;
47205 -{
47206 - const struct known_translation_t *s1;
47207 - const struct known_translation_t *s2;
47208 - int result;
47209 -
47210 - s1 = (const struct known_translation_t *) p1;
47211 - s2 = (const struct known_translation_t *) p2;
47212 -
47213 - result = strcmp (s1->msgid, s2->msgid);
47214 - if (result == 0)
47215 - {
47216 - result = strcmp (s1->domainname, s2->domainname);
47217 - if (result == 0)
47218 - /* We compare the category last (though this is the cheapest
47219 - operation) since it is hopefully always the same (namely
47220 - LC_MESSAGES). */
47221 - result = s1->category - s2->category;
47222 - }
47223 -
47224 - return result;
47225 -}
47226 -#endif
47227 -
47228 -#ifndef INTVARDEF
47229 -# define INTVARDEF(name)
47230 -#endif
47231 -#ifndef INTUSE
47232 -# define INTUSE(name) name
47233 -#endif
47234 -
47235 -/* Name of the default domain used for gettext(3) prior any call to
47236 - textdomain(3). The default value for this is "messages". */
47237 -const char _nl_default_default_domain[] attribute_hidden = "messages";
47238 -
47239 -/* Value used as the default domain for gettext(3). */
47240 -const char *_nl_current_default_domain attribute_hidden
47241 - = _nl_default_default_domain;
47242 -
47243 -/* Contains the default location of the message catalogs. */
47244 -#if defined __EMX__
47245 -extern const char _nl_default_dirname[];
47246 -#else
47247 -const char _nl_default_dirname[] = LOCALEDIR;
47248 -INTVARDEF (_nl_default_dirname)
47249 -#endif
47250 -
47251 -/* List with bindings of specific domains created by bindtextdomain()
47252 - calls. */
47253 -struct binding *_nl_domain_bindings;
47254 -
47255 -/* Prototypes for local functions. */
47256 -static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
47257 - unsigned long int n,
47258 - const char *translation,
47259 - size_t translation_len))
47260 - internal_function;
47261 -static const char *guess_category_value PARAMS ((int category,
47262 - const char *categoryname))
47263 - internal_function;
47264 -#ifdef _LIBC
47265 -# include "../locale/localeinfo.h"
47266 -# define category_to_name(category) _nl_category_names[category]
47267 -#else
47268 -static const char *category_to_name PARAMS ((int category)) internal_function;
47269 -#endif
47270 -
47271 -
47272 -/* For those loosing systems which don't have `alloca' we have to add
47273 - some additional code emulating it. */
47274 -#ifdef HAVE_ALLOCA
47275 -/* Nothing has to be done. */
47276 -# define freea(p) /* nothing */
47277 -# define ADD_BLOCK(list, address) /* nothing */
47278 -# define FREE_BLOCKS(list) /* nothing */
47279 -#else
47280 -struct block_list
47281 -{
47282 - void *address;
47283 - struct block_list *next;
47284 -};
47285 -# define ADD_BLOCK(list, addr) \
47286 - do { \
47287 - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
47288 - /* If we cannot get a free block we cannot add the new element to \
47289 - the list. */ \
47290 - if (newp != NULL) { \
47291 - newp->address = (addr); \
47292 - newp->next = (list); \
47293 - (list) = newp; \
47294 - } \
47295 - } while (0)
47296 -# define FREE_BLOCKS(list) \
47297 - do { \
47298 - while (list != NULL) { \
47299 - struct block_list *old = list; \
47300 - list = list->next; \
47301 - free (old->address); \
47302 - free (old); \
47303 - } \
47304 - } while (0)
47305 -# undef alloca
47306 -# define alloca(size) (malloc (size))
47307 -# define freea(p) free (p)
47308 -#endif /* have alloca */
47309 -
47310 -
47311 -#ifdef _LIBC
47312 -/* List of blocks allocated for translations. */
47313 -typedef struct transmem_list
47314 -{
47315 - struct transmem_list *next;
47316 - char data[ZERO];
47317 -} transmem_block_t;
47318 -static struct transmem_list *transmem_list;
47319 -#else
47320 -typedef unsigned char transmem_block_t;
47321 -#endif
47322 -
47323 -
47324 -/* Names for the libintl functions are a problem. They must not clash
47325 - with existing names and they should follow ANSI C. But this source
47326 - code is also used in GNU C Library where the names have a __
47327 - prefix. So we have to make a difference here. */
47328 -#ifdef _LIBC
47329 -# define DCIGETTEXT __dcigettext
47330 -#else
47331 -# define DCIGETTEXT libintl_dcigettext
47332 -#endif
47333 -
47334 -/* Lock variable to protect the global data in the gettext implementation. */
47335 -#ifdef _LIBC
47336 -__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
47337 -#endif
47338 -
47339 -/* Checking whether the binaries runs SUID must be done and glibc provides
47340 - easier methods therefore we make a difference here. */
47341 -#ifdef _LIBC
47342 -# define ENABLE_SECURE __libc_enable_secure
47343 -# define DETERMINE_SECURE
47344 -#else
47345 -# ifndef HAVE_GETUID
47346 -# define getuid() 0
47347 -# endif
47348 -# ifndef HAVE_GETGID
47349 -# define getgid() 0
47350 -# endif
47351 -# ifndef HAVE_GETEUID
47352 -# define geteuid() getuid()
47353 -# endif
47354 -# ifndef HAVE_GETEGID
47355 -# define getegid() getgid()
47356 -# endif
47357 -static int enable_secure;
47358 -# define ENABLE_SECURE (enable_secure == 1)
47359 -# define DETERMINE_SECURE \
47360 - if (enable_secure == 0) \
47361 - { \
47362 - if (getuid () != geteuid () || getgid () != getegid ()) \
47363 - enable_secure = 1; \
47364 - else \
47365 - enable_secure = -1; \
47366 - }
47367 -#endif
47368 -
47369 -/* Get the function to evaluate the plural expression. */
47370 -#include "eval-plural.h"
47371 -
47372 -/* Look up MSGID in the DOMAINNAME message catalog for the current
47373 - CATEGORY locale and, if PLURAL is nonzero, search over string
47374 - depending on the plural form determined by N. */
47375 -char *
47376 -DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
47377 - const char *domainname;
47378 - const char *msgid1;
47379 - const char *msgid2;
47380 - int plural;
47381 - unsigned long int n;
47382 - int category;
47383 -{
47384 -#ifndef HAVE_ALLOCA
47385 - struct block_list *block_list = NULL;
47386 -#endif
47387 - struct loaded_l10nfile *domain;
47388 - struct binding *binding;
47389 - const char *categoryname;
47390 - const char *categoryvalue;
47391 - char *dirname, *xdomainname;
47392 - char *single_locale;
47393 - char *retval;
47394 - size_t retlen;
47395 - int saved_errno;
47396 -#if defined HAVE_TSEARCH || defined _LIBC
47397 - struct known_translation_t *search;
47398 - struct known_translation_t **foundp = NULL;
47399 - size_t msgid_len;
47400 -#endif
47401 - size_t domainname_len;
47402 -
47403 - /* If no real MSGID is given return NULL. */
47404 - if (msgid1 == NULL)
47405 - return NULL;
47406 -
47407 -#ifdef _LIBC
47408 - if (category < 0 || category >= __LC_LAST || category == LC_ALL)
47409 - /* Bogus. */
47410 - return (plural == 0
47411 - ? (char *) msgid1
47412 - /* Use the Germanic plural rule. */
47413 - : n == 1 ? (char *) msgid1 : (char *) msgid2);
47414 -#endif
47415 -
47416 - __libc_rwlock_rdlock (_nl_state_lock);
47417 -
47418 - /* If DOMAINNAME is NULL, we are interested in the default domain. If
47419 - CATEGORY is not LC_MESSAGES this might not make much sense but the
47420 - definition left this undefined. */
47421 - if (domainname == NULL)
47422 - domainname = _nl_current_default_domain;
47423 -
47424 - /* OS/2 specific: backward compatibility with older libintl versions */
47425 -#ifdef LC_MESSAGES_COMPAT
47426 - if (category == LC_MESSAGES_COMPAT)
47427 - category = LC_MESSAGES;
47428 -#endif
47429 -
47430 -#if defined HAVE_TSEARCH || defined _LIBC
47431 - msgid_len = strlen (msgid1) + 1;
47432 -
47433 - /* Try to find the translation among those which we found at
47434 - some time. */
47435 - search = (struct known_translation_t *)
47436 - alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
47437 - memcpy (search->msgid, msgid1, msgid_len);
47438 - search->domainname = (char *) domainname;
47439 - search->category = category;
47440 -
47441 - foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
47442 - freea (search);
47443 - if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
47444 - {
47445 - /* Now deal with plural. */
47446 - if (plural)
47447 - retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
47448 - (*foundp)->translation_length);
47449 - else
47450 - retval = (char *) (*foundp)->translation;
47451 -
47452 - __libc_rwlock_unlock (_nl_state_lock);
47453 - return retval;
47454 - }
47455 -#endif
47456 -
47457 - /* Preserve the `errno' value. */
47458 - saved_errno = errno;
47459 -
47460 - /* See whether this is a SUID binary or not. */
47461 - DETERMINE_SECURE;
47462 -
47463 - /* First find matching binding. */
47464 - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
47465 - {
47466 - int compare = strcmp (domainname, binding->domainname);
47467 - if (compare == 0)
47468 - /* We found it! */
47469 - break;
47470 - if (compare < 0)
47471 - {
47472 - /* It is not in the list. */
47473 - binding = NULL;
47474 - break;
47475 - }
47476 - }
47477 -
47478 - if (binding == NULL)
47479 - dirname = (char *) INTUSE(_nl_default_dirname);
47480 - else if (IS_ABSOLUTE_PATH (binding->dirname))
47481 - dirname = binding->dirname;
47482 - else
47483 - {
47484 - /* We have a relative path. Make it absolute now. */
47485 - size_t dirname_len = strlen (binding->dirname) + 1;
47486 - size_t path_max;
47487 - char *ret;
47488 -
47489 - path_max = (unsigned int) PATH_MAX;
47490 - path_max += 2; /* The getcwd docs say to do this. */
47491 -
47492 - for (;;)
47493 - {
47494 - dirname = (char *) alloca (path_max + dirname_len);
47495 - ADD_BLOCK (block_list, dirname);
47496 -
47497 - __set_errno (0);
47498 - ret = getcwd (dirname, path_max);
47499 - if (ret != NULL || errno != ERANGE)
47500 - break;
47501 -
47502 - path_max += path_max / 2;
47503 - path_max += PATH_INCR;
47504 - }
47505 -
47506 - if (ret == NULL)
47507 - /* We cannot get the current working directory. Don't signal an
47508 - error but simply return the default string. */
47509 - goto return_untranslated;
47510 -
47511 - stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
47512 - }
47513 -
47514 - /* Now determine the symbolic name of CATEGORY and its value. */
47515 - categoryname = category_to_name (category);
47516 - categoryvalue = guess_category_value (category, categoryname);
47517 -
47518 - domainname_len = strlen (domainname);
47519 - xdomainname = (char *) alloca (strlen (categoryname)
47520 - + domainname_len + 5);
47521 - ADD_BLOCK (block_list, xdomainname);
47522 -
47523 - stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
47524 - domainname, domainname_len),
47525 - ".mo");
47526 -
47527 - /* Creating working area. */
47528 - single_locale = (char *) alloca (strlen (categoryvalue) + 1);
47529 - ADD_BLOCK (block_list, single_locale);
47530 -
47531 -
47532 - /* Search for the given string. This is a loop because we perhaps
47533 - got an ordered list of languages to consider for the translation. */
47534 - while (1)
47535 - {
47536 - /* Make CATEGORYVALUE point to the next element of the list. */
47537 - while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
47538 - ++categoryvalue;
47539 - if (categoryvalue[0] == '\0')
47540 - {
47541 - /* The whole contents of CATEGORYVALUE has been searched but
47542 - no valid entry has been found. We solve this situation
47543 - by implicitly appending a "C" entry, i.e. no translation
47544 - will take place. */
47545 - single_locale[0] = 'C';
47546 - single_locale[1] = '\0';
47547 - }
47548 - else
47549 - {
47550 - char *cp = single_locale;
47551 - while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
47552 - *cp++ = *categoryvalue++;
47553 - *cp = '\0';
47554 -
47555 - /* When this is a SUID binary we must not allow accessing files
47556 - outside the dedicated directories. */
47557 - if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
47558 - /* Ingore this entry. */
47559 - continue;
47560 - }
47561 -
47562 - /* If the current locale value is C (or POSIX) we don't load a
47563 - domain. Return the MSGID. */
47564 - if (strcmp (single_locale, "C") == 0
47565 - || strcmp (single_locale, "POSIX") == 0)
47566 - break;
47567 -
47568 - /* Find structure describing the message catalog matching the
47569 - DOMAINNAME and CATEGORY. */
47570 - domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
47571 -
47572 - if (domain != NULL)
47573 - {
47574 - retval = _nl_find_msg (domain, binding, msgid1, &retlen);
47575 -
47576 - if (retval == NULL)
47577 - {
47578 - int cnt;
47579 -
47580 - for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
47581 - {
47582 - retval = _nl_find_msg (domain->successor[cnt], binding,
47583 - msgid1, &retlen);
47584 -
47585 - if (retval != NULL)
47586 - {
47587 - domain = domain->successor[cnt];
47588 - break;
47589 - }
47590 - }
47591 - }
47592 -
47593 - if (retval != NULL)
47594 - {
47595 - /* Found the translation of MSGID1 in domain DOMAIN:
47596 - starting at RETVAL, RETLEN bytes. */
47597 - FREE_BLOCKS (block_list);
47598 -#if defined HAVE_TSEARCH || defined _LIBC
47599 - if (foundp == NULL)
47600 - {
47601 - /* Create a new entry and add it to the search tree. */
47602 - struct known_translation_t *newp;
47603 -
47604 - newp = (struct known_translation_t *)
47605 - malloc (offsetof (struct known_translation_t, msgid)
47606 - + msgid_len + domainname_len + 1);
47607 - if (newp != NULL)
47608 - {
47609 - newp->domainname =
47610 - mempcpy (newp->msgid, msgid1, msgid_len);
47611 - memcpy (newp->domainname, domainname, domainname_len + 1);
47612 - newp->category = category;
47613 - newp->counter = _nl_msg_cat_cntr;
47614 - newp->domain = domain;
47615 - newp->translation = retval;
47616 - newp->translation_length = retlen;
47617 -
47618 - /* Insert the entry in the search tree. */
47619 - foundp = (struct known_translation_t **)
47620 - tsearch (newp, &root, transcmp);
47621 - if (foundp == NULL
47622 - || __builtin_expect (*foundp != newp, 0))
47623 - /* The insert failed. */
47624 - free (newp);
47625 - }
47626 - }
47627 - else
47628 - {
47629 - /* We can update the existing entry. */
47630 - (*foundp)->counter = _nl_msg_cat_cntr;
47631 - (*foundp)->domain = domain;
47632 - (*foundp)->translation = retval;
47633 - (*foundp)->translation_length = retlen;
47634 - }
47635 -#endif
47636 - __set_errno (saved_errno);
47637 -
47638 - /* Now deal with plural. */
47639 - if (plural)
47640 - retval = plural_lookup (domain, n, retval, retlen);
47641 -
47642 - __libc_rwlock_unlock (_nl_state_lock);
47643 - return retval;
47644 - }
47645 - }
47646 - }
47647 -
47648 - return_untranslated:
47649 - /* Return the untranslated MSGID. */
47650 - FREE_BLOCKS (block_list);
47651 - __libc_rwlock_unlock (_nl_state_lock);
47652 -#ifndef _LIBC
47653 - if (!ENABLE_SECURE)
47654 - {
47655 - extern void _nl_log_untranslated PARAMS ((const char *logfilename,
47656 - const char *domainname,
47657 - const char *msgid1,
47658 - const char *msgid2,
47659 - int plural));
47660 - const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
47661 -
47662 - if (logfilename != NULL && logfilename[0] != '\0')
47663 - _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
47664 - }
47665 -#endif
47666 - __set_errno (saved_errno);
47667 - return (plural == 0
47668 - ? (char *) msgid1
47669 - /* Use the Germanic plural rule. */
47670 - : n == 1 ? (char *) msgid1 : (char *) msgid2);
47671 -}
47672 -
47673 -
47674 -char *
47675 -internal_function
47676 -_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
47677 - struct loaded_l10nfile *domain_file;
47678 - struct binding *domainbinding;
47679 - const char *msgid;
47680 - size_t *lengthp;
47681 -{
47682 - struct loaded_domain *domain;
47683 - nls_uint32 nstrings;
47684 - size_t act;
47685 - char *result;
47686 - size_t resultlen;
47687 -
47688 - if (domain_file->decided == 0)
47689 - _nl_load_domain (domain_file, domainbinding);
47690 -
47691 - if (domain_file->data == NULL)
47692 - return NULL;
47693 -
47694 - domain = (struct loaded_domain *) domain_file->data;
47695 -
47696 - nstrings = domain->nstrings;
47697 -
47698 - /* Locate the MSGID and its translation. */
47699 - if (domain->hash_tab != NULL)
47700 - {
47701 - /* Use the hashing table. */
47702 - nls_uint32 len = strlen (msgid);
47703 - nls_uint32 hash_val = hash_string (msgid);
47704 - nls_uint32 idx = hash_val % domain->hash_size;
47705 - nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
47706 -
47707 - while (1)
47708 - {
47709 - nls_uint32 nstr =
47710 - W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
47711 -
47712 - if (nstr == 0)
47713 - /* Hash table entry is empty. */
47714 - return NULL;
47715 -
47716 - nstr--;
47717 -
47718 - /* Compare msgid with the original string at index nstr.
47719 - We compare the lengths with >=, not ==, because plural entries
47720 - are represented by strings with an embedded NUL. */
47721 - if (nstr < nstrings
47722 - ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
47723 - && (strcmp (msgid,
47724 - domain->data + W (domain->must_swap,
47725 - domain->orig_tab[nstr].offset))
47726 - == 0)
47727 - : domain->orig_sysdep_tab[nstr - nstrings].length > len
47728 - && (strcmp (msgid,
47729 - domain->orig_sysdep_tab[nstr - nstrings].pointer)
47730 - == 0))
47731 - {
47732 - act = nstr;
47733 - goto found;
47734 - }
47735 -
47736 - if (idx >= domain->hash_size - incr)
47737 - idx -= domain->hash_size - incr;
47738 - else
47739 - idx += incr;
47740 - }
47741 - /* NOTREACHED */
47742 - }
47743 - else
47744 - {
47745 - /* Try the default method: binary search in the sorted array of
47746 - messages. */
47747 - size_t top, bottom;
47748 -
47749 - bottom = 0;
47750 - top = nstrings;
47751 - while (bottom < top)
47752 - {
47753 - int cmp_val;
47754 -
47755 - act = (bottom + top) / 2;
47756 - cmp_val = strcmp (msgid, (domain->data
47757 - + W (domain->must_swap,
47758 - domain->orig_tab[act].offset)));
47759 - if (cmp_val < 0)
47760 - top = act;
47761 - else if (cmp_val > 0)
47762 - bottom = act + 1;
47763 - else
47764 - goto found;
47765 - }
47766 - /* No translation was found. */
47767 - return NULL;
47768 - }
47769 -
47770 - found:
47771 - /* The translation was found at index ACT. If we have to convert the
47772 - string to use a different character set, this is the time. */
47773 - if (act < nstrings)
47774 - {
47775 - result = (char *)
47776 - (domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
47777 - resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
47778 - }
47779 - else
47780 - {
47781 - result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
47782 - resultlen = domain->trans_sysdep_tab[act - nstrings].length;
47783 - }
47784 -
47785 -#if defined _LIBC || HAVE_ICONV
47786 - if (domain->codeset_cntr
47787 - != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
47788 - {
47789 - /* The domain's codeset has changed through bind_textdomain_codeset()
47790 - since the message catalog was initialized or last accessed. We
47791 - have to reinitialize the converter. */
47792 - _nl_free_domain_conv (domain);
47793 - _nl_init_domain_conv (domain_file, domain, domainbinding);
47794 - }
47795 -
47796 - if (
47797 -# ifdef _LIBC
47798 - domain->conv != (__gconv_t) -1
47799 -# else
47800 -# if HAVE_ICONV
47801 - domain->conv != (iconv_t) -1
47802 -# endif
47803 -# endif
47804 - )
47805 - {
47806 - /* We are supposed to do a conversion. First allocate an
47807 - appropriate table with the same structure as the table
47808 - of translations in the file, where we can put the pointers
47809 - to the converted strings in.
47810 - There is a slight complication with plural entries. They
47811 - are represented by consecutive NUL terminated strings. We
47812 - handle this case by converting RESULTLEN bytes, including
47813 - NULs. */
47814 -
47815 - if (domain->conv_tab == NULL
47816 - && ((domain->conv_tab =
47817 - (char **) calloc (nstrings + domain->n_sysdep_strings,
47818 - sizeof (char *)))
47819 - == NULL))
47820 - /* Mark that we didn't succeed allocating a table. */
47821 - domain->conv_tab = (char **) -1;
47822 -
47823 - if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
47824 - /* Nothing we can do, no more memory. */
47825 - goto converted;
47826 -
47827 - if (domain->conv_tab[act] == NULL)
47828 - {
47829 - /* We haven't used this string so far, so it is not
47830 - translated yet. Do this now. */
47831 - /* We use a bit more efficient memory handling.
47832 - We allocate always larger blocks which get used over
47833 - time. This is faster than many small allocations. */
47834 - __libc_lock_define_initialized (static, lock)
47835 -# define INITIAL_BLOCK_SIZE 4080
47836 - static unsigned char *freemem;
47837 - static size_t freemem_size;
47838 -
47839 - const unsigned char *inbuf;
47840 - unsigned char *outbuf;
47841 - int malloc_count;
47842 -# ifndef _LIBC
47843 - transmem_block_t *transmem_list = NULL;
47844 -# endif
47845 -
47846 - __libc_lock_lock (lock);
47847 -
47848 - inbuf = (const unsigned char *) result;
47849 - outbuf = freemem + sizeof (size_t);
47850 -
47851 - malloc_count = 0;
47852 - while (1)
47853 - {
47854 - transmem_block_t *newmem;
47855 -# ifdef _LIBC
47856 - size_t non_reversible;
47857 - int res;
47858 -
47859 - if (freemem_size < sizeof (size_t))
47860 - goto resize_freemem;
47861 -
47862 - res = __gconv (domain->conv,
47863 - &inbuf, inbuf + resultlen,
47864 - &outbuf,
47865 - outbuf + freemem_size - sizeof (size_t),
47866 - &non_reversible);
47867 -
47868 - if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
47869 - break;
47870 -
47871 - if (res != __GCONV_FULL_OUTPUT)
47872 - {
47873 - __libc_lock_unlock (lock);
47874 - goto converted;
47875 - }
47876 -
47877 - inbuf = result;
47878 -# else
47879 -# if HAVE_ICONV
47880 - const char *inptr = (const char *) inbuf;
47881 - size_t inleft = resultlen;
47882 - char *outptr = (char *) outbuf;
47883 - size_t outleft;
47884 -
47885 - if (freemem_size < sizeof (size_t))
47886 - goto resize_freemem;
47887 -
47888 - outleft = freemem_size - sizeof (size_t);
47889 - if (iconv (domain->conv,
47890 - (ICONV_CONST char **) &inptr, &inleft,
47891 - &outptr, &outleft)
47892 - != (size_t) (-1))
47893 - {
47894 - outbuf = (unsigned char *) outptr;
47895 - break;
47896 - }
47897 - if (errno != E2BIG)
47898 - {
47899 - __libc_lock_unlock (lock);
47900 - goto converted;
47901 - }
47902 -# endif
47903 -# endif
47904 -
47905 - resize_freemem:
47906 - /* We must allocate a new buffer or resize the old one. */
47907 - if (malloc_count > 0)
47908 - {
47909 - ++malloc_count;
47910 - freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
47911 - newmem = (transmem_block_t *) realloc (transmem_list,
47912 - freemem_size);
47913 -# ifdef _LIBC
47914 - if (newmem != NULL)
47915 - transmem_list = transmem_list->next;
47916 - else
47917 - {
47918 - struct transmem_list *old = transmem_list;
47919 -
47920 - transmem_list = transmem_list->next;
47921 - free (old);
47922 - }
47923 -# endif
47924 - }
47925 - else
47926 - {
47927 - malloc_count = 1;
47928 - freemem_size = INITIAL_BLOCK_SIZE;
47929 - newmem = (transmem_block_t *) malloc (freemem_size);
47930 - }
47931 - if (__builtin_expect (newmem == NULL, 0))
47932 - {
47933 - freemem = NULL;
47934 - freemem_size = 0;
47935 - __libc_lock_unlock (lock);
47936 - goto converted;
47937 - }
47938 -
47939 -# ifdef _LIBC
47940 - /* Add the block to the list of blocks we have to free
47941 - at some point. */
47942 - newmem->next = transmem_list;
47943 - transmem_list = newmem;
47944 -
47945 - freemem = newmem->data;
47946 - freemem_size -= offsetof (struct transmem_list, data);
47947 -# else
47948 - transmem_list = newmem;
47949 - freemem = newmem;
47950 -# endif
47951 -
47952 - outbuf = freemem + sizeof (size_t);
47953 - }
47954 -
47955 - /* We have now in our buffer a converted string. Put this
47956 - into the table of conversions. */
47957 - *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
47958 - domain->conv_tab[act] = (char *) freemem;
47959 - /* Shrink freemem, but keep it aligned. */
47960 - freemem_size -= outbuf - freemem;
47961 - freemem = outbuf;
47962 - freemem += freemem_size & (alignof (size_t) - 1);
47963 - freemem_size = freemem_size & ~ (alignof (size_t) - 1);
47964 -
47965 - __libc_lock_unlock (lock);
47966 - }
47967 -
47968 - /* Now domain->conv_tab[act] contains the translation of all
47969 - the plural variants. */
47970 - result = domain->conv_tab[act] + sizeof (size_t);
47971 - resultlen = *(size_t *) domain->conv_tab[act];
47972 - }
47973 -
47974 - converted:
47975 - /* The result string is converted. */
47976 -
47977 -#endif /* _LIBC || HAVE_ICONV */
47978 -
47979 - *lengthp = resultlen;
47980 - return result;
47981 -}
47982 -
47983 -
47984 -/* Look up a plural variant. */
47985 -static char *
47986 -internal_function
47987 -plural_lookup (domain, n, translation, translation_len)
47988 - struct loaded_l10nfile *domain;
47989 - unsigned long int n;
47990 - const char *translation;
47991 - size_t translation_len;
47992 -{
47993 - struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
47994 - unsigned long int index;
47995 - const char *p;
47996 -
47997 - index = plural_eval (domaindata->plural, n);
47998 - if (index >= domaindata->nplurals)
47999 - /* This should never happen. It means the plural expression and the
48000 - given maximum value do not match. */
48001 - index = 0;
48002 -
48003 - /* Skip INDEX strings at TRANSLATION. */
48004 - p = translation;
48005 - while (index-- > 0)
48006 - {
48007 -#ifdef _LIBC
48008 - p = __rawmemchr (p, '\0');
48009 -#else
48010 - p = strchr (p, '\0');
48011 -#endif
48012 - /* And skip over the NUL byte. */
48013 - p++;
48014 -
48015 - if (p >= translation + translation_len)
48016 - /* This should never happen. It means the plural expression
48017 - evaluated to a value larger than the number of variants
48018 - available for MSGID1. */
48019 - return (char *) translation;
48020 - }
48021 - return (char *) p;
48022 -}
48023 -
48024 -#ifndef _LIBC
48025 -/* Return string representation of locale CATEGORY. */
48026 -static const char *
48027 -internal_function
48028 -category_to_name (category)
48029 - int category;
48030 -{
48031 - const char *retval;
48032 -
48033 - switch (category)
48034 - {
48035 -#ifdef LC_COLLATE
48036 - case LC_COLLATE:
48037 - retval = "LC_COLLATE";
48038 - break;
48039 -#endif
48040 -#ifdef LC_CTYPE
48041 - case LC_CTYPE:
48042 - retval = "LC_CTYPE";
48043 - break;
48044 -#endif
48045 -#ifdef LC_MONETARY
48046 - case LC_MONETARY:
48047 - retval = "LC_MONETARY";
48048 - break;
48049 -#endif
48050 -#ifdef LC_NUMERIC
48051 - case LC_NUMERIC:
48052 - retval = "LC_NUMERIC";
48053 - break;
48054 -#endif
48055 -#ifdef LC_TIME
48056 - case LC_TIME:
48057 - retval = "LC_TIME";
48058 - break;
48059 -#endif
48060 -#ifdef LC_MESSAGES
48061 - case LC_MESSAGES:
48062 - retval = "LC_MESSAGES";
48063 - break;
48064 -#endif
48065 -#ifdef LC_RESPONSE
48066 - case LC_RESPONSE:
48067 - retval = "LC_RESPONSE";
48068 - break;
48069 -#endif
48070 -#ifdef LC_ALL
48071 - case LC_ALL:
48072 - /* This might not make sense but is perhaps better than any other
48073 - value. */
48074 - retval = "LC_ALL";
48075 - break;
48076 -#endif
48077 - default:
48078 - /* If you have a better idea for a default value let me know. */
48079 - retval = "LC_XXX";
48080 - }
48081 -
48082 - return retval;
48083 -}
48084 -#endif
48085 -
48086 -/* Guess value of current locale from value of the environment variables. */
48087 -static const char *
48088 -internal_function
48089 -guess_category_value (category, categoryname)
48090 - int category;
48091 - const char *categoryname;
48092 -{
48093 - const char *language;
48094 - const char *retval;
48095 -
48096 - /* The highest priority value is the `LANGUAGE' environment
48097 - variable. But we don't use the value if the currently selected
48098 - locale is the C locale. This is a GNU extension. */
48099 - language = getenv ("LANGUAGE");
48100 - if (language != NULL && language[0] == '\0')
48101 - language = NULL;
48102 -
48103 - /* We have to proceed with the POSIX methods of looking to `LC_ALL',
48104 - `LC_xxx', and `LANG'. On some systems this can be done by the
48105 - `setlocale' function itself. */
48106 -#ifdef _LIBC
48107 - retval = __current_locale_name (category);
48108 -#else
48109 - retval = _nl_locale_name (category, categoryname);
48110 -#endif
48111 -
48112 - /* Ignore LANGUAGE if the locale is set to "C" because
48113 - 1. "C" locale usually uses the ASCII encoding, and most international
48114 - messages use non-ASCII characters. These characters get displayed
48115 - as question marks (if using glibc's iconv()) or as invalid 8-bit
48116 - characters (because other iconv()s refuse to convert most non-ASCII
48117 - characters to ASCII). In any case, the output is ugly.
48118 - 2. The precise output of some programs in the "C" locale is specified
48119 - by POSIX and should not depend on environment variables like
48120 - "LANGUAGE". We allow such programs to use gettext(). */
48121 - return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
48122 -}
48123 -
48124 -/* @@ begin of epilog @@ */
48125 -
48126 -/* We don't want libintl.a to depend on any other library. So we
48127 - avoid the non-standard function stpcpy. In GNU C Library this
48128 - function is available, though. Also allow the symbol HAVE_STPCPY
48129 - to be defined. */
48130 -#if !_LIBC && !HAVE_STPCPY
48131 -static char *
48132 -stpcpy (dest, src)
48133 - char *dest;
48134 - const char *src;
48135 -{
48136 - while ((*dest++ = *src++) != '\0')
48137 - /* Do nothing. */ ;
48138 - return dest - 1;
48139 -}
48140 -#endif
48141 -
48142 -#if !_LIBC && !HAVE_MEMPCPY
48143 -static void *
48144 -mempcpy (dest, src, n)
48145 - void *dest;
48146 - const void *src;
48147 - size_t n;
48148 -{
48149 - return (void *) ((char *) memcpy (dest, src, n) + n);
48150 -}
48151 -#endif
48152 -
48153 -
48154 -#ifdef _LIBC
48155 -/* If we want to free all resources we have to do some work at
48156 - program's end. */
48157 -libc_freeres_fn (free_mem)
48158 -{
48159 - void *old;
48160 -
48161 - while (_nl_domain_bindings != NULL)
48162 - {
48163 - struct binding *oldp = _nl_domain_bindings;
48164 - _nl_domain_bindings = _nl_domain_bindings->next;
48165 - if (oldp->dirname != INTUSE(_nl_default_dirname))
48166 - /* Yes, this is a pointer comparison. */
48167 - free (oldp->dirname);
48168 - free (oldp->codeset);
48169 - free (oldp);
48170 - }
48171 -
48172 - if (_nl_current_default_domain != _nl_default_default_domain)
48173 - /* Yes, again a pointer comparison. */
48174 - free ((char *) _nl_current_default_domain);
48175 -
48176 - /* Remove the search tree with the known translations. */
48177 - __tdestroy (root, free);
48178 - root = NULL;
48179 -
48180 - while (transmem_list != NULL)
48181 - {
48182 - old = transmem_list;
48183 - transmem_list = transmem_list->next;
48184 - free (old);
48185 - }
48186 -}
48187 -#endif
48188 diff -rupN original/intl/dcngettext.c new/intl/dcngettext.c
48189 --- original/intl/dcngettext.c 2009-03-28 22:33:59.000000000 -0430
48190 +++ new/intl/dcngettext.c 1969-12-31 20:00:00.000000000 -0400
48191 @@ -1,60 +0,0 @@
48192 -/* Implementation of the dcngettext(3) function.
48193 - Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
48194 -
48195 - This program is free software; you can redistribute it and/or modify it
48196 - under the terms of the GNU Library General Public License as published
48197 - by the Free Software Foundation; either version 2, or (at your option)
48198 - any later version.
48199 -
48200 - This program is distributed in the hope that it will be useful,
48201 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48202 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48203 - Library General Public License for more details.
48204 -
48205 - You should have received a copy of the GNU Library General Public
48206 - License along with this program; if not, write to the Free Software
48207 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48208 - USA. */
48209 -
48210 -#ifdef HAVE_CONFIG_H
48211 -# include <config.h>
48212 -#endif
48213 -
48214 -#include "gettextP.h"
48215 -#ifdef _LIBC
48216 -# include <libintl.h>
48217 -#else
48218 -# include "libgnuintl.h"
48219 -#endif
48220 -
48221 -/* @@ end of prolog @@ */
48222 -
48223 -/* Names for the libintl functions are a problem. They must not clash
48224 - with existing names and they should follow ANSI C. But this source
48225 - code is also used in GNU C Library where the names have a __
48226 - prefix. So we have to make a difference here. */
48227 -#ifdef _LIBC
48228 -# define DCNGETTEXT __dcngettext
48229 -# define DCIGETTEXT __dcigettext
48230 -#else
48231 -# define DCNGETTEXT libintl_dcngettext
48232 -# define DCIGETTEXT libintl_dcigettext
48233 -#endif
48234 -
48235 -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
48236 - locale. */
48237 -char *
48238 -DCNGETTEXT (domainname, msgid1, msgid2, n, category)
48239 - const char *domainname;
48240 - const char *msgid1;
48241 - const char *msgid2;
48242 - unsigned long int n;
48243 - int category;
48244 -{
48245 - return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
48246 -}
48247 -
48248 -#ifdef _LIBC
48249 -/* Alias for function name in GNU C Library. */
48250 -weak_alias (__dcngettext, dcngettext);
48251 -#endif
48252 diff -rupN original/intl/dgettext.c new/intl/dgettext.c
48253 --- original/intl/dgettext.c 2009-03-28 22:33:59.000000000 -0430
48254 +++ new/intl/dgettext.c 1969-12-31 20:00:00.000000000 -0400
48255 @@ -1,59 +0,0 @@
48256 -/* Implementation of the dgettext(3) function.
48257 - Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
48258 -
48259 - This program is free software; you can redistribute it and/or modify it
48260 - under the terms of the GNU Library General Public License as published
48261 - by the Free Software Foundation; either version 2, or (at your option)
48262 - any later version.
48263 -
48264 - This program is distributed in the hope that it will be useful,
48265 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48266 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48267 - Library General Public License for more details.
48268 -
48269 - You should have received a copy of the GNU Library General Public
48270 - License along with this program; if not, write to the Free Software
48271 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48272 - USA. */
48273 -
48274 -#ifdef HAVE_CONFIG_H
48275 -# include <config.h>
48276 -#endif
48277 -
48278 -#include <locale.h>
48279 -
48280 -#include "gettextP.h"
48281 -#ifdef _LIBC
48282 -# include <libintl.h>
48283 -#else
48284 -# include "libgnuintl.h"
48285 -#endif
48286 -
48287 -/* @@ end of prolog @@ */
48288 -
48289 -/* Names for the libintl functions are a problem. They must not clash
48290 - with existing names and they should follow ANSI C. But this source
48291 - code is also used in GNU C Library where the names have a __
48292 - prefix. So we have to make a difference here. */
48293 -#ifdef _LIBC
48294 -# define DGETTEXT __dgettext
48295 -# define DCGETTEXT INTUSE(__dcgettext)
48296 -#else
48297 -# define DGETTEXT libintl_dgettext
48298 -# define DCGETTEXT libintl_dcgettext
48299 -#endif
48300 -
48301 -/* Look up MSGID in the DOMAINNAME message catalog of the current
48302 - LC_MESSAGES locale. */
48303 -char *
48304 -DGETTEXT (domainname, msgid)
48305 - const char *domainname;
48306 - const char *msgid;
48307 -{
48308 - return DCGETTEXT (domainname, msgid, LC_MESSAGES);
48309 -}
48310 -
48311 -#ifdef _LIBC
48312 -/* Alias for function name in GNU C Library. */
48313 -weak_alias (__dgettext, dgettext);
48314 -#endif
48315 diff -rupN original/intl/dngettext.c new/intl/dngettext.c
48316 --- original/intl/dngettext.c 2009-03-28 22:33:59.000000000 -0430
48317 +++ new/intl/dngettext.c 1969-12-31 20:00:00.000000000 -0400
48318 @@ -1,61 +0,0 @@
48319 -/* Implementation of the dngettext(3) function.
48320 - Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
48321 -
48322 - This program is free software; you can redistribute it and/or modify it
48323 - under the terms of the GNU Library General Public License as published
48324 - by the Free Software Foundation; either version 2, or (at your option)
48325 - any later version.
48326 -
48327 - This program is distributed in the hope that it will be useful,
48328 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48329 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48330 - Library General Public License for more details.
48331 -
48332 - You should have received a copy of the GNU Library General Public
48333 - License along with this program; if not, write to the Free Software
48334 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48335 - USA. */
48336 -
48337 -#ifdef HAVE_CONFIG_H
48338 -# include <config.h>
48339 -#endif
48340 -
48341 -#include <locale.h>
48342 -
48343 -#include "gettextP.h"
48344 -#ifdef _LIBC
48345 -# include <libintl.h>
48346 -#else
48347 -# include "libgnuintl.h"
48348 -#endif
48349 -
48350 -/* @@ end of prolog @@ */
48351 -
48352 -/* Names for the libintl functions are a problem. They must not clash
48353 - with existing names and they should follow ANSI C. But this source
48354 - code is also used in GNU C Library where the names have a __
48355 - prefix. So we have to make a difference here. */
48356 -#ifdef _LIBC
48357 -# define DNGETTEXT __dngettext
48358 -# define DCNGETTEXT __dcngettext
48359 -#else
48360 -# define DNGETTEXT libintl_dngettext
48361 -# define DCNGETTEXT libintl_dcngettext
48362 -#endif
48363 -
48364 -/* Look up MSGID in the DOMAINNAME message catalog of the current
48365 - LC_MESSAGES locale and skip message according to the plural form. */
48366 -char *
48367 -DNGETTEXT (domainname, msgid1, msgid2, n)
48368 - const char *domainname;
48369 - const char *msgid1;
48370 - const char *msgid2;
48371 - unsigned long int n;
48372 -{
48373 - return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
48374 -}
48375 -
48376 -#ifdef _LIBC
48377 -/* Alias for function name in GNU C Library. */
48378 -weak_alias (__dngettext, dngettext);
48379 -#endif
48380 diff -rupN original/intl/eval-plural.h new/intl/eval-plural.h
48381 --- original/intl/eval-plural.h 2009-03-28 22:33:59.000000000 -0430
48382 +++ new/intl/eval-plural.h 1969-12-31 20:00:00.000000000 -0400
48383 @@ -1,114 +0,0 @@
48384 -/* Plural expression evaluation.
48385 - Copyright (C) 2000-2002 Free Software Foundation, Inc.
48386 -
48387 - This program is free software; you can redistribute it and/or modify it
48388 - under the terms of the GNU Library General Public License as published
48389 - by the Free Software Foundation; either version 2, or (at your option)
48390 - any later version.
48391 -
48392 - This program is distributed in the hope that it will be useful,
48393 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48394 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48395 - Library General Public License for more details.
48396 -
48397 - You should have received a copy of the GNU Library General Public
48398 - License along with this program; if not, write to the Free Software
48399 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48400 - USA. */
48401 -
48402 -#ifndef STATIC
48403 -#define STATIC static
48404 -#endif
48405 -
48406 -/* Evaluate the plural expression and return an index value. */
48407 -STATIC unsigned long int plural_eval PARAMS ((struct expression *pexp,
48408 - unsigned long int n))
48409 - internal_function;
48410 -
48411 -STATIC
48412 -unsigned long int
48413 -internal_function
48414 -plural_eval (pexp, n)
48415 - struct expression *pexp;
48416 - unsigned long int n;
48417 -{
48418 - switch (pexp->nargs)
48419 - {
48420 - case 0:
48421 - switch (pexp->operation)
48422 - {
48423 - case var:
48424 - return n;
48425 - case num:
48426 - return pexp->val.num;
48427 - default:
48428 - break;
48429 - }
48430 - /* NOTREACHED */
48431 - break;
48432 - case 1:
48433 - {
48434 - /* pexp->operation must be lnot. */
48435 - unsigned long int arg = plural_eval (pexp->val.args[0], n);
48436 - return ! arg;
48437 - }
48438 - case 2:
48439 - {
48440 - unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
48441 - if (pexp->operation == lor)
48442 - return leftarg || plural_eval (pexp->val.args[1], n);
48443 - else if (pexp->operation == land)
48444 - return leftarg && plural_eval (pexp->val.args[1], n);
48445 - else
48446 - {
48447 - unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
48448 -
48449 - switch (pexp->operation)
48450 - {
48451 - case mult:
48452 - return leftarg * rightarg;
48453 - case divide:
48454 -#if !INTDIV0_RAISES_SIGFPE
48455 - if (rightarg == 0)
48456 - raise (SIGFPE);
48457 -#endif
48458 - return leftarg / rightarg;
48459 - case module:
48460 -#if !INTDIV0_RAISES_SIGFPE
48461 - if (rightarg == 0)
48462 - raise (SIGFPE);
48463 -#endif
48464 - return leftarg % rightarg;
48465 - case plus:
48466 - return leftarg + rightarg;
48467 - case minus:
48468 - return leftarg - rightarg;
48469 - case less_than:
48470 - return leftarg < rightarg;
48471 - case greater_than:
48472 - return leftarg > rightarg;
48473 - case less_or_equal:
48474 - return leftarg <= rightarg;
48475 - case greater_or_equal:
48476 - return leftarg >= rightarg;
48477 - case equal:
48478 - return leftarg == rightarg;
48479 - case not_equal:
48480 - return leftarg != rightarg;
48481 - default:
48482 - break;
48483 - }
48484 - }
48485 - /* NOTREACHED */
48486 - break;
48487 - }
48488 - case 3:
48489 - {
48490 - /* pexp->operation must be qmop. */
48491 - unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
48492 - return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
48493 - }
48494 - }
48495 - /* NOTREACHED */
48496 - return 0;
48497 -}
48498 diff -rupN original/intl/explodename.c new/intl/explodename.c
48499 --- original/intl/explodename.c 2009-03-28 22:33:59.000000000 -0430
48500 +++ new/intl/explodename.c 1969-12-31 20:00:00.000000000 -0400
48501 @@ -1,192 +0,0 @@
48502 -/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
48503 - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
48504 -
48505 - This program is free software; you can redistribute it and/or modify it
48506 - under the terms of the GNU Library General Public License as published
48507 - by the Free Software Foundation; either version 2, or (at your option)
48508 - any later version.
48509 -
48510 - This program is distributed in the hope that it will be useful,
48511 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48512 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48513 - Library General Public License for more details.
48514 -
48515 - You should have received a copy of the GNU Library General Public
48516 - License along with this program; if not, write to the Free Software
48517 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48518 - USA. */
48519 -
48520 -#ifdef HAVE_CONFIG_H
48521 -# include <config.h>
48522 -#endif
48523 -
48524 -#include <stdlib.h>
48525 -#include <string.h>
48526 -#include <sys/types.h>
48527 -
48528 -#include "loadinfo.h"
48529 -
48530 -/* On some strange systems still no definition of NULL is found. Sigh! */
48531 -#ifndef NULL
48532 -# if defined __STDC__ && __STDC__
48533 -# define NULL ((void *) 0)
48534 -# else
48535 -# define NULL 0
48536 -# endif
48537 -#endif
48538 -
48539 -/* @@ end of prolog @@ */
48540 -
48541 -char *
48542 -_nl_find_language (name)
48543 - const char *name;
48544 -{
48545 - while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
48546 - && name[0] != '+' && name[0] != ',')
48547 - ++name;
48548 -
48549 - return (char *) name;
48550 -}
48551 -
48552 -
48553 -int
48554 -_nl_explode_name (name, language, modifier, territory, codeset,
48555 - normalized_codeset, special, sponsor, revision)
48556 - char *name;
48557 - const char **language;
48558 - const char **modifier;
48559 - const char **territory;
48560 - const char **codeset;
48561 - const char **normalized_codeset;
48562 - const char **special;
48563 - const char **sponsor;
48564 - const char **revision;
48565 -{
48566 - enum { undecided, xpg, cen } syntax;
48567 - char *cp;
48568 - int mask;
48569 -
48570 - *modifier = NULL;
48571 - *territory = NULL;
48572 - *codeset = NULL;
48573 - *normalized_codeset = NULL;
48574 - *special = NULL;
48575 - *sponsor = NULL;
48576 - *revision = NULL;
48577 -
48578 - /* Now we determine the single parts of the locale name. First
48579 - look for the language. Termination symbols are `_' and `@' if
48580 - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
48581 - mask = 0;
48582 - syntax = undecided;
48583 - *language = cp = name;
48584 - cp = _nl_find_language (*language);
48585 -
48586 - if (*language == cp)
48587 - /* This does not make sense: language has to be specified. Use
48588 - this entry as it is without exploding. Perhaps it is an alias. */
48589 - cp = strchr (*language, '\0');
48590 - else if (cp[0] == '_')
48591 - {
48592 - /* Next is the territory. */
48593 - cp[0] = '\0';
48594 - *territory = ++cp;
48595 -
48596 - while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
48597 - && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
48598 - ++cp;
48599 -
48600 - mask |= TERRITORY;
48601 -
48602 - if (cp[0] == '.')
48603 - {
48604 - /* Next is the codeset. */
48605 - syntax = xpg;
48606 - cp[0] = '\0';
48607 - *codeset = ++cp;
48608 -
48609 - while (cp[0] != '\0' && cp[0] != '@')
48610 - ++cp;
48611 -
48612 - mask |= XPG_CODESET;
48613 -
48614 - if (*codeset != cp && (*codeset)[0] != '\0')
48615 - {
48616 - *normalized_codeset = _nl_normalize_codeset (*codeset,
48617 - cp - *codeset);
48618 - if (strcmp (*codeset, *normalized_codeset) == 0)
48619 - free ((char *) *normalized_codeset);
48620 - else
48621 - mask |= XPG_NORM_CODESET;
48622 - }
48623 - }
48624 - }
48625 -
48626 - if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
48627 - {
48628 - /* Next is the modifier. */
48629 - syntax = cp[0] == '@' ? xpg : cen;
48630 - cp[0] = '\0';
48631 - *modifier = ++cp;
48632 -
48633 - while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
48634 - && cp[0] != ',' && cp[0] != '_')
48635 - ++cp;
48636 -
48637 - mask |= XPG_MODIFIER | CEN_AUDIENCE;
48638 - }
48639 -
48640 - if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
48641 - {
48642 - syntax = cen;
48643 -
48644 - if (cp[0] == '+')
48645 - {
48646 - /* Next is special application (CEN syntax). */
48647 - cp[0] = '\0';
48648 - *special = ++cp;
48649 -
48650 - while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
48651 - ++cp;
48652 -
48653 - mask |= CEN_SPECIAL;
48654 - }
48655 -
48656 - if (cp[0] == ',')
48657 - {
48658 - /* Next is sponsor (CEN syntax). */
48659 - cp[0] = '\0';
48660 - *sponsor = ++cp;
48661 -
48662 - while (cp[0] != '\0' && cp[0] != '_')
48663 - ++cp;
48664 -
48665 - mask |= CEN_SPONSOR;
48666 - }
48667 -
48668 - if (cp[0] == '_')
48669 - {
48670 - /* Next is revision (CEN syntax). */
48671 - cp[0] = '\0';
48672 - *revision = ++cp;
48673 -
48674 - mask |= CEN_REVISION;
48675 - }
48676 - }
48677 -
48678 - /* For CEN syntax values it might be important to have the
48679 - separator character in the file name, not for XPG syntax. */
48680 - if (syntax == xpg)
48681 - {
48682 - if (*territory != NULL && (*territory)[0] == '\0')
48683 - mask &= ~TERRITORY;
48684 -
48685 - if (*codeset != NULL && (*codeset)[0] == '\0')
48686 - mask &= ~XPG_CODESET;
48687 -
48688 - if (*modifier != NULL && (*modifier)[0] == '\0')
48689 - mask &= ~XPG_MODIFIER;
48690 - }
48691 -
48692 - return mask;
48693 -}
48694 diff -rupN original/intl/finddomain.c new/intl/finddomain.c
48695 --- original/intl/finddomain.c 2009-03-28 22:33:59.000000000 -0430
48696 +++ new/intl/finddomain.c 1969-12-31 20:00:00.000000000 -0400
48697 @@ -1,195 +0,0 @@
48698 -/* Handle list of needed message catalogs
48699 - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
48700 - Written by Ulrich Drepper <drepper@gnu.org>, 1995.
48701 -
48702 - This program is free software; you can redistribute it and/or modify it
48703 - under the terms of the GNU Library General Public License as published
48704 - by the Free Software Foundation; either version 2, or (at your option)
48705 - any later version.
48706 -
48707 - This program is distributed in the hope that it will be useful,
48708 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48709 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48710 - Library General Public License for more details.
48711 -
48712 - You should have received a copy of the GNU Library General Public
48713 - License along with this program; if not, write to the Free Software
48714 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48715 - USA. */
48716 -
48717 -#ifdef HAVE_CONFIG_H
48718 -# include <config.h>
48719 -#endif
48720 -
48721 -#include <stdio.h>
48722 -#include <sys/types.h>
48723 -#include <stdlib.h>
48724 -#include <string.h>
48725 -
48726 -#if defined HAVE_UNISTD_H || defined _LIBC
48727 -# include <unistd.h>
48728 -#endif
48729 -
48730 -#include "gettextP.h"
48731 -#ifdef _LIBC
48732 -# include <libintl.h>
48733 -#else
48734 -# include "libgnuintl.h"
48735 -#endif
48736 -
48737 -/* @@ end of prolog @@ */
48738 -/* List of already loaded domains. */
48739 -static struct loaded_l10nfile *_nl_loaded_domains;
48740 -
48741 -
48742 -/* Return a data structure describing the message catalog described by
48743 - the DOMAINNAME and CATEGORY parameters with respect to the currently
48744 - established bindings. */
48745 -struct loaded_l10nfile *
48746 -internal_function
48747 -_nl_find_domain (dirname, locale, domainname, domainbinding)
48748 - const char *dirname;
48749 - char *locale;
48750 - const char *domainname;
48751 - struct binding *domainbinding;
48752 -{
48753 - struct loaded_l10nfile *retval;
48754 - const char *language;
48755 - const char *modifier;
48756 - const char *territory;
48757 - const char *codeset;
48758 - const char *normalized_codeset;
48759 - const char *special;
48760 - const char *sponsor;
48761 - const char *revision;
48762 - const char *alias_value;
48763 - int mask;
48764 -
48765 - /* LOCALE can consist of up to four recognized parts for the XPG syntax:
48766 -
48767 - language[_territory[.codeset]][@modifier]
48768 -
48769 - and six parts for the CEN syntax:
48770 -
48771 - language[_territory][+audience][+special][,[sponsor][_revision]]
48772 -
48773 - Beside the first part all of them are allowed to be missing. If
48774 - the full specified locale is not found, the less specific one are
48775 - looked for. The various parts will be stripped off according to
48776 - the following order:
48777 - (1) revision
48778 - (2) sponsor
48779 - (3) special
48780 - (4) codeset
48781 - (5) normalized codeset
48782 - (6) territory
48783 - (7) audience/modifier
48784 - */
48785 -
48786 - /* If we have already tested for this locale entry there has to
48787 - be one data set in the list of loaded domains. */
48788 - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
48789 - strlen (dirname) + 1, 0, locale, NULL, NULL,
48790 - NULL, NULL, NULL, NULL, NULL, domainname, 0);
48791 - if (retval != NULL)
48792 - {
48793 - /* We know something about this locale. */
48794 - int cnt;
48795 -
48796 - if (retval->decided == 0)
48797 - _nl_load_domain (retval, domainbinding);
48798 -
48799 - if (retval->data != NULL)
48800 - return retval;
48801 -
48802 - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
48803 - {
48804 - if (retval->successor[cnt]->decided == 0)
48805 - _nl_load_domain (retval->successor[cnt], domainbinding);
48806 -
48807 - if (retval->successor[cnt]->data != NULL)
48808 - break;
48809 - }
48810 - return cnt >= 0 ? retval : NULL;
48811 - /* NOTREACHED */
48812 - }
48813 -
48814 - /* See whether the locale value is an alias. If yes its value
48815 - *overwrites* the alias name. No test for the original value is
48816 - done. */
48817 - alias_value = _nl_expand_alias (locale);
48818 - if (alias_value != NULL)
48819 - {
48820 -#if defined _LIBC || defined HAVE_STRDUP
48821 - locale = strdup (alias_value);
48822 - if (locale == NULL)
48823 - return NULL;
48824 -#else
48825 - size_t len = strlen (alias_value) + 1;
48826 - locale = (char *) malloc (len);
48827 - if (locale == NULL)
48828 - return NULL;
48829 -
48830 - memcpy (locale, alias_value, len);
48831 -#endif
48832 - }
48833 -
48834 - /* Now we determine the single parts of the locale name. First
48835 - look for the language. Termination symbols are `_' and `@' if
48836 - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
48837 - mask = _nl_explode_name (locale, &language, &modifier, &territory,
48838 - &codeset, &normalized_codeset, &special,
48839 - &sponsor, &revision);
48840 -
48841 - /* Create all possible locale entries which might be interested in
48842 - generalization. */
48843 - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
48844 - strlen (dirname) + 1, mask, language, territory,
48845 - codeset, normalized_codeset, modifier, special,
48846 - sponsor, revision, domainname, 1);
48847 - if (retval == NULL)
48848 - /* This means we are out of core. */
48849 - return NULL;
48850 -
48851 - if (retval->decided == 0)
48852 - _nl_load_domain (retval, domainbinding);
48853 - if (retval->data == NULL)
48854 - {
48855 - int cnt;
48856 - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
48857 - {
48858 - if (retval->successor[cnt]->decided == 0)
48859 - _nl_load_domain (retval->successor[cnt], domainbinding);
48860 - if (retval->successor[cnt]->data != NULL)
48861 - break;
48862 - }
48863 - }
48864 -
48865 - /* The room for an alias was dynamically allocated. Free it now. */
48866 - if (alias_value != NULL)
48867 - free (locale);
48868 -
48869 - /* The space for normalized_codeset is dynamically allocated. Free it. */
48870 - if (mask & XPG_NORM_CODESET)
48871 - free ((void *) normalized_codeset);
48872 -
48873 - return retval;
48874 -}
48875 -
48876 -
48877 -#ifdef _LIBC
48878 -libc_freeres_fn (free_mem)
48879 -{
48880 - struct loaded_l10nfile *runp = _nl_loaded_domains;
48881 -
48882 - while (runp != NULL)
48883 - {
48884 - struct loaded_l10nfile *here = runp;
48885 - if (runp->data != NULL)
48886 - _nl_unload_domain ((struct loaded_domain *) runp->data);
48887 - runp = runp->next;
48888 - free ((char *) here->filename);
48889 - free (here);
48890 - }
48891 -}
48892 -#endif
48893 diff -rupN original/intl/gettext.c new/intl/gettext.c
48894 --- original/intl/gettext.c 2009-03-28 22:33:59.000000000 -0430
48895 +++ new/intl/gettext.c 1969-12-31 20:00:00.000000000 -0400
48896 @@ -1,64 +0,0 @@
48897 -/* Implementation of gettext(3) function.
48898 - Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
48899 -
48900 - This program is free software; you can redistribute it and/or modify it
48901 - under the terms of the GNU Library General Public License as published
48902 - by the Free Software Foundation; either version 2, or (at your option)
48903 - any later version.
48904 -
48905 - This program is distributed in the hope that it will be useful,
48906 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48907 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48908 - Library General Public License for more details.
48909 -
48910 - You should have received a copy of the GNU Library General Public
48911 - License along with this program; if not, write to the Free Software
48912 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48913 - USA. */
48914 -
48915 -#ifdef HAVE_CONFIG_H
48916 -# include <config.h>
48917 -#endif
48918 -
48919 -#ifdef _LIBC
48920 -# define __need_NULL
48921 -# include <stddef.h>
48922 -#else
48923 -# include <stdlib.h> /* Just for NULL. */
48924 -#endif
48925 -
48926 -#include "gettextP.h"
48927 -#ifdef _LIBC
48928 -# include <libintl.h>
48929 -#else
48930 -# include "libgnuintl.h"
48931 -#endif
48932 -
48933 -/* @@ end of prolog @@ */
48934 -
48935 -/* Names for the libintl functions are a problem. They must not clash
48936 - with existing names and they should follow ANSI C. But this source
48937 - code is also used in GNU C Library where the names have a __
48938 - prefix. So we have to make a difference here. */
48939 -#ifdef _LIBC
48940 -# define GETTEXT __gettext
48941 -# define DCGETTEXT INTUSE(__dcgettext)
48942 -#else
48943 -# define GETTEXT libintl_gettext
48944 -# define DCGETTEXT libintl_dcgettext
48945 -#endif
48946 -
48947 -/* Look up MSGID in the current default message catalog for the current
48948 - LC_MESSAGES locale. If not found, returns MSGID itself (the default
48949 - text). */
48950 -char *
48951 -GETTEXT (msgid)
48952 - const char *msgid;
48953 -{
48954 - return DCGETTEXT (NULL, msgid, LC_MESSAGES);
48955 -}
48956 -
48957 -#ifdef _LIBC
48958 -/* Alias for function name in GNU C Library. */
48959 -weak_alias (__gettext, gettext);
48960 -#endif
48961 diff -rupN original/intl/gettextP.h new/intl/gettextP.h
48962 --- original/intl/gettextP.h 2009-03-28 22:33:59.000000000 -0430
48963 +++ new/intl/gettextP.h 1969-12-31 20:00:00.000000000 -0400
48964 @@ -1,224 +0,0 @@
48965 -/* Header describing internals of libintl library.
48966 - Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
48967 - Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
48968 -
48969 - This program is free software; you can redistribute it and/or modify it
48970 - under the terms of the GNU Library General Public License as published
48971 - by the Free Software Foundation; either version 2, or (at your option)
48972 - any later version.
48973 -
48974 - This program is distributed in the hope that it will be useful,
48975 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48976 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48977 - Library General Public License for more details.
48978 -
48979 - You should have received a copy of the GNU Library General Public
48980 - License along with this program; if not, write to the Free Software
48981 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48982 - USA. */
48983 -
48984 -#ifndef _GETTEXTP_H
48985 -#define _GETTEXTP_H
48986 -
48987 -#include <stddef.h> /* Get size_t. */
48988 -
48989 -#ifdef _LIBC
48990 -# include "../iconv/gconv_int.h"
48991 -#else
48992 -# if HAVE_ICONV
48993 -# include <iconv.h>
48994 -# endif
48995 -#endif
48996 -
48997 -#include "loadinfo.h"
48998 -
48999 -#include "gmo.h" /* Get nls_uint32. */
49000 -
49001 -/* @@ end of prolog @@ */
49002 -
49003 -#ifndef PARAMS
49004 -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
49005 -# define PARAMS(args) args
49006 -# else
49007 -# define PARAMS(args) ()
49008 -# endif
49009 -#endif
49010 -
49011 -#ifndef internal_function
49012 -# define internal_function
49013 -#endif
49014 -
49015 -#ifndef attribute_hidden
49016 -# define attribute_hidden
49017 -#endif
49018 -
49019 -/* Tell the compiler when a conditional or integer expression is
49020 - almost always true or almost always false. */
49021 -#ifndef HAVE_BUILTIN_EXPECT
49022 -# define __builtin_expect(expr, val) (expr)
49023 -#endif
49024 -
49025 -#ifndef W
49026 -# define W(flag, data) ((flag) ? SWAP (data) : (data))
49027 -#endif
49028 -
49029 -
49030 -#ifdef _LIBC
49031 -# include <byteswap.h>
49032 -# define SWAP(i) bswap_32 (i)
49033 -#else
49034 -static inline nls_uint32
49035 -SWAP (i)
49036 - nls_uint32 i;
49037 -{
49038 - return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
49039 -}
49040 -#endif
49041 -
49042 -
49043 -/* In-memory representation of system dependent string. */
49044 -struct sysdep_string_desc
49045 -{
49046 - /* Length of addressed string, including the trailing NUL. */
49047 - size_t length;
49048 - /* Pointer to addressed string. */
49049 - const char *pointer;
49050 -};
49051 -
49052 -/* The representation of an opened message catalog. */
49053 -struct loaded_domain
49054 -{
49055 - /* Pointer to memory containing the .mo file. */
49056 - const char *data;
49057 - /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
49058 - int use_mmap;
49059 - /* Size of mmap()ed memory. */
49060 - size_t mmap_size;
49061 - /* 1 if the .mo file uses a different endianness than this machine. */
49062 - int must_swap;
49063 - /* Pointer to additional malloc()ed memory. */
49064 - void *malloced;
49065 -
49066 - /* Number of static strings pairs. */
49067 - nls_uint32 nstrings;
49068 - /* Pointer to descriptors of original strings in the file. */
49069 - const struct string_desc *orig_tab;
49070 - /* Pointer to descriptors of translated strings in the file. */
49071 - const struct string_desc *trans_tab;
49072 -
49073 - /* Number of system dependent strings pairs. */
49074 - nls_uint32 n_sysdep_strings;
49075 - /* Pointer to descriptors of original sysdep strings. */
49076 - const struct sysdep_string_desc *orig_sysdep_tab;
49077 - /* Pointer to descriptors of translated sysdep strings. */
49078 - const struct sysdep_string_desc *trans_sysdep_tab;
49079 -
49080 - /* Size of hash table. */
49081 - nls_uint32 hash_size;
49082 - /* Pointer to hash table. */
49083 - const nls_uint32 *hash_tab;
49084 - /* 1 if the hash table uses a different endianness than this machine. */
49085 - int must_swap_hash_tab;
49086 -
49087 - int codeset_cntr;
49088 -#ifdef _LIBC
49089 - __gconv_t conv;
49090 -#else
49091 -# if HAVE_ICONV
49092 - iconv_t conv;
49093 -# endif
49094 -#endif
49095 - char **conv_tab;
49096 -
49097 - struct expression *plural;
49098 - unsigned long int nplurals;
49099 -};
49100 -
49101 -/* We want to allocate a string at the end of the struct. But ISO C
49102 - doesn't allow zero sized arrays. */
49103 -#ifdef __GNUC__
49104 -# define ZERO 0
49105 -#else
49106 -# define ZERO 1
49107 -#endif
49108 -
49109 -/* A set of settings bound to a message domain. Used to store settings
49110 - from bindtextdomain() and bind_textdomain_codeset(). */
49111 -struct binding
49112 -{
49113 - struct binding *next;
49114 - char *dirname;
49115 - int codeset_cntr; /* Incremented each time codeset changes. */
49116 - char *codeset;
49117 - char domainname[ZERO];
49118 -};
49119 -
49120 -/* A counter which is incremented each time some previous translations
49121 - become invalid.
49122 - This variable is part of the external ABI of the GNU libintl. */
49123 -extern int _nl_msg_cat_cntr;
49124 -
49125 -#ifndef _LIBC
49126 -const char *_nl_locale_name PARAMS ((int category, const char *categoryname));
49127 -#endif
49128 -
49129 -struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
49130 - char *__locale,
49131 - const char *__domainname,
49132 - struct binding *__domainbinding))
49133 - internal_function;
49134 -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
49135 - struct binding *__domainbinding))
49136 - internal_function;
49137 -void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
49138 - internal_function;
49139 -const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
49140 - struct loaded_domain *__domain,
49141 - struct binding *__domainbinding))
49142 - internal_function;
49143 -void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
49144 - internal_function;
49145 -
49146 -char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
49147 - struct binding *domainbinding,
49148 - const char *msgid, size_t *lengthp))
49149 - internal_function;
49150 -
49151 -#ifdef _LIBC
49152 -extern char *__gettext PARAMS ((const char *__msgid));
49153 -extern char *__dgettext PARAMS ((const char *__domainname,
49154 - const char *__msgid));
49155 -extern char *__dcgettext PARAMS ((const char *__domainname,
49156 - const char *__msgid, int __category));
49157 -extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
49158 - unsigned long int __n));
49159 -extern char *__dngettext PARAMS ((const char *__domainname,
49160 - const char *__msgid1, const char *__msgid2,
49161 - unsigned long int n));
49162 -extern char *__dcngettext PARAMS ((const char *__domainname,
49163 - const char *__msgid1, const char *__msgid2,
49164 - unsigned long int __n, int __category));
49165 -extern char *__dcigettext PARAMS ((const char *__domainname,
49166 - const char *__msgid1, const char *__msgid2,
49167 - int __plural, unsigned long int __n,
49168 - int __category));
49169 -extern char *__textdomain PARAMS ((const char *__domainname));
49170 -extern char *__bindtextdomain PARAMS ((const char *__domainname,
49171 - const char *__dirname));
49172 -extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
49173 - const char *__codeset));
49174 -#else
49175 -/* Declare the exported libintl_* functions, in a way that allows us to
49176 - call them under their real name. */
49177 -# define _INTL_REDIRECT_MACROS
49178 -# include "libgnuintl.h"
49179 -extern char *libintl_dcigettext PARAMS ((const char *__domainname,
49180 - const char *__msgid1,
49181 - const char *__msgid2,
49182 - int __plural, unsigned long int __n,
49183 - int __category));
49184 -#endif
49185 -
49186 -/* @@ begin of epilog @@ */
49187 -
49188 -#endif /* gettextP.h */
49189 diff -rupN original/intl/gmo.h new/intl/gmo.h
49190 --- original/intl/gmo.h 2009-03-28 22:33:59.000000000 -0430
49191 +++ new/intl/gmo.h 1969-12-31 20:00:00.000000000 -0400
49192 @@ -1,148 +0,0 @@
49193 -/* Description of GNU message catalog format: general file layout.
49194 - Copyright (C) 1995, 1997, 2000-2002 Free Software Foundation, Inc.
49195 -
49196 - This program is free software; you can redistribute it and/or modify it
49197 - under the terms of the GNU Library General Public License as published
49198 - by the Free Software Foundation; either version 2, or (at your option)
49199 - any later version.
49200 -
49201 - This program is distributed in the hope that it will be useful,
49202 - but WITHOUT ANY WARRANTY; without even the implied warranty of
49203 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49204 - Library General Public License for more details.
49205 -
49206 - You should have received a copy of the GNU Library General Public
49207 - License along with this program; if not, write to the Free Software
49208 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
49209 - USA. */
49210 -
49211 -#ifndef _GETTEXT_H
49212 -#define _GETTEXT_H 1
49213 -
49214 -#include <limits.h>
49215 -
49216 -/* @@ end of prolog @@ */
49217 -
49218 -/* The magic number of the GNU message catalog format. */
49219 -#define _MAGIC 0x950412de
49220 -#define _MAGIC_SWAPPED 0xde120495
49221 -
49222 -/* Revision number of the currently used .mo (binary) file format. */
49223 -#define MO_REVISION_NUMBER 0
49224 -
49225 -/* The following contortions are an attempt to use the C preprocessor
49226 - to determine an unsigned integral type that is 32 bits wide. An
49227 - alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
49228 - as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
49229 - when cross-compiling. */
49230 -
49231 -#if __STDC__
49232 -# define UINT_MAX_32_BITS 4294967295U
49233 -#else
49234 -# define UINT_MAX_32_BITS 0xFFFFFFFF
49235 -#endif
49236 -
49237 -/* If UINT_MAX isn't defined, assume it's a 32-bit type.
49238 - This should be valid for all systems GNU cares about because
49239 - that doesn't include 16-bit systems, and only modern systems
49240 - (that certainly have <limits.h>) have 64+-bit integral types. */
49241 -
49242 -#ifndef UINT_MAX
49243 -# define UINT_MAX UINT_MAX_32_BITS
49244 -#endif
49245 -
49246 -#if UINT_MAX == UINT_MAX_32_BITS
49247 -typedef unsigned nls_uint32;
49248 -#else
49249 -# if USHRT_MAX == UINT_MAX_32_BITS
49250 -typedef unsigned short nls_uint32;
49251 -# else
49252 -# if ULONG_MAX == UINT_MAX_32_BITS
49253 -typedef unsigned long nls_uint32;
49254 -# else
49255 - /* The following line is intended to throw an error. Using #error is
49256 - not portable enough. */
49257 - "Cannot determine unsigned 32-bit data type."
49258 -# endif
49259 -# endif
49260 -#endif
49261 -
49262 -
49263 -/* Header for binary .mo file format. */
49264 -struct mo_file_header
49265 -{
49266 - /* The magic number. */
49267 - nls_uint32 magic;
49268 - /* The revision number of the file format. */
49269 - nls_uint32 revision;
49270 -
49271 - /* The following are only used in .mo files with major revision 0. */
49272 -
49273 - /* The number of strings pairs. */
49274 - nls_uint32 nstrings;
49275 - /* Offset of table with start offsets of original strings. */
49276 - nls_uint32 orig_tab_offset;
49277 - /* Offset of table with start offsets of translated strings. */
49278 - nls_uint32 trans_tab_offset;
49279 - /* Size of hash table. */
49280 - nls_uint32 hash_tab_size;
49281 - /* Offset of first hash table entry. */
49282 - nls_uint32 hash_tab_offset;
49283 -
49284 - /* The following are only used in .mo files with minor revision >= 1. */
49285 -
49286 - /* The number of system dependent segments. */
49287 - nls_uint32 n_sysdep_segments;
49288 - /* Offset of table describing system dependent segments. */
49289 - nls_uint32 sysdep_segments_offset;
49290 - /* The number of system dependent strings pairs. */
49291 - nls_uint32 n_sysdep_strings;
49292 - /* Offset of table with start offsets of original sysdep strings. */
49293 - nls_uint32 orig_sysdep_tab_offset;
49294 - /* Offset of table with start offsets of translated sysdep strings. */
49295 - nls_uint32 trans_sysdep_tab_offset;
49296 -};
49297 -
49298 -/* Descriptor for static string contained in the binary .mo file. */
49299 -struct string_desc
49300 -{
49301 - /* Length of addressed string, not including the trailing NUL. */
49302 - nls_uint32 length;
49303 - /* Offset of string in file. */
49304 - nls_uint32 offset;
49305 -};
49306 -
49307 -/* The following are only used in .mo files with minor revision >= 1. */
49308 -
49309 -/* Descriptor for system dependent string segment. */
49310 -struct sysdep_segment
49311 -{
49312 - /* Length of addressed string, including the trailing NUL. */
49313 - nls_uint32 length;
49314 - /* Offset of string in file. */
49315 - nls_uint32 offset;
49316 -};
49317 -
49318 -/* Descriptor for system dependent string. */
49319 -struct sysdep_string
49320 -{
49321 - /* Offset of static string segments in file. */
49322 - nls_uint32 offset;
49323 - /* Alternating sequence of static and system dependent segments.
49324 - The last segment is a static segment, including the trailing NUL. */
49325 - struct segment_pair
49326 - {
49327 - /* Size of static segment. */
49328 - nls_uint32 segsize;
49329 - /* Reference to system dependent string segment, or ~0 at the end. */
49330 - nls_uint32 sysdepref;
49331 - } segments[1];
49332 -};
49333 -
49334 -/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF,
49335 - regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */
49336 -#define SEGMENTS_END ((nls_uint32) ~0)
49337 -
49338 -/* @@ begin of epilog @@ */
49339 -
49340 -#endif /* gettext.h */
49341 diff -rupN original/intl/hash-string.h new/intl/hash-string.h
49342 --- original/intl/hash-string.h 2009-03-28 22:33:59.000000000 -0430
49343 +++ new/intl/hash-string.h 1969-12-31 20:00:00.000000000 -0400
49344 @@ -1,59 +0,0 @@
49345 -/* Description of GNU message catalog format: string hashing function.
49346 - Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
49347 -
49348 - This program is free software; you can redistribute it and/or modify it
49349 - under the terms of the GNU Library General Public License as published
49350 - by the Free Software Foundation; either version 2, or (at your option)
49351 - any later version.
49352 -
49353 - This program is distributed in the hope that it will be useful,
49354 - but WITHOUT ANY WARRANTY; without even the implied warranty of
49355 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49356 - Library General Public License for more details.
49357 -
49358 - You should have received a copy of the GNU Library General Public
49359 - License along with this program; if not, write to the Free Software
49360 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
49361 - USA. */
49362 -
49363 -/* @@ end of prolog @@ */
49364 -
49365 -#ifndef PARAMS
49366 -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
49367 -# define PARAMS(Args) Args
49368 -# else
49369 -# define PARAMS(Args) ()
49370 -# endif
49371 -#endif
49372 -
49373 -/* We assume to have `unsigned long int' value with at least 32 bits. */
49374 -#define HASHWORDBITS 32
49375 -
49376 -
49377 -/* Defines the so called `hashpjw' function by P.J. Weinberger
49378 - [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
49379 - 1986, 1987 Bell Telephone Laboratories, Inc.] */
49380 -static unsigned long int hash_string PARAMS ((const char *__str_param));
49381 -
49382 -static inline unsigned long int
49383 -hash_string (str_param)
49384 - const char *str_param;
49385 -{
49386 - unsigned long int hval, g;
49387 - const char *str = str_param;
49388 -
49389 - /* Compute the hash value for the given string. */
49390 - hval = 0;
49391 - while (*str != '\0')
49392 - {
49393 - hval <<= 4;
49394 - hval += (unsigned long int) *str++;
49395 - g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
49396 - if (g != 0)
49397 - {
49398 - hval ^= g >> (HASHWORDBITS - 8);
49399 - hval ^= g;
49400 - }
49401 - }
49402 - return hval;
49403 -}
49404 diff -rupN original/intl/intl-compat.c new/intl/intl-compat.c
49405 --- original/intl/intl-compat.c 2009-03-28 22:33:59.000000000 -0430
49406 +++ new/intl/intl-compat.c 1969-12-31 20:00:00.000000000 -0400
49407 @@ -1,151 +0,0 @@
49408 -/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
49409 - Library.
49410 - Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
49411 -
49412 - This program is free software; you can redistribute it and/or modify it
49413 - under the terms of the GNU Library General Public License as published
49414 - by the Free Software Foundation; either version 2, or (at your option)
49415 - any later version.
49416 -
49417 - This program is distributed in the hope that it will be useful,
49418 - but WITHOUT ANY WARRANTY; without even the implied warranty of
49419 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49420 - Library General Public License for more details.
49421 -
49422 - You should have received a copy of the GNU Library General Public
49423 - License along with this program; if not, write to the Free Software
49424 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
49425 - USA. */
49426 -
49427 -#ifdef HAVE_CONFIG_H
49428 -# include <config.h>
49429 -#endif
49430 -
49431 -#include "gettextP.h"
49432 -
49433 -/* @@ end of prolog @@ */
49434 -
49435 -/* This file redirects the gettext functions (without prefix) to those
49436 - defined in the included GNU libintl library (with "libintl_" prefix).
49437 - It is compiled into libintl in order to make the AM_GNU_GETTEXT test
49438 - of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
49439 - has the redirections primarily in the <libintl.h> include file.
49440 - It is also compiled into libgnuintl so that libgnuintl.so can be used
49441 - as LD_PRELOADable library on glibc systems, to provide the extra
49442 - features that the functions in the libc don't have (namely, logging). */
49443 -
49444 -
49445 -#undef gettext
49446 -#undef dgettext
49447 -#undef dcgettext
49448 -#undef ngettext
49449 -#undef dngettext
49450 -#undef dcngettext
49451 -#undef textdomain
49452 -#undef bindtextdomain
49453 -#undef bind_textdomain_codeset
49454 -
49455 -
49456 -/* When building a DLL, we must export some functions. Note that because
49457 - the functions are only defined for binary backward compatibility, we
49458 - don't need to use __declspec(dllimport) in any case. */
49459 -#if defined _MSC_VER && BUILDING_DLL
49460 -# define DLL_EXPORTED __declspec(dllexport)
49461 -#else
49462 -# define DLL_EXPORTED
49463 -#endif
49464 -
49465 -
49466 -DLL_EXPORTED
49467 -char *
49468 -gettext (msgid)
49469 - const char *msgid;
49470 -{
49471 - return libintl_gettext (msgid);
49472 -}
49473 -
49474 -
49475 -DLL_EXPORTED
49476 -char *
49477 -dgettext (domainname, msgid)
49478 - const char *domainname;
49479 - const char *msgid;
49480 -{
49481 - return libintl_dgettext (domainname, msgid);
49482 -}
49483 -
49484 -
49485 -DLL_EXPORTED
49486 -char *
49487 -dcgettext (domainname, msgid, category)
49488 - const char *domainname;
49489 - const char *msgid;
49490 - int category;
49491 -{
49492 - return libintl_dcgettext (domainname, msgid, category);
49493 -}
49494 -
49495 -
49496 -DLL_EXPORTED
49497 -char *
49498 -ngettext (msgid1, msgid2, n)
49499 - const char *msgid1;
49500 - const char *msgid2;
49501 - unsigned long int n;
49502 -{
49503 - return libintl_ngettext (msgid1, msgid2, n);
49504 -}
49505 -
49506 -
49507 -DLL_EXPORTED
49508 -char *
49509 -dngettext (domainname, msgid1, msgid2, n)
49510 - const char *domainname;
49511 - const char *msgid1;
49512 - const char *msgid2;
49513 - unsigned long int n;
49514 -{
49515 - return libintl_dngettext (domainname, msgid1, msgid2, n);
49516 -}
49517 -
49518 -
49519 -DLL_EXPORTED
49520 -char *
49521 -dcngettext (domainname, msgid1, msgid2, n, category)
49522 - const char *domainname;
49523 - const char *msgid1;
49524 - const char *msgid2;
49525 - unsigned long int n;
49526 - int category;
49527 -{
49528 - return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
49529 -}
49530 -
49531 -
49532 -DLL_EXPORTED
49533 -char *
49534 -textdomain (domainname)
49535 - const char *domainname;
49536 -{
49537 - return libintl_textdomain (domainname);
49538 -}
49539 -
49540 -
49541 -DLL_EXPORTED
49542 -char *
49543 -bindtextdomain (domainname, dirname)
49544 - const char *domainname;
49545 - const char *dirname;
49546 -{
49547 - return libintl_bindtextdomain (domainname, dirname);
49548 -}
49549 -
49550 -
49551 -DLL_EXPORTED
49552 -char *
49553 -bind_textdomain_codeset (domainname, codeset)
49554 - const char *domainname;
49555 - const char *codeset;
49556 -{
49557 - return libintl_bind_textdomain_codeset (domainname, codeset);
49558 -}
49559 diff -rupN original/intl/l10nflist.c new/intl/l10nflist.c
49560 --- original/intl/l10nflist.c 2009-03-28 22:33:59.000000000 -0430
49561 +++ new/intl/l10nflist.c 1969-12-31 20:00:00.000000000 -0400
49562 @@ -1,453 +0,0 @@
49563 -/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
49564 - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
49565 -
49566 - This program is free software; you can redistribute it and/or modify it
49567 - under the terms of the GNU Library General Public License as published
49568 - by the Free Software Foundation; either version 2, or (at your option)
49569 - any later version.
49570 -
49571 - This program is distributed in the hope that it will be useful,
49572 - but WITHOUT ANY WARRANTY; without even the implied warranty of
49573 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49574 - Library General Public License for more details.
49575 -
49576 - You should have received a copy of the GNU Library General Public
49577 - License along with this program; if not, write to the Free Software
49578 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
49579 - USA. */
49580 -
49581 -/* Tell glibc's <string.h> to provide a prototype for stpcpy().
49582 - This must come before <config.h> because <config.h> may include
49583 - <features.h>, and once <features.h> has been included, it's too late. */
49584 -#ifndef _GNU_SOURCE
49585 -# define _GNU_SOURCE 1
49586 -#endif
49587 -
49588 -#ifdef HAVE_CONFIG_H
49589 -# include <config.h>
49590 -#endif
49591 -
49592 -#include <string.h>
49593 -
49594 -#if defined _LIBC || defined HAVE_ARGZ_H
49595 -# include <argz.h>
49596 -#endif
49597 -#include <ctype.h>
49598 -#include <sys/types.h>
49599 -#include <stdlib.h>
49600 -
49601 -#include "loadinfo.h"
49602 -
49603 -/* On some strange systems still no definition of NULL is found. Sigh! */
49604 -#ifndef NULL
49605 -# if defined __STDC__ && __STDC__
49606 -# define NULL ((void *) 0)
49607 -# else
49608 -# define NULL 0
49609 -# endif
49610 -#endif
49611 -
49612 -/* @@ end of prolog @@ */
49613 -
49614 -#ifdef _LIBC
49615 -/* Rename the non ANSI C functions. This is required by the standard
49616 - because some ANSI C functions will require linking with this object
49617 - file and the name space must not be polluted. */
49618 -# ifndef stpcpy
49619 -# define stpcpy(dest, src) __stpcpy(dest, src)
49620 -# endif
49621 -#else
49622 -# ifndef HAVE_STPCPY
49623 -static char *stpcpy PARAMS ((char *dest, const char *src));
49624 -# endif
49625 -#endif
49626 -
49627 -/* Pathname support.
49628 - ISSLASH(C) tests whether C is a directory separator character.
49629 - IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
49630 - it may be concatenated to a directory pathname.
49631 - */
49632 -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
49633 - /* Win32, OS/2, DOS */
49634 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
49635 -# define HAS_DEVICE(P) \
49636 - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
49637 - && (P)[1] == ':')
49638 -# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
49639 -#else
49640 - /* Unix */
49641 -# define ISSLASH(C) ((C) == '/')
49642 -# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
49643 -#endif
49644 -
49645 -/* Define function which are usually not available. */
49646 -
49647 -#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
49648 -/* Returns the number of strings in ARGZ. */
49649 -static size_t argz_count__ PARAMS ((const char *argz, size_t len));
49650 -
49651 -static size_t
49652 -argz_count__ (argz, len)
49653 - const char *argz;
49654 - size_t len;
49655 -{
49656 - size_t count = 0;
49657 - while (len > 0)
49658 - {
49659 - size_t part_len = strlen (argz);
49660 - argz += part_len + 1;
49661 - len -= part_len + 1;
49662 - count++;
49663 - }
49664 - return count;
49665 -}
49666 -# undef __argz_count
49667 -# define __argz_count(argz, len) argz_count__ (argz, len)
49668 -#else
49669 -# ifdef _LIBC
49670 -# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
49671 -# endif
49672 -#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
49673 -
49674 -#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
49675 -/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
49676 - except the last into the character SEP. */
49677 -static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
49678 -
49679 -static void
49680 -argz_stringify__ (argz, len, sep)
49681 - char *argz;
49682 - size_t len;
49683 - int sep;
49684 -{
49685 - while (len > 0)
49686 - {
49687 - size_t part_len = strlen (argz);
49688 - argz += part_len;
49689 - len -= part_len + 1;
49690 - if (len > 0)
49691 - *argz++ = sep;
49692 - }
49693 -}
49694 -# undef __argz_stringify
49695 -# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
49696 -#else
49697 -# ifdef _LIBC
49698 -# define __argz_stringify(argz, len, sep) \
49699 - INTUSE(__argz_stringify) (argz, len, sep)
49700 -# endif
49701 -#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
49702 -
49703 -#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
49704 -static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
49705 - const char *entry));
49706 -
49707 -static char *
49708 -argz_next__ (argz, argz_len, entry)
49709 - char *argz;
49710 - size_t argz_len;
49711 - const char *entry;
49712 -{
49713 - if (entry)
49714 - {
49715 - if (entry < argz + argz_len)
49716 - entry = strchr (entry, '\0') + 1;
49717 -
49718 - return entry >= argz + argz_len ? NULL : (char *) entry;
49719 - }
49720 - else
49721 - if (argz_len > 0)
49722 - return argz;
49723 - else
49724 - return 0;
49725 -}
49726 -# undef __argz_next
49727 -# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
49728 -#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
49729 -
49730 -
49731 -/* Return number of bits set in X. */
49732 -static int pop PARAMS ((int x));
49733 -
49734 -static inline int
49735 -pop (x)
49736 - int x;
49737 -{
49738 - /* We assume that no more than 16 bits are used. */
49739 - x = ((x & ~0x5555) >> 1) + (x & 0x5555);
49740 - x = ((x & ~0x3333) >> 2) + (x & 0x3333);
49741 - x = ((x >> 4) + x) & 0x0f0f;
49742 - x = ((x >> 8) + x) & 0xff;
49743 -
49744 - return x;
49745 -}
49746 -
49747 -\f
49748 -struct loaded_l10nfile *
49749 -_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
49750 - territory, codeset, normalized_codeset, modifier, special,
49751 - sponsor, revision, filename, do_allocate)
49752 - struct loaded_l10nfile **l10nfile_list;
49753 - const char *dirlist;
49754 - size_t dirlist_len;
49755 - int mask;
49756 - const char *language;
49757 - const char *territory;
49758 - const char *codeset;
49759 - const char *normalized_codeset;
49760 - const char *modifier;
49761 - const char *special;
49762 - const char *sponsor;
49763 - const char *revision;
49764 - const char *filename;
49765 - int do_allocate;
49766 -{
49767 - char *abs_filename;
49768 - struct loaded_l10nfile **lastp;
49769 - struct loaded_l10nfile *retval;
49770 - char *cp;
49771 - size_t dirlist_count;
49772 - size_t entries;
49773 - int cnt;
49774 -
49775 - /* If LANGUAGE contains an absolute directory specification, we ignore
49776 - DIRLIST. */
49777 - if (IS_ABSOLUTE_PATH (language))
49778 - dirlist_len = 0;
49779 -
49780 - /* Allocate room for the full file name. */
49781 - abs_filename = (char *) malloc (dirlist_len
49782 - + strlen (language)
49783 - + ((mask & TERRITORY) != 0
49784 - ? strlen (territory) + 1 : 0)
49785 - + ((mask & XPG_CODESET) != 0
49786 - ? strlen (codeset) + 1 : 0)
49787 - + ((mask & XPG_NORM_CODESET) != 0
49788 - ? strlen (normalized_codeset) + 1 : 0)
49789 - + (((mask & XPG_MODIFIER) != 0
49790 - || (mask & CEN_AUDIENCE) != 0)
49791 - ? strlen (modifier) + 1 : 0)
49792 - + ((mask & CEN_SPECIAL) != 0
49793 - ? strlen (special) + 1 : 0)
49794 - + (((mask & CEN_SPONSOR) != 0
49795 - || (mask & CEN_REVISION) != 0)
49796 - ? (1 + ((mask & CEN_SPONSOR) != 0
49797 - ? strlen (sponsor) : 0)
49798 - + ((mask & CEN_REVISION) != 0
49799 - ? strlen (revision) + 1 : 0)) : 0)
49800 - + 1 + strlen (filename) + 1);
49801 -
49802 - if (abs_filename == NULL)
49803 - return NULL;
49804 -
49805 - /* Construct file name. */
49806 - cp = abs_filename;
49807 - if (dirlist_len > 0)
49808 - {
49809 - memcpy (cp, dirlist, dirlist_len);
49810 - __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
49811 - cp += dirlist_len;
49812 - cp[-1] = '/';
49813 - }
49814 -
49815 - cp = stpcpy (cp, language);
49816 -
49817 - if ((mask & TERRITORY) != 0)
49818 - {
49819 - *cp++ = '_';
49820 - cp = stpcpy (cp, territory);
49821 - }
49822 - if ((mask & XPG_CODESET) != 0)
49823 - {
49824 - *cp++ = '.';
49825 - cp = stpcpy (cp, codeset);
49826 - }
49827 - if ((mask & XPG_NORM_CODESET) != 0)
49828 - {
49829 - *cp++ = '.';
49830 - cp = stpcpy (cp, normalized_codeset);
49831 - }
49832 - if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
49833 - {
49834 - /* This component can be part of both syntaces but has different
49835 - leading characters. For CEN we use `+', else `@'. */
49836 - *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
49837 - cp = stpcpy (cp, modifier);
49838 - }
49839 - if ((mask & CEN_SPECIAL) != 0)
49840 - {
49841 - *cp++ = '+';
49842 - cp = stpcpy (cp, special);
49843 - }
49844 - if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
49845 - {
49846 - *cp++ = ',';
49847 - if ((mask & CEN_SPONSOR) != 0)
49848 - cp = stpcpy (cp, sponsor);
49849 - if ((mask & CEN_REVISION) != 0)
49850 - {
49851 - *cp++ = '_';
49852 - cp = stpcpy (cp, revision);
49853 - }
49854 - }
49855 -
49856 - *cp++ = '/';
49857 - stpcpy (cp, filename);
49858 -
49859 - /* Look in list of already loaded domains whether it is already
49860 - available. */
49861 - lastp = l10nfile_list;
49862 - for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
49863 - if (retval->filename != NULL)
49864 - {
49865 - int compare = strcmp (retval->filename, abs_filename);
49866 - if (compare == 0)
49867 - /* We found it! */
49868 - break;
49869 - if (compare < 0)
49870 - {
49871 - /* It's not in the list. */
49872 - retval = NULL;
49873 - break;
49874 - }
49875 -
49876 - lastp = &retval->next;
49877 - }
49878 -
49879 - if (retval != NULL || do_allocate == 0)
49880 - {
49881 - free (abs_filename);
49882 - return retval;
49883 - }
49884 -
49885 - dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
49886 -
49887 - /* Allocate a new loaded_l10nfile. */
49888 - retval =
49889 - (struct loaded_l10nfile *)
49890 - malloc (sizeof (*retval)
49891 - + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
49892 - * sizeof (struct loaded_l10nfile *)));
49893 - if (retval == NULL)
49894 - return NULL;
49895 -
49896 - retval->filename = abs_filename;
49897 -
49898 - /* We set retval->data to NULL here; it is filled in later.
49899 - Setting retval->decided to 1 here means that retval does not
49900 - correspond to a real file (dirlist_count > 1) or is not worth
49901 - looking up (if an unnormalized codeset was specified). */
49902 - retval->decided = (dirlist_count > 1
49903 - || ((mask & XPG_CODESET) != 0
49904 - && (mask & XPG_NORM_CODESET) != 0));
49905 - retval->data = NULL;
49906 -
49907 - retval->next = *lastp;
49908 - *lastp = retval;
49909 -
49910 - entries = 0;
49911 - /* Recurse to fill the inheritance list of RETVAL.
49912 - If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
49913 - entry does not correspond to a real file; retval->filename contains
49914 - colons. In this case we loop across all elements of DIRLIST and
49915 - across all bit patterns dominated by MASK.
49916 - If the DIRLIST is a single directory or entirely redundant (i.e.
49917 - DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
49918 - MASK, excluding MASK itself.
49919 - In either case, we loop down from MASK to 0. This has the effect
49920 - that the extra bits in the locale name are dropped in this order:
49921 - first the modifier, then the territory, then the codeset, then the
49922 - normalized_codeset. */
49923 - for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
49924 - if ((cnt & ~mask) == 0
49925 - && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
49926 - && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
49927 - {
49928 - if (dirlist_count > 1)
49929 - {
49930 - /* Iterate over all elements of the DIRLIST. */
49931 - char *dir = NULL;
49932 -
49933 - while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
49934 - != NULL)
49935 - retval->successor[entries++]
49936 - = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
49937 - cnt, language, territory, codeset,
49938 - normalized_codeset, modifier, special,
49939 - sponsor, revision, filename, 1);
49940 - }
49941 - else
49942 - retval->successor[entries++]
49943 - = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
49944 - cnt, language, territory, codeset,
49945 - normalized_codeset, modifier, special,
49946 - sponsor, revision, filename, 1);
49947 - }
49948 - retval->successor[entries] = NULL;
49949 -
49950 - return retval;
49951 -}
49952 -\f
49953 -/* Normalize codeset name. There is no standard for the codeset
49954 - names. Normalization allows the user to use any of the common
49955 - names. The return value is dynamically allocated and has to be
49956 - freed by the caller. */
49957 -const char *
49958 -_nl_normalize_codeset (codeset, name_len)
49959 - const char *codeset;
49960 - size_t name_len;
49961 -{
49962 - int len = 0;
49963 - int only_digit = 1;
49964 - char *retval;
49965 - char *wp;
49966 - size_t cnt;
49967 -
49968 - for (cnt = 0; cnt < name_len; ++cnt)
49969 - if (isalnum ((unsigned char) codeset[cnt]))
49970 - {
49971 - ++len;
49972 -
49973 - if (isalpha ((unsigned char) codeset[cnt]))
49974 - only_digit = 0;
49975 - }
49976 -
49977 - retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
49978 -
49979 - if (retval != NULL)
49980 - {
49981 - if (only_digit)
49982 - wp = stpcpy (retval, "iso");
49983 - else
49984 - wp = retval;
49985 -
49986 - for (cnt = 0; cnt < name_len; ++cnt)
49987 - if (isalpha ((unsigned char) codeset[cnt]))
49988 - *wp++ = tolower ((unsigned char) codeset[cnt]);
49989 - else if (isdigit ((unsigned char) codeset[cnt]))
49990 - *wp++ = codeset[cnt];
49991 -
49992 - *wp = '\0';
49993 - }
49994 -
49995 - return (const char *) retval;
49996 -}
49997 -
49998 -
49999 -/* @@ begin of epilog @@ */
50000 -
50001 -/* We don't want libintl.a to depend on any other library. So we
50002 - avoid the non-standard function stpcpy. In GNU C Library this
50003 - function is available, though. Also allow the symbol HAVE_STPCPY
50004 - to be defined. */
50005 -#if !_LIBC && !HAVE_STPCPY
50006 -static char *
50007 -stpcpy (dest, src)
50008 - char *dest;
50009 - const char *src;
50010 -{
50011 - while ((*dest++ = *src++) != '\0')
50012 - /* Do nothing. */ ;
50013 - return dest - 1;
50014 -}
50015 -#endif
50016 diff -rupN original/intl/libgnuintl.h.in new/intl/libgnuintl.h.in
50017 --- original/intl/libgnuintl.h.in 2009-03-28 22:33:59.000000000 -0430
50018 +++ new/intl/libgnuintl.h.in 1969-12-31 20:00:00.000000000 -0400
50019 @@ -1,309 +0,0 @@
50020 -/* Message catalogs for internationalization.
50021 - Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
50022 -
50023 - This program is free software; you can redistribute it and/or modify it
50024 - under the terms of the GNU Library General Public License as published
50025 - by the Free Software Foundation; either version 2, or (at your option)
50026 - any later version.
50027 -
50028 - This program is distributed in the hope that it will be useful,
50029 - but WITHOUT ANY WARRANTY; without even the implied warranty of
50030 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
50031 - Library General Public License for more details.
50032 -
50033 - You should have received a copy of the GNU Library General Public
50034 - License along with this program; if not, write to the Free Software
50035 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
50036 - USA. */
50037 -
50038 -#ifndef _LIBINTL_H
50039 -#define _LIBINTL_H 1
50040 -
50041 -#include <locale.h>
50042 -
50043 -/* The LC_MESSAGES locale category is the category used by the functions
50044 - gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
50045 - On systems that don't define it, use an arbitrary value instead.
50046 - On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
50047 - then includes <libintl.h> (i.e. this file!) and then only defines
50048 - LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
50049 - in this case. */
50050 -#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
50051 -# define LC_MESSAGES 1729
50052 -#endif
50053 -
50054 -/* We define an additional symbol to signal that we use the GNU
50055 - implementation of gettext. */
50056 -#define __USE_GNU_GETTEXT 1
50057 -
50058 -/* Provide information about the supported file formats. Returns the
50059 - maximum minor revision number supported for a given major revision. */
50060 -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
50061 - ((major) == 0 ? 1 : -1)
50062 -
50063 -/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
50064 - precedence over _conio_gettext. */
50065 -#ifdef __DJGPP__
50066 -# undef gettext
50067 -#endif
50068 -
50069 -/* Use _INTL_PARAMS, not PARAMS, in order to avoid clashes with identifiers
50070 - used by programs. Similarly, test __PROTOTYPES, not PROTOTYPES. */
50071 -#ifndef _INTL_PARAMS
50072 -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
50073 -# define _INTL_PARAMS(args) args
50074 -# else
50075 -# define _INTL_PARAMS(args) ()
50076 -# endif
50077 -#endif
50078 -
50079 -#ifdef __cplusplus
50080 -extern "C" {
50081 -#endif
50082 -
50083 -
50084 -/* We redirect the functions to those prefixed with "libintl_". This is
50085 - necessary, because some systems define gettext/textdomain/... in the C
50086 - library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
50087 - If we used the unprefixed names, there would be cases where the
50088 - definition in the C library would override the one in the libintl.so
50089 - shared library. Recall that on ELF systems, the symbols are looked
50090 - up in the following order:
50091 - 1. in the executable,
50092 - 2. in the shared libraries specified on the link command line, in order,
50093 - 3. in the dependencies of the shared libraries specified on the link
50094 - command line,
50095 - 4. in the dlopen()ed shared libraries, in the order in which they were
50096 - dlopen()ed.
50097 - The definition in the C library would override the one in libintl.so if
50098 - either
50099 - * -lc is given on the link command line and -lintl isn't, or
50100 - * -lc is given on the link command line before -lintl, or
50101 - * libintl.so is a dependency of a dlopen()ed shared library but not
50102 - linked to the executable at link time.
50103 - Since Solaris gettext() behaves differently than GNU gettext(), this
50104 - would be unacceptable.
50105 -
50106 - The redirection happens by default through macros in C, so that &gettext
50107 - is independent of the compilation unit, but through inline functions in
50108 - C++, in order not to interfere with the name mangling of class fields or
50109 - class methods called 'gettext'. */
50110 -
50111 -/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
50112 - If he doesn't, we choose the method. A third possible method is
50113 - _INTL_REDIRECT_ASM, supported only by GCC. */
50114 -#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
50115 -# if __GNUC__ >= 2 && !defined __APPLE_CC__ && (defined __STDC__ || defined __cplusplus)
50116 -# define _INTL_REDIRECT_ASM
50117 -# else
50118 -# ifdef __cplusplus
50119 -# define _INTL_REDIRECT_INLINE
50120 -# else
50121 -# define _INTL_REDIRECT_MACROS
50122 -# endif
50123 -# endif
50124 -#endif
50125 -/* Auxiliary macros. */
50126 -#ifdef _INTL_REDIRECT_ASM
50127 -# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
50128 -# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
50129 -# define _INTL_STRINGIFY(prefix) #prefix
50130 -#else
50131 -# define _INTL_ASM(cname)
50132 -#endif
50133 -
50134 -/* Look up MSGID in the current default message catalog for the current
50135 - LC_MESSAGES locale. If not found, returns MSGID itself (the default
50136 - text). */
50137 -#ifdef _INTL_REDIRECT_INLINE
50138 -extern char *libintl_gettext (const char *__msgid);
50139 -static inline char *gettext (const char *__msgid)
50140 -{
50141 - return libintl_gettext (__msgid);
50142 -}
50143 -#else
50144 -#ifdef _INTL_REDIRECT_MACROS
50145 -# define gettext libintl_gettext
50146 -#endif
50147 -extern char *gettext _INTL_PARAMS ((const char *__msgid))
50148 - _INTL_ASM (libintl_gettext);
50149 -#endif
50150 -
50151 -/* Look up MSGID in the DOMAINNAME message catalog for the current
50152 - LC_MESSAGES locale. */
50153 -#ifdef _INTL_REDIRECT_INLINE
50154 -extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
50155 -static inline char *dgettext (const char *__domainname, const char *__msgid)
50156 -{
50157 - return libintl_dgettext (__domainname, __msgid);
50158 -}
50159 -#else
50160 -#ifdef _INTL_REDIRECT_MACROS
50161 -# define dgettext libintl_dgettext
50162 -#endif
50163 -extern char *dgettext _INTL_PARAMS ((const char *__domainname,
50164 - const char *__msgid))
50165 - _INTL_ASM (libintl_dgettext);
50166 -#endif
50167 -
50168 -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
50169 - locale. */
50170 -#ifdef _INTL_REDIRECT_INLINE
50171 -extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
50172 - int __category);
50173 -static inline char *dcgettext (const char *__domainname, const char *__msgid,
50174 - int __category)
50175 -{
50176 - return libintl_dcgettext (__domainname, __msgid, __category);
50177 -}
50178 -#else
50179 -#ifdef _INTL_REDIRECT_MACROS
50180 -# define dcgettext libintl_dcgettext
50181 -#endif
50182 -extern char *dcgettext _INTL_PARAMS ((const char *__domainname,
50183 - const char *__msgid,
50184 - int __category))
50185 - _INTL_ASM (libintl_dcgettext);
50186 -#endif
50187 -
50188 -
50189 -/* Similar to `gettext' but select the plural form corresponding to the
50190 - number N. */
50191 -#ifdef _INTL_REDIRECT_INLINE
50192 -extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
50193 - unsigned long int __n);
50194 -static inline char *ngettext (const char *__msgid1, const char *__msgid2,
50195 - unsigned long int __n)
50196 -{
50197 - return libintl_ngettext (__msgid1, __msgid2, __n);
50198 -}
50199 -#else
50200 -#ifdef _INTL_REDIRECT_MACROS
50201 -# define ngettext libintl_ngettext
50202 -#endif
50203 -extern char *ngettext _INTL_PARAMS ((const char *__msgid1,
50204 - const char *__msgid2,
50205 - unsigned long int __n))
50206 - _INTL_ASM (libintl_ngettext);
50207 -#endif
50208 -
50209 -/* Similar to `dgettext' but select the plural form corresponding to the
50210 - number N. */
50211 -#ifdef _INTL_REDIRECT_INLINE
50212 -extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
50213 - const char *__msgid2, unsigned long int __n);
50214 -static inline char *dngettext (const char *__domainname, const char *__msgid1,
50215 - const char *__msgid2, unsigned long int __n)
50216 -{
50217 - return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
50218 -}
50219 -#else
50220 -#ifdef _INTL_REDIRECT_MACROS
50221 -# define dngettext libintl_dngettext
50222 -#endif
50223 -extern char *dngettext _INTL_PARAMS ((const char *__domainname,
50224 - const char *__msgid1,
50225 - const char *__msgid2,
50226 - unsigned long int __n))
50227 - _INTL_ASM (libintl_dngettext);
50228 -#endif
50229 -
50230 -/* Similar to `dcgettext' but select the plural form corresponding to the
50231 - number N. */
50232 -#ifdef _INTL_REDIRECT_INLINE
50233 -extern char *libintl_dcngettext (const char *__domainname,
50234 - const char *__msgid1, const char *__msgid2,
50235 - unsigned long int __n, int __category);
50236 -static inline char *dcngettext (const char *__domainname,
50237 - const char *__msgid1, const char *__msgid2,
50238 - unsigned long int __n, int __category)
50239 -{
50240 - return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
50241 -}
50242 -#else
50243 -#ifdef _INTL_REDIRECT_MACROS
50244 -# define dcngettext libintl_dcngettext
50245 -#endif
50246 -extern char *dcngettext _INTL_PARAMS ((const char *__domainname,
50247 - const char *__msgid1,
50248 - const char *__msgid2,
50249 - unsigned long int __n,
50250 - int __category))
50251 - _INTL_ASM (libintl_dcngettext);
50252 -#endif
50253 -
50254 -
50255 -/* Set the current default message catalog to DOMAINNAME.
50256 - If DOMAINNAME is null, return the current default.
50257 - If DOMAINNAME is "", reset to the default of "messages". */
50258 -#ifdef _INTL_REDIRECT_INLINE
50259 -extern char *libintl_textdomain (const char *__domainname);
50260 -static inline char *textdomain (const char *__domainname)
50261 -{
50262 - return libintl_textdomain (__domainname);
50263 -}
50264 -#else
50265 -#ifdef _INTL_REDIRECT_MACROS
50266 -# define textdomain libintl_textdomain
50267 -#endif
50268 -extern char *textdomain _INTL_PARAMS ((const char *__domainname))
50269 - _INTL_ASM (libintl_textdomain);
50270 -#endif
50271 -
50272 -/* Specify that the DOMAINNAME message catalog will be found
50273 - in DIRNAME rather than in the system locale data base. */
50274 -#ifdef _INTL_REDIRECT_INLINE
50275 -extern char *libintl_bindtextdomain (const char *__domainname,
50276 - const char *__dirname);
50277 -static inline char *bindtextdomain (const char *__domainname,
50278 - const char *__dirname)
50279 -{
50280 - return libintl_bindtextdomain (__domainname, __dirname);
50281 -}
50282 -#else
50283 -#ifdef _INTL_REDIRECT_MACROS
50284 -# define bindtextdomain libintl_bindtextdomain
50285 -#endif
50286 -extern char *bindtextdomain _INTL_PARAMS ((const char *__domainname,
50287 - const char *__dirname))
50288 - _INTL_ASM (libintl_bindtextdomain);
50289 -#endif
50290 -
50291 -/* Specify the character encoding in which the messages from the
50292 - DOMAINNAME message catalog will be returned. */
50293 -#ifdef _INTL_REDIRECT_INLINE
50294 -extern char *libintl_bind_textdomain_codeset (const char *__domainname,
50295 - const char *__codeset);
50296 -static inline char *bind_textdomain_codeset (const char *__domainname,
50297 - const char *__codeset)
50298 -{
50299 - return libintl_bind_textdomain_codeset (__domainname, __codeset);
50300 -}
50301 -#else
50302 -#ifdef _INTL_REDIRECT_MACROS
50303 -# define bind_textdomain_codeset libintl_bind_textdomain_codeset
50304 -#endif
50305 -extern char *bind_textdomain_codeset _INTL_PARAMS ((const char *__domainname,
50306 - const char *__codeset))
50307 - _INTL_ASM (libintl_bind_textdomain_codeset);
50308 -#endif
50309 -
50310 -
50311 -/* Support for relocatable packages. */
50312 -
50313 -/* Sets the original and the current installation prefix of the package.
50314 - Relocation simply replaces a pathname starting with the original prefix
50315 - by the corresponding pathname with the current prefix instead. Both
50316 - prefixes should be directory names without trailing slash (i.e. use ""
50317 - instead of "/"). */
50318 -#define libintl_set_relocation_prefix libintl_set_relocation_prefix
50319 -extern void
50320 - libintl_set_relocation_prefix _INTL_PARAMS ((const char *orig_prefix,
50321 - const char *curr_prefix));
50322 -
50323 -
50324 -#ifdef __cplusplus
50325 -}
50326 -#endif
50327 -
50328 -#endif /* libintl.h */
50329 diff -rupN original/intl/loadinfo.h new/intl/loadinfo.h
50330 --- original/intl/loadinfo.h 2009-03-28 22:33:59.000000000 -0430
50331 +++ new/intl/loadinfo.h 1969-12-31 20:00:00.000000000 -0400
50332 @@ -1,156 +0,0 @@
50333 -/* Copyright (C) 1996-1999, 2000-2002 Free Software Foundation, Inc.
50334 - This file is part of the GNU C Library.
50335 - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
50336 -
50337 - This program is free software; you can redistribute it and/or modify it
50338 - under the terms of the GNU Library General Public License as published
50339 - by the Free Software Foundation; either version 2, or (at your option)
50340 - any later version.
50341 -
50342 - This program is distributed in the hope that it will be useful,
50343 - but WITHOUT ANY WARRANTY; without even the implied warranty of
50344 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
50345 - Library General Public License for more details.
50346 -
50347 - You should have received a copy of the GNU Library General Public
50348 - License along with this program; if not, write to the Free Software
50349 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
50350 - USA. */
50351 -
50352 -#ifndef _LOADINFO_H
50353 -#define _LOADINFO_H 1
50354 -
50355 -/* Declarations of locale dependent catalog lookup functions.
50356 - Implemented in
50357 -
50358 - localealias.c Possibly replace a locale name by another.
50359 - explodename.c Split a locale name into its various fields.
50360 - l10nflist.c Generate a list of filenames of possible message catalogs.
50361 - finddomain.c Find and open the relevant message catalogs.
50362 -
50363 - The main function _nl_find_domain() in finddomain.c is declared
50364 - in gettextP.h.
50365 - */
50366 -
50367 -#ifndef PARAMS
50368 -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
50369 -# define PARAMS(args) args
50370 -# else
50371 -# define PARAMS(args) ()
50372 -# endif
50373 -#endif
50374 -
50375 -#ifndef internal_function
50376 -# define internal_function
50377 -#endif
50378 -
50379 -/* Tell the compiler when a conditional or integer expression is
50380 - almost always true or almost always false. */
50381 -#ifndef HAVE_BUILTIN_EXPECT
50382 -# define __builtin_expect(expr, val) (expr)
50383 -#endif
50384 -
50385 -/* Separator in PATH like lists of pathnames. */
50386 -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
50387 - /* Win32, OS/2, DOS */
50388 -# define PATH_SEPARATOR ';'
50389 -#else
50390 - /* Unix */
50391 -# define PATH_SEPARATOR ':'
50392 -#endif
50393 -
50394 -/* Encoding of locale name parts. */
50395 -#define CEN_REVISION 1
50396 -#define CEN_SPONSOR 2
50397 -#define CEN_SPECIAL 4
50398 -#define XPG_NORM_CODESET 8
50399 -#define XPG_CODESET 16
50400 -#define TERRITORY 32
50401 -#define CEN_AUDIENCE 64
50402 -#define XPG_MODIFIER 128
50403 -
50404 -#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
50405 -#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
50406 -
50407 -
50408 -struct loaded_l10nfile
50409 -{
50410 - const char *filename;
50411 - int decided;
50412 -
50413 - const void *data;
50414 -
50415 - struct loaded_l10nfile *next;
50416 - struct loaded_l10nfile *successor[1];
50417 -};
50418 -
50419 -
50420 -/* Normalize codeset name. There is no standard for the codeset
50421 - names. Normalization allows the user to use any of the common
50422 - names. The return value is dynamically allocated and has to be
50423 - freed by the caller. */
50424 -extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
50425 - size_t name_len));
50426 -
50427 -/* Lookup a locale dependent file.
50428 - *L10NFILE_LIST denotes a pool of lookup results of locale dependent
50429 - files of the same kind, sorted in decreasing order of ->filename.
50430 - DIRLIST and DIRLIST_LEN are an argz list of directories in which to
50431 - look, containing at least one directory (i.e. DIRLIST_LEN > 0).
50432 - MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
50433 - SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
50434 - produced by _nl_explode_name(). FILENAME is the filename suffix.
50435 - The return value is the lookup result, either found in *L10NFILE_LIST,
50436 - or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
50437 - If the return value is non-NULL, it is added to *L10NFILE_LIST, and
50438 - its ->next field denotes the chaining inside *L10NFILE_LIST, and
50439 - furthermore its ->successor[] field contains a list of other lookup
50440 - results from which this lookup result inherits. */
50441 -extern struct loaded_l10nfile *
50442 -_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
50443 - const char *dirlist, size_t dirlist_len, int mask,
50444 - const char *language, const char *territory,
50445 - const char *codeset,
50446 - const char *normalized_codeset,
50447 - const char *modifier, const char *special,
50448 - const char *sponsor, const char *revision,
50449 - const char *filename, int do_allocate));
50450 -
50451 -/* Lookup the real locale name for a locale alias NAME, or NULL if
50452 - NAME is not a locale alias (but possibly a real locale name).
50453 - The return value is statically allocated and must not be freed. */
50454 -extern const char *_nl_expand_alias PARAMS ((const char *name));
50455 -
50456 -/* Split a locale name NAME into its pieces: language, modifier,
50457 - territory, codeset, special, sponsor, revision.
50458 - NAME gets destructively modified: NUL bytes are inserted here and
50459 - there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
50460 - *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
50461 - pointer into the old NAME string, or NULL. *NORMALIZED_CODESET
50462 - gets assigned the expanded *CODESET, if it is different from *CODESET;
50463 - this one is dynamically allocated and has to be freed by the caller.
50464 - The return value is a bitmask, where each bit corresponds to one
50465 - filled-in value:
50466 - XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER,
50467 - TERRITORY for *TERRITORY,
50468 - XPG_CODESET for *CODESET,
50469 - XPG_NORM_CODESET for *NORMALIZED_CODESET,
50470 - CEN_SPECIAL for *SPECIAL,
50471 - CEN_SPONSOR for *SPONSOR,
50472 - CEN_REVISION for *REVISION.
50473 - */
50474 -extern int _nl_explode_name PARAMS ((char *name, const char **language,
50475 - const char **modifier,
50476 - const char **territory,
50477 - const char **codeset,
50478 - const char **normalized_codeset,
50479 - const char **special,
50480 - const char **sponsor,
50481 - const char **revision));
50482 -
50483 -/* Split a locale name NAME into a leading language part and all the
50484 - rest. Return a pointer to the first character after the language,
50485 - i.e. to the first byte of the rest. */
50486 -extern char *_nl_find_language PARAMS ((const char *name));
50487 -
50488 -#endif /* loadinfo.h */
50489 diff -rupN original/intl/loadmsgcat.c new/intl/loadmsgcat.c
50490 --- original/intl/loadmsgcat.c 2009-03-28 22:33:59.000000000 -0430
50491 +++ new/intl/loadmsgcat.c 1969-12-31 20:00:00.000000000 -0400
50492 @@ -1,1322 +0,0 @@
50493 -/* Load needed message catalogs.
50494 - Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
50495 -
50496 - This program is free software; you can redistribute it and/or modify it
50497 - under the terms of the GNU Library General Public License as published
50498 - by the Free Software Foundation; either version 2, or (at your option)
50499 - any later version.
50500 -
50501 - This program is distributed in the hope that it will be useful,
50502 - but WITHOUT ANY WARRANTY; without even the implied warranty of
50503 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
50504 - Library General Public License for more details.
50505 -
50506 - You should have received a copy of the GNU Library General Public
50507 - License along with this program; if not, write to the Free Software
50508 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
50509 - USA. */
50510 -
50511 -/* Tell glibc's <string.h> to provide a prototype for mempcpy().
50512 - This must come before <config.h> because <config.h> may include
50513 - <features.h>, and once <features.h> has been included, it's too late. */
50514 -#ifndef _GNU_SOURCE
50515 -# define _GNU_SOURCE 1
50516 -#endif
50517 -
50518 -#ifdef HAVE_CONFIG_H
50519 -# include <config.h>
50520 -#endif
50521 -
50522 -#include <ctype.h>
50523 -#include <errno.h>
50524 -#include <fcntl.h>
50525 -#include <sys/types.h>
50526 -#include <sys/stat.h>
50527 -
50528 -#ifdef __GNUC__
50529 -# undef alloca
50530 -# define alloca __builtin_alloca
50531 -# define HAVE_ALLOCA 1
50532 -#else
50533 -# ifdef _MSC_VER
50534 -# include <malloc.h>
50535 -# define alloca _alloca
50536 -# else
50537 -# if defined HAVE_ALLOCA_H || defined _LIBC
50538 -# include <alloca.h>
50539 -# else
50540 -# ifdef _AIX
50541 - #pragma alloca
50542 -# else
50543 -# ifndef alloca
50544 -char *alloca ();
50545 -# endif
50546 -# endif
50547 -# endif
50548 -# endif
50549 -#endif
50550 -
50551 -#include <stdlib.h>
50552 -#include <string.h>
50553 -
50554 -#if defined HAVE_UNISTD_H || defined _LIBC
50555 -# include <unistd.h>
50556 -#endif
50557 -
50558 -#ifdef _LIBC
50559 -# include <langinfo.h>
50560 -# include <locale.h>
50561 -#endif
50562 -
50563 -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
50564 - || (defined _LIBC && defined _POSIX_MAPPED_FILES)
50565 -# include <sys/mman.h>
50566 -# undef HAVE_MMAP
50567 -# define HAVE_MMAP 1
50568 -#else
50569 -# undef HAVE_MMAP
50570 -#endif
50571 -
50572 -#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
50573 -# include <stdint.h>
50574 -#endif
50575 -#if defined HAVE_INTTYPES_H || defined _LIBC
50576 -# include <inttypes.h>
50577 -#endif
50578 -
50579 -#include "gmo.h"
50580 -#include "gettextP.h"
50581 -#include "hash-string.h"
50582 -#include "plural-exp.h"
50583 -
50584 -#ifdef _LIBC
50585 -# include "../locale/localeinfo.h"
50586 -#endif
50587 -
50588 -/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
50589 - Note that our fallback values need not be literal strings, because we don't
50590 - use them with preprocessor string concatenation. */
50591 -#if !defined PRId8 || PRI_MACROS_BROKEN
50592 -# undef PRId8
50593 -# define PRId8 "d"
50594 -#endif
50595 -#if !defined PRIi8 || PRI_MACROS_BROKEN
50596 -# undef PRIi8
50597 -# define PRIi8 "i"
50598 -#endif
50599 -#if !defined PRIo8 || PRI_MACROS_BROKEN
50600 -# undef PRIo8
50601 -# define PRIo8 "o"
50602 -#endif
50603 -#if !defined PRIu8 || PRI_MACROS_BROKEN
50604 -# undef PRIu8
50605 -# define PRIu8 "u"
50606 -#endif
50607 -#if !defined PRIx8 || PRI_MACROS_BROKEN
50608 -# undef PRIx8
50609 -# define PRIx8 "x"
50610 -#endif
50611 -#if !defined PRIX8 || PRI_MACROS_BROKEN
50612 -# undef PRIX8
50613 -# define PRIX8 "X"
50614 -#endif
50615 -#if !defined PRId16 || PRI_MACROS_BROKEN
50616 -# undef PRId16
50617 -# define PRId16 "d"
50618 -#endif
50619 -#if !defined PRIi16 || PRI_MACROS_BROKEN
50620 -# undef PRIi16
50621 -# define PRIi16 "i"
50622 -#endif
50623 -#if !defined PRIo16 || PRI_MACROS_BROKEN
50624 -# undef PRIo16
50625 -# define PRIo16 "o"
50626 -#endif
50627 -#if !defined PRIu16 || PRI_MACROS_BROKEN
50628 -# undef PRIu16
50629 -# define PRIu16 "u"
50630 -#endif
50631 -#if !defined PRIx16 || PRI_MACROS_BROKEN
50632 -# undef PRIx16
50633 -# define PRIx16 "x"
50634 -#endif
50635 -#if !defined PRIX16 || PRI_MACROS_BROKEN
50636 -# undef PRIX16
50637 -# define PRIX16 "X"
50638 -#endif
50639 -#if !defined PRId32 || PRI_MACROS_BROKEN
50640 -# undef PRId32
50641 -# define PRId32 "d"
50642 -#endif
50643 -#if !defined PRIi32 || PRI_MACROS_BROKEN
50644 -# undef PRIi32
50645 -# define PRIi32 "i"
50646 -#endif
50647 -#if !defined PRIo32 || PRI_MACROS_BROKEN
50648 -# undef PRIo32
50649 -# define PRIo32 "o"
50650 -#endif
50651 -#if !defined PRIu32 || PRI_MACROS_BROKEN
50652 -# undef PRIu32
50653 -# define PRIu32 "u"
50654 -#endif
50655 -#if !defined PRIx32 || PRI_MACROS_BROKEN
50656 -# undef PRIx32
50657 -# define PRIx32 "x"
50658 -#endif
50659 -#if !defined PRIX32 || PRI_MACROS_BROKEN
50660 -# undef PRIX32
50661 -# define PRIX32 "X"
50662 -#endif
50663 -#if !defined PRId64 || PRI_MACROS_BROKEN
50664 -# undef PRId64
50665 -# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
50666 -#endif
50667 -#if !defined PRIi64 || PRI_MACROS_BROKEN
50668 -# undef PRIi64
50669 -# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
50670 -#endif
50671 -#if !defined PRIo64 || PRI_MACROS_BROKEN
50672 -# undef PRIo64
50673 -# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
50674 -#endif
50675 -#if !defined PRIu64 || PRI_MACROS_BROKEN
50676 -# undef PRIu64
50677 -# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
50678 -#endif
50679 -#if !defined PRIx64 || PRI_MACROS_BROKEN
50680 -# undef PRIx64
50681 -# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
50682 -#endif
50683 -#if !defined PRIX64 || PRI_MACROS_BROKEN
50684 -# undef PRIX64
50685 -# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
50686 -#endif
50687 -#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
50688 -# undef PRIdLEAST8
50689 -# define PRIdLEAST8 "d"
50690 -#endif
50691 -#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
50692 -# undef PRIiLEAST8
50693 -# define PRIiLEAST8 "i"
50694 -#endif
50695 -#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
50696 -# undef PRIoLEAST8
50697 -# define PRIoLEAST8 "o"
50698 -#endif
50699 -#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
50700 -# undef PRIuLEAST8
50701 -# define PRIuLEAST8 "u"
50702 -#endif
50703 -#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
50704 -# undef PRIxLEAST8
50705 -# define PRIxLEAST8 "x"
50706 -#endif
50707 -#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
50708 -# undef PRIXLEAST8
50709 -# define PRIXLEAST8 "X"
50710 -#endif
50711 -#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
50712 -# undef PRIdLEAST16
50713 -# define PRIdLEAST16 "d"
50714 -#endif
50715 -#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
50716 -# undef PRIiLEAST16
50717 -# define PRIiLEAST16 "i"
50718 -#endif
50719 -#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
50720 -# undef PRIoLEAST16
50721 -# define PRIoLEAST16 "o"
50722 -#endif
50723 -#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
50724 -# undef PRIuLEAST16
50725 -# define PRIuLEAST16 "u"
50726 -#endif
50727 -#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
50728 -# undef PRIxLEAST16
50729 -# define PRIxLEAST16 "x"
50730 -#endif
50731 -#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
50732 -# undef PRIXLEAST16
50733 -# define PRIXLEAST16 "X"
50734 -#endif
50735 -#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
50736 -# undef PRIdLEAST32
50737 -# define PRIdLEAST32 "d"
50738 -#endif
50739 -#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
50740 -# undef PRIiLEAST32
50741 -# define PRIiLEAST32 "i"
50742 -#endif
50743 -#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
50744 -# undef PRIoLEAST32
50745 -# define PRIoLEAST32 "o"
50746 -#endif
50747 -#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
50748 -# undef PRIuLEAST32
50749 -# define PRIuLEAST32 "u"
50750 -#endif
50751 -#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
50752 -# undef PRIxLEAST32
50753 -# define PRIxLEAST32 "x"
50754 -#endif
50755 -#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
50756 -# undef PRIXLEAST32
50757 -# define PRIXLEAST32 "X"
50758 -#endif
50759 -#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
50760 -# undef PRIdLEAST64
50761 -# define PRIdLEAST64 PRId64
50762 -#endif
50763 -#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
50764 -# undef PRIiLEAST64
50765 -# define PRIiLEAST64 PRIi64
50766 -#endif
50767 -#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
50768 -# undef PRIoLEAST64
50769 -# define PRIoLEAST64 PRIo64
50770 -#endif
50771 -#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
50772 -# undef PRIuLEAST64
50773 -# define PRIuLEAST64 PRIu64
50774 -#endif
50775 -#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
50776 -# undef PRIxLEAST64
50777 -# define PRIxLEAST64 PRIx64
50778 -#endif
50779 -#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
50780 -# undef PRIXLEAST64
50781 -# define PRIXLEAST64 PRIX64
50782 -#endif
50783 -#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
50784 -# undef PRIdFAST8
50785 -# define PRIdFAST8 "d"
50786 -#endif
50787 -#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
50788 -# undef PRIiFAST8
50789 -# define PRIiFAST8 "i"
50790 -#endif
50791 -#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
50792 -# undef PRIoFAST8
50793 -# define PRIoFAST8 "o"
50794 -#endif
50795 -#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
50796 -# undef PRIuFAST8
50797 -# define PRIuFAST8 "u"
50798 -#endif
50799 -#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
50800 -# undef PRIxFAST8
50801 -# define PRIxFAST8 "x"
50802 -#endif
50803 -#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
50804 -# undef PRIXFAST8
50805 -# define PRIXFAST8 "X"
50806 -#endif
50807 -#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
50808 -# undef PRIdFAST16
50809 -# define PRIdFAST16 "d"
50810 -#endif
50811 -#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
50812 -# undef PRIiFAST16
50813 -# define PRIiFAST16 "i"
50814 -#endif
50815 -#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
50816 -# undef PRIoFAST16
50817 -# define PRIoFAST16 "o"
50818 -#endif
50819 -#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
50820 -# undef PRIuFAST16
50821 -# define PRIuFAST16 "u"
50822 -#endif
50823 -#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
50824 -# undef PRIxFAST16
50825 -# define PRIxFAST16 "x"
50826 -#endif
50827 -#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
50828 -# undef PRIXFAST16
50829 -# define PRIXFAST16 "X"
50830 -#endif
50831 -#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
50832 -# undef PRIdFAST32
50833 -# define PRIdFAST32 "d"
50834 -#endif
50835 -#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
50836 -# undef PRIiFAST32
50837 -# define PRIiFAST32 "i"
50838 -#endif
50839 -#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
50840 -# undef PRIoFAST32
50841 -# define PRIoFAST32 "o"
50842 -#endif
50843 -#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
50844 -# undef PRIuFAST32
50845 -# define PRIuFAST32 "u"
50846 -#endif
50847 -#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
50848 -# undef PRIxFAST32
50849 -# define PRIxFAST32 "x"
50850 -#endif
50851 -#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
50852 -# undef PRIXFAST32
50853 -# define PRIXFAST32 "X"
50854 -#endif
50855 -#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
50856 -# undef PRIdFAST64
50857 -# define PRIdFAST64 PRId64
50858 -#endif
50859 -#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
50860 -# undef PRIiFAST64
50861 -# define PRIiFAST64 PRIi64
50862 -#endif
50863 -#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
50864 -# undef PRIoFAST64
50865 -# define PRIoFAST64 PRIo64
50866 -#endif
50867 -#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
50868 -# undef PRIuFAST64
50869 -# define PRIuFAST64 PRIu64
50870 -#endif
50871 -#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
50872 -# undef PRIxFAST64
50873 -# define PRIxFAST64 PRIx64
50874 -#endif
50875 -#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
50876 -# undef PRIXFAST64
50877 -# define PRIXFAST64 PRIX64
50878 -#endif
50879 -#if !defined PRIdMAX || PRI_MACROS_BROKEN
50880 -# undef PRIdMAX
50881 -# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
50882 -#endif
50883 -#if !defined PRIiMAX || PRI_MACROS_BROKEN
50884 -# undef PRIiMAX
50885 -# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
50886 -#endif
50887 -#if !defined PRIoMAX || PRI_MACROS_BROKEN
50888 -# undef PRIoMAX
50889 -# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
50890 -#endif
50891 -#if !defined PRIuMAX || PRI_MACROS_BROKEN
50892 -# undef PRIuMAX
50893 -# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
50894 -#endif
50895 -#if !defined PRIxMAX || PRI_MACROS_BROKEN
50896 -# undef PRIxMAX
50897 -# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
50898 -#endif
50899 -#if !defined PRIXMAX || PRI_MACROS_BROKEN
50900 -# undef PRIXMAX
50901 -# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
50902 -#endif
50903 -#if !defined PRIdPTR || PRI_MACROS_BROKEN
50904 -# undef PRIdPTR
50905 -# define PRIdPTR \
50906 - (sizeof (void *) == sizeof (long) ? "ld" : \
50907 - sizeof (void *) == sizeof (int) ? "d" : \
50908 - "lld")
50909 -#endif
50910 -#if !defined PRIiPTR || PRI_MACROS_BROKEN
50911 -# undef PRIiPTR
50912 -# define PRIiPTR \
50913 - (sizeof (void *) == sizeof (long) ? "li" : \
50914 - sizeof (void *) == sizeof (int) ? "i" : \
50915 - "lli")
50916 -#endif
50917 -#if !defined PRIoPTR || PRI_MACROS_BROKEN
50918 -# undef PRIoPTR
50919 -# define PRIoPTR \
50920 - (sizeof (void *) == sizeof (long) ? "lo" : \
50921 - sizeof (void *) == sizeof (int) ? "o" : \
50922 - "llo")
50923 -#endif
50924 -#if !defined PRIuPTR || PRI_MACROS_BROKEN
50925 -# undef PRIuPTR
50926 -# define PRIuPTR \
50927 - (sizeof (void *) == sizeof (long) ? "lu" : \
50928 - sizeof (void *) == sizeof (int) ? "u" : \
50929 - "llu")
50930 -#endif
50931 -#if !defined PRIxPTR || PRI_MACROS_BROKEN
50932 -# undef PRIxPTR
50933 -# define PRIxPTR \
50934 - (sizeof (void *) == sizeof (long) ? "lx" : \
50935 - sizeof (void *) == sizeof (int) ? "x" : \
50936 - "llx")
50937 -#endif
50938 -#if !defined PRIXPTR || PRI_MACROS_BROKEN
50939 -# undef PRIXPTR
50940 -# define PRIXPTR \
50941 - (sizeof (void *) == sizeof (long) ? "lX" : \
50942 - sizeof (void *) == sizeof (int) ? "X" : \
50943 - "llX")
50944 -#endif
50945 -
50946 -/* @@ end of prolog @@ */
50947 -
50948 -#ifdef _LIBC
50949 -/* Rename the non ISO C functions. This is required by the standard
50950 - because some ISO C functions will require linking with this object
50951 - file and the name space must not be polluted. */
50952 -# define open __open
50953 -# define close __close
50954 -# define read __read
50955 -# define mmap __mmap
50956 -# define munmap __munmap
50957 -#endif
50958 -
50959 -/* For those losing systems which don't have `alloca' we have to add
50960 - some additional code emulating it. */
50961 -#ifdef HAVE_ALLOCA
50962 -# define freea(p) /* nothing */
50963 -#else
50964 -# define alloca(n) malloc (n)
50965 -# define freea(p) free (p)
50966 -#endif
50967 -
50968 -/* For systems that distinguish between text and binary I/O.
50969 - O_BINARY is usually declared in <fcntl.h>. */
50970 -#if !defined O_BINARY && defined _O_BINARY
50971 - /* For MSC-compatible compilers. */
50972 -# define O_BINARY _O_BINARY
50973 -# define O_TEXT _O_TEXT
50974 -#endif
50975 -#ifdef __BEOS__
50976 - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
50977 -# undef O_BINARY
50978 -# undef O_TEXT
50979 -#endif
50980 -/* On reasonable systems, binary I/O is the default. */
50981 -#ifndef O_BINARY
50982 -# define O_BINARY 0
50983 -#endif
50984 -
50985 -
50986 -/* Prototypes for local functions. Needed to ensure compiler checking of
50987 - function argument counts despite of K&R C function definition syntax. */
50988 -static const char *get_sysdep_segment_value PARAMS ((const char *name));
50989 -
50990 -
50991 -/* We need a sign, whether a new catalog was loaded, which can be associated
50992 - with all translations. This is important if the translations are
50993 - cached by one of GCC's features. */
50994 -int _nl_msg_cat_cntr;
50995 -
50996 -
50997 -/* Expand a system dependent string segment. Return NULL if unsupported. */
50998 -static const char *
50999 -get_sysdep_segment_value (name)
51000 - const char *name;
51001 -{
51002 - /* Test for an ISO C 99 section 7.8.1 format string directive.
51003 - Syntax:
51004 - P R I { d | i | o | u | x | X }
51005 - { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
51006 - /* We don't use a table of 14 times 6 'const char *' strings here, because
51007 - data relocations cost startup time. */
51008 - if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
51009 - {
51010 - if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
51011 - || name[3] == 'x' || name[3] == 'X')
51012 - {
51013 - if (name[4] == '8' && name[5] == '\0')
51014 - {
51015 - if (name[3] == 'd')
51016 - return PRId8;
51017 - if (name[3] == 'i')
51018 - return PRIi8;
51019 - if (name[3] == 'o')
51020 - return PRIo8;
51021 - if (name[3] == 'u')
51022 - return PRIu8;
51023 - if (name[3] == 'x')
51024 - return PRIx8;
51025 - if (name[3] == 'X')
51026 - return PRIX8;
51027 - abort ();
51028 - }
51029 - if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
51030 - {
51031 - if (name[3] == 'd')
51032 - return PRId16;
51033 - if (name[3] == 'i')
51034 - return PRIi16;
51035 - if (name[3] == 'o')
51036 - return PRIo16;
51037 - if (name[3] == 'u')
51038 - return PRIu16;
51039 - if (name[3] == 'x')
51040 - return PRIx16;
51041 - if (name[3] == 'X')
51042 - return PRIX16;
51043 - abort ();
51044 - }
51045 - if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
51046 - {
51047 - if (name[3] == 'd')
51048 - return PRId32;
51049 - if (name[3] == 'i')
51050 - return PRIi32;
51051 - if (name[3] == 'o')
51052 - return PRIo32;
51053 - if (name[3] == 'u')
51054 - return PRIu32;
51055 - if (name[3] == 'x')
51056 - return PRIx32;
51057 - if (name[3] == 'X')
51058 - return PRIX32;
51059 - abort ();
51060 - }
51061 - if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
51062 - {
51063 - if (name[3] == 'd')
51064 - return PRId64;
51065 - if (name[3] == 'i')
51066 - return PRIi64;
51067 - if (name[3] == 'o')
51068 - return PRIo64;
51069 - if (name[3] == 'u')
51070 - return PRIu64;
51071 - if (name[3] == 'x')
51072 - return PRIx64;
51073 - if (name[3] == 'X')
51074 - return PRIX64;
51075 - abort ();
51076 - }
51077 - if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
51078 - && name[7] == 'S' && name[8] == 'T')
51079 - {
51080 - if (name[9] == '8' && name[10] == '\0')
51081 - {
51082 - if (name[3] == 'd')
51083 - return PRIdLEAST8;
51084 - if (name[3] == 'i')
51085 - return PRIiLEAST8;
51086 - if (name[3] == 'o')
51087 - return PRIoLEAST8;
51088 - if (name[3] == 'u')
51089 - return PRIuLEAST8;
51090 - if (name[3] == 'x')
51091 - return PRIxLEAST8;
51092 - if (name[3] == 'X')
51093 - return PRIXLEAST8;
51094 - abort ();
51095 - }
51096 - if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
51097 - {
51098 - if (name[3] == 'd')
51099 - return PRIdLEAST16;
51100 - if (name[3] == 'i')
51101 - return PRIiLEAST16;
51102 - if (name[3] == 'o')
51103 - return PRIoLEAST16;
51104 - if (name[3] == 'u')
51105 - return PRIuLEAST16;
51106 - if (name[3] == 'x')
51107 - return PRIxLEAST16;
51108 - if (name[3] == 'X')
51109 - return PRIXLEAST16;
51110 - abort ();
51111 - }
51112 - if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
51113 - {
51114 - if (name[3] == 'd')
51115 - return PRIdLEAST32;
51116 - if (name[3] == 'i')
51117 - return PRIiLEAST32;
51118 - if (name[3] == 'o')
51119 - return PRIoLEAST32;
51120 - if (name[3] == 'u')
51121 - return PRIuLEAST32;
51122 - if (name[3] == 'x')
51123 - return PRIxLEAST32;
51124 - if (name[3] == 'X')
51125 - return PRIXLEAST32;
51126 - abort ();
51127 - }
51128 - if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
51129 - {
51130 - if (name[3] == 'd')
51131 - return PRIdLEAST64;
51132 - if (name[3] == 'i')
51133 - return PRIiLEAST64;
51134 - if (name[3] == 'o')
51135 - return PRIoLEAST64;
51136 - if (name[3] == 'u')
51137 - return PRIuLEAST64;
51138 - if (name[3] == 'x')
51139 - return PRIxLEAST64;
51140 - if (name[3] == 'X')
51141 - return PRIXLEAST64;
51142 - abort ();
51143 - }
51144 - }
51145 - if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
51146 - && name[7] == 'T')
51147 - {
51148 - if (name[8] == '8' && name[9] == '\0')
51149 - {
51150 - if (name[3] == 'd')
51151 - return PRIdFAST8;
51152 - if (name[3] == 'i')
51153 - return PRIiFAST8;
51154 - if (name[3] == 'o')
51155 - return PRIoFAST8;
51156 - if (name[3] == 'u')
51157 - return PRIuFAST8;
51158 - if (name[3] == 'x')
51159 - return PRIxFAST8;
51160 - if (name[3] == 'X')
51161 - return PRIXFAST8;
51162 - abort ();
51163 - }
51164 - if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
51165 - {
51166 - if (name[3] == 'd')
51167 - return PRIdFAST16;
51168 - if (name[3] == 'i')
51169 - return PRIiFAST16;
51170 - if (name[3] == 'o')
51171 - return PRIoFAST16;
51172 - if (name[3] == 'u')
51173 - return PRIuFAST16;
51174 - if (name[3] == 'x')
51175 - return PRIxFAST16;
51176 - if (name[3] == 'X')
51177 - return PRIXFAST16;
51178 - abort ();
51179 - }
51180 - if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
51181 - {
51182 - if (name[3] == 'd')
51183 - return PRIdFAST32;
51184 - if (name[3] == 'i')
51185 - return PRIiFAST32;
51186 - if (name[3] == 'o')
51187 - return PRIoFAST32;
51188 - if (name[3] == 'u')
51189 - return PRIuFAST32;
51190 - if (name[3] == 'x')
51191 - return PRIxFAST32;
51192 - if (name[3] == 'X')
51193 - return PRIXFAST32;
51194 - abort ();
51195 - }
51196 - if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
51197 - {
51198 - if (name[3] == 'd')
51199 - return PRIdFAST64;
51200 - if (name[3] == 'i')
51201 - return PRIiFAST64;
51202 - if (name[3] == 'o')
51203 - return PRIoFAST64;
51204 - if (name[3] == 'u')
51205 - return PRIuFAST64;
51206 - if (name[3] == 'x')
51207 - return PRIxFAST64;
51208 - if (name[3] == 'X')
51209 - return PRIXFAST64;
51210 - abort ();
51211 - }
51212 - }
51213 - if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
51214 - && name[7] == '\0')
51215 - {
51216 - if (name[3] == 'd')
51217 - return PRIdMAX;
51218 - if (name[3] == 'i')
51219 - return PRIiMAX;
51220 - if (name[3] == 'o')
51221 - return PRIoMAX;
51222 - if (name[3] == 'u')
51223 - return PRIuMAX;
51224 - if (name[3] == 'x')
51225 - return PRIxMAX;
51226 - if (name[3] == 'X')
51227 - return PRIXMAX;
51228 - abort ();
51229 - }
51230 - if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
51231 - && name[7] == '\0')
51232 - {
51233 - if (name[3] == 'd')
51234 - return PRIdPTR;
51235 - if (name[3] == 'i')
51236 - return PRIiPTR;
51237 - if (name[3] == 'o')
51238 - return PRIoPTR;
51239 - if (name[3] == 'u')
51240 - return PRIuPTR;
51241 - if (name[3] == 'x')
51242 - return PRIxPTR;
51243 - if (name[3] == 'X')
51244 - return PRIXPTR;
51245 - abort ();
51246 - }
51247 - }
51248 - }
51249 - /* Other system dependent strings are not valid. */
51250 - return NULL;
51251 -}
51252 -
51253 -/* Initialize the codeset dependent parts of an opened message catalog.
51254 - Return the header entry. */
51255 -const char *
51256 -internal_function
51257 -_nl_init_domain_conv (domain_file, domain, domainbinding)
51258 - struct loaded_l10nfile *domain_file;
51259 - struct loaded_domain *domain;
51260 - struct binding *domainbinding;
51261 -{
51262 - /* Find out about the character set the file is encoded with.
51263 - This can be found (in textual form) in the entry "". If this
51264 - entry does not exist or if this does not contain the `charset='
51265 - information, we will assume the charset matches the one the
51266 - current locale and we don't have to perform any conversion. */
51267 - char *nullentry;
51268 - size_t nullentrylen;
51269 -
51270 - /* Preinitialize fields, to avoid recursion during _nl_find_msg. */
51271 - domain->codeset_cntr =
51272 - (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
51273 -#ifdef _LIBC
51274 - domain->conv = (__gconv_t) -1;
51275 -#else
51276 -# if HAVE_ICONV
51277 - domain->conv = (iconv_t) -1;
51278 -# endif
51279 -#endif
51280 - domain->conv_tab = NULL;
51281 -
51282 - /* Get the header entry. */
51283 - nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
51284 -
51285 - if (nullentry != NULL)
51286 - {
51287 -#if defined _LIBC || HAVE_ICONV
51288 - const char *charsetstr;
51289 -
51290 - charsetstr = strstr (nullentry, "charset=");
51291 - if (charsetstr != NULL)
51292 - {
51293 - size_t len;
51294 - char *charset;
51295 - const char *outcharset;
51296 -
51297 - charsetstr += strlen ("charset=");
51298 - len = strcspn (charsetstr, " \t\n");
51299 -
51300 - charset = (char *) alloca (len + 1);
51301 -# if defined _LIBC || HAVE_MEMPCPY
51302 - *((char *) mempcpy (charset, charsetstr, len)) = '\0';
51303 -# else
51304 - memcpy (charset, charsetstr, len);
51305 - charset[len] = '\0';
51306 -# endif
51307 -
51308 - /* The output charset should normally be determined by the
51309 - locale. But sometimes the locale is not used or not correctly
51310 - set up, so we provide a possibility for the user to override
51311 - this. Moreover, the value specified through
51312 - bind_textdomain_codeset overrides both. */
51313 - if (domainbinding != NULL && domainbinding->codeset != NULL)
51314 - outcharset = domainbinding->codeset;
51315 - else
51316 - {
51317 - outcharset = getenv ("OUTPUT_CHARSET");
51318 - if (outcharset == NULL || outcharset[0] == '\0')
51319 - {
51320 -# ifdef _LIBC
51321 - outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
51322 -# else
51323 -# if HAVE_ICONV
51324 - extern const char *locale_charset PARAMS ((void));
51325 - outcharset = locale_charset ();
51326 -# endif
51327 -# endif
51328 - }
51329 - }
51330 -
51331 -# ifdef _LIBC
51332 - /* We always want to use transliteration. */
51333 - outcharset = norm_add_slashes (outcharset, "TRANSLIT");
51334 - charset = norm_add_slashes (charset, NULL);
51335 - if (__gconv_open (outcharset, charset, &domain->conv,
51336 - GCONV_AVOID_NOCONV)
51337 - != __GCONV_OK)
51338 - domain->conv = (__gconv_t) -1;
51339 -# else
51340 -# if HAVE_ICONV
51341 - /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
51342 - we want to use transliteration. */
51343 -# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
51344 - || _LIBICONV_VERSION >= 0x0105
51345 - if (strchr (outcharset, '/') == NULL)
51346 - {
51347 - char *tmp;
51348 -
51349 - len = strlen (outcharset);
51350 - tmp = (char *) alloca (len + 10 + 1);
51351 - memcpy (tmp, outcharset, len);
51352 - memcpy (tmp + len, "//TRANSLIT", 10 + 1);
51353 - outcharset = tmp;
51354 -
51355 - domain->conv = iconv_open (outcharset, charset);
51356 -
51357 - freea (outcharset);
51358 - }
51359 - else
51360 -# endif
51361 - domain->conv = iconv_open (outcharset, charset);
51362 -# endif
51363 -# endif
51364 -
51365 - freea (charset);
51366 - }
51367 -#endif /* _LIBC || HAVE_ICONV */
51368 - }
51369 -
51370 - return nullentry;
51371 -}
51372 -
51373 -/* Frees the codeset dependent parts of an opened message catalog. */
51374 -void
51375 -internal_function
51376 -_nl_free_domain_conv (domain)
51377 - struct loaded_domain *domain;
51378 -{
51379 - if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
51380 - free (domain->conv_tab);
51381 -
51382 -#ifdef _LIBC
51383 - if (domain->conv != (__gconv_t) -1)
51384 - __gconv_close (domain->conv);
51385 -#else
51386 -# if HAVE_ICONV
51387 - if (domain->conv != (iconv_t) -1)
51388 - iconv_close (domain->conv);
51389 -# endif
51390 -#endif
51391 -}
51392 -
51393 -/* Load the message catalogs specified by FILENAME. If it is no valid
51394 - message catalog do nothing. */
51395 -void
51396 -internal_function
51397 -_nl_load_domain (domain_file, domainbinding)
51398 - struct loaded_l10nfile *domain_file;
51399 - struct binding *domainbinding;
51400 -{
51401 - int fd;
51402 - size_t size;
51403 -#ifdef _LIBC
51404 - struct stat64 st;
51405 -#else
51406 - struct stat st;
51407 -#endif
51408 - struct mo_file_header *data = (struct mo_file_header *) -1;
51409 - int use_mmap = 0;
51410 - struct loaded_domain *domain;
51411 - int revision;
51412 - const char *nullentry;
51413 -
51414 - domain_file->decided = 1;
51415 - domain_file->data = NULL;
51416 -
51417 - /* Note that it would be useless to store domainbinding in domain_file
51418 - because domainbinding might be == NULL now but != NULL later (after
51419 - a call to bind_textdomain_codeset). */
51420 -
51421 - /* If the record does not represent a valid locale the FILENAME
51422 - might be NULL. This can happen when according to the given
51423 - specification the locale file name is different for XPG and CEN
51424 - syntax. */
51425 - if (domain_file->filename == NULL)
51426 - return;
51427 -
51428 - /* Try to open the addressed file. */
51429 - fd = open (domain_file->filename, O_RDONLY | O_BINARY);
51430 - if (fd == -1)
51431 - return;
51432 -
51433 - /* We must know about the size of the file. */
51434 - if (
51435 -#ifdef _LIBC
51436 - __builtin_expect (fstat64 (fd, &st) != 0, 0)
51437 -#else
51438 - __builtin_expect (fstat (fd, &st) != 0, 0)
51439 -#endif
51440 - || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
51441 - || __builtin_expect (size < sizeof (struct mo_file_header), 0))
51442 - {
51443 - /* Something went wrong. */
51444 - close (fd);
51445 - return;
51446 - }
51447 -
51448 -#ifdef HAVE_MMAP
51449 - /* Now we are ready to load the file. If mmap() is available we try
51450 - this first. If not available or it failed we try to load it. */
51451 - data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
51452 - MAP_PRIVATE, fd, 0);
51453 -
51454 - if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
51455 - {
51456 - /* mmap() call was successful. */
51457 - close (fd);
51458 - use_mmap = 1;
51459 - }
51460 -#endif
51461 -
51462 - /* If the data is not yet available (i.e. mmap'ed) we try to load
51463 - it manually. */
51464 - if (data == (struct mo_file_header *) -1)
51465 - {
51466 - size_t to_read;
51467 - char *read_ptr;
51468 -
51469 - data = (struct mo_file_header *) malloc (size);
51470 - if (data == NULL)
51471 - return;
51472 -
51473 - to_read = size;
51474 - read_ptr = (char *) data;
51475 - do
51476 - {
51477 - long int nb = (long int) read (fd, read_ptr, to_read);
51478 - if (nb <= 0)
51479 - {
51480 -#ifdef EINTR
51481 - if (nb == -1 && errno == EINTR)
51482 - continue;
51483 -#endif
51484 - close (fd);
51485 - return;
51486 - }
51487 - read_ptr += nb;
51488 - to_read -= nb;
51489 - }
51490 - while (to_read > 0);
51491 -
51492 - close (fd);
51493 - }
51494 -
51495 - /* Using the magic number we can test whether it really is a message
51496 - catalog file. */
51497 - if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
51498 - 0))
51499 - {
51500 - /* The magic number is wrong: not a message catalog file. */
51501 -#ifdef HAVE_MMAP
51502 - if (use_mmap)
51503 - munmap ((caddr_t) data, size);
51504 - else
51505 -#endif
51506 - free (data);
51507 - return;
51508 - }
51509 -
51510 - domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
51511 - if (domain == NULL)
51512 - return;
51513 - domain_file->data = domain;
51514 -
51515 - domain->data = (char *) data;
51516 - domain->use_mmap = use_mmap;
51517 - domain->mmap_size = size;
51518 - domain->must_swap = data->magic != _MAGIC;
51519 - domain->malloced = NULL;
51520 -
51521 - /* Fill in the information about the available tables. */
51522 - revision = W (domain->must_swap, data->revision);
51523 - /* We support only the major revision 0. */
51524 - switch (revision >> 16)
51525 - {
51526 - case 0:
51527 - domain->nstrings = W (domain->must_swap, data->nstrings);
51528 - domain->orig_tab = (const struct string_desc *)
51529 - ((char *) data + W (domain->must_swap, data->orig_tab_offset));
51530 - domain->trans_tab = (const struct string_desc *)
51531 - ((char *) data + W (domain->must_swap, data->trans_tab_offset));
51532 - domain->hash_size = W (domain->must_swap, data->hash_tab_size);
51533 - domain->hash_tab =
51534 - (domain->hash_size > 2
51535 - ? (const nls_uint32 *)
51536 - ((char *) data + W (domain->must_swap, data->hash_tab_offset))
51537 - : NULL);
51538 - domain->must_swap_hash_tab = domain->must_swap;
51539 -
51540 - /* Now dispatch on the minor revision. */
51541 - switch (revision & 0xffff)
51542 - {
51543 - case 0:
51544 - domain->n_sysdep_strings = 0;
51545 - domain->orig_sysdep_tab = NULL;
51546 - domain->trans_sysdep_tab = NULL;
51547 - break;
51548 - case 1:
51549 - default:
51550 - {
51551 - nls_uint32 n_sysdep_strings;
51552 -
51553 - if (domain->hash_tab == NULL)
51554 - /* This is invalid. These minor revisions need a hash table. */
51555 - goto invalid;
51556 -
51557 - n_sysdep_strings =
51558 - W (domain->must_swap, data->n_sysdep_strings);
51559 - if (n_sysdep_strings > 0)
51560 - {
51561 - nls_uint32 n_sysdep_segments;
51562 - const struct sysdep_segment *sysdep_segments;
51563 - const char **sysdep_segment_values;
51564 - const nls_uint32 *orig_sysdep_tab;
51565 - const nls_uint32 *trans_sysdep_tab;
51566 - size_t memneed;
51567 - char *mem;
51568 - struct sysdep_string_desc *inmem_orig_sysdep_tab;
51569 - struct sysdep_string_desc *inmem_trans_sysdep_tab;
51570 - nls_uint32 *inmem_hash_tab;
51571 - unsigned int i;
51572 -
51573 - /* Get the values of the system dependent segments. */
51574 - n_sysdep_segments =
51575 - W (domain->must_swap, data->n_sysdep_segments);
51576 - sysdep_segments = (const struct sysdep_segment *)
51577 - ((char *) data
51578 - + W (domain->must_swap, data->sysdep_segments_offset));
51579 - sysdep_segment_values =
51580 - alloca (n_sysdep_segments * sizeof (const char *));
51581 - for (i = 0; i < n_sysdep_segments; i++)
51582 - {
51583 - const char *name =
51584 - (char *) data
51585 - + W (domain->must_swap, sysdep_segments[i].offset);
51586 - nls_uint32 namelen =
51587 - W (domain->must_swap, sysdep_segments[i].length);
51588 -
51589 - if (!(namelen > 0 && name[namelen - 1] == '\0'))
51590 - {
51591 - freea (sysdep_segment_values);
51592 - goto invalid;
51593 - }
51594 -
51595 - sysdep_segment_values[i] = get_sysdep_segment_value (name);
51596 - }
51597 -
51598 - orig_sysdep_tab = (const nls_uint32 *)
51599 - ((char *) data
51600 - + W (domain->must_swap, data->orig_sysdep_tab_offset));
51601 - trans_sysdep_tab = (const nls_uint32 *)
51602 - ((char *) data
51603 - + W (domain->must_swap, data->trans_sysdep_tab_offset));
51604 -
51605 - /* Compute the amount of additional memory needed for the
51606 - system dependent strings and the augmented hash table. */
51607 - memneed = 2 * n_sysdep_strings
51608 - * sizeof (struct sysdep_string_desc)
51609 - + domain->hash_size * sizeof (nls_uint32);
51610 - for (i = 0; i < 2 * n_sysdep_strings; i++)
51611 - {
51612 - const struct sysdep_string *sysdep_string =
51613 - (const struct sysdep_string *)
51614 - ((char *) data
51615 - + W (domain->must_swap,
51616 - i < n_sysdep_strings
51617 - ? orig_sysdep_tab[i]
51618 - : trans_sysdep_tab[i - n_sysdep_strings]));
51619 - size_t need = 0;
51620 - const struct segment_pair *p = sysdep_string->segments;
51621 -
51622 - if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
51623 - for (p = sysdep_string->segments;; p++)
51624 - {
51625 - nls_uint32 sysdepref;
51626 -
51627 - need += W (domain->must_swap, p->segsize);
51628 -
51629 - sysdepref = W (domain->must_swap, p->sysdepref);
51630 - if (sysdepref == SEGMENTS_END)
51631 - break;
51632 -
51633 - if (sysdepref >= n_sysdep_segments)
51634 - {
51635 - /* Invalid. */
51636 - freea (sysdep_segment_values);
51637 - goto invalid;
51638 - }
51639 -
51640 - need += strlen (sysdep_segment_values[sysdepref]);
51641 - }
51642 -
51643 - memneed += need;
51644 - }
51645 -
51646 - /* Allocate additional memory. */
51647 - mem = (char *) malloc (memneed);
51648 - if (mem == NULL)
51649 - goto invalid;
51650 -
51651 - domain->malloced = mem;
51652 - inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
51653 - mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
51654 - inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
51655 - mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
51656 - inmem_hash_tab = (nls_uint32 *) mem;
51657 - mem += domain->hash_size * sizeof (nls_uint32);
51658 -
51659 - /* Compute the system dependent strings. */
51660 - for (i = 0; i < 2 * n_sysdep_strings; i++)
51661 - {
51662 - const struct sysdep_string *sysdep_string =
51663 - (const struct sysdep_string *)
51664 - ((char *) data
51665 - + W (domain->must_swap,
51666 - i < n_sysdep_strings
51667 - ? orig_sysdep_tab[i]
51668 - : trans_sysdep_tab[i - n_sysdep_strings]));
51669 - const char *static_segments =
51670 - (char *) data
51671 - + W (domain->must_swap, sysdep_string->offset);
51672 - const struct segment_pair *p = sysdep_string->segments;
51673 -
51674 - /* Concatenate the segments, and fill
51675 - inmem_orig_sysdep_tab[i] (for i < n_sysdep_strings) and
51676 - inmem_trans_sysdep_tab[i-n_sysdep_strings] (for
51677 - i >= n_sysdep_strings). */
51678 -
51679 - if (W (domain->must_swap, p->sysdepref) == SEGMENTS_END)
51680 - {
51681 - /* Only one static segment. */
51682 - inmem_orig_sysdep_tab[i].length =
51683 - W (domain->must_swap, p->segsize);
51684 - inmem_orig_sysdep_tab[i].pointer = static_segments;
51685 - }
51686 - else
51687 - {
51688 - inmem_orig_sysdep_tab[i].pointer = mem;
51689 -
51690 - for (p = sysdep_string->segments;; p++)
51691 - {
51692 - nls_uint32 segsize =
51693 - W (domain->must_swap, p->segsize);
51694 - nls_uint32 sysdepref =
51695 - W (domain->must_swap, p->sysdepref);
51696 - size_t n;
51697 -
51698 - if (segsize > 0)
51699 - {
51700 - memcpy (mem, static_segments, segsize);
51701 - mem += segsize;
51702 - static_segments += segsize;
51703 - }
51704 -
51705 - if (sysdepref == SEGMENTS_END)
51706 - break;
51707 -
51708 - n = strlen (sysdep_segment_values[sysdepref]);
51709 - memcpy (mem, sysdep_segment_values[sysdepref], n);
51710 - mem += n;
51711 - }
51712 -
51713 - inmem_orig_sysdep_tab[i].length =
51714 - mem - inmem_orig_sysdep_tab[i].pointer;
51715 - }
51716 - }
51717 -
51718 - /* Compute the augmented hash table. */
51719 - for (i = 0; i < domain->hash_size; i++)
51720 - inmem_hash_tab[i] =
51721 - W (domain->must_swap_hash_tab, domain->hash_tab[i]);
51722 - for (i = 0; i < n_sysdep_strings; i++)
51723 - {
51724 - const char *msgid = inmem_orig_sysdep_tab[i].pointer;
51725 - nls_uint32 hash_val = hash_string (msgid);
51726 - nls_uint32 idx = hash_val % domain->hash_size;
51727 - nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
51728 -
51729 - for (;;)
51730 - {
51731 - if (inmem_hash_tab[idx] == 0)
51732 - {
51733 - /* Hash table entry is empty. Use it. */
51734 - inmem_hash_tab[idx] = 1 + domain->nstrings + i;
51735 - break;
51736 - }
51737 -
51738 - if (idx >= domain->hash_size - incr)
51739 - idx -= domain->hash_size - incr;
51740 - else
51741 - idx += incr;
51742 - }
51743 - }
51744 -
51745 - freea (sysdep_segment_values);
51746 -
51747 - domain->n_sysdep_strings = n_sysdep_strings;
51748 - domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
51749 - domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
51750 -
51751 - domain->hash_tab = inmem_hash_tab;
51752 - domain->must_swap_hash_tab = 0;
51753 - }
51754 - else
51755 - {
51756 - domain->n_sysdep_strings = 0;
51757 - domain->orig_sysdep_tab = NULL;
51758 - domain->trans_sysdep_tab = NULL;
51759 - }
51760 - }
51761 - break;
51762 - }
51763 - break;
51764 - default:
51765 - /* This is an invalid revision. */
51766 - invalid:
51767 - /* This is an invalid .mo file. */
51768 - if (domain->malloced)
51769 - free (domain->malloced);
51770 -#ifdef HAVE_MMAP
51771 - if (use_mmap)
51772 - munmap ((caddr_t) data, size);
51773 - else
51774 -#endif
51775 - free (data);
51776 - free (domain);
51777 - domain_file->data = NULL;
51778 - return;
51779 - }
51780 -
51781 - /* Now initialize the character set converter from the character set
51782 - the file is encoded with (found in the header entry) to the domain's
51783 - specified character set or the locale's character set. */
51784 - nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
51785 -
51786 - /* Also look for a plural specification. */
51787 - EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
51788 -}
51789 -
51790 -
51791 -#ifdef _LIBC
51792 -void
51793 -internal_function
51794 -_nl_unload_domain (domain)
51795 - struct loaded_domain *domain;
51796 -{
51797 - if (domain->plural != &__gettext_germanic_plural)
51798 - __gettext_free_exp (domain->plural);
51799 -
51800 - _nl_free_domain_conv (domain);
51801 -
51802 - if (domain->malloced)
51803 - free (domain->malloced);
51804 -
51805 -# ifdef _POSIX_MAPPED_FILES
51806 - if (domain->use_mmap)
51807 - munmap ((caddr_t) domain->data, domain->mmap_size);
51808 - else
51809 -# endif /* _POSIX_MAPPED_FILES */
51810 - free ((void *) domain->data);
51811 -
51812 - free (domain);
51813 -}
51814 -#endif
51815 diff -rupN original/intl/localcharset.c new/intl/localcharset.c
51816 --- original/intl/localcharset.c 2009-03-28 22:33:59.000000000 -0430
51817 +++ new/intl/localcharset.c 1969-12-31 20:00:00.000000000 -0400
51818 @@ -1,398 +0,0 @@
51819 -/* Determine a canonical name for the current locale's character encoding.
51820 -
51821 - Copyright (C) 2000-2003 Free Software Foundation, Inc.
51822 -
51823 - This program is free software; you can redistribute it and/or modify it
51824 - under the terms of the GNU Library General Public License as published
51825 - by the Free Software Foundation; either version 2, or (at your option)
51826 - any later version.
51827 -
51828 - This program is distributed in the hope that it will be useful,
51829 - but WITHOUT ANY WARRANTY; without even the implied warranty of
51830 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
51831 - Library General Public License for more details.
51832 -
51833 - You should have received a copy of the GNU Library General Public
51834 - License along with this program; if not, write to the Free Software
51835 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
51836 - USA. */
51837 -
51838 -/* Written by Bruno Haible <bruno@clisp.org>. */
51839 -
51840 -#ifdef HAVE_CONFIG_H
51841 -# include <config.h>
51842 -#endif
51843 -
51844 -/* Specification. */
51845 -#include "localcharset.h"
51846 -
51847 -#if HAVE_STDDEF_H
51848 -# include <stddef.h>
51849 -#endif
51850 -
51851 -#include <stdio.h>
51852 -#if HAVE_STRING_H
51853 -# include <string.h>
51854 -#else
51855 -# include <strings.h>
51856 -#endif
51857 -#if HAVE_STDLIB_H
51858 -# include <stdlib.h>
51859 -#endif
51860 -
51861 -#if defined _WIN32 || defined __WIN32__
51862 -# undef WIN32 /* avoid warning on mingw32 */
51863 -# define WIN32
51864 -#endif
51865 -
51866 -#if defined __EMX__
51867 -/* Assume EMX program runs on OS/2, even if compiled under DOS. */
51868 -# define OS2
51869 -#endif
51870 -
51871 -#if !defined WIN32
51872 -# if HAVE_LANGINFO_CODESET
51873 -# include <langinfo.h>
51874 -# else
51875 -# if HAVE_SETLOCALE
51876 -# include <locale.h>
51877 -# endif
51878 -# endif
51879 -#elif defined WIN32
51880 -# define WIN32_LEAN_AND_MEAN
51881 -# include <windows.h>
51882 -#endif
51883 -#if defined OS2
51884 -# define INCL_DOS
51885 -# include <os2.h>
51886 -#endif
51887 -
51888 -#if ENABLE_RELOCATABLE
51889 -# include "relocatable.h"
51890 -#else
51891 -# define relocate(pathname) (pathname)
51892 -#endif
51893 -
51894 -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
51895 - /* Win32, OS/2, DOS */
51896 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
51897 -#endif
51898 -
51899 -#ifndef DIRECTORY_SEPARATOR
51900 -# define DIRECTORY_SEPARATOR '/'
51901 -#endif
51902 -
51903 -#ifndef ISSLASH
51904 -# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
51905 -#endif
51906 -
51907 -#ifdef HAVE_GETC_UNLOCKED
51908 -# undef getc
51909 -# define getc getc_unlocked
51910 -#endif
51911 -
51912 -/* The following static variable is declared 'volatile' to avoid a
51913 - possible multithread problem in the function get_charset_aliases. If we
51914 - are running in a threaded environment, and if two threads initialize
51915 - 'charset_aliases' simultaneously, both will produce the same value,
51916 - and everything will be ok if the two assignments to 'charset_aliases'
51917 - are atomic. But I don't know what will happen if the two assignments mix. */
51918 -#if __STDC__ != 1
51919 -# define volatile /* empty */
51920 -#endif
51921 -/* Pointer to the contents of the charset.alias file, if it has already been
51922 - read, else NULL. Its format is:
51923 - ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
51924 -static const char * volatile charset_aliases;
51925 -
51926 -/* Return a pointer to the contents of the charset.alias file. */
51927 -static const char *
51928 -get_charset_aliases ()
51929 -{
51930 - const char *cp;
51931 -
51932 - cp = charset_aliases;
51933 - if (cp == NULL)
51934 - {
51935 -#if !(defined VMS || defined WIN32)
51936 - FILE *fp;
51937 - const char *dir = relocate (LIBDIR);
51938 - const char *base = "charset.alias";
51939 - char *file_name;
51940 -
51941 - /* Concatenate dir and base into freshly allocated file_name. */
51942 - {
51943 - size_t dir_len = strlen (dir);
51944 - size_t base_len = strlen (base);
51945 - int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
51946 - file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
51947 - if (file_name != NULL)
51948 - {
51949 - memcpy (file_name, dir, dir_len);
51950 - if (add_slash)
51951 - file_name[dir_len] = DIRECTORY_SEPARATOR;
51952 - memcpy (file_name + dir_len + add_slash, base, base_len + 1);
51953 - }
51954 - }
51955 -
51956 - if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
51957 - /* Out of memory or file not found, treat it as empty. */
51958 - cp = "";
51959 - else
51960 - {
51961 - /* Parse the file's contents. */
51962 - int c;
51963 - char buf1[50+1];
51964 - char buf2[50+1];
51965 - char *res_ptr = NULL;
51966 - size_t res_size = 0;
51967 - size_t l1, l2;
51968 -
51969 - for (;;)
51970 - {
51971 - c = getc (fp);
51972 - if (c == EOF)
51973 - break;
51974 - if (c == '\n' || c == ' ' || c == '\t')
51975 - continue;
51976 - if (c == '#')
51977 - {
51978 - /* Skip comment, to end of line. */
51979 - do
51980 - c = getc (fp);
51981 - while (!(c == EOF || c == '\n'));
51982 - if (c == EOF)
51983 - break;
51984 - continue;
51985 - }
51986 - ungetc (c, fp);
51987 - if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
51988 - break;
51989 - l1 = strlen (buf1);
51990 - l2 = strlen (buf2);
51991 - if (res_size == 0)
51992 - {
51993 - res_size = l1 + 1 + l2 + 1;
51994 - res_ptr = (char *) malloc (res_size + 1);
51995 - }
51996 - else
51997 - {
51998 - res_size += l1 + 1 + l2 + 1;
51999 - res_ptr = (char *) realloc (res_ptr, res_size + 1);
52000 - }
52001 - if (res_ptr == NULL)
52002 - {
52003 - /* Out of memory. */
52004 - res_size = 0;
52005 - break;
52006 - }
52007 - strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
52008 - strcpy (res_ptr + res_size - (l2 + 1), buf2);
52009 - }
52010 - fclose (fp);
52011 - if (res_size == 0)
52012 - cp = "";
52013 - else
52014 - {
52015 - *(res_ptr + res_size) = '\0';
52016 - cp = res_ptr;
52017 - }
52018 - }
52019 -
52020 - if (file_name != NULL)
52021 - free (file_name);
52022 -
52023 -#else
52024 -
52025 -# if defined VMS
52026 - /* To avoid the troubles of an extra file charset.alias_vms in the
52027 - sources of many GNU packages, simply inline the aliases here. */
52028 - /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
52029 - "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
52030 - section 10.7 "Handling Different Character Sets". */
52031 - cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
52032 - "ISO8859-2" "\0" "ISO-8859-2" "\0"
52033 - "ISO8859-5" "\0" "ISO-8859-5" "\0"
52034 - "ISO8859-7" "\0" "ISO-8859-7" "\0"
52035 - "ISO8859-8" "\0" "ISO-8859-8" "\0"
52036 - "ISO8859-9" "\0" "ISO-8859-9" "\0"
52037 - /* Japanese */
52038 - "eucJP" "\0" "EUC-JP" "\0"
52039 - "SJIS" "\0" "SHIFT_JIS" "\0"
52040 - "DECKANJI" "\0" "DEC-KANJI" "\0"
52041 - "SDECKANJI" "\0" "EUC-JP" "\0"
52042 - /* Chinese */
52043 - "eucTW" "\0" "EUC-TW" "\0"
52044 - "DECHANYU" "\0" "DEC-HANYU" "\0"
52045 - "DECHANZI" "\0" "GB2312" "\0"
52046 - /* Korean */
52047 - "DECKOREAN" "\0" "EUC-KR" "\0";
52048 -# endif
52049 -
52050 -# if defined WIN32
52051 - /* To avoid the troubles of installing a separate file in the same
52052 - directory as the DLL and of retrieving the DLL's directory at
52053 - runtime, simply inline the aliases here. */
52054 -
52055 - cp = "CP936" "\0" "GBK" "\0"
52056 - "CP1361" "\0" "JOHAB" "\0"
52057 - "CP20127" "\0" "ASCII" "\0"
52058 - "CP20866" "\0" "KOI8-R" "\0"
52059 - "CP21866" "\0" "KOI8-RU" "\0"
52060 - "CP28591" "\0" "ISO-8859-1" "\0"
52061 - "CP28592" "\0" "ISO-8859-2" "\0"
52062 - "CP28593" "\0" "ISO-8859-3" "\0"
52063 - "CP28594" "\0" "ISO-8859-4" "\0"
52064 - "CP28595" "\0" "ISO-8859-5" "\0"
52065 - "CP28596" "\0" "ISO-8859-6" "\0"
52066 - "CP28597" "\0" "ISO-8859-7" "\0"
52067 - "CP28598" "\0" "ISO-8859-8" "\0"
52068 - "CP28599" "\0" "ISO-8859-9" "\0"
52069 - "CP28605" "\0" "ISO-8859-15" "\0";
52070 -# endif
52071 -#endif
52072 -
52073 - charset_aliases = cp;
52074 - }
52075 -
52076 - return cp;
52077 -}
52078 -
52079 -/* Determine the current locale's character encoding, and canonicalize it
52080 - into one of the canonical names listed in config.charset.
52081 - The result must not be freed; it is statically allocated.
52082 - If the canonical name cannot be determined, the result is a non-canonical
52083 - name. */
52084 -
52085 -#ifdef STATIC
52086 -STATIC
52087 -#endif
52088 -const char *
52089 -locale_charset ()
52090 -{
52091 - const char *codeset;
52092 - const char *aliases;
52093 -
52094 -#if !(defined WIN32 || defined OS2)
52095 -
52096 -# if HAVE_LANGINFO_CODESET
52097 -
52098 - /* Most systems support nl_langinfo (CODESET) nowadays. */
52099 - codeset = nl_langinfo (CODESET);
52100 -
52101 -# else
52102 -
52103 - /* On old systems which lack it, use setlocale or getenv. */
52104 - const char *locale = NULL;
52105 -
52106 - /* But most old systems don't have a complete set of locales. Some
52107 - (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
52108 - use setlocale here; it would return "C" when it doesn't support the
52109 - locale name the user has set. */
52110 -# if HAVE_SETLOCALE && 0
52111 - locale = setlocale (LC_CTYPE, NULL);
52112 -# endif
52113 - if (locale == NULL || locale[0] == '\0')
52114 - {
52115 - locale = getenv ("LC_ALL");
52116 - if (locale == NULL || locale[0] == '\0')
52117 - {
52118 - locale = getenv ("LC_CTYPE");
52119 - if (locale == NULL || locale[0] == '\0')
52120 - locale = getenv ("LANG");
52121 - }
52122 - }
52123 -
52124 - /* On some old systems, one used to set locale = "iso8859_1". On others,
52125 - you set it to "language_COUNTRY.charset". In any case, we resolve it
52126 - through the charset.alias file. */
52127 - codeset = locale;
52128 -
52129 -# endif
52130 -
52131 -#elif defined WIN32
52132 -
52133 - static char buf[2 + 10 + 1];
52134 -
52135 - /* Woe32 has a function returning the locale's codepage as a number. */
52136 - sprintf (buf, "CP%u", GetACP ());
52137 - codeset = buf;
52138 -
52139 -#elif defined OS2
52140 -
52141 - const char *locale;
52142 - static char buf[2 + 10 + 1];
52143 - ULONG cp[3];
52144 - ULONG cplen;
52145 -
52146 - /* Allow user to override the codeset, as set in the operating system,
52147 - with standard language environment variables. */
52148 - locale = getenv ("LC_ALL");
52149 - if (locale == NULL || locale[0] == '\0')
52150 - {
52151 - locale = getenv ("LC_CTYPE");
52152 - if (locale == NULL || locale[0] == '\0')
52153 - locale = getenv ("LANG");
52154 - }
52155 - if (locale != NULL && locale[0] != '\0')
52156 - {
52157 - /* If the locale name contains an encoding after the dot, return it. */
52158 - const char *dot = strchr (locale, '.');
52159 -
52160 - if (dot != NULL)
52161 - {
52162 - const char *modifier;
52163 -
52164 - dot++;
52165 - /* Look for the possible @... trailer and remove it, if any. */
52166 - modifier = strchr (dot, '@');
52167 - if (modifier == NULL)
52168 - return dot;
52169 - if (modifier - dot < sizeof (buf))
52170 - {
52171 - memcpy (buf, dot, modifier - dot);
52172 - buf [modifier - dot] = '\0';
52173 - return buf;
52174 - }
52175 - }
52176 -
52177 - /* Resolve through the charset.alias file. */
52178 - codeset = locale;
52179 - }
52180 - else
52181 - {
52182 - /* OS/2 has a function returning the locale's codepage as a number. */
52183 - if (DosQueryCp (sizeof (cp), cp, &cplen))
52184 - codeset = "";
52185 - else
52186 - {
52187 - sprintf (buf, "CP%u", cp[0]);
52188 - codeset = buf;
52189 - }
52190 - }
52191 -
52192 -#endif
52193 -
52194 - if (codeset == NULL)
52195 - /* The canonical name cannot be determined. */
52196 - codeset = "";
52197 -
52198 - /* Resolve alias. */
52199 - for (aliases = get_charset_aliases ();
52200 - *aliases != '\0';
52201 - aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
52202 - if (strcmp (codeset, aliases) == 0
52203 - || (aliases[0] == '*' && aliases[1] == '\0'))
52204 - {
52205 - codeset = aliases + strlen (aliases) + 1;
52206 - break;
52207 - }
52208 -
52209 - /* Don't return an empty string. GNU libc and GNU libiconv interpret
52210 - the empty string as denoting "the locale's character encoding",
52211 - thus GNU libiconv would call this function a second time. */
52212 - if (codeset[0] == '\0')
52213 - codeset = "ASCII";
52214 -
52215 - return codeset;
52216 -}
52217 diff -rupN original/intl/localcharset.h new/intl/localcharset.h
52218 --- original/intl/localcharset.h 2009-03-28 22:33:59.000000000 -0430
52219 +++ new/intl/localcharset.h 1969-12-31 20:00:00.000000000 -0400
52220 @@ -1,42 +0,0 @@
52221 -/* Determine a canonical name for the current locale's character encoding.
52222 - Copyright (C) 2000-2003 Free Software Foundation, Inc.
52223 - This file is part of the GNU CHARSET Library.
52224 -
52225 - This program is free software; you can redistribute it and/or modify it
52226 - under the terms of the GNU Library General Public License as published
52227 - by the Free Software Foundation; either version 2, or (at your option)
52228 - any later version.
52229 -
52230 - This program is distributed in the hope that it will be useful,
52231 - but WITHOUT ANY WARRANTY; without even the implied warranty of
52232 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
52233 - Library General Public License for more details.
52234 -
52235 - You should have received a copy of the GNU Library General Public
52236 - License along with this program; if not, write to the Free Software
52237 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
52238 - USA. */
52239 -
52240 -#ifndef _LOCALCHARSET_H
52241 -#define _LOCALCHARSET_H
52242 -
52243 -
52244 -#ifdef __cplusplus
52245 -extern "C" {
52246 -#endif
52247 -
52248 -
52249 -/* Determine the current locale's character encoding, and canonicalize it
52250 - into one of the canonical names listed in config.charset.
52251 - The result must not be freed; it is statically allocated.
52252 - If the canonical name cannot be determined, the result is a non-canonical
52253 - name. */
52254 -extern const char * locale_charset (void);
52255 -
52256 -
52257 -#ifdef __cplusplus
52258 -}
52259 -#endif
52260 -
52261 -
52262 -#endif /* _LOCALCHARSET_H */
52263 diff -rupN original/intl/locale.alias new/intl/locale.alias
52264 --- original/intl/locale.alias 2009-03-28 22:33:59.000000000 -0430
52265 +++ new/intl/locale.alias 1969-12-31 20:00:00.000000000 -0400
52266 @@ -1,78 +0,0 @@
52267 -# Locale name alias data base.
52268 -# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
52269 -#
52270 -# This program is free software; you can redistribute it and/or modify it
52271 -# under the terms of the GNU Library General Public License as published
52272 -# by the Free Software Foundation; either version 2, or (at your option)
52273 -# any later version.
52274 -#
52275 -# This program is distributed in the hope that it will be useful,
52276 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
52277 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
52278 -# Library General Public License for more details.
52279 -#
52280 -# You should have received a copy of the GNU Library General Public
52281 -# License along with this program; if not, write to the Free Software
52282 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
52283 -# USA.
52284 -
52285 -# The format of this file is the same as for the corresponding file of
52286 -# the X Window System, which normally can be found in
52287 -# /usr/lib/X11/locale/locale.alias
52288 -# A single line contains two fields: an alias and a substitution value.
52289 -# All entries are case independent.
52290 -
52291 -# Note: This file is far from being complete. If you have a value for
52292 -# your own site which you think might be useful for others too, share
52293 -# it with the rest of us. Send it using the `glibcbug' script to
52294 -# bugs@gnu.org.
52295 -
52296 -# Packages using this file:
52297 -
52298 -bokmal no_NO.ISO-8859-1
52299 -bokmål no_NO.ISO-8859-1
52300 -catalan ca_ES.ISO-8859-1
52301 -croatian hr_HR.ISO-8859-2
52302 -czech cs_CZ.ISO-8859-2
52303 -danish da_DK.ISO-8859-1
52304 -dansk da_DK.ISO-8859-1
52305 -deutsch de_DE.ISO-8859-1
52306 -dutch nl_NL.ISO-8859-1
52307 -eesti et_EE.ISO-8859-1
52308 -estonian et_EE.ISO-8859-1
52309 -finnish fi_FI.ISO-8859-1
52310 -français fr_FR.ISO-8859-1
52311 -french fr_FR.ISO-8859-1
52312 -galego gl_ES.ISO-8859-1
52313 -galician gl_ES.ISO-8859-1
52314 -german de_DE.ISO-8859-1
52315 -greek el_GR.ISO-8859-7
52316 -hebrew he_IL.ISO-8859-8
52317 -hrvatski hr_HR.ISO-8859-2
52318 -hungarian hu_HU.ISO-8859-2
52319 -icelandic is_IS.ISO-8859-1
52320 -italian it_IT.ISO-8859-1
52321 -japanese ja_JP.eucJP
52322 -japanese.euc ja_JP.eucJP
52323 -ja_JP ja_JP.eucJP
52324 -ja_JP.ujis ja_JP.eucJP
52325 -japanese.sjis ja_JP.SJIS
52326 -korean ko_KR.eucKR
52327 -korean.euc ko_KR.eucKR
52328 -ko_KR ko_KR.eucKR
52329 -lithuanian lt_LT.ISO-8859-13
52330 -nb_NO no_NO.ISO-8859-1
52331 -nb_NO.ISO-8859-1 no_NO.ISO-8859-1
52332 -norwegian no_NO.ISO-8859-1
52333 -nynorsk nn_NO.ISO-8859-1
52334 -polish pl_PL.ISO-8859-2
52335 -portuguese pt_PT.ISO-8859-1
52336 -romanian ro_RO.ISO-8859-2
52337 -russian ru_RU.ISO-8859-5
52338 -slovak sk_SK.ISO-8859-2
52339 -slovene sl_SI.ISO-8859-2
52340 -slovenian sl_SI.ISO-8859-2
52341 -spanish es_ES.ISO-8859-1
52342 -swedish sv_SE.ISO-8859-1
52343 -thai th_TH.TIS-620
52344 -turkish tr_TR.ISO-8859-9
52345 diff -rupN original/intl/localealias.c new/intl/localealias.c
52346 --- original/intl/localealias.c 2009-03-28 22:33:59.000000000 -0430
52347 +++ new/intl/localealias.c 1969-12-31 20:00:00.000000000 -0400
52348 @@ -1,419 +0,0 @@
52349 -/* Handle aliases for locale names.
52350 - Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
52351 -
52352 - This program is free software; you can redistribute it and/or modify it
52353 - under the terms of the GNU Library General Public License as published
52354 - by the Free Software Foundation; either version 2, or (at your option)
52355 - any later version.
52356 -
52357 - This program is distributed in the hope that it will be useful,
52358 - but WITHOUT ANY WARRANTY; without even the implied warranty of
52359 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
52360 - Library General Public License for more details.
52361 -
52362 - You should have received a copy of the GNU Library General Public
52363 - License along with this program; if not, write to the Free Software
52364 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
52365 - USA. */
52366 -
52367 -/* Tell glibc's <string.h> to provide a prototype for mempcpy().
52368 - This must come before <config.h> because <config.h> may include
52369 - <features.h>, and once <features.h> has been included, it's too late. */
52370 -#ifndef _GNU_SOURCE
52371 -# define _GNU_SOURCE 1
52372 -#endif
52373 -
52374 -#ifdef HAVE_CONFIG_H
52375 -# include <config.h>
52376 -#endif
52377 -
52378 -#include <ctype.h>
52379 -#include <stdio.h>
52380 -#if defined _LIBC || defined HAVE___FSETLOCKING
52381 -# include <stdio_ext.h>
52382 -#endif
52383 -#include <sys/types.h>
52384 -
52385 -#ifdef __GNUC__
52386 -# undef alloca
52387 -# define alloca __builtin_alloca
52388 -# define HAVE_ALLOCA 1
52389 -#else
52390 -# ifdef _MSC_VER
52391 -# include <malloc.h>
52392 -# define alloca _alloca
52393 -# else
52394 -# if defined HAVE_ALLOCA_H || defined _LIBC
52395 -# include <alloca.h>
52396 -# else
52397 -# ifdef _AIX
52398 - #pragma alloca
52399 -# else
52400 -# ifndef alloca
52401 -char *alloca ();
52402 -# endif
52403 -# endif
52404 -# endif
52405 -# endif
52406 -#endif
52407 -
52408 -#include <stdlib.h>
52409 -#include <string.h>
52410 -
52411 -#include "gettextP.h"
52412 -
52413 -#if ENABLE_RELOCATABLE
52414 -# include "relocatable.h"
52415 -#else
52416 -# define relocate(pathname) (pathname)
52417 -#endif
52418 -
52419 -/* @@ end of prolog @@ */
52420 -
52421 -#ifdef _LIBC
52422 -/* Rename the non ANSI C functions. This is required by the standard
52423 - because some ANSI C functions will require linking with this object
52424 - file and the name space must not be polluted. */
52425 -# define strcasecmp __strcasecmp
52426 -
52427 -# ifndef mempcpy
52428 -# define mempcpy __mempcpy
52429 -# endif
52430 -# define HAVE_MEMPCPY 1
52431 -# define HAVE___FSETLOCKING 1
52432 -
52433 -/* We need locking here since we can be called from different places. */
52434 -# include <bits/libc-lock.h>
52435 -
52436 -__libc_lock_define_initialized (static, lock);
52437 -#endif
52438 -
52439 -#ifndef internal_function
52440 -# define internal_function
52441 -#endif
52442 -
52443 -/* Some optimizations for glibc. */
52444 -#ifdef _LIBC
52445 -# define FEOF(fp) feof_unlocked (fp)
52446 -# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
52447 -#else
52448 -# define FEOF(fp) feof (fp)
52449 -# define FGETS(buf, n, fp) fgets (buf, n, fp)
52450 -#endif
52451 -
52452 -/* For those losing systems which don't have `alloca' we have to add
52453 - some additional code emulating it. */
52454 -#ifdef HAVE_ALLOCA
52455 -# define freea(p) /* nothing */
52456 -#else
52457 -# define alloca(n) malloc (n)
52458 -# define freea(p) free (p)
52459 -#endif
52460 -
52461 -#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
52462 -# undef fgets
52463 -# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
52464 -#endif
52465 -#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
52466 -# undef feof
52467 -# define feof(s) feof_unlocked (s)
52468 -#endif
52469 -
52470 -
52471 -struct alias_map
52472 -{
52473 - const char *alias;
52474 - const char *value;
52475 -};
52476 -
52477 -
52478 -#ifndef _LIBC
52479 -# define libc_freeres_ptr(decl) decl
52480 -#endif
52481 -
52482 -libc_freeres_ptr (static char *string_space);
52483 -static size_t string_space_act;
52484 -static size_t string_space_max;
52485 -libc_freeres_ptr (static struct alias_map *map);
52486 -static size_t nmap;
52487 -static size_t maxmap;
52488 -
52489 -
52490 -/* Prototypes for local functions. */
52491 -static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
52492 - internal_function;
52493 -static int extend_alias_table PARAMS ((void));
52494 -static int alias_compare PARAMS ((const struct alias_map *map1,
52495 - const struct alias_map *map2));
52496 -
52497 -
52498 -const char *
52499 -_nl_expand_alias (name)
52500 - const char *name;
52501 -{
52502 - static const char *locale_alias_path;
52503 - struct alias_map *retval;
52504 - const char *result = NULL;
52505 - size_t added;
52506 -
52507 -#ifdef _LIBC
52508 - __libc_lock_lock (lock);
52509 -#endif
52510 -
52511 - if (locale_alias_path == NULL)
52512 - locale_alias_path = LOCALE_ALIAS_PATH;
52513 -
52514 - do
52515 - {
52516 - struct alias_map item;
52517 -
52518 - item.alias = name;
52519 -
52520 - if (nmap > 0)
52521 - retval = (struct alias_map *) bsearch (&item, map, nmap,
52522 - sizeof (struct alias_map),
52523 - (int (*) PARAMS ((const void *,
52524 - const void *))
52525 - ) alias_compare);
52526 - else
52527 - retval = NULL;
52528 -
52529 - /* We really found an alias. Return the value. */
52530 - if (retval != NULL)
52531 - {
52532 - result = retval->value;
52533 - break;
52534 - }
52535 -
52536 - /* Perhaps we can find another alias file. */
52537 - added = 0;
52538 - while (added == 0 && locale_alias_path[0] != '\0')
52539 - {
52540 - const char *start;
52541 -
52542 - while (locale_alias_path[0] == PATH_SEPARATOR)
52543 - ++locale_alias_path;
52544 - start = locale_alias_path;
52545 -
52546 - while (locale_alias_path[0] != '\0'
52547 - && locale_alias_path[0] != PATH_SEPARATOR)
52548 - ++locale_alias_path;
52549 -
52550 - if (start < locale_alias_path)
52551 - added = read_alias_file (start, locale_alias_path - start);
52552 - }
52553 - }
52554 - while (added != 0);
52555 -
52556 -#ifdef _LIBC
52557 - __libc_lock_unlock (lock);
52558 -#endif
52559 -
52560 - return result;
52561 -}
52562 -
52563 -
52564 -static size_t
52565 -internal_function
52566 -read_alias_file (fname, fname_len)
52567 - const char *fname;
52568 - int fname_len;
52569 -{
52570 - FILE *fp;
52571 - char *full_fname;
52572 - size_t added;
52573 - static const char aliasfile[] = "/locale.alias";
52574 -
52575 - full_fname = (char *) alloca (fname_len + sizeof aliasfile);
52576 -#ifdef HAVE_MEMPCPY
52577 - mempcpy (mempcpy (full_fname, fname, fname_len),
52578 - aliasfile, sizeof aliasfile);
52579 -#else
52580 - memcpy (full_fname, fname, fname_len);
52581 - memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
52582 -#endif
52583 -
52584 - fp = fopen (relocate (full_fname), "r");
52585 - freea (full_fname);
52586 - if (fp == NULL)
52587 - return 0;
52588 -
52589 -#ifdef HAVE___FSETLOCKING
52590 - /* No threads present. */
52591 - __fsetlocking (fp, FSETLOCKING_BYCALLER);
52592 -#endif
52593 -
52594 - added = 0;
52595 - while (!FEOF (fp))
52596 - {
52597 - /* It is a reasonable approach to use a fix buffer here because
52598 - a) we are only interested in the first two fields
52599 - b) these fields must be usable as file names and so must not
52600 - be that long
52601 - We avoid a multi-kilobyte buffer here since this would use up
52602 - stack space which we might not have if the program ran out of
52603 - memory. */
52604 - char buf[400];
52605 - char *alias;
52606 - char *value;
52607 - char *cp;
52608 -
52609 - if (FGETS (buf, sizeof buf, fp) == NULL)
52610 - /* EOF reached. */
52611 - break;
52612 -
52613 - cp = buf;
52614 - /* Ignore leading white space. */
52615 - while (isspace ((unsigned char) cp[0]))
52616 - ++cp;
52617 -
52618 - /* A leading '#' signals a comment line. */
52619 - if (cp[0] != '\0' && cp[0] != '#')
52620 - {
52621 - alias = cp++;
52622 - while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
52623 - ++cp;
52624 - /* Terminate alias name. */
52625 - if (cp[0] != '\0')
52626 - *cp++ = '\0';
52627 -
52628 - /* Now look for the beginning of the value. */
52629 - while (isspace ((unsigned char) cp[0]))
52630 - ++cp;
52631 -
52632 - if (cp[0] != '\0')
52633 - {
52634 - size_t alias_len;
52635 - size_t value_len;
52636 -
52637 - value = cp++;
52638 - while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
52639 - ++cp;
52640 - /* Terminate value. */
52641 - if (cp[0] == '\n')
52642 - {
52643 - /* This has to be done to make the following test
52644 - for the end of line possible. We are looking for
52645 - the terminating '\n' which do not overwrite here. */
52646 - *cp++ = '\0';
52647 - *cp = '\n';
52648 - }
52649 - else if (cp[0] != '\0')
52650 - *cp++ = '\0';
52651 -
52652 - if (nmap >= maxmap)
52653 - if (__builtin_expect (extend_alias_table (), 0))
52654 - return added;
52655 -
52656 - alias_len = strlen (alias) + 1;
52657 - value_len = strlen (value) + 1;
52658 -
52659 - if (string_space_act + alias_len + value_len > string_space_max)
52660 - {
52661 - /* Increase size of memory pool. */
52662 - size_t new_size = (string_space_max
52663 - + (alias_len + value_len > 1024
52664 - ? alias_len + value_len : 1024));
52665 - char *new_pool = (char *) realloc (string_space, new_size);
52666 - if (new_pool == NULL)
52667 - return added;
52668 -
52669 - if (__builtin_expect (string_space != new_pool, 0))
52670 - {
52671 - size_t i;
52672 -
52673 - for (i = 0; i < nmap; i++)
52674 - {
52675 - map[i].alias += new_pool - string_space;
52676 - map[i].value += new_pool - string_space;
52677 - }
52678 - }
52679 -
52680 - string_space = new_pool;
52681 - string_space_max = new_size;
52682 - }
52683 -
52684 - map[nmap].alias = memcpy (&string_space[string_space_act],
52685 - alias, alias_len);
52686 - string_space_act += alias_len;
52687 -
52688 - map[nmap].value = memcpy (&string_space[string_space_act],
52689 - value, value_len);
52690 - string_space_act += value_len;
52691 -
52692 - ++nmap;
52693 - ++added;
52694 - }
52695 - }
52696 -
52697 - /* Possibly not the whole line fits into the buffer. Ignore
52698 - the rest of the line. */
52699 - while (strchr (buf, '\n') == NULL)
52700 - if (FGETS (buf, sizeof buf, fp) == NULL)
52701 - /* Make sure the inner loop will be left. The outer loop
52702 - will exit at the `feof' test. */
52703 - break;
52704 - }
52705 -
52706 - /* Should we test for ferror()? I think we have to silently ignore
52707 - errors. --drepper */
52708 - fclose (fp);
52709 -
52710 - if (added > 0)
52711 - qsort (map, nmap, sizeof (struct alias_map),
52712 - (int (*) PARAMS ((const void *, const void *))) alias_compare);
52713 -
52714 - return added;
52715 -}
52716 -
52717 -
52718 -static int
52719 -extend_alias_table ()
52720 -{
52721 - size_t new_size;
52722 - struct alias_map *new_map;
52723 -
52724 - new_size = maxmap == 0 ? 100 : 2 * maxmap;
52725 - new_map = (struct alias_map *) realloc (map, (new_size
52726 - * sizeof (struct alias_map)));
52727 - if (new_map == NULL)
52728 - /* Simply don't extend: we don't have any more core. */
52729 - return -1;
52730 -
52731 - map = new_map;
52732 - maxmap = new_size;
52733 - return 0;
52734 -}
52735 -
52736 -
52737 -static int
52738 -alias_compare (map1, map2)
52739 - const struct alias_map *map1;
52740 - const struct alias_map *map2;
52741 -{
52742 -#if defined _LIBC || defined HAVE_STRCASECMP
52743 - return strcasecmp (map1->alias, map2->alias);
52744 -#else
52745 - const unsigned char *p1 = (const unsigned char *) map1->alias;
52746 - const unsigned char *p2 = (const unsigned char *) map2->alias;
52747 - unsigned char c1, c2;
52748 -
52749 - if (p1 == p2)
52750 - return 0;
52751 -
52752 - do
52753 - {
52754 - /* I know this seems to be odd but the tolower() function in
52755 - some systems libc cannot handle nonalpha characters. */
52756 - c1 = isupper (*p1) ? tolower (*p1) : *p1;
52757 - c2 = isupper (*p2) ? tolower (*p2) : *p2;
52758 - if (c1 == '\0')
52759 - break;
52760 - ++p1;
52761 - ++p2;
52762 - }
52763 - while (c1 == c2);
52764 -
52765 - return c1 - c2;
52766 -#endif
52767 -}
52768 diff -rupN original/intl/localename.c new/intl/localename.c
52769 --- original/intl/localename.c 2009-03-28 22:33:59.000000000 -0430
52770 +++ new/intl/localename.c 1969-12-31 20:00:00.000000000 -0400
52771 @@ -1,772 +0,0 @@
52772 -/* Determine the current selected locale.
52773 - Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
52774 -
52775 - This program is free software; you can redistribute it and/or modify it
52776 - under the terms of the GNU Library General Public License as published
52777 - by the Free Software Foundation; either version 2, or (at your option)
52778 - any later version.
52779 -
52780 - This program is distributed in the hope that it will be useful,
52781 - but WITHOUT ANY WARRANTY; without even the implied warranty of
52782 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
52783 - Library General Public License for more details.
52784 -
52785 - You should have received a copy of the GNU Library General Public
52786 - License along with this program; if not, write to the Free Software
52787 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
52788 - USA. */
52789 -
52790 -/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
52791 -/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */
52792 -
52793 -#ifdef HAVE_CONFIG_H
52794 -# include <config.h>
52795 -#endif
52796 -
52797 -#include <stdlib.h>
52798 -#include <locale.h>
52799 -
52800 -#if defined _WIN32 || defined __WIN32__
52801 -# undef WIN32 /* avoid warning on mingw32 */
52802 -# define WIN32
52803 -#endif
52804 -
52805 -#ifdef WIN32
52806 -# define WIN32_LEAN_AND_MEAN
52807 -# include <windows.h>
52808 -/* Mingw headers don't have latest language and sublanguage codes. */
52809 -# ifndef LANG_AFRIKAANS
52810 -# define LANG_AFRIKAANS 0x36
52811 -# endif
52812 -# ifndef LANG_ALBANIAN
52813 -# define LANG_ALBANIAN 0x1c
52814 -# endif
52815 -# ifndef LANG_ARABIC
52816 -# define LANG_ARABIC 0x01
52817 -# endif
52818 -# ifndef LANG_ARMENIAN
52819 -# define LANG_ARMENIAN 0x2b
52820 -# endif
52821 -# ifndef LANG_ASSAMESE
52822 -# define LANG_ASSAMESE 0x4d
52823 -# endif
52824 -# ifndef LANG_AZERI
52825 -# define LANG_AZERI 0x2c
52826 -# endif
52827 -# ifndef LANG_BASQUE
52828 -# define LANG_BASQUE 0x2d
52829 -# endif
52830 -# ifndef LANG_BELARUSIAN
52831 -# define LANG_BELARUSIAN 0x23
52832 -# endif
52833 -# ifndef LANG_BENGALI
52834 -# define LANG_BENGALI 0x45
52835 -# endif
52836 -# ifndef LANG_CATALAN
52837 -# define LANG_CATALAN 0x03
52838 -# endif
52839 -# ifndef LANG_DIVEHI
52840 -# define LANG_DIVEHI 0x65
52841 -# endif
52842 -# ifndef LANG_ESTONIAN
52843 -# define LANG_ESTONIAN 0x25
52844 -# endif
52845 -# ifndef LANG_FAEROESE
52846 -# define LANG_FAEROESE 0x38
52847 -# endif
52848 -# ifndef LANG_FARSI
52849 -# define LANG_FARSI 0x29
52850 -# endif
52851 -# ifndef LANG_GALICIAN
52852 -# define LANG_GALICIAN 0x56
52853 -# endif
52854 -# ifndef LANG_GEORGIAN
52855 -# define LANG_GEORGIAN 0x37
52856 -# endif
52857 -# ifndef LANG_GUJARATI
52858 -# define LANG_GUJARATI 0x47
52859 -# endif
52860 -# ifndef LANG_HEBREW
52861 -# define LANG_HEBREW 0x0d
52862 -# endif
52863 -# ifndef LANG_HINDI
52864 -# define LANG_HINDI 0x39
52865 -# endif
52866 -# ifndef LANG_INDONESIAN
52867 -# define LANG_INDONESIAN 0x21
52868 -# endif
52869 -# ifndef LANG_KANNADA
52870 -# define LANG_KANNADA 0x4b
52871 -# endif
52872 -# ifndef LANG_KASHMIRI
52873 -# define LANG_KASHMIRI 0x60
52874 -# endif
52875 -# ifndef LANG_KAZAK
52876 -# define LANG_KAZAK 0x3f
52877 -# endif
52878 -# ifndef LANG_KONKANI
52879 -# define LANG_KONKANI 0x57
52880 -# endif
52881 -# ifndef LANG_KYRGYZ
52882 -# define LANG_KYRGYZ 0x40
52883 -# endif
52884 -# ifndef LANG_LATVIAN
52885 -# define LANG_LATVIAN 0x26
52886 -# endif
52887 -# ifndef LANG_LITHUANIAN
52888 -# define LANG_LITHUANIAN 0x27
52889 -# endif
52890 -# ifndef LANG_MACEDONIAN
52891 -# define LANG_MACEDONIAN 0x2f
52892 -# endif
52893 -# ifndef LANG_MALAY
52894 -# define LANG_MALAY 0x3e
52895 -# endif
52896 -# ifndef LANG_MALAYALAM
52897 -# define LANG_MALAYALAM 0x4c
52898 -# endif
52899 -# ifndef LANG_MANIPURI
52900 -# define LANG_MANIPURI 0x58
52901 -# endif
52902 -# ifndef LANG_MARATHI
52903 -# define LANG_MARATHI 0x4e
52904 -# endif
52905 -# ifndef LANG_MONGOLIAN
52906 -# define LANG_MONGOLIAN 0x50
52907 -# endif
52908 -# ifndef LANG_NEPALI
52909 -# define LANG_NEPALI 0x61
52910 -# endif
52911 -# ifndef LANG_ORIYA
52912 -# define LANG_ORIYA 0x48
52913 -# endif
52914 -# ifndef LANG_PUNJABI
52915 -# define LANG_PUNJABI 0x46
52916 -# endif
52917 -# ifndef LANG_SANSKRIT
52918 -# define LANG_SANSKRIT 0x4f
52919 -# endif
52920 -# ifndef LANG_SERBIAN
52921 -# define LANG_SERBIAN 0x1a
52922 -# endif
52923 -# ifndef LANG_SINDHI
52924 -# define LANG_SINDHI 0x59
52925 -# endif
52926 -# ifndef LANG_SLOVAK
52927 -# define LANG_SLOVAK 0x1b
52928 -# endif
52929 -# ifndef LANG_SORBIAN
52930 -# define LANG_SORBIAN 0x2e
52931 -# endif
52932 -# ifndef LANG_SWAHILI
52933 -# define LANG_SWAHILI 0x41
52934 -# endif
52935 -# ifndef LANG_SYRIAC
52936 -# define LANG_SYRIAC 0x5a
52937 -# endif
52938 -# ifndef LANG_TAMIL
52939 -# define LANG_TAMIL 0x49
52940 -# endif
52941 -# ifndef LANG_TATAR
52942 -# define LANG_TATAR 0x44
52943 -# endif
52944 -# ifndef LANG_TELUGU
52945 -# define LANG_TELUGU 0x4a
52946 -# endif
52947 -# ifndef LANG_THAI
52948 -# define LANG_THAI 0x1e
52949 -# endif
52950 -# ifndef LANG_UKRAINIAN
52951 -# define LANG_UKRAINIAN 0x22
52952 -# endif
52953 -# ifndef LANG_URDU
52954 -# define LANG_URDU 0x20
52955 -# endif
52956 -# ifndef LANG_UZBEK
52957 -# define LANG_UZBEK 0x43
52958 -# endif
52959 -# ifndef LANG_VIETNAMESE
52960 -# define LANG_VIETNAMESE 0x2a
52961 -# endif
52962 -# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
52963 -# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
52964 -# endif
52965 -# ifndef SUBLANG_ARABIC_IRAQ
52966 -# define SUBLANG_ARABIC_IRAQ 0x02
52967 -# endif
52968 -# ifndef SUBLANG_ARABIC_EGYPT
52969 -# define SUBLANG_ARABIC_EGYPT 0x03
52970 -# endif
52971 -# ifndef SUBLANG_ARABIC_LIBYA
52972 -# define SUBLANG_ARABIC_LIBYA 0x04
52973 -# endif
52974 -# ifndef SUBLANG_ARABIC_ALGERIA
52975 -# define SUBLANG_ARABIC_ALGERIA 0x05
52976 -# endif
52977 -# ifndef SUBLANG_ARABIC_MOROCCO
52978 -# define SUBLANG_ARABIC_MOROCCO 0x06
52979 -# endif
52980 -# ifndef SUBLANG_ARABIC_TUNISIA
52981 -# define SUBLANG_ARABIC_TUNISIA 0x07
52982 -# endif
52983 -# ifndef SUBLANG_ARABIC_OMAN
52984 -# define SUBLANG_ARABIC_OMAN 0x08
52985 -# endif
52986 -# ifndef SUBLANG_ARABIC_YEMEN
52987 -# define SUBLANG_ARABIC_YEMEN 0x09
52988 -# endif
52989 -# ifndef SUBLANG_ARABIC_SYRIA
52990 -# define SUBLANG_ARABIC_SYRIA 0x0a
52991 -# endif
52992 -# ifndef SUBLANG_ARABIC_JORDAN
52993 -# define SUBLANG_ARABIC_JORDAN 0x0b
52994 -# endif
52995 -# ifndef SUBLANG_ARABIC_LEBANON
52996 -# define SUBLANG_ARABIC_LEBANON 0x0c
52997 -# endif
52998 -# ifndef SUBLANG_ARABIC_KUWAIT
52999 -# define SUBLANG_ARABIC_KUWAIT 0x0d
53000 -# endif
53001 -# ifndef SUBLANG_ARABIC_UAE
53002 -# define SUBLANG_ARABIC_UAE 0x0e
53003 -# endif
53004 -# ifndef SUBLANG_ARABIC_BAHRAIN
53005 -# define SUBLANG_ARABIC_BAHRAIN 0x0f
53006 -# endif
53007 -# ifndef SUBLANG_ARABIC_QATAR
53008 -# define SUBLANG_ARABIC_QATAR 0x10
53009 -# endif
53010 -# ifndef SUBLANG_AZERI_LATIN
53011 -# define SUBLANG_AZERI_LATIN 0x01
53012 -# endif
53013 -# ifndef SUBLANG_AZERI_CYRILLIC
53014 -# define SUBLANG_AZERI_CYRILLIC 0x02
53015 -# endif
53016 -# ifndef SUBLANG_CHINESE_MACAU
53017 -# define SUBLANG_CHINESE_MACAU 0x05
53018 -# endif
53019 -# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
53020 -# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
53021 -# endif
53022 -# ifndef SUBLANG_ENGLISH_JAMAICA
53023 -# define SUBLANG_ENGLISH_JAMAICA 0x08
53024 -# endif
53025 -# ifndef SUBLANG_ENGLISH_CARIBBEAN
53026 -# define SUBLANG_ENGLISH_CARIBBEAN 0x09
53027 -# endif
53028 -# ifndef SUBLANG_ENGLISH_BELIZE
53029 -# define SUBLANG_ENGLISH_BELIZE 0x0a
53030 -# endif
53031 -# ifndef SUBLANG_ENGLISH_TRINIDAD
53032 -# define SUBLANG_ENGLISH_TRINIDAD 0x0b
53033 -# endif
53034 -# ifndef SUBLANG_ENGLISH_ZIMBABWE
53035 -# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
53036 -# endif
53037 -# ifndef SUBLANG_ENGLISH_PHILIPPINES
53038 -# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
53039 -# endif
53040 -# ifndef SUBLANG_FRENCH_LUXEMBOURG
53041 -# define SUBLANG_FRENCH_LUXEMBOURG 0x05
53042 -# endif
53043 -# ifndef SUBLANG_FRENCH_MONACO
53044 -# define SUBLANG_FRENCH_MONACO 0x06
53045 -# endif
53046 -# ifndef SUBLANG_GERMAN_LUXEMBOURG
53047 -# define SUBLANG_GERMAN_LUXEMBOURG 0x04
53048 -# endif
53049 -# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
53050 -# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
53051 -# endif
53052 -# ifndef SUBLANG_KASHMIRI_INDIA
53053 -# define SUBLANG_KASHMIRI_INDIA 0x02
53054 -# endif
53055 -# ifndef SUBLANG_MALAY_MALAYSIA
53056 -# define SUBLANG_MALAY_MALAYSIA 0x01
53057 -# endif
53058 -# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
53059 -# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
53060 -# endif
53061 -# ifndef SUBLANG_NEPALI_INDIA
53062 -# define SUBLANG_NEPALI_INDIA 0x02
53063 -# endif
53064 -# ifndef SUBLANG_SERBIAN_LATIN
53065 -# define SUBLANG_SERBIAN_LATIN 0x02
53066 -# endif
53067 -# ifndef SUBLANG_SERBIAN_CYRILLIC
53068 -# define SUBLANG_SERBIAN_CYRILLIC 0x03
53069 -# endif
53070 -# ifndef SUBLANG_SPANISH_GUATEMALA
53071 -# define SUBLANG_SPANISH_GUATEMALA 0x04
53072 -# endif
53073 -# ifndef SUBLANG_SPANISH_COSTA_RICA
53074 -# define SUBLANG_SPANISH_COSTA_RICA 0x05
53075 -# endif
53076 -# ifndef SUBLANG_SPANISH_PANAMA
53077 -# define SUBLANG_SPANISH_PANAMA 0x06
53078 -# endif
53079 -# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
53080 -# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
53081 -# endif
53082 -# ifndef SUBLANG_SPANISH_VENEZUELA
53083 -# define SUBLANG_SPANISH_VENEZUELA 0x08
53084 -# endif
53085 -# ifndef SUBLANG_SPANISH_COLOMBIA
53086 -# define SUBLANG_SPANISH_COLOMBIA 0x09
53087 -# endif
53088 -# ifndef SUBLANG_SPANISH_PERU
53089 -# define SUBLANG_SPANISH_PERU 0x0a
53090 -# endif
53091 -# ifndef SUBLANG_SPANISH_ARGENTINA
53092 -# define SUBLANG_SPANISH_ARGENTINA 0x0b
53093 -# endif
53094 -# ifndef SUBLANG_SPANISH_ECUADOR
53095 -# define SUBLANG_SPANISH_ECUADOR 0x0c
53096 -# endif
53097 -# ifndef SUBLANG_SPANISH_CHILE
53098 -# define SUBLANG_SPANISH_CHILE 0x0d
53099 -# endif
53100 -# ifndef SUBLANG_SPANISH_URUGUAY
53101 -# define SUBLANG_SPANISH_URUGUAY 0x0e
53102 -# endif
53103 -# ifndef SUBLANG_SPANISH_PARAGUAY
53104 -# define SUBLANG_SPANISH_PARAGUAY 0x0f
53105 -# endif
53106 -# ifndef SUBLANG_SPANISH_BOLIVIA
53107 -# define SUBLANG_SPANISH_BOLIVIA 0x10
53108 -# endif
53109 -# ifndef SUBLANG_SPANISH_EL_SALVADOR
53110 -# define SUBLANG_SPANISH_EL_SALVADOR 0x11
53111 -# endif
53112 -# ifndef SUBLANG_SPANISH_HONDURAS
53113 -# define SUBLANG_SPANISH_HONDURAS 0x12
53114 -# endif
53115 -# ifndef SUBLANG_SPANISH_NICARAGUA
53116 -# define SUBLANG_SPANISH_NICARAGUA 0x13
53117 -# endif
53118 -# ifndef SUBLANG_SPANISH_PUERTO_RICO
53119 -# define SUBLANG_SPANISH_PUERTO_RICO 0x14
53120 -# endif
53121 -# ifndef SUBLANG_SWEDISH_FINLAND
53122 -# define SUBLANG_SWEDISH_FINLAND 0x02
53123 -# endif
53124 -# ifndef SUBLANG_URDU_PAKISTAN
53125 -# define SUBLANG_URDU_PAKISTAN 0x01
53126 -# endif
53127 -# ifndef SUBLANG_URDU_INDIA
53128 -# define SUBLANG_URDU_INDIA 0x02
53129 -# endif
53130 -# ifndef SUBLANG_UZBEK_LATIN
53131 -# define SUBLANG_UZBEK_LATIN 0x01
53132 -# endif
53133 -# ifndef SUBLANG_UZBEK_CYRILLIC
53134 -# define SUBLANG_UZBEK_CYRILLIC 0x02
53135 -# endif
53136 -#endif
53137 -
53138 -/* XPG3 defines the result of 'setlocale (category, NULL)' as:
53139 - "Directs 'setlocale()' to query 'category' and return the current
53140 - setting of 'local'."
53141 - However it does not specify the exact format. Neither do SUSV2 and
53142 - ISO C 99. So we can use this feature only on selected systems (e.g.
53143 - those using GNU C Library). */
53144 -#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
53145 -# define HAVE_LOCALE_NULL
53146 -#endif
53147 -
53148 -/* Determine the current locale's name, and canonicalize it into XPG syntax
53149 - language[_territory[.codeset]][@modifier]
53150 - The codeset part in the result is not reliable; the locale_charset()
53151 - should be used for codeset information instead.
53152 - The result must not be freed; it is statically allocated. */
53153 -
53154 -const char *
53155 -_nl_locale_name (category, categoryname)
53156 - int category;
53157 - const char *categoryname;
53158 -{
53159 - const char *retval;
53160 -
53161 -#ifndef WIN32
53162 -
53163 - /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
53164 - On some systems this can be done by the 'setlocale' function itself. */
53165 -# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
53166 - retval = setlocale (category, NULL);
53167 -# else
53168 - /* Setting of LC_ALL overwrites all other. */
53169 - retval = getenv ("LC_ALL");
53170 - if (retval == NULL || retval[0] == '\0')
53171 - {
53172 - /* Next comes the name of the desired category. */
53173 - retval = getenv (categoryname);
53174 - if (retval == NULL || retval[0] == '\0')
53175 - {
53176 - /* Last possibility is the LANG environment variable. */
53177 - retval = getenv ("LANG");
53178 - if (retval == NULL || retval[0] == '\0')
53179 - /* We use C as the default domain. POSIX says this is
53180 - implementation defined. */
53181 - retval = "C";
53182 - }
53183 - }
53184 -# endif
53185 -
53186 - return retval;
53187 -
53188 -#else /* WIN32 */
53189 -
53190 - /* Return an XPG style locale name language[_territory][@modifier].
53191 - Don't even bother determining the codeset; it's not useful in this
53192 - context, because message catalogs are not specific to a single
53193 - codeset. */
53194 -
53195 - LCID lcid;
53196 - LANGID langid;
53197 - int primary, sub;
53198 -
53199 - /* Let the user override the system settings through environment
53200 - variables, as on POSIX systems. */
53201 - retval = getenv ("LC_ALL");
53202 - if (retval != NULL && retval[0] != '\0')
53203 - return retval;
53204 - retval = getenv (categoryname);
53205 - if (retval != NULL && retval[0] != '\0')
53206 - return retval;
53207 - retval = getenv ("LANG");
53208 - if (retval != NULL && retval[0] != '\0')
53209 - return retval;
53210 -
53211 - /* Use native Win32 API locale ID. */
53212 - lcid = GetThreadLocale ();
53213 -
53214 - /* Strip off the sorting rules, keep only the language part. */
53215 - langid = LANGIDFROMLCID (lcid);
53216 -
53217 - /* Split into language and territory part. */
53218 - primary = PRIMARYLANGID (langid);
53219 - sub = SUBLANGID (langid);
53220 -
53221 - /* Dispatch on language.
53222 - See also http://www.unicode.org/unicode/onlinedat/languages.html .
53223 - For details about languages, see http://www.ethnologue.com/ . */
53224 - switch (primary)
53225 - {
53226 - case LANG_AFRIKAANS: return "af_ZA";
53227 - case LANG_ALBANIAN: return "sq_AL";
53228 - case 0x5e: /* AMHARIC */ return "am_ET";
53229 - case LANG_ARABIC:
53230 - switch (sub)
53231 - {
53232 - case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
53233 - case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
53234 - case SUBLANG_ARABIC_EGYPT: return "ar_EG";
53235 - case SUBLANG_ARABIC_LIBYA: return "ar_LY";
53236 - case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
53237 - case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
53238 - case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
53239 - case SUBLANG_ARABIC_OMAN: return "ar_OM";
53240 - case SUBLANG_ARABIC_YEMEN: return "ar_YE";
53241 - case SUBLANG_ARABIC_SYRIA: return "ar_SY";
53242 - case SUBLANG_ARABIC_JORDAN: return "ar_JO";
53243 - case SUBLANG_ARABIC_LEBANON: return "ar_LB";
53244 - case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
53245 - case SUBLANG_ARABIC_UAE: return "ar_AE";
53246 - case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
53247 - case SUBLANG_ARABIC_QATAR: return "ar_QA";
53248 - }
53249 - return "ar";
53250 - case LANG_ARMENIAN: return "hy_AM";
53251 - case LANG_ASSAMESE: return "as_IN";
53252 - case LANG_AZERI:
53253 - switch (sub)
53254 - {
53255 - /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
53256 - case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
53257 - case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
53258 - }
53259 - return "az";
53260 - case LANG_BASQUE:
53261 - return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
53262 - case LANG_BELARUSIAN: return "be_BY";
53263 - case LANG_BENGALI: return "bn_IN";
53264 - case LANG_BULGARIAN: return "bg_BG";
53265 - case 0x55: /* BURMESE */ return "my_MM";
53266 - case 0x53: /* CAMBODIAN */ return "km_KH";
53267 - case LANG_CATALAN: return "ca_ES";
53268 - case 0x5c: /* CHEROKEE */ return "chr_US";
53269 - case LANG_CHINESE:
53270 - switch (sub)
53271 - {
53272 - case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
53273 - case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
53274 - case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
53275 - case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
53276 - case SUBLANG_CHINESE_MACAU: return "zh_MO";
53277 - }
53278 - return "zh";
53279 - case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
53280 - * What used to be called Serbo-Croatian
53281 - * should really now be two separate
53282 - * languages because of political reasons.
53283 - * (Says tml, who knows nothing about Serbian
53284 - * or Croatian.)
53285 - * (I can feel those flames coming already.)
53286 - */
53287 - switch (sub)
53288 - {
53289 - case SUBLANG_DEFAULT: return "hr_HR";
53290 - case SUBLANG_SERBIAN_LATIN: return "sr_YU";
53291 - case SUBLANG_SERBIAN_CYRILLIC: return "sr_YU@cyrillic";
53292 - }
53293 - return "hr";
53294 - case LANG_CZECH: return "cs_CZ";
53295 - case LANG_DANISH: return "da_DK";
53296 - case LANG_DIVEHI: return "div_MV";
53297 - case LANG_DUTCH:
53298 - switch (sub)
53299 - {
53300 - case SUBLANG_DUTCH: return "nl_NL";
53301 - case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
53302 - }
53303 - return "nl";
53304 - case 0x66: /* EDO */ return "bin_NG";
53305 - case LANG_ENGLISH:
53306 - switch (sub)
53307 - {
53308 - /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
53309 - * English was the language spoken in England.
53310 - * Oh well.
53311 - */
53312 - case SUBLANG_ENGLISH_US: return "en_US";
53313 - case SUBLANG_ENGLISH_UK: return "en_GB";
53314 - case SUBLANG_ENGLISH_AUS: return "en_AU";
53315 - case SUBLANG_ENGLISH_CAN: return "en_CA";
53316 - case SUBLANG_ENGLISH_NZ: return "en_NZ";
53317 - case SUBLANG_ENGLISH_EIRE: return "en_IE";
53318 - case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
53319 - case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
53320 - case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
53321 - case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
53322 - case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
53323 - case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
53324 - case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
53325 - }
53326 - return "en";
53327 - case LANG_ESTONIAN: return "et_EE";
53328 - case LANG_FAEROESE: return "fo_FO";
53329 - case LANG_FARSI: return "fa_IR";
53330 - case LANG_FINNISH: return "fi_FI";
53331 - case LANG_FRENCH:
53332 - switch (sub)
53333 - {
53334 - case SUBLANG_FRENCH: return "fr_FR";
53335 - case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
53336 - case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
53337 - case SUBLANG_FRENCH_SWISS: return "fr_CH";
53338 - case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
53339 - case SUBLANG_FRENCH_MONACO: return "fr_MC";
53340 - }
53341 - return "fr";
53342 - case 0x62: /* FRISIAN */ return "fy_NL";
53343 - case 0x67: /* FULFULDE */ return "ful_NG";
53344 - case 0x3c: /* GAELIC */
53345 - switch (sub)
53346 - {
53347 - case 0x01: /* SCOTTISH */ return "gd_GB";
53348 - case 0x02: /* IRISH */ return "ga_IE";
53349 - }
53350 - return "C";
53351 - case LANG_GALICIAN: return "gl_ES";
53352 - case LANG_GEORGIAN: return "ka_GE";
53353 - case LANG_GERMAN:
53354 - switch (sub)
53355 - {
53356 - case SUBLANG_GERMAN: return "de_DE";
53357 - case SUBLANG_GERMAN_SWISS: return "de_CH";
53358 - case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
53359 - case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
53360 - case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
53361 - }
53362 - return "de";
53363 - case LANG_GREEK: return "el_GR";
53364 - case 0x74: /* GUARANI */ return "gn_PY";
53365 - case LANG_GUJARATI: return "gu_IN";
53366 - case 0x68: /* HAUSA */ return "ha_NG";
53367 - case 0x75: /* HAWAIIAN */
53368 - /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
53369 - or Hawaii Creole English ("cpe_US", 600000 speakers)? */
53370 - return "cpe_US";
53371 - case LANG_HEBREW: return "he_IL";
53372 - case LANG_HINDI: return "hi_IN";
53373 - case LANG_HUNGARIAN: return "hu_HU";
53374 - case 0x69: /* IBIBIO */ return "nic_NG";
53375 - case LANG_ICELANDIC: return "is_IS";
53376 - case 0x70: /* IGBO */ return "ibo_NG";
53377 - case LANG_INDONESIAN: return "id_ID";
53378 - case 0x5d: /* INUKTITUT */ return "iu_CA";
53379 - case LANG_ITALIAN:
53380 - switch (sub)
53381 - {
53382 - case SUBLANG_ITALIAN: return "it_IT";
53383 - case SUBLANG_ITALIAN_SWISS: return "it_CH";
53384 - }
53385 - return "it";
53386 - case LANG_JAPANESE: return "ja_JP";
53387 - case LANG_KANNADA: return "kn_IN";
53388 - case 0x71: /* KANURI */ return "kau_NG";
53389 - case LANG_KASHMIRI:
53390 - switch (sub)
53391 - {
53392 - case SUBLANG_DEFAULT: return "ks_PK";
53393 - case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
53394 - }
53395 - return "ks";
53396 - case LANG_KAZAK: return "kk_KZ";
53397 - case LANG_KONKANI:
53398 - /* FIXME: Adjust this when such locales appear on Unix. */
53399 - return "kok_IN";
53400 - case LANG_KOREAN: return "ko_KR";
53401 - case LANG_KYRGYZ: return "ky_KG";
53402 - case 0x54: /* LAO */ return "lo_LA";
53403 - case 0x76: /* LATIN */ return "la_VA";
53404 - case LANG_LATVIAN: return "lv_LV";
53405 - case LANG_LITHUANIAN: return "lt_LT";
53406 - case LANG_MACEDONIAN: return "mk_MK";
53407 - case LANG_MALAY:
53408 - switch (sub)
53409 - {
53410 - case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
53411 - case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
53412 - }
53413 - return "ms";
53414 - case LANG_MALAYALAM: return "ml_IN";
53415 - case 0x3a: /* MALTESE */ return "mt_MT";
53416 - case LANG_MANIPURI:
53417 - /* FIXME: Adjust this when such locales appear on Unix. */
53418 - return "mni_IN";
53419 - case LANG_MARATHI: return "mr_IN";
53420 - case LANG_MONGOLIAN:
53421 - return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
53422 - case LANG_NEPALI:
53423 - switch (sub)
53424 - {
53425 - case SUBLANG_DEFAULT: return "ne_NP";
53426 - case SUBLANG_NEPALI_INDIA: return "ne_IN";
53427 - }
53428 - return "ne";
53429 - case LANG_NORWEGIAN:
53430 - switch (sub)
53431 - {
53432 - case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
53433 - case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
53434 - }
53435 - return "no";
53436 - case LANG_ORIYA: return "or_IN";
53437 - case 0x72: /* OROMO */ return "om_ET";
53438 - case 0x79: /* PAPIAMENTU */ return "pap_AN";
53439 - case 0x63: /* PASHTO */
53440 - return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
53441 - case LANG_POLISH: return "pl_PL";
53442 - case LANG_PORTUGUESE:
53443 - switch (sub)
53444 - {
53445 - case SUBLANG_PORTUGUESE: return "pt_PT";
53446 - /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
53447 - Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
53448 - case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
53449 - }
53450 - return "pt";
53451 - case LANG_PUNJABI: return "pa_IN";
53452 - case 0x17: /* RHAETO-ROMANCE */ return "rm_CH";
53453 - case LANG_ROMANIAN: return "ro_RO";
53454 - case LANG_RUSSIAN:
53455 - return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA". */
53456 - case 0x3b: /* SAMI */ return "se_NO";
53457 - case LANG_SANSKRIT: return "sa_IN";
53458 - case LANG_SINDHI: return "sd";
53459 - case 0x5b: /* SINHALESE */ return "si_LK";
53460 - case LANG_SLOVAK: return "sk_SK";
53461 - case LANG_SLOVENIAN: return "sl_SI";
53462 - case 0x77: /* SOMALI */ return "so_SO";
53463 - case LANG_SORBIAN:
53464 - /* FIXME: Adjust this when such locales appear on Unix. */
53465 - return "wen_DE";
53466 - case LANG_SPANISH:
53467 - switch (sub)
53468 - {
53469 - case SUBLANG_SPANISH: return "es_ES";
53470 - case SUBLANG_SPANISH_MEXICAN: return "es_MX";
53471 - case SUBLANG_SPANISH_MODERN:
53472 - return "es_ES@modern"; /* not seen on Unix */
53473 - case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
53474 - case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
53475 - case SUBLANG_SPANISH_PANAMA: return "es_PA";
53476 - case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
53477 - case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
53478 - case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
53479 - case SUBLANG_SPANISH_PERU: return "es_PE";
53480 - case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
53481 - case SUBLANG_SPANISH_ECUADOR: return "es_EC";
53482 - case SUBLANG_SPANISH_CHILE: return "es_CL";
53483 - case SUBLANG_SPANISH_URUGUAY: return "es_UY";
53484 - case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
53485 - case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
53486 - case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
53487 - case SUBLANG_SPANISH_HONDURAS: return "es_HN";
53488 - case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
53489 - case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
53490 - }
53491 - return "es";
53492 - case 0x30: /* SUTU */ return "bnt_TZ";
53493 - case LANG_SWAHILI: return "sw_KE";
53494 - case LANG_SWEDISH:
53495 - switch (sub)
53496 - {
53497 - case SUBLANG_DEFAULT: return "sv_SE";
53498 - case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
53499 - }
53500 - return "sv";
53501 - case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
53502 - case 0x64: /* TAGALOG */ return "tl_PH";
53503 - case 0x28: /* TAJIK */ return "tg_TJ";
53504 - case 0x5f: /* TAMAZIGHT */ return "ber_MA";
53505 - case LANG_TAMIL:
53506 - return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
53507 - case LANG_TATAR: return "tt_RU";
53508 - case LANG_TELUGU: return "te_IN";
53509 - case LANG_THAI: return "th_TH";
53510 - case 0x51: /* TIBETAN */ return "bo_CN";
53511 - case 0x73: /* TIGRINYA */ return "ti_ET";
53512 - case 0x31: /* TSONGA */ return "ts_ZA";
53513 - case LANG_TURKISH: return "tr_TR";
53514 - case 0x42: /* TURKMEN */ return "tk_TM";
53515 - case LANG_UKRAINIAN: return "uk_UA";
53516 - case LANG_URDU:
53517 - switch (sub)
53518 - {
53519 - case SUBLANG_URDU_PAKISTAN: return "ur_PK";
53520 - case SUBLANG_URDU_INDIA: return "ur_IN";
53521 - }
53522 - return "ur";
53523 - case LANG_UZBEK:
53524 - switch (sub)
53525 - {
53526 - /* FIXME: Adjust this when Uzbek locales appear on Unix. */
53527 - case SUBLANG_UZBEK_LATIN: return "uz_UZ@latin";
53528 - case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
53529 - }
53530 - return "uz";
53531 - case 0x33: /* VENDA */ return "ven_ZA";
53532 - case LANG_VIETNAMESE: return "vi_VN";
53533 - case 0x52: /* WELSH */ return "cy_GB";
53534 - case 0x34: /* XHOSA */ return "xh_ZA";
53535 - case 0x78: /* YI */ return "sit_CN";
53536 - case 0x3d: /* YIDDISH */ return "yi_IL";
53537 - case 0x6a: /* YORUBA */ return "yo_NG";
53538 - case 0x35: /* ZULU */ return "zu_ZA";
53539 - default: return "C";
53540 - }
53541 -
53542 -#endif
53543 -}
53544 diff -rupN original/intl/log.c new/intl/log.c
53545 --- original/intl/log.c 2009-03-28 22:33:59.000000000 -0430
53546 +++ new/intl/log.c 1969-12-31 20:00:00.000000000 -0400
53547 @@ -1,104 +0,0 @@
53548 -/* Log file output.
53549 - Copyright (C) 2003 Free Software Foundation, Inc.
53550 -
53551 - This program is free software; you can redistribute it and/or modify it
53552 - under the terms of the GNU Library General Public License as published
53553 - by the Free Software Foundation; either version 2, or (at your option)
53554 - any later version.
53555 -
53556 - This program is distributed in the hope that it will be useful,
53557 - but WITHOUT ANY WARRANTY; without even the implied warranty of
53558 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
53559 - Library General Public License for more details.
53560 -
53561 - You should have received a copy of the GNU Library General Public
53562 - License along with this program; if not, write to the Free Software
53563 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
53564 - USA. */
53565 -
53566 -/* Written by Bruno Haible <bruno@clisp.org>. */
53567 -
53568 -#ifdef HAVE_CONFIG_H
53569 -# include <config.h>
53570 -#endif
53571 -
53572 -#include <stdio.h>
53573 -#include <stdlib.h>
53574 -#include <string.h>
53575 -
53576 -/* Print an ASCII string with quotes and escape sequences where needed. */
53577 -static void
53578 -print_escaped (stream, str)
53579 - FILE *stream;
53580 - const char *str;
53581 -{
53582 - putc ('"', stream);
53583 - for (; *str != '\0'; str++)
53584 - if (*str == '\n')
53585 - {
53586 - fputs ("\\n\"", stream);
53587 - if (str[1] == '\0')
53588 - return;
53589 - fputs ("\n\"", stream);
53590 - }
53591 - else
53592 - {
53593 - if (*str == '"' || *str == '\\')
53594 - putc ('\\', stream);
53595 - putc (*str, stream);
53596 - }
53597 - putc ('"', stream);
53598 -}
53599 -
53600 -/* Add to the log file an entry denoting a failed translation. */
53601 -void
53602 -_nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural)
53603 - const char *logfilename;
53604 - const char *domainname;
53605 - const char *msgid1;
53606 - const char *msgid2;
53607 - int plural;
53608 -{
53609 - static char *last_logfilename = NULL;
53610 - static FILE *last_logfile = NULL;
53611 - FILE *logfile;
53612 -
53613 - /* Can we reuse the last opened logfile? */
53614 - if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
53615 - {
53616 - /* Close the last used logfile. */
53617 - if (last_logfilename != NULL)
53618 - {
53619 - if (last_logfile != NULL)
53620 - {
53621 - fclose (last_logfile);
53622 - last_logfile = NULL;
53623 - }
53624 - free (last_logfilename);
53625 - last_logfilename = NULL;
53626 - }
53627 - /* Open the logfile. */
53628 - last_logfilename = (char *) malloc (strlen (logfilename) + 1);
53629 - if (last_logfilename == NULL)
53630 - return;
53631 - strcpy (last_logfilename, logfilename);
53632 - last_logfile = fopen (logfilename, "a");
53633 - if (last_logfile == NULL)
53634 - return;
53635 - }
53636 - logfile = last_logfile;
53637 -
53638 - fprintf (logfile, "domain ");
53639 - print_escaped (logfile, domainname);
53640 - fprintf (logfile, "\nmsgid ");
53641 - print_escaped (logfile, msgid1);
53642 - if (plural)
53643 - {
53644 - fprintf (logfile, "\nmsgid_plural ");
53645 - print_escaped (logfile, msgid2);
53646 - fprintf (logfile, "\nmsgstr[0] \"\"\n");
53647 - }
53648 - else
53649 - fprintf (logfile, "\nmsgstr \"\"\n");
53650 - putc ('\n', logfile);
53651 -}
53652 diff -rupN original/intl/ngettext.c new/intl/ngettext.c
53653 --- original/intl/ngettext.c 2009-03-28 22:33:59.000000000 -0430
53654 +++ new/intl/ngettext.c 1969-12-31 20:00:00.000000000 -0400
53655 @@ -1,68 +0,0 @@
53656 -/* Implementation of ngettext(3) function.
53657 - Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
53658 -
53659 - This program is free software; you can redistribute it and/or modify it
53660 - under the terms of the GNU Library General Public License as published
53661 - by the Free Software Foundation; either version 2, or (at your option)
53662 - any later version.
53663 -
53664 - This program is distributed in the hope that it will be useful,
53665 - but WITHOUT ANY WARRANTY; without even the implied warranty of
53666 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
53667 - Library General Public License for more details.
53668 -
53669 - You should have received a copy of the GNU Library General Public
53670 - License along with this program; if not, write to the Free Software
53671 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
53672 - USA. */
53673 -
53674 -#ifdef HAVE_CONFIG_H
53675 -# include <config.h>
53676 -#endif
53677 -
53678 -#ifdef _LIBC
53679 -# define __need_NULL
53680 -# include <stddef.h>
53681 -#else
53682 -# include <stdlib.h> /* Just for NULL. */
53683 -#endif
53684 -
53685 -#include "gettextP.h"
53686 -#ifdef _LIBC
53687 -# include <libintl.h>
53688 -#else
53689 -# include "libgnuintl.h"
53690 -#endif
53691 -
53692 -#include <locale.h>
53693 -
53694 -/* @@ end of prolog @@ */
53695 -
53696 -/* Names for the libintl functions are a problem. They must not clash
53697 - with existing names and they should follow ANSI C. But this source
53698 - code is also used in GNU C Library where the names have a __
53699 - prefix. So we have to make a difference here. */
53700 -#ifdef _LIBC
53701 -# define NGETTEXT __ngettext
53702 -# define DCNGETTEXT __dcngettext
53703 -#else
53704 -# define NGETTEXT libintl_ngettext
53705 -# define DCNGETTEXT libintl_dcngettext
53706 -#endif
53707 -
53708 -/* Look up MSGID in the current default message catalog for the current
53709 - LC_MESSAGES locale. If not found, returns MSGID itself (the default
53710 - text). */
53711 -char *
53712 -NGETTEXT (msgid1, msgid2, n)
53713 - const char *msgid1;
53714 - const char *msgid2;
53715 - unsigned long int n;
53716 -{
53717 - return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
53718 -}
53719 -
53720 -#ifdef _LIBC
53721 -/* Alias for function name in GNU C Library. */
53722 -weak_alias (__ngettext, ngettext);
53723 -#endif
53724 diff -rupN original/intl/os2compat.c new/intl/os2compat.c
53725 --- original/intl/os2compat.c 2009-03-28 22:33:59.000000000 -0430
53726 +++ new/intl/os2compat.c 1969-12-31 20:00:00.000000000 -0400
53727 @@ -1,98 +0,0 @@
53728 -/* OS/2 compatibility functions.
53729 - Copyright (C) 2001-2002 Free Software Foundation, Inc.
53730 -
53731 - This program is free software; you can redistribute it and/or modify it
53732 - under the terms of the GNU Library General Public License as published
53733 - by the Free Software Foundation; either version 2, or (at your option)
53734 - any later version.
53735 -
53736 - This program is distributed in the hope that it will be useful,
53737 - but WITHOUT ANY WARRANTY; without even the implied warranty of
53738 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
53739 - Library General Public License for more details.
53740 -
53741 - You should have received a copy of the GNU Library General Public
53742 - License along with this program; if not, write to the Free Software
53743 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
53744 - USA. */
53745 -
53746 -#define OS2_AWARE
53747 -#ifdef HAVE_CONFIG_H
53748 -#include <config.h>
53749 -#endif
53750 -
53751 -#include <stdlib.h>
53752 -#include <string.h>
53753 -#include <sys/param.h>
53754 -
53755 -/* A version of getenv() that works from DLLs */
53756 -extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
53757 -
53758 -char *
53759 -_nl_getenv (const char *name)
53760 -{
53761 - unsigned char *value;
53762 - if (DosScanEnv (name, &value))
53763 - return NULL;
53764 - else
53765 - return value;
53766 -}
53767 -
53768 -/* A fixed size buffer. */
53769 -char libintl_nl_default_dirname[MAXPATHLEN+1];
53770 -
53771 -char *_nlos2_libdir = NULL;
53772 -char *_nlos2_localealiaspath = NULL;
53773 -char *_nlos2_localedir = NULL;
53774 -
53775 -static __attribute__((constructor)) void
53776 -nlos2_initialize ()
53777 -{
53778 - char *root = getenv ("UNIXROOT");
53779 - char *gnulocaledir = getenv ("GNULOCALEDIR");
53780 -
53781 - _nlos2_libdir = gnulocaledir;
53782 - if (!_nlos2_libdir)
53783 - {
53784 - if (root)
53785 - {
53786 - size_t sl = strlen (root);
53787 - _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
53788 - memcpy (_nlos2_libdir, root, sl);
53789 - memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
53790 - }
53791 - else
53792 - _nlos2_libdir = LIBDIR;
53793 - }
53794 -
53795 - _nlos2_localealiaspath = gnulocaledir;
53796 - if (!_nlos2_localealiaspath)
53797 - {
53798 - if (root)
53799 - {
53800 - size_t sl = strlen (root);
53801 - _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
53802 - memcpy (_nlos2_localealiaspath, root, sl);
53803 - memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
53804 - }
53805 - else
53806 - _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
53807 - }
53808 -
53809 - _nlos2_localedir = gnulocaledir;
53810 - if (!_nlos2_localedir)
53811 - {
53812 - if (root)
53813 - {
53814 - size_t sl = strlen (root);
53815 - _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
53816 - memcpy (_nlos2_localedir, root, sl);
53817 - memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
53818 - }
53819 - else
53820 - _nlos2_localedir = LOCALEDIR;
53821 - }
53822 -
53823 - if (strlen (_nlos2_localedir) <= MAXPATHLEN)
53824 - strcpy (libintl_nl_default_dirname, _nlos2_localedir);
53825 -}
53826 diff -rupN original/intl/os2compat.h new/intl/os2compat.h
53827 --- original/intl/os2compat.h 2009-03-28 22:33:59.000000000 -0430
53828 +++ new/intl/os2compat.h 1969-12-31 20:00:00.000000000 -0400
53829 @@ -1,46 +0,0 @@
53830 -/* OS/2 compatibility defines.
53831 - This file is intended to be included from config.h
53832 - Copyright (C) 2001-2002 Free Software Foundation, Inc.
53833 -
53834 - This program is free software; you can redistribute it and/or modify it
53835 - under the terms of the GNU Library General Public License as published
53836 - by the Free Software Foundation; either version 2, or (at your option)
53837 - any later version.
53838 -
53839 - This program is distributed in the hope that it will be useful,
53840 - but WITHOUT ANY WARRANTY; without even the implied warranty of
53841 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
53842 - Library General Public License for more details.
53843 -
53844 - You should have received a copy of the GNU Library General Public
53845 - License along with this program; if not, write to the Free Software
53846 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
53847 - USA. */
53848 -
53849 -/* When included from os2compat.h we need all the original definitions */
53850 -#ifndef OS2_AWARE
53851 -
53852 -#undef LIBDIR
53853 -#define LIBDIR _nlos2_libdir
53854 -extern char *_nlos2_libdir;
53855 -
53856 -#undef LOCALEDIR
53857 -#define LOCALEDIR _nlos2_localedir
53858 -extern char *_nlos2_localedir;
53859 -
53860 -#undef LOCALE_ALIAS_PATH
53861 -#define LOCALE_ALIAS_PATH _nlos2_localealiaspath
53862 -extern char *_nlos2_localealiaspath;
53863 -
53864 -#endif
53865 -
53866 -#undef HAVE_STRCASECMP
53867 -#define HAVE_STRCASECMP 1
53868 -#define strcasecmp stricmp
53869 -#define strncasecmp strnicmp
53870 -
53871 -/* We have our own getenv() which works even if library is compiled as DLL */
53872 -#define getenv _nl_getenv
53873 -
53874 -/* Older versions of gettext used -1 as the value of LC_MESSAGES */
53875 -#define LC_MESSAGES_COMPAT (-1)
53876 diff -rupN original/intl/osdep.c new/intl/osdep.c
53877 --- original/intl/osdep.c 2009-03-28 22:33:59.000000000 -0430
53878 +++ new/intl/osdep.c 1969-12-31 20:00:00.000000000 -0400
53879 @@ -1,24 +0,0 @@
53880 -/* OS dependent parts of libintl.
53881 - Copyright (C) 2001-2002 Free Software Foundation, Inc.
53882 -
53883 - This program is free software; you can redistribute it and/or modify it
53884 - under the terms of the GNU Library General Public License as published
53885 - by the Free Software Foundation; either version 2, or (at your option)
53886 - any later version.
53887 -
53888 - This program is distributed in the hope that it will be useful,
53889 - but WITHOUT ANY WARRANTY; without even the implied warranty of
53890 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
53891 - Library General Public License for more details.
53892 -
53893 - You should have received a copy of the GNU Library General Public
53894 - License along with this program; if not, write to the Free Software
53895 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
53896 - USA. */
53897 -
53898 -#if defined __EMX__
53899 -# include "os2compat.c"
53900 -#else
53901 -/* Avoid AIX compiler warning. */
53902 -typedef int dummy;
53903 -#endif
53904 diff -rupN original/intl/plural-exp.c new/intl/plural-exp.c
53905 --- original/intl/plural-exp.c 2009-03-28 22:33:59.000000000 -0430
53906 +++ new/intl/plural-exp.c 1969-12-31 20:00:00.000000000 -0400
53907 @@ -1,156 +0,0 @@
53908 -/* Expression parsing for plural form selection.
53909 - Copyright (C) 2000, 2001 Free Software Foundation, Inc.
53910 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
53911 -
53912 - This program is free software; you can redistribute it and/or modify it
53913 - under the terms of the GNU Library General Public License as published
53914 - by the Free Software Foundation; either version 2, or (at your option)
53915 - any later version.
53916 -
53917 - This program is distributed in the hope that it will be useful,
53918 - but WITHOUT ANY WARRANTY; without even the implied warranty of
53919 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
53920 - Library General Public License for more details.
53921 -
53922 - You should have received a copy of the GNU Library General Public
53923 - License along with this program; if not, write to the Free Software
53924 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
53925 - USA. */
53926 -
53927 -#ifdef HAVE_CONFIG_H
53928 -# include <config.h>
53929 -#endif
53930 -
53931 -#include <ctype.h>
53932 -#include <stdlib.h>
53933 -#include <string.h>
53934 -
53935 -#include "plural-exp.h"
53936 -
53937 -#if (defined __GNUC__ && !defined __APPLE_CC__) \
53938 - || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
53939 -
53940 -/* These structs are the constant expression for the germanic plural
53941 - form determination. It represents the expression "n != 1". */
53942 -static const struct expression plvar =
53943 -{
53944 - .nargs = 0,
53945 - .operation = var,
53946 -};
53947 -static const struct expression plone =
53948 -{
53949 - .nargs = 0,
53950 - .operation = num,
53951 - .val =
53952 - {
53953 - .num = 1
53954 - }
53955 -};
53956 -struct expression GERMANIC_PLURAL =
53957 -{
53958 - .nargs = 2,
53959 - .operation = not_equal,
53960 - .val =
53961 - {
53962 - .args =
53963 - {
53964 - [0] = (struct expression *) &plvar,
53965 - [1] = (struct expression *) &plone
53966 - }
53967 - }
53968 -};
53969 -
53970 -# define INIT_GERMANIC_PLURAL()
53971 -
53972 -#else
53973 -
53974 -/* For compilers without support for ISO C 99 struct/union initializers:
53975 - Initialization at run-time. */
53976 -
53977 -static struct expression plvar;
53978 -static struct expression plone;
53979 -struct expression GERMANIC_PLURAL;
53980 -
53981 -static void
53982 -init_germanic_plural ()
53983 -{
53984 - if (plone.val.num == 0)
53985 - {
53986 - plvar.nargs = 0;
53987 - plvar.operation = var;
53988 -
53989 - plone.nargs = 0;
53990 - plone.operation = num;
53991 - plone.val.num = 1;
53992 -
53993 - GERMANIC_PLURAL.nargs = 2;
53994 - GERMANIC_PLURAL.operation = not_equal;
53995 - GERMANIC_PLURAL.val.args[0] = &plvar;
53996 - GERMANIC_PLURAL.val.args[1] = &plone;
53997 - }
53998 -}
53999 -
54000 -# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
54001 -
54002 -#endif
54003 -
54004 -void
54005 -internal_function
54006 -EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
54007 - const char *nullentry;
54008 - struct expression **pluralp;
54009 - unsigned long int *npluralsp;
54010 -{
54011 - if (nullentry != NULL)
54012 - {
54013 - const char *plural;
54014 - const char *nplurals;
54015 -
54016 - plural = strstr (nullentry, "plural=");
54017 - nplurals = strstr (nullentry, "nplurals=");
54018 - if (plural == NULL || nplurals == NULL)
54019 - goto no_plural;
54020 - else
54021 - {
54022 - char *endp;
54023 - unsigned long int n;
54024 - struct parse_args args;
54025 -
54026 - /* First get the number. */
54027 - nplurals += 9;
54028 - while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
54029 - ++nplurals;
54030 - if (!(*nplurals >= '0' && *nplurals <= '9'))
54031 - goto no_plural;
54032 -#if defined HAVE_STRTOUL || defined _LIBC
54033 - n = strtoul (nplurals, &endp, 10);
54034 -#else
54035 - for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
54036 - n = n * 10 + (*endp - '0');
54037 -#endif
54038 - if (nplurals == endp)
54039 - goto no_plural;
54040 - *npluralsp = n;
54041 -
54042 - /* Due to the restrictions bison imposes onto the interface of the
54043 - scanner function we have to put the input string and the result
54044 - passed up from the parser into the same structure which address
54045 - is passed down to the parser. */
54046 - plural += 7;
54047 - args.cp = plural;
54048 - if (PLURAL_PARSE (&args) != 0)
54049 - goto no_plural;
54050 - *pluralp = args.res;
54051 - }
54052 - }
54053 - else
54054 - {
54055 - /* By default we are using the Germanic form: singular form only
54056 - for `one', the plural form otherwise. Yes, this is also what
54057 - English is using since English is a Germanic language. */
54058 - no_plural:
54059 - INIT_GERMANIC_PLURAL ();
54060 - *pluralp = &GERMANIC_PLURAL;
54061 - *npluralsp = 2;
54062 - }
54063 -}
54064 diff -rupN original/intl/plural-exp.h new/intl/plural-exp.h
54065 --- original/intl/plural-exp.h 2009-03-28 22:33:59.000000000 -0430
54066 +++ new/intl/plural-exp.h 1969-12-31 20:00:00.000000000 -0400
54067 @@ -1,126 +0,0 @@
54068 -/* Expression parsing and evaluation for plural form selection.
54069 - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
54070 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
54071 -
54072 - This program is free software; you can redistribute it and/or modify it
54073 - under the terms of the GNU Library General Public License as published
54074 - by the Free Software Foundation; either version 2, or (at your option)
54075 - any later version.
54076 -
54077 - This program is distributed in the hope that it will be useful,
54078 - but WITHOUT ANY WARRANTY; without even the implied warranty of
54079 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
54080 - Library General Public License for more details.
54081 -
54082 - You should have received a copy of the GNU Library General Public
54083 - License along with this program; if not, write to the Free Software
54084 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
54085 - USA. */
54086 -
54087 -#ifndef _PLURAL_EXP_H
54088 -#define _PLURAL_EXP_H
54089 -
54090 -#ifndef PARAMS
54091 -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
54092 -# define PARAMS(args) args
54093 -# else
54094 -# define PARAMS(args) ()
54095 -# endif
54096 -#endif
54097 -
54098 -#ifndef internal_function
54099 -# define internal_function
54100 -#endif
54101 -
54102 -#ifndef attribute_hidden
54103 -# define attribute_hidden
54104 -#endif
54105 -
54106 -
54107 -/* This is the representation of the expressions to determine the
54108 - plural form. */
54109 -struct expression
54110 -{
54111 - int nargs; /* Number of arguments. */
54112 - enum operator
54113 - {
54114 - /* Without arguments: */
54115 - var, /* The variable "n". */
54116 - num, /* Decimal number. */
54117 - /* Unary operators: */
54118 - lnot, /* Logical NOT. */
54119 - /* Binary operators: */
54120 - mult, /* Multiplication. */
54121 - divide, /* Division. */
54122 - module, /* Modulo operation. */
54123 - plus, /* Addition. */
54124 - minus, /* Subtraction. */
54125 - less_than, /* Comparison. */
54126 - greater_than, /* Comparison. */
54127 - less_or_equal, /* Comparison. */
54128 - greater_or_equal, /* Comparison. */
54129 - equal, /* Comparison for equality. */
54130 - not_equal, /* Comparison for inequality. */
54131 - land, /* Logical AND. */
54132 - lor, /* Logical OR. */
54133 - /* Ternary operators: */
54134 - qmop /* Question mark operator. */
54135 - } operation;
54136 - union
54137 - {
54138 - unsigned long int num; /* Number value for `num'. */
54139 - struct expression *args[3]; /* Up to three arguments. */
54140 - } val;
54141 -};
54142 -
54143 -/* This is the data structure to pass information to the parser and get
54144 - the result in a thread-safe way. */
54145 -struct parse_args
54146 -{
54147 - const char *cp;
54148 - struct expression *res;
54149 -};
54150 -
54151 -
54152 -/* Names for the libintl functions are a problem. This source code is used
54153 - 1. in the GNU C Library library,
54154 - 2. in the GNU libintl library,
54155 - 3. in the GNU gettext tools.
54156 - The function names in each situation must be different, to allow for
54157 - binary incompatible changes in 'struct expression'. Furthermore,
54158 - 1. in the GNU C Library library, the names have a __ prefix,
54159 - 2.+3. in the GNU libintl library and in the GNU gettext tools, the names
54160 - must follow ANSI C and not start with __.
54161 - So we have to distinguish the three cases. */
54162 -#ifdef _LIBC
54163 -# define FREE_EXPRESSION __gettext_free_exp
54164 -# define PLURAL_PARSE __gettextparse
54165 -# define GERMANIC_PLURAL __gettext_germanic_plural
54166 -# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
54167 -#elif defined (IN_LIBINTL)
54168 -# define FREE_EXPRESSION libintl_gettext_free_exp
54169 -# define PLURAL_PARSE libintl_gettextparse
54170 -# define GERMANIC_PLURAL libintl_gettext_germanic_plural
54171 -# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
54172 -#else
54173 -# define FREE_EXPRESSION free_plural_expression
54174 -# define PLURAL_PARSE parse_plural_expression
54175 -# define GERMANIC_PLURAL germanic_plural
54176 -# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
54177 -#endif
54178 -
54179 -extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
54180 - internal_function;
54181 -extern int PLURAL_PARSE PARAMS ((void *arg));
54182 -extern struct expression GERMANIC_PLURAL attribute_hidden;
54183 -extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
54184 - struct expression **pluralp,
54185 - unsigned long int *npluralsp))
54186 - internal_function;
54187 -
54188 -#if !defined (_LIBC) && !defined (IN_LIBINTL)
54189 -extern unsigned long int plural_eval PARAMS ((struct expression *pexp,
54190 - unsigned long int n));
54191 -#endif
54192 -
54193 -#endif /* _PLURAL_EXP_H */
54194 diff -rupN original/intl/plural.c new/intl/plural.c
54195 --- original/intl/plural.c 2009-03-28 22:33:59.000000000 -0430
54196 +++ new/intl/plural.c 1969-12-31 20:00:00.000000000 -0400
54197 @@ -1,1518 +0,0 @@
54198 -/* A Bison parser, made from plural.y
54199 - by GNU bison 1.35. */
54200 -
54201 -#define YYBISON 1 /* Identify Bison output. */
54202 -
54203 -#define yyparse __gettextparse
54204 -#define yylex __gettextlex
54205 -#define yyerror __gettexterror
54206 -#define yylval __gettextlval
54207 -#define yychar __gettextchar
54208 -#define yydebug __gettextdebug
54209 -#define yynerrs __gettextnerrs
54210 -# define EQUOP2 257
54211 -# define CMPOP2 258
54212 -# define ADDOP2 259
54213 -# define MULOP2 260
54214 -# define NUMBER 261
54215 -
54216 -#line 1 "plural.y"
54217 -
54218 -/* Expression parsing for plural form selection.
54219 - Copyright (C) 2000, 2001 Free Software Foundation, Inc.
54220 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
54221 -
54222 - This program is free software; you can redistribute it and/or modify it
54223 - under the terms of the GNU Library General Public License as published
54224 - by the Free Software Foundation; either version 2, or (at your option)
54225 - any later version.
54226 -
54227 - This program is distributed in the hope that it will be useful,
54228 - but WITHOUT ANY WARRANTY; without even the implied warranty of
54229 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
54230 - Library General Public License for more details.
54231 -
54232 - You should have received a copy of the GNU Library General Public
54233 - License along with this program; if not, write to the Free Software
54234 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
54235 - USA. */
54236 -
54237 -/* The bison generated parser uses alloca. AIX 3 forces us to put this
54238 - declaration at the beginning of the file. The declaration in bison's
54239 - skeleton file comes too late. This must come before <config.h>
54240 - because <config.h> may include arbitrary system headers. */
54241 -#if defined _AIX && !defined __GNUC__
54242 - #pragma alloca
54243 -#endif
54244 -
54245 -#ifdef HAVE_CONFIG_H
54246 -# include <config.h>
54247 -#endif
54248 -
54249 -#include <stddef.h>
54250 -#include <stdlib.h>
54251 -#include "plural-exp.h"
54252 -
54253 -/* The main function generated by the parser is called __gettextparse,
54254 - but we want it to be called PLURAL_PARSE. */
54255 -#ifndef _LIBC
54256 -# define __gettextparse PLURAL_PARSE
54257 -#endif
54258 -
54259 -#define YYLEX_PARAM &((struct parse_args *) arg)->cp
54260 -#define YYPARSE_PARAM arg
54261 -
54262 -#line 49 "plural.y"
54263 -#ifndef YYSTYPE
54264 -typedef union {
54265 - unsigned long int num;
54266 - enum operator op;
54267 - struct expression *exp;
54268 -} yystype;
54269 -# define YYSTYPE yystype
54270 -# define YYSTYPE_IS_TRIVIAL 1
54271 -#endif
54272 -#line 55 "plural.y"
54273 -
54274 -/* Prototypes for local functions. */
54275 -static struct expression *new_exp PARAMS ((int nargs, enum operator op,
54276 - struct expression * const *args));
54277 -static inline struct expression *new_exp_0 PARAMS ((enum operator op));
54278 -static inline struct expression *new_exp_1 PARAMS ((enum operator op,
54279 - struct expression *right));
54280 -static struct expression *new_exp_2 PARAMS ((enum operator op,
54281 - struct expression *left,
54282 - struct expression *right));
54283 -static inline struct expression *new_exp_3 PARAMS ((enum operator op,
54284 - struct expression *bexp,
54285 - struct expression *tbranch,
54286 - struct expression *fbranch));
54287 -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
54288 -static void yyerror PARAMS ((const char *str));
54289 -
54290 -/* Allocation of expressions. */
54291 -
54292 -static struct expression *
54293 -new_exp (nargs, op, args)
54294 - int nargs;
54295 - enum operator op;
54296 - struct expression * const *args;
54297 -{
54298 - int i;
54299 - struct expression *newp;
54300 -
54301 - /* If any of the argument could not be malloc'ed, just return NULL. */
54302 - for (i = nargs - 1; i >= 0; i--)
54303 - if (args[i] == NULL)
54304 - goto fail;
54305 -
54306 - /* Allocate a new expression. */
54307 - newp = (struct expression *) malloc (sizeof (*newp));
54308 - if (newp != NULL)
54309 - {
54310 - newp->nargs = nargs;
54311 - newp->operation = op;
54312 - for (i = nargs - 1; i >= 0; i--)
54313 - newp->val.args[i] = args[i];
54314 - return newp;
54315 - }
54316 -
54317 - fail:
54318 - for (i = nargs - 1; i >= 0; i--)
54319 - FREE_EXPRESSION (args[i]);
54320 -
54321 - return NULL;
54322 -}
54323 -
54324 -static inline struct expression *
54325 -new_exp_0 (op)
54326 - enum operator op;
54327 -{
54328 - return new_exp (0, op, NULL);
54329 -}
54330 -
54331 -static inline struct expression *
54332 -new_exp_1 (op, right)
54333 - enum operator op;
54334 - struct expression *right;
54335 -{
54336 - struct expression *args[1];
54337 -
54338 - args[0] = right;
54339 - return new_exp (1, op, args);
54340 -}
54341 -
54342 -static struct expression *
54343 -new_exp_2 (op, left, right)
54344 - enum operator op;
54345 - struct expression *left;
54346 - struct expression *right;
54347 -{
54348 - struct expression *args[2];
54349 -
54350 - args[0] = left;
54351 - args[1] = right;
54352 - return new_exp (2, op, args);
54353 -}
54354 -
54355 -static inline struct expression *
54356 -new_exp_3 (op, bexp, tbranch, fbranch)
54357 - enum operator op;
54358 - struct expression *bexp;
54359 - struct expression *tbranch;
54360 - struct expression *fbranch;
54361 -{
54362 - struct expression *args[3];
54363 -
54364 - args[0] = bexp;
54365 - args[1] = tbranch;
54366 - args[2] = fbranch;
54367 - return new_exp (3, op, args);
54368 -}
54369 -
54370 -#ifndef YYDEBUG
54371 -# define YYDEBUG 0
54372 -#endif
54373 -
54374 -
54375 -
54376 -#define YYFINAL 27
54377 -#define YYFLAG -32768
54378 -#define YYNTBASE 16
54379 -
54380 -/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
54381 -#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
54382 -
54383 -/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
54384 -static const char yytranslate[] =
54385 -{
54386 - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54387 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54388 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54389 - 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
54390 - 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
54391 - 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
54392 - 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
54393 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54394 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54395 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54396 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54397 - 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54398 - 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
54399 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54400 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54401 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54402 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54403 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54404 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54405 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54406 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54407 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54408 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54409 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54410 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
54411 - 2, 2, 2, 2, 2, 2, 1, 6, 7, 8,
54412 - 9, 11
54413 -};
54414 -
54415 -#if YYDEBUG
54416 -static const short yyprhs[] =
54417 -{
54418 - 0, 0, 2, 8, 12, 16, 20, 24, 28, 32,
54419 - 35, 37, 39
54420 -};
54421 -static const short yyrhs[] =
54422 -{
54423 - 17, 0, 17, 3, 17, 12, 17, 0, 17, 4,
54424 - 17, 0, 17, 5, 17, 0, 17, 6, 17, 0,
54425 - 17, 7, 17, 0, 17, 8, 17, 0, 17, 9,
54426 - 17, 0, 10, 17, 0, 13, 0, 11, 0, 14,
54427 - 17, 15, 0
54428 -};
54429 -
54430 -#endif
54431 -
54432 -#if YYDEBUG
54433 -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
54434 -static const short yyrline[] =
54435 -{
54436 - 0, 174, 182, 186, 190, 194, 198, 202, 206, 210,
54437 - 214, 218, 223
54438 -};
54439 -#endif
54440 -
54441 -
54442 -#if (YYDEBUG) || defined YYERROR_VERBOSE
54443 -
54444 -/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
54445 -static const char *const yytname[] =
54446 -{
54447 - "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
54448 - "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
54449 - "start", "exp", 0
54450 -};
54451 -#endif
54452 -
54453 -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
54454 -static const short yyr1[] =
54455 -{
54456 - 0, 16, 17, 17, 17, 17, 17, 17, 17, 17,
54457 - 17, 17, 17
54458 -};
54459 -
54460 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
54461 -static const short yyr2[] =
54462 -{
54463 - 0, 1, 5, 3, 3, 3, 3, 3, 3, 2,
54464 - 1, 1, 3
54465 -};
54466 -
54467 -/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
54468 - doesn't specify something else to do. Zero means the default is an
54469 - error. */
54470 -static const short yydefact[] =
54471 -{
54472 - 0, 0, 11, 10, 0, 1, 9, 0, 0, 0,
54473 - 0, 0, 0, 0, 0, 12, 0, 3, 4, 5,
54474 - 6, 7, 8, 0, 2, 0, 0, 0
54475 -};
54476 -
54477 -static const short yydefgoto[] =
54478 -{
54479 - 25, 5
54480 -};
54481 -
54482 -static const short yypact[] =
54483 -{
54484 - -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9,
54485 - -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16,
54486 - 26, -3,-32768, -9, 34, 21, 53,-32768
54487 -};
54488 -
54489 -static const short yypgoto[] =
54490 -{
54491 - -32768, -1
54492 -};
54493 -
54494 -
54495 -#define YYLAST 53
54496 -
54497 -
54498 -static const short yytable[] =
54499 -{
54500 - 6, 1, 2, 7, 3, 4, 14, 16, 17, 18,
54501 - 19, 20, 21, 22, 8, 9, 10, 11, 12, 13,
54502 - 14, 26, 24, 12, 13, 14, 15, 8, 9, 10,
54503 - 11, 12, 13, 14, 13, 14, 23, 8, 9, 10,
54504 - 11, 12, 13, 14, 10, 11, 12, 13, 14, 11,
54505 - 12, 13, 14, 27
54506 -};
54507 -
54508 -static const short yycheck[] =
54509 -{
54510 - 1, 10, 11, 4, 13, 14, 9, 8, 9, 10,
54511 - 11, 12, 13, 14, 3, 4, 5, 6, 7, 8,
54512 - 9, 0, 23, 7, 8, 9, 15, 3, 4, 5,
54513 - 6, 7, 8, 9, 8, 9, 12, 3, 4, 5,
54514 - 6, 7, 8, 9, 5, 6, 7, 8, 9, 6,
54515 - 7, 8, 9, 0
54516 -};
54517 -#define YYPURE 1
54518 -
54519 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
54520 -#line 3 "/usr/local/share/bison/bison.simple"
54521 -
54522 -/* Skeleton output parser for bison,
54523 -
54524 - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
54525 - Foundation, Inc.
54526 -
54527 - This program is free software; you can redistribute it and/or modify
54528 - it under the terms of the GNU General Public License as published by
54529 - the Free Software Foundation; either version 2, or (at your option)
54530 - any later version.
54531 -
54532 - This program is distributed in the hope that it will be useful,
54533 - but WITHOUT ANY WARRANTY; without even the implied warranty of
54534 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
54535 - GNU General Public License for more details.
54536 -
54537 - You should have received a copy of the GNU General Public License
54538 - along with this program; if not, write to the Free Software
54539 - Foundation, Inc., 59 Temple Place - Suite 330,
54540 - Boston, MA 02111-1307, USA. */
54541 -
54542 -/* As a special exception, when this file is copied by Bison into a
54543 - Bison output file, you may use that output file without restriction.
54544 - This special exception was added by the Free Software Foundation
54545 - in version 1.24 of Bison. */
54546 -
54547 -/* This is the parser code that is written into each bison parser when
54548 - the %semantic_parser declaration is not specified in the grammar.
54549 - It was written by Richard Stallman by simplifying the hairy parser
54550 - used when %semantic_parser is specified. */
54551 -
54552 -/* All symbols defined below should begin with yy or YY, to avoid
54553 - infringing on user name space. This should be done even for local
54554 - variables, as they might otherwise be expanded by user macros.
54555 - There are some unavoidable exceptions within include files to
54556 - define necessary library symbols; they are noted "INFRINGES ON
54557 - USER NAME SPACE" below. */
54558 -
54559 -#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
54560 -
54561 -/* The parser invokes alloca or malloc; define the necessary symbols. */
54562 -
54563 -# if YYSTACK_USE_ALLOCA
54564 -# define YYSTACK_ALLOC alloca
54565 -# else
54566 -# ifndef YYSTACK_USE_ALLOCA
54567 -# if defined (alloca) || defined (_ALLOCA_H)
54568 -# define YYSTACK_ALLOC alloca
54569 -# else
54570 -# ifdef __GNUC__
54571 -# define YYSTACK_ALLOC __builtin_alloca
54572 -# endif
54573 -# endif
54574 -# endif
54575 -# endif
54576 -
54577 -# ifdef YYSTACK_ALLOC
54578 - /* Pacify GCC's `empty if-body' warning. */
54579 -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
54580 -# else
54581 -# if defined (__STDC__) || defined (__cplusplus)
54582 -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
54583 -# define YYSIZE_T size_t
54584 -# endif
54585 -# define YYSTACK_ALLOC malloc
54586 -# define YYSTACK_FREE free
54587 -# endif
54588 -#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
54589 -
54590 -
54591 -#if (! defined (yyoverflow) \
54592 - && (! defined (__cplusplus) \
54593 - || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
54594 -
54595 -/* A type that is properly aligned for any stack member. */
54596 -union yyalloc
54597 -{
54598 - short yyss;
54599 - YYSTYPE yyvs;
54600 -# if YYLSP_NEEDED
54601 - YYLTYPE yyls;
54602 -# endif
54603 -};
54604 -
54605 -/* The size of the maximum gap between one aligned stack and the next. */
54606 -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
54607 -
54608 -/* The size of an array large to enough to hold all stacks, each with
54609 - N elements. */
54610 -# if YYLSP_NEEDED
54611 -# define YYSTACK_BYTES(N) \
54612 - ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
54613 - + 2 * YYSTACK_GAP_MAX)
54614 -# else
54615 -# define YYSTACK_BYTES(N) \
54616 - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
54617 - + YYSTACK_GAP_MAX)
54618 -# endif
54619 -
54620 -/* Copy COUNT objects from FROM to TO. The source and destination do
54621 - not overlap. */
54622 -# ifndef YYCOPY
54623 -# if 1 < __GNUC__
54624 -# define YYCOPY(To, From, Count) \
54625 - __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
54626 -# else
54627 -# define YYCOPY(To, From, Count) \
54628 - do \
54629 - { \
54630 - register YYSIZE_T yyi; \
54631 - for (yyi = 0; yyi < (Count); yyi++) \
54632 - (To)[yyi] = (From)[yyi]; \
54633 - } \
54634 - while (0)
54635 -# endif
54636 -# endif
54637 -
54638 -/* Relocate STACK from its old location to the new one. The
54639 - local variables YYSIZE and YYSTACKSIZE give the old and new number of
54640 - elements in the stack, and YYPTR gives the new location of the
54641 - stack. Advance YYPTR to a properly aligned location for the next
54642 - stack. */
54643 -# define YYSTACK_RELOCATE(Stack) \
54644 - do \
54645 - { \
54646 - YYSIZE_T yynewbytes; \
54647 - YYCOPY (&yyptr->Stack, Stack, yysize); \
54648 - Stack = &yyptr->Stack; \
54649 - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
54650 - yyptr += yynewbytes / sizeof (*yyptr); \
54651 - } \
54652 - while (0)
54653 -
54654 -#endif
54655 -
54656 -
54657 -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
54658 -# define YYSIZE_T __SIZE_TYPE__
54659 -#endif
54660 -#if ! defined (YYSIZE_T) && defined (size_t)
54661 -# define YYSIZE_T size_t
54662 -#endif
54663 -#if ! defined (YYSIZE_T)
54664 -# if defined (__STDC__) || defined (__cplusplus)
54665 -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
54666 -# define YYSIZE_T size_t
54667 -# endif
54668 -#endif
54669 -#if ! defined (YYSIZE_T)
54670 -# define YYSIZE_T unsigned int
54671 -#endif
54672 -
54673 -#define yyerrok (yyerrstatus = 0)
54674 -#define yyclearin (yychar = YYEMPTY)
54675 -#define YYEMPTY -2
54676 -#define YYEOF 0
54677 -#define YYACCEPT goto yyacceptlab
54678 -#define YYABORT goto yyabortlab
54679 -#define YYERROR goto yyerrlab1
54680 -/* Like YYERROR except do call yyerror. This remains here temporarily
54681 - to ease the transition to the new meaning of YYERROR, for GCC.
54682 - Once GCC version 2 has supplanted version 1, this can go. */
54683 -#define YYFAIL goto yyerrlab
54684 -#define YYRECOVERING() (!!yyerrstatus)
54685 -#define YYBACKUP(Token, Value) \
54686 -do \
54687 - if (yychar == YYEMPTY && yylen == 1) \
54688 - { \
54689 - yychar = (Token); \
54690 - yylval = (Value); \
54691 - yychar1 = YYTRANSLATE (yychar); \
54692 - YYPOPSTACK; \
54693 - goto yybackup; \
54694 - } \
54695 - else \
54696 - { \
54697 - yyerror ("syntax error: cannot back up"); \
54698 - YYERROR; \
54699 - } \
54700 -while (0)
54701 -
54702 -#define YYTERROR 1
54703 -#define YYERRCODE 256
54704 -
54705 -
54706 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions
54707 - are run).
54708 -
54709 - When YYLLOC_DEFAULT is run, CURRENT is set the location of the
54710 - first token. By default, to implement support for ranges, extend
54711 - its range to the last symbol. */
54712 -
54713 -#ifndef YYLLOC_DEFAULT
54714 -# define YYLLOC_DEFAULT(Current, Rhs, N) \
54715 - Current.last_line = Rhs[N].last_line; \
54716 - Current.last_column = Rhs[N].last_column;
54717 -#endif
54718 -
54719 -
54720 -/* YYLEX -- calling `yylex' with the right arguments. */
54721 -
54722 -#if YYPURE
54723 -# if YYLSP_NEEDED
54724 -# ifdef YYLEX_PARAM
54725 -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
54726 -# else
54727 -# define YYLEX yylex (&yylval, &yylloc)
54728 -# endif
54729 -# else /* !YYLSP_NEEDED */
54730 -# ifdef YYLEX_PARAM
54731 -# define YYLEX yylex (&yylval, YYLEX_PARAM)
54732 -# else
54733 -# define YYLEX yylex (&yylval)
54734 -# endif
54735 -# endif /* !YYLSP_NEEDED */
54736 -#else /* !YYPURE */
54737 -# define YYLEX yylex ()
54738 -#endif /* !YYPURE */
54739 -
54740 -
54741 -/* Enable debugging if requested. */
54742 -#if YYDEBUG
54743 -
54744 -# ifndef YYFPRINTF
54745 -# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
54746 -# define YYFPRINTF fprintf
54747 -# endif
54748 -
54749 -# define YYDPRINTF(Args) \
54750 -do { \
54751 - if (yydebug) \
54752 - YYFPRINTF Args; \
54753 -} while (0)
54754 -/* Nonzero means print parse trace. It is left uninitialized so that
54755 - multiple parsers can coexist. */
54756 -int yydebug;
54757 -#else /* !YYDEBUG */
54758 -# define YYDPRINTF(Args)
54759 -#endif /* !YYDEBUG */
54760 -
54761 -/* YYINITDEPTH -- initial size of the parser's stacks. */
54762 -#ifndef YYINITDEPTH
54763 -# define YYINITDEPTH 200
54764 -#endif
54765 -
54766 -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
54767 - if the built-in stack extension method is used).
54768 -
54769 - Do not make this value too large; the results are undefined if
54770 - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
54771 - evaluated with infinite-precision integer arithmetic. */
54772 -
54773 -#if YYMAXDEPTH == 0
54774 -# undef YYMAXDEPTH
54775 -#endif
54776 -
54777 -#ifndef YYMAXDEPTH
54778 -# define YYMAXDEPTH 10000
54779 -#endif
54780 -\f
54781 -#ifdef YYERROR_VERBOSE
54782 -
54783 -# ifndef yystrlen
54784 -# if defined (__GLIBC__) && defined (_STRING_H)
54785 -# define yystrlen strlen
54786 -# else
54787 -/* Return the length of YYSTR. */
54788 -static YYSIZE_T
54789 -# if defined (__STDC__) || defined (__cplusplus)
54790 -yystrlen (const char *yystr)
54791 -# else
54792 -yystrlen (yystr)
54793 - const char *yystr;
54794 -# endif
54795 -{
54796 - register const char *yys = yystr;
54797 -
54798 - while (*yys++ != '\0')
54799 - continue;
54800 -
54801 - return yys - yystr - 1;
54802 -}
54803 -# endif
54804 -# endif
54805 -
54806 -# ifndef yystpcpy
54807 -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
54808 -# define yystpcpy stpcpy
54809 -# else
54810 -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
54811 - YYDEST. */
54812 -static char *
54813 -# if defined (__STDC__) || defined (__cplusplus)
54814 -yystpcpy (char *yydest, const char *yysrc)
54815 -# else
54816 -yystpcpy (yydest, yysrc)
54817 - char *yydest;
54818 - const char *yysrc;
54819 -# endif
54820 -{
54821 - register char *yyd = yydest;
54822 - register const char *yys = yysrc;
54823 -
54824 - while ((*yyd++ = *yys++) != '\0')
54825 - continue;
54826 -
54827 - return yyd - 1;
54828 -}
54829 -# endif
54830 -# endif
54831 -#endif
54832 -\f
54833 -#line 315 "/usr/local/share/bison/bison.simple"
54834 -
54835 -
54836 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
54837 - into yyparse. The argument should have type void *.
54838 - It should actually point to an object.
54839 - Grammar actions can access the variable by casting it
54840 - to the proper pointer type. */
54841 -
54842 -#ifdef YYPARSE_PARAM
54843 -# if defined (__STDC__) || defined (__cplusplus)
54844 -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
54845 -# define YYPARSE_PARAM_DECL
54846 -# else
54847 -# define YYPARSE_PARAM_ARG YYPARSE_PARAM
54848 -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
54849 -# endif
54850 -#else /* !YYPARSE_PARAM */
54851 -# define YYPARSE_PARAM_ARG
54852 -# define YYPARSE_PARAM_DECL
54853 -#endif /* !YYPARSE_PARAM */
54854 -
54855 -/* Prevent warning if -Wstrict-prototypes. */
54856 -#ifdef __GNUC__
54857 -# ifdef YYPARSE_PARAM
54858 -int yyparse (void *);
54859 -# else
54860 -int yyparse (void);
54861 -# endif
54862 -#endif
54863 -
54864 -/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
54865 - variables are global, or local to YYPARSE. */
54866 -
54867 -#define YY_DECL_NON_LSP_VARIABLES \
54868 -/* The lookahead symbol. */ \
54869 -int yychar; \
54870 - \
54871 -/* The semantic value of the lookahead symbol. */ \
54872 -YYSTYPE yylval; \
54873 - \
54874 -/* Number of parse errors so far. */ \
54875 -int yynerrs;
54876 -
54877 -#if YYLSP_NEEDED
54878 -# define YY_DECL_VARIABLES \
54879 -YY_DECL_NON_LSP_VARIABLES \
54880 - \
54881 -/* Location data for the lookahead symbol. */ \
54882 -YYLTYPE yylloc;
54883 -#else
54884 -# define YY_DECL_VARIABLES \
54885 -YY_DECL_NON_LSP_VARIABLES
54886 -#endif
54887 -
54888 -
54889 -/* If nonreentrant, generate the variables here. */
54890 -
54891 -#if !YYPURE
54892 -YY_DECL_VARIABLES
54893 -#endif /* !YYPURE */
54894 -
54895 -int
54896 -yyparse (YYPARSE_PARAM_ARG)
54897 - YYPARSE_PARAM_DECL
54898 -{
54899 - /* If reentrant, generate the variables here. */
54900 -#if YYPURE
54901 - YY_DECL_VARIABLES
54902 -#endif /* !YYPURE */
54903 -
54904 - register int yystate;
54905 - register int yyn;
54906 - int yyresult;
54907 - /* Number of tokens to shift before error messages enabled. */
54908 - int yyerrstatus;
54909 - /* Lookahead token as an internal (translated) token number. */
54910 - int yychar1 = 0;
54911 -
54912 - /* Three stacks and their tools:
54913 - `yyss': related to states,
54914 - `yyvs': related to semantic values,
54915 - `yyls': related to locations.
54916 -
54917 - Refer to the stacks thru separate pointers, to allow yyoverflow
54918 - to reallocate them elsewhere. */
54919 -
54920 - /* The state stack. */
54921 - short yyssa[YYINITDEPTH];
54922 - short *yyss = yyssa;
54923 - register short *yyssp;
54924 -
54925 - /* The semantic value stack. */
54926 - YYSTYPE yyvsa[YYINITDEPTH];
54927 - YYSTYPE *yyvs = yyvsa;
54928 - register YYSTYPE *yyvsp;
54929 -
54930 -#if YYLSP_NEEDED
54931 - /* The location stack. */
54932 - YYLTYPE yylsa[YYINITDEPTH];
54933 - YYLTYPE *yyls = yylsa;
54934 - YYLTYPE *yylsp;
54935 -#endif
54936 -
54937 -#if YYLSP_NEEDED
54938 -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
54939 -#else
54940 -# define YYPOPSTACK (yyvsp--, yyssp--)
54941 -#endif
54942 -
54943 - YYSIZE_T yystacksize = YYINITDEPTH;
54944 -
54945 -
54946 - /* The variables used to return semantic value and location from the
54947 - action routines. */
54948 - YYSTYPE yyval;
54949 -#if YYLSP_NEEDED
54950 - YYLTYPE yyloc;
54951 -#endif
54952 -
54953 - /* When reducing, the number of symbols on the RHS of the reduced
54954 - rule. */
54955 - int yylen;
54956 -
54957 - YYDPRINTF ((stderr, "Starting parse\n"));
54958 -
54959 - yystate = 0;
54960 - yyerrstatus = 0;
54961 - yynerrs = 0;
54962 - yychar = YYEMPTY; /* Cause a token to be read. */
54963 -
54964 - /* Initialize stack pointers.
54965 - Waste one element of value and location stack
54966 - so that they stay on the same level as the state stack.
54967 - The wasted elements are never initialized. */
54968 -
54969 - yyssp = yyss;
54970 - yyvsp = yyvs;
54971 -#if YYLSP_NEEDED
54972 - yylsp = yyls;
54973 -#endif
54974 - goto yysetstate;
54975 -
54976 -/*------------------------------------------------------------.
54977 -| yynewstate -- Push a new state, which is found in yystate. |
54978 -`------------------------------------------------------------*/
54979 - yynewstate:
54980 - /* In all cases, when you get here, the value and location stacks
54981 - have just been pushed. so pushing a state here evens the stacks.
54982 - */
54983 - yyssp++;
54984 -
54985 - yysetstate:
54986 - *yyssp = yystate;
54987 -
54988 - if (yyssp >= yyss + yystacksize - 1)
54989 - {
54990 - /* Get the current used size of the three stacks, in elements. */
54991 - YYSIZE_T yysize = yyssp - yyss + 1;
54992 -
54993 -#ifdef yyoverflow
54994 - {
54995 - /* Give user a chance to reallocate the stack. Use copies of
54996 - these so that the &'s don't force the real ones into
54997 - memory. */
54998 - YYSTYPE *yyvs1 = yyvs;
54999 - short *yyss1 = yyss;
55000 -
55001 - /* Each stack pointer address is followed by the size of the
55002 - data in use in that stack, in bytes. */
55003 -# if YYLSP_NEEDED
55004 - YYLTYPE *yyls1 = yyls;
55005 - /* This used to be a conditional around just the two extra args,
55006 - but that might be undefined if yyoverflow is a macro. */
55007 - yyoverflow ("parser stack overflow",
55008 - &yyss1, yysize * sizeof (*yyssp),
55009 - &yyvs1, yysize * sizeof (*yyvsp),
55010 - &yyls1, yysize * sizeof (*yylsp),
55011 - &yystacksize);
55012 - yyls = yyls1;
55013 -# else
55014 - yyoverflow ("parser stack overflow",
55015 - &yyss1, yysize * sizeof (*yyssp),
55016 - &yyvs1, yysize * sizeof (*yyvsp),
55017 - &yystacksize);
55018 -# endif
55019 - yyss = yyss1;
55020 - yyvs = yyvs1;
55021 - }
55022 -#else /* no yyoverflow */
55023 -# ifndef YYSTACK_RELOCATE
55024 - goto yyoverflowlab;
55025 -# else
55026 - /* Extend the stack our own way. */
55027 - if (yystacksize >= YYMAXDEPTH)
55028 - goto yyoverflowlab;
55029 - yystacksize *= 2;
55030 - if (yystacksize > YYMAXDEPTH)
55031 - yystacksize = YYMAXDEPTH;
55032 -
55033 - {
55034 - short *yyss1 = yyss;
55035 - union yyalloc *yyptr =
55036 - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
55037 - if (! yyptr)
55038 - goto yyoverflowlab;
55039 - YYSTACK_RELOCATE (yyss);
55040 - YYSTACK_RELOCATE (yyvs);
55041 -# if YYLSP_NEEDED
55042 - YYSTACK_RELOCATE (yyls);
55043 -# endif
55044 -# undef YYSTACK_RELOCATE
55045 - if (yyss1 != yyssa)
55046 - YYSTACK_FREE (yyss1);
55047 - }
55048 -# endif
55049 -#endif /* no yyoverflow */
55050 -
55051 - yyssp = yyss + yysize - 1;
55052 - yyvsp = yyvs + yysize - 1;
55053 -#if YYLSP_NEEDED
55054 - yylsp = yyls + yysize - 1;
55055 -#endif
55056 -
55057 - YYDPRINTF ((stderr, "Stack size increased to %lu\n",
55058 - (unsigned long int) yystacksize));
55059 -
55060 - if (yyssp >= yyss + yystacksize - 1)
55061 - YYABORT;
55062 - }
55063 -
55064 - YYDPRINTF ((stderr, "Entering state %d\n", yystate));
55065 -
55066 - goto yybackup;
55067 -
55068 -
55069 -/*-----------.
55070 -| yybackup. |
55071 -`-----------*/
55072 -yybackup:
55073 -
55074 -/* Do appropriate processing given the current state. */
55075 -/* Read a lookahead token if we need one and don't already have one. */
55076 -/* yyresume: */
55077 -
55078 - /* First try to decide what to do without reference to lookahead token. */
55079 -
55080 - yyn = yypact[yystate];
55081 - if (yyn == YYFLAG)
55082 - goto yydefault;
55083 -
55084 - /* Not known => get a lookahead token if don't already have one. */
55085 -
55086 - /* yychar is either YYEMPTY or YYEOF
55087 - or a valid token in external form. */
55088 -
55089 - if (yychar == YYEMPTY)
55090 - {
55091 - YYDPRINTF ((stderr, "Reading a token: "));
55092 - yychar = YYLEX;
55093 - }
55094 -
55095 - /* Convert token to internal form (in yychar1) for indexing tables with */
55096 -
55097 - if (yychar <= 0) /* This means end of input. */
55098 - {
55099 - yychar1 = 0;
55100 - yychar = YYEOF; /* Don't call YYLEX any more */
55101 -
55102 - YYDPRINTF ((stderr, "Now at end of input.\n"));
55103 - }
55104 - else
55105 - {
55106 - yychar1 = YYTRANSLATE (yychar);
55107 -
55108 -#if YYDEBUG
55109 - /* We have to keep this `#if YYDEBUG', since we use variables
55110 - which are defined only if `YYDEBUG' is set. */
55111 - if (yydebug)
55112 - {
55113 - YYFPRINTF (stderr, "Next token is %d (%s",
55114 - yychar, yytname[yychar1]);
55115 - /* Give the individual parser a way to print the precise
55116 - meaning of a token, for further debugging info. */
55117 -# ifdef YYPRINT
55118 - YYPRINT (stderr, yychar, yylval);
55119 -# endif
55120 - YYFPRINTF (stderr, ")\n");
55121 - }
55122 -#endif
55123 - }
55124 -
55125 - yyn += yychar1;
55126 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
55127 - goto yydefault;
55128 -
55129 - yyn = yytable[yyn];
55130 -
55131 - /* yyn is what to do for this token type in this state.
55132 - Negative => reduce, -yyn is rule number.
55133 - Positive => shift, yyn is new state.
55134 - New state is final state => don't bother to shift,
55135 - just return success.
55136 - 0, or most negative number => error. */
55137 -
55138 - if (yyn < 0)
55139 - {
55140 - if (yyn == YYFLAG)
55141 - goto yyerrlab;
55142 - yyn = -yyn;
55143 - goto yyreduce;
55144 - }
55145 - else if (yyn == 0)
55146 - goto yyerrlab;
55147 -
55148 - if (yyn == YYFINAL)
55149 - YYACCEPT;
55150 -
55151 - /* Shift the lookahead token. */
55152 - YYDPRINTF ((stderr, "Shifting token %d (%s), ",
55153 - yychar, yytname[yychar1]));
55154 -
55155 - /* Discard the token being shifted unless it is eof. */
55156 - if (yychar != YYEOF)
55157 - yychar = YYEMPTY;
55158 -
55159 - *++yyvsp = yylval;
55160 -#if YYLSP_NEEDED
55161 - *++yylsp = yylloc;
55162 -#endif
55163 -
55164 - /* Count tokens shifted since error; after three, turn off error
55165 - status. */
55166 - if (yyerrstatus)
55167 - yyerrstatus--;
55168 -
55169 - yystate = yyn;
55170 - goto yynewstate;
55171 -
55172 -
55173 -/*-----------------------------------------------------------.
55174 -| yydefault -- do the default action for the current state. |
55175 -`-----------------------------------------------------------*/
55176 -yydefault:
55177 - yyn = yydefact[yystate];
55178 - if (yyn == 0)
55179 - goto yyerrlab;
55180 - goto yyreduce;
55181 -
55182 -
55183 -/*-----------------------------.
55184 -| yyreduce -- Do a reduction. |
55185 -`-----------------------------*/
55186 -yyreduce:
55187 - /* yyn is the number of a rule to reduce with. */
55188 - yylen = yyr2[yyn];
55189 -
55190 - /* If YYLEN is nonzero, implement the default value of the action:
55191 - `$$ = $1'.
55192 -
55193 - Otherwise, the following line sets YYVAL to the semantic value of
55194 - the lookahead token. This behavior is undocumented and Bison
55195 - users should not rely upon it. Assigning to YYVAL
55196 - unconditionally makes the parser a bit smaller, and it avoids a
55197 - GCC warning that YYVAL may be used uninitialized. */
55198 - yyval = yyvsp[1-yylen];
55199 -
55200 -#if YYLSP_NEEDED
55201 - /* Similarly for the default location. Let the user run additional
55202 - commands if for instance locations are ranges. */
55203 - yyloc = yylsp[1-yylen];
55204 - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
55205 -#endif
55206 -
55207 -#if YYDEBUG
55208 - /* We have to keep this `#if YYDEBUG', since we use variables which
55209 - are defined only if `YYDEBUG' is set. */
55210 - if (yydebug)
55211 - {
55212 - int yyi;
55213 -
55214 - YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
55215 - yyn, yyrline[yyn]);
55216 -
55217 - /* Print the symbols being reduced, and their result. */
55218 - for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
55219 - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
55220 - YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
55221 - }
55222 -#endif
55223 -
55224 - switch (yyn) {
55225 -
55226 -case 1:
55227 -#line 175 "plural.y"
55228 -{
55229 - if (yyvsp[0].exp == NULL)
55230 - YYABORT;
55231 - ((struct parse_args *) arg)->res = yyvsp[0].exp;
55232 - }
55233 - break;
55234 -case 2:
55235 -#line 183 "plural.y"
55236 -{
55237 - yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
55238 - }
55239 - break;
55240 -case 3:
55241 -#line 187 "plural.y"
55242 -{
55243 - yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
55244 - }
55245 - break;
55246 -case 4:
55247 -#line 191 "plural.y"
55248 -{
55249 - yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
55250 - }
55251 - break;
55252 -case 5:
55253 -#line 195 "plural.y"
55254 -{
55255 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
55256 - }
55257 - break;
55258 -case 6:
55259 -#line 199 "plural.y"
55260 -{
55261 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
55262 - }
55263 - break;
55264 -case 7:
55265 -#line 203 "plural.y"
55266 -{
55267 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
55268 - }
55269 - break;
55270 -case 8:
55271 -#line 207 "plural.y"
55272 -{
55273 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
55274 - }
55275 - break;
55276 -case 9:
55277 -#line 211 "plural.y"
55278 -{
55279 - yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
55280 - }
55281 - break;
55282 -case 10:
55283 -#line 215 "plural.y"
55284 -{
55285 - yyval.exp = new_exp_0 (var);
55286 - }
55287 - break;
55288 -case 11:
55289 -#line 219 "plural.y"
55290 -{
55291 - if ((yyval.exp = new_exp_0 (num)) != NULL)
55292 - yyval.exp->val.num = yyvsp[0].num;
55293 - }
55294 - break;
55295 -case 12:
55296 -#line 224 "plural.y"
55297 -{
55298 - yyval.exp = yyvsp[-1].exp;
55299 - }
55300 - break;
55301 -}
55302 -
55303 -#line 705 "/usr/local/share/bison/bison.simple"
55304 -
55305 -\f
55306 - yyvsp -= yylen;
55307 - yyssp -= yylen;
55308 -#if YYLSP_NEEDED
55309 - yylsp -= yylen;
55310 -#endif
55311 -
55312 -#if YYDEBUG
55313 - if (yydebug)
55314 - {
55315 - short *yyssp1 = yyss - 1;
55316 - YYFPRINTF (stderr, "state stack now");
55317 - while (yyssp1 != yyssp)
55318 - YYFPRINTF (stderr, " %d", *++yyssp1);
55319 - YYFPRINTF (stderr, "\n");
55320 - }
55321 -#endif
55322 -
55323 - *++yyvsp = yyval;
55324 -#if YYLSP_NEEDED
55325 - *++yylsp = yyloc;
55326 -#endif
55327 -
55328 - /* Now `shift' the result of the reduction. Determine what state
55329 - that goes to, based on the state we popped back to and the rule
55330 - number reduced by. */
55331 -
55332 - yyn = yyr1[yyn];
55333 -
55334 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
55335 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
55336 - yystate = yytable[yystate];
55337 - else
55338 - yystate = yydefgoto[yyn - YYNTBASE];
55339 -
55340 - goto yynewstate;
55341 -
55342 -
55343 -/*------------------------------------.
55344 -| yyerrlab -- here on detecting error |
55345 -`------------------------------------*/
55346 -yyerrlab:
55347 - /* If not already recovering from an error, report this error. */
55348 - if (!yyerrstatus)
55349 - {
55350 - ++yynerrs;
55351 -
55352 -#ifdef YYERROR_VERBOSE
55353 - yyn = yypact[yystate];
55354 -
55355 - if (yyn > YYFLAG && yyn < YYLAST)
55356 - {
55357 - YYSIZE_T yysize = 0;
55358 - char *yymsg;
55359 - int yyx, yycount;
55360 -
55361 - yycount = 0;
55362 - /* Start YYX at -YYN if negative to avoid negative indexes in
55363 - YYCHECK. */
55364 - for (yyx = yyn < 0 ? -yyn : 0;
55365 - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
55366 - if (yycheck[yyx + yyn] == yyx)
55367 - yysize += yystrlen (yytname[yyx]) + 15, yycount++;
55368 - yysize += yystrlen ("parse error, unexpected ") + 1;
55369 - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
55370 - yymsg = (char *) YYSTACK_ALLOC (yysize);
55371 - if (yymsg != 0)
55372 - {
55373 - char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
55374 - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
55375 -
55376 - if (yycount < 5)
55377 - {
55378 - yycount = 0;
55379 - for (yyx = yyn < 0 ? -yyn : 0;
55380 - yyx < (int) (sizeof (yytname) / sizeof (char *));
55381 - yyx++)
55382 - if (yycheck[yyx + yyn] == yyx)
55383 - {
55384 - const char *yyq = ! yycount ? ", expecting " : " or ";
55385 - yyp = yystpcpy (yyp, yyq);
55386 - yyp = yystpcpy (yyp, yytname[yyx]);
55387 - yycount++;
55388 - }
55389 - }
55390 - yyerror (yymsg);
55391 - YYSTACK_FREE (yymsg);
55392 - }
55393 - else
55394 - yyerror ("parse error; also virtual memory exhausted");
55395 - }
55396 - else
55397 -#endif /* defined (YYERROR_VERBOSE) */
55398 - yyerror ("parse error");
55399 - }
55400 - goto yyerrlab1;
55401 -
55402 -
55403 -/*--------------------------------------------------.
55404 -| yyerrlab1 -- error raised explicitly by an action |
55405 -`--------------------------------------------------*/
55406 -yyerrlab1:
55407 - if (yyerrstatus == 3)
55408 - {
55409 - /* If just tried and failed to reuse lookahead token after an
55410 - error, discard it. */
55411 -
55412 - /* return failure if at end of input */
55413 - if (yychar == YYEOF)
55414 - YYABORT;
55415 - YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
55416 - yychar, yytname[yychar1]));
55417 - yychar = YYEMPTY;
55418 - }
55419 -
55420 - /* Else will try to reuse lookahead token after shifting the error
55421 - token. */
55422 -
55423 - yyerrstatus = 3; /* Each real token shifted decrements this */
55424 -
55425 - goto yyerrhandle;
55426 -
55427 -
55428 -/*-------------------------------------------------------------------.
55429 -| yyerrdefault -- current state does not do anything special for the |
55430 -| error token. |
55431 -`-------------------------------------------------------------------*/
55432 -yyerrdefault:
55433 -#if 0
55434 - /* This is wrong; only states that explicitly want error tokens
55435 - should shift them. */
55436 -
55437 - /* If its default is to accept any token, ok. Otherwise pop it. */
55438 - yyn = yydefact[yystate];
55439 - if (yyn)
55440 - goto yydefault;
55441 -#endif
55442 -
55443 -
55444 -/*---------------------------------------------------------------.
55445 -| yyerrpop -- pop the current state because it cannot handle the |
55446 -| error token |
55447 -`---------------------------------------------------------------*/
55448 -yyerrpop:
55449 - if (yyssp == yyss)
55450 - YYABORT;
55451 - yyvsp--;
55452 - yystate = *--yyssp;
55453 -#if YYLSP_NEEDED
55454 - yylsp--;
55455 -#endif
55456 -
55457 -#if YYDEBUG
55458 - if (yydebug)
55459 - {
55460 - short *yyssp1 = yyss - 1;
55461 - YYFPRINTF (stderr, "Error: state stack now");
55462 - while (yyssp1 != yyssp)
55463 - YYFPRINTF (stderr, " %d", *++yyssp1);
55464 - YYFPRINTF (stderr, "\n");
55465 - }
55466 -#endif
55467 -
55468 -/*--------------.
55469 -| yyerrhandle. |
55470 -`--------------*/
55471 -yyerrhandle:
55472 - yyn = yypact[yystate];
55473 - if (yyn == YYFLAG)
55474 - goto yyerrdefault;
55475 -
55476 - yyn += YYTERROR;
55477 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
55478 - goto yyerrdefault;
55479 -
55480 - yyn = yytable[yyn];
55481 - if (yyn < 0)
55482 - {
55483 - if (yyn == YYFLAG)
55484 - goto yyerrpop;
55485 - yyn = -yyn;
55486 - goto yyreduce;
55487 - }
55488 - else if (yyn == 0)
55489 - goto yyerrpop;
55490 -
55491 - if (yyn == YYFINAL)
55492 - YYACCEPT;
55493 -
55494 - YYDPRINTF ((stderr, "Shifting error token, "));
55495 -
55496 - *++yyvsp = yylval;
55497 -#if YYLSP_NEEDED
55498 - *++yylsp = yylloc;
55499 -#endif
55500 -
55501 - yystate = yyn;
55502 - goto yynewstate;
55503 -
55504 -
55505 -/*-------------------------------------.
55506 -| yyacceptlab -- YYACCEPT comes here. |
55507 -`-------------------------------------*/
55508 -yyacceptlab:
55509 - yyresult = 0;
55510 - goto yyreturn;
55511 -
55512 -/*-----------------------------------.
55513 -| yyabortlab -- YYABORT comes here. |
55514 -`-----------------------------------*/
55515 -yyabortlab:
55516 - yyresult = 1;
55517 - goto yyreturn;
55518 -
55519 -/*---------------------------------------------.
55520 -| yyoverflowab -- parser overflow comes here. |
55521 -`---------------------------------------------*/
55522 -yyoverflowlab:
55523 - yyerror ("parser stack overflow");
55524 - yyresult = 2;
55525 - /* Fall through. */
55526 -
55527 -yyreturn:
55528 -#ifndef yyoverflow
55529 - if (yyss != yyssa)
55530 - YYSTACK_FREE (yyss);
55531 -#endif
55532 - return yyresult;
55533 -}
55534 -#line 229 "plural.y"
55535 -
55536 -
55537 -void
55538 -internal_function
55539 -FREE_EXPRESSION (exp)
55540 - struct expression *exp;
55541 -{
55542 - if (exp == NULL)
55543 - return;
55544 -
55545 - /* Handle the recursive case. */
55546 - switch (exp->nargs)
55547 - {
55548 - case 3:
55549 - FREE_EXPRESSION (exp->val.args[2]);
55550 - /* FALLTHROUGH */
55551 - case 2:
55552 - FREE_EXPRESSION (exp->val.args[1]);
55553 - /* FALLTHROUGH */
55554 - case 1:
55555 - FREE_EXPRESSION (exp->val.args[0]);
55556 - /* FALLTHROUGH */
55557 - default:
55558 - break;
55559 - }
55560 -
55561 - free (exp);
55562 -}
55563 -
55564 -
55565 -static int
55566 -yylex (lval, pexp)
55567 - YYSTYPE *lval;
55568 - const char **pexp;
55569 -{
55570 - const char *exp = *pexp;
55571 - int result;
55572 -
55573 - while (1)
55574 - {
55575 - if (exp[0] == '\0')
55576 - {
55577 - *pexp = exp;
55578 - return YYEOF;
55579 - }
55580 -
55581 - if (exp[0] != ' ' && exp[0] != '\t')
55582 - break;
55583 -
55584 - ++exp;
55585 - }
55586 -
55587 - result = *exp++;
55588 - switch (result)
55589 - {
55590 - case '0': case '1': case '2': case '3': case '4':
55591 - case '5': case '6': case '7': case '8': case '9':
55592 - {
55593 - unsigned long int n = result - '0';
55594 - while (exp[0] >= '0' && exp[0] <= '9')
55595 - {
55596 - n *= 10;
55597 - n += exp[0] - '0';
55598 - ++exp;
55599 - }
55600 - lval->num = n;
55601 - result = NUMBER;
55602 - }
55603 - break;
55604 -
55605 - case '=':
55606 - if (exp[0] == '=')
55607 - {
55608 - ++exp;
55609 - lval->op = equal;
55610 - result = EQUOP2;
55611 - }
55612 - else
55613 - result = YYERRCODE;
55614 - break;
55615 -
55616 - case '!':
55617 - if (exp[0] == '=')
55618 - {
55619 - ++exp;
55620 - lval->op = not_equal;
55621 - result = EQUOP2;
55622 - }
55623 - break;
55624 -
55625 - case '&':
55626 - case '|':
55627 - if (exp[0] == result)
55628 - ++exp;
55629 - else
55630 - result = YYERRCODE;
55631 - break;
55632 -
55633 - case '<':
55634 - if (exp[0] == '=')
55635 - {
55636 - ++exp;
55637 - lval->op = less_or_equal;
55638 - }
55639 - else
55640 - lval->op = less_than;
55641 - result = CMPOP2;
55642 - break;
55643 -
55644 - case '>':
55645 - if (exp[0] == '=')
55646 - {
55647 - ++exp;
55648 - lval->op = greater_or_equal;
55649 - }
55650 - else
55651 - lval->op = greater_than;
55652 - result = CMPOP2;
55653 - break;
55654 -
55655 - case '*':
55656 - lval->op = mult;
55657 - result = MULOP2;
55658 - break;
55659 -
55660 - case '/':
55661 - lval->op = divide;
55662 - result = MULOP2;
55663 - break;
55664 -
55665 - case '%':
55666 - lval->op = module;
55667 - result = MULOP2;
55668 - break;
55669 -
55670 - case '+':
55671 - lval->op = plus;
55672 - result = ADDOP2;
55673 - break;
55674 -
55675 - case '-':
55676 - lval->op = minus;
55677 - result = ADDOP2;
55678 - break;
55679 -
55680 - case 'n':
55681 - case '?':
55682 - case ':':
55683 - case '(':
55684 - case ')':
55685 - /* Nothing, just return the character. */
55686 - break;
55687 -
55688 - case ';':
55689 - case '\n':
55690 - case '\0':
55691 - /* Be safe and let the user call this function again. */
55692 - --exp;
55693 - result = YYEOF;
55694 - break;
55695 -
55696 - default:
55697 - result = YYERRCODE;
55698 -#if YYDEBUG != 0
55699 - --exp;
55700 -#endif
55701 - break;
55702 - }
55703 -
55704 - *pexp = exp;
55705 -
55706 - return result;
55707 -}
55708 -
55709 -
55710 -static void
55711 -yyerror (str)
55712 - const char *str;
55713 -{
55714 - /* Do nothing. We don't print error messages here. */
55715 -}
55716 diff -rupN original/intl/plural.y new/intl/plural.y
55717 --- original/intl/plural.y 2009-03-28 22:33:59.000000000 -0430
55718 +++ new/intl/plural.y 1969-12-31 20:00:00.000000000 -0400
55719 @@ -1,409 +0,0 @@
55720 -%{
55721 -/* Expression parsing for plural form selection.
55722 - Copyright (C) 2000, 2001 Free Software Foundation, Inc.
55723 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
55724 -
55725 - This program is free software; you can redistribute it and/or modify it
55726 - under the terms of the GNU Library General Public License as published
55727 - by the Free Software Foundation; either version 2, or (at your option)
55728 - any later version.
55729 -
55730 - This program is distributed in the hope that it will be useful,
55731 - but WITHOUT ANY WARRANTY; without even the implied warranty of
55732 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
55733 - Library General Public License for more details.
55734 -
55735 - You should have received a copy of the GNU Library General Public
55736 - License along with this program; if not, write to the Free Software
55737 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
55738 - USA. */
55739 -
55740 -/* The bison generated parser uses alloca. AIX 3 forces us to put this
55741 - declaration at the beginning of the file. The declaration in bison's
55742 - skeleton file comes too late. This must come before <config.h>
55743 - because <config.h> may include arbitrary system headers. */
55744 -#if defined _AIX && !defined __GNUC__
55745 - #pragma alloca
55746 -#endif
55747 -
55748 -#ifdef HAVE_CONFIG_H
55749 -# include <config.h>
55750 -#endif
55751 -
55752 -#include <stddef.h>
55753 -#include <stdlib.h>
55754 -#include "plural-exp.h"
55755 -
55756 -/* The main function generated by the parser is called __gettextparse,
55757 - but we want it to be called PLURAL_PARSE. */
55758 -#ifndef _LIBC
55759 -# define __gettextparse PLURAL_PARSE
55760 -#endif
55761 -
55762 -#define YYLEX_PARAM &((struct parse_args *) arg)->cp
55763 -#define YYPARSE_PARAM arg
55764 -%}
55765 -%pure_parser
55766 -%expect 7
55767 -
55768 -%union {
55769 - unsigned long int num;
55770 - enum operator op;
55771 - struct expression *exp;
55772 -}
55773 -
55774 -%{
55775 -/* Prototypes for local functions. */
55776 -static struct expression *new_exp PARAMS ((int nargs, enum operator op,
55777 - struct expression * const *args));
55778 -static inline struct expression *new_exp_0 PARAMS ((enum operator op));
55779 -static inline struct expression *new_exp_1 PARAMS ((enum operator op,
55780 - struct expression *right));
55781 -static struct expression *new_exp_2 PARAMS ((enum operator op,
55782 - struct expression *left,
55783 - struct expression *right));
55784 -static inline struct expression *new_exp_3 PARAMS ((enum operator op,
55785 - struct expression *bexp,
55786 - struct expression *tbranch,
55787 - struct expression *fbranch));
55788 -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
55789 -static void yyerror PARAMS ((const char *str));
55790 -
55791 -/* Allocation of expressions. */
55792 -
55793 -static struct expression *
55794 -new_exp (nargs, op, args)
55795 - int nargs;
55796 - enum operator op;
55797 - struct expression * const *args;
55798 -{
55799 - int i;
55800 - struct expression *newp;
55801 -
55802 - /* If any of the argument could not be malloc'ed, just return NULL. */
55803 - for (i = nargs - 1; i >= 0; i--)
55804 - if (args[i] == NULL)
55805 - goto fail;
55806 -
55807 - /* Allocate a new expression. */
55808 - newp = (struct expression *) malloc (sizeof (*newp));
55809 - if (newp != NULL)
55810 - {
55811 - newp->nargs = nargs;
55812 - newp->operation = op;
55813 - for (i = nargs - 1; i >= 0; i--)
55814 - newp->val.args[i] = args[i];
55815 - return newp;
55816 - }
55817 -
55818 - fail:
55819 - for (i = nargs - 1; i >= 0; i--)
55820 - FREE_EXPRESSION (args[i]);
55821 -
55822 - return NULL;
55823 -}
55824 -
55825 -static inline struct expression *
55826 -new_exp_0 (op)
55827 - enum operator op;
55828 -{
55829 - return new_exp (0, op, NULL);
55830 -}
55831 -
55832 -static inline struct expression *
55833 -new_exp_1 (op, right)
55834 - enum operator op;
55835 - struct expression *right;
55836 -{
55837 - struct expression *args[1];
55838 -
55839 - args[0] = right;
55840 - return new_exp (1, op, args);
55841 -}
55842 -
55843 -static struct expression *
55844 -new_exp_2 (op, left, right)
55845 - enum operator op;
55846 - struct expression *left;
55847 - struct expression *right;
55848 -{
55849 - struct expression *args[2];
55850 -
55851 - args[0] = left;
55852 - args[1] = right;
55853 - return new_exp (2, op, args);
55854 -}
55855 -
55856 -static inline struct expression *
55857 -new_exp_3 (op, bexp, tbranch, fbranch)
55858 - enum operator op;
55859 - struct expression *bexp;
55860 - struct expression *tbranch;
55861 - struct expression *fbranch;
55862 -{
55863 - struct expression *args[3];
55864 -
55865 - args[0] = bexp;
55866 - args[1] = tbranch;
55867 - args[2] = fbranch;
55868 - return new_exp (3, op, args);
55869 -}
55870 -
55871 -%}
55872 -
55873 -/* This declares that all operators have the same associativity and the
55874 - precedence order as in C. See [Harbison, Steele: C, A Reference Manual].
55875 - There is no unary minus and no bitwise operators.
55876 - Operators with the same syntactic behaviour have been merged into a single
55877 - token, to save space in the array generated by bison. */
55878 -%right '?' /* ? */
55879 -%left '|' /* || */
55880 -%left '&' /* && */
55881 -%left EQUOP2 /* == != */
55882 -%left CMPOP2 /* < > <= >= */
55883 -%left ADDOP2 /* + - */
55884 -%left MULOP2 /* * / % */
55885 -%right '!' /* ! */
55886 -
55887 -%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
55888 -%token <num> NUMBER
55889 -%type <exp> exp
55890 -
55891 -%%
55892 -
55893 -start: exp
55894 - {
55895 - if ($1 == NULL)
55896 - YYABORT;
55897 - ((struct parse_args *) arg)->res = $1;
55898 - }
55899 - ;
55900 -
55901 -exp: exp '?' exp ':' exp
55902 - {
55903 - $$ = new_exp_3 (qmop, $1, $3, $5);
55904 - }
55905 - | exp '|' exp
55906 - {
55907 - $$ = new_exp_2 (lor, $1, $3);
55908 - }
55909 - | exp '&' exp
55910 - {
55911 - $$ = new_exp_2 (land, $1, $3);
55912 - }
55913 - | exp EQUOP2 exp
55914 - {
55915 - $$ = new_exp_2 ($2, $1, $3);
55916 - }
55917 - | exp CMPOP2 exp
55918 - {
55919 - $$ = new_exp_2 ($2, $1, $3);
55920 - }
55921 - | exp ADDOP2 exp
55922 - {
55923 - $$ = new_exp_2 ($2, $1, $3);
55924 - }
55925 - | exp MULOP2 exp
55926 - {
55927 - $$ = new_exp_2 ($2, $1, $3);
55928 - }
55929 - | '!' exp
55930 - {
55931 - $$ = new_exp_1 (lnot, $2);
55932 - }
55933 - | 'n'
55934 - {
55935 - $$ = new_exp_0 (var);
55936 - }
55937 - | NUMBER
55938 - {
55939 - if (($$ = new_exp_0 (num)) != NULL)
55940 - $$->val.num = $1;
55941 - }
55942 - | '(' exp ')'
55943 - {
55944 - $$ = $2;
55945 - }
55946 - ;
55947 -
55948 -%%
55949 -
55950 -void
55951 -internal_function
55952 -FREE_EXPRESSION (exp)
55953 - struct expression *exp;
55954 -{
55955 - if (exp == NULL)
55956 - return;
55957 -
55958 - /* Handle the recursive case. */
55959 - switch (exp->nargs)
55960 - {
55961 - case 3:
55962 - FREE_EXPRESSION (exp->val.args[2]);
55963 - /* FALLTHROUGH */
55964 - case 2:
55965 - FREE_EXPRESSION (exp->val.args[1]);
55966 - /* FALLTHROUGH */
55967 - case 1:
55968 - FREE_EXPRESSION (exp->val.args[0]);
55969 - /* FALLTHROUGH */
55970 - default:
55971 - break;
55972 - }
55973 -
55974 - free (exp);
55975 -}
55976 -
55977 -
55978 -static int
55979 -yylex (lval, pexp)
55980 - YYSTYPE *lval;
55981 - const char **pexp;
55982 -{
55983 - const char *exp = *pexp;
55984 - int result;
55985 -
55986 - while (1)
55987 - {
55988 - if (exp[0] == '\0')
55989 - {
55990 - *pexp = exp;
55991 - return YYEOF;
55992 - }
55993 -
55994 - if (exp[0] != ' ' && exp[0] != '\t')
55995 - break;
55996 -
55997 - ++exp;
55998 - }
55999 -
56000 - result = *exp++;
56001 - switch (result)
56002 - {
56003 - case '0': case '1': case '2': case '3': case '4':
56004 - case '5': case '6': case '7': case '8': case '9':
56005 - {
56006 - unsigned long int n = result - '0';
56007 - while (exp[0] >= '0' && exp[0] <= '9')
56008 - {
56009 - n *= 10;
56010 - n += exp[0] - '0';
56011 - ++exp;
56012 - }
56013 - lval->num = n;
56014 - result = NUMBER;
56015 - }
56016 - break;
56017 -
56018 - case '=':
56019 - if (exp[0] == '=')
56020 - {
56021 - ++exp;
56022 - lval->op = equal;
56023 - result = EQUOP2;
56024 - }
56025 - else
56026 - result = YYERRCODE;
56027 - break;
56028 -
56029 - case '!':
56030 - if (exp[0] == '=')
56031 - {
56032 - ++exp;
56033 - lval->op = not_equal;
56034 - result = EQUOP2;
56035 - }
56036 - break;
56037 -
56038 - case '&':
56039 - case '|':
56040 - if (exp[0] == result)
56041 - ++exp;
56042 - else
56043 - result = YYERRCODE;
56044 - break;
56045 -
56046 - case '<':
56047 - if (exp[0] == '=')
56048 - {
56049 - ++exp;
56050 - lval->op = less_or_equal;
56051 - }
56052 - else
56053 - lval->op = less_than;
56054 - result = CMPOP2;
56055 - break;
56056 -
56057 - case '>':
56058 - if (exp[0] == '=')
56059 - {
56060 - ++exp;
56061 - lval->op = greater_or_equal;
56062 - }
56063 - else
56064 - lval->op = greater_than;
56065 - result = CMPOP2;
56066 - break;
56067 -
56068 - case '*':
56069 - lval->op = mult;
56070 - result = MULOP2;
56071 - break;
56072 -
56073 - case '/':
56074 - lval->op = divide;
56075 - result = MULOP2;
56076 - break;
56077 -
56078 - case '%':
56079 - lval->op = module;
56080 - result = MULOP2;
56081 - break;
56082 -
56083 - case '+':
56084 - lval->op = plus;
56085 - result = ADDOP2;
56086 - break;
56087 -
56088 - case '-':
56089 - lval->op = minus;
56090 - result = ADDOP2;
56091 - break;
56092 -
56093 - case 'n':
56094 - case '?':
56095 - case ':':
56096 - case '(':
56097 - case ')':
56098 - /* Nothing, just return the character. */
56099 - break;
56100 -
56101 - case ';':
56102 - case '\n':
56103 - case '\0':
56104 - /* Be safe and let the user call this function again. */
56105 - --exp;
56106 - result = YYEOF;
56107 - break;
56108 -
56109 - default:
56110 - result = YYERRCODE;
56111 -#if YYDEBUG != 0
56112 - --exp;
56113 -#endif
56114 - break;
56115 - }
56116 -
56117 - *pexp = exp;
56118 -
56119 - return result;
56120 -}
56121 -
56122 -
56123 -static void
56124 -yyerror (str)
56125 - const char *str;
56126 -{
56127 - /* Do nothing. We don't print error messages here. */
56128 -}
56129 diff -rupN original/intl/ref-add.sin new/intl/ref-add.sin
56130 --- original/intl/ref-add.sin 2009-03-28 22:33:59.000000000 -0430
56131 +++ new/intl/ref-add.sin 1969-12-31 20:00:00.000000000 -0400
56132 @@ -1,31 +0,0 @@
56133 -# Add this package to a list of references stored in a text file.
56134 -#
56135 -# Copyright (C) 2000 Free Software Foundation, Inc.
56136 -#
56137 -# This program is free software; you can redistribute it and/or modify it
56138 -# under the terms of the GNU Library General Public License as published
56139 -# by the Free Software Foundation; either version 2, or (at your option)
56140 -# any later version.
56141 -#
56142 -# This program is distributed in the hope that it will be useful,
56143 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
56144 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
56145 -# Library General Public License for more details.
56146 -#
56147 -# You should have received a copy of the GNU Library General Public
56148 -# License along with this program; if not, write to the Free Software
56149 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
56150 -# USA.
56151 -#
56152 -# Written by Bruno Haible <haible@clisp.cons.org>.
56153 -#
56154 -/^# Packages using this file: / {
56155 - s/# Packages using this file://
56156 - ta
56157 - :a
56158 - s/ @PACKAGE@ / @PACKAGE@ /
56159 - tb
56160 - s/ $/ @PACKAGE@ /
56161 - :b
56162 - s/^/# Packages using this file:/
56163 -}
56164 diff -rupN original/intl/ref-del.sin new/intl/ref-del.sin
56165 --- original/intl/ref-del.sin 2009-03-28 22:33:59.000000000 -0430
56166 +++ new/intl/ref-del.sin 1969-12-31 20:00:00.000000000 -0400
56167 @@ -1,26 +0,0 @@
56168 -# Remove this package from a list of references stored in a text file.
56169 -#
56170 -# Copyright (C) 2000 Free Software Foundation, Inc.
56171 -#
56172 -# This program is free software; you can redistribute it and/or modify it
56173 -# under the terms of the GNU Library General Public License as published
56174 -# by the Free Software Foundation; either version 2, or (at your option)
56175 -# any later version.
56176 -#
56177 -# This program is distributed in the hope that it will be useful,
56178 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
56179 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
56180 -# Library General Public License for more details.
56181 -#
56182 -# You should have received a copy of the GNU Library General Public
56183 -# License along with this program; if not, write to the Free Software
56184 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
56185 -# USA.
56186 -#
56187 -# Written by Bruno Haible <haible@clisp.cons.org>.
56188 -#
56189 -/^# Packages using this file: / {
56190 - s/# Packages using this file://
56191 - s/ @PACKAGE@ / /
56192 - s/^/# Packages using this file:/
56193 -}
56194 diff -rupN original/intl/relocatable.c new/intl/relocatable.c
56195 --- original/intl/relocatable.c 2009-03-28 22:33:59.000000000 -0430
56196 +++ new/intl/relocatable.c 1969-12-31 20:00:00.000000000 -0400
56197 @@ -1,439 +0,0 @@
56198 -/* Provide relocatable packages.
56199 - Copyright (C) 2003 Free Software Foundation, Inc.
56200 - Written by Bruno Haible <bruno@clisp.org>, 2003.
56201 -
56202 - This program is free software; you can redistribute it and/or modify it
56203 - under the terms of the GNU Library General Public License as published
56204 - by the Free Software Foundation; either version 2, or (at your option)
56205 - any later version.
56206 -
56207 - This program is distributed in the hope that it will be useful,
56208 - but WITHOUT ANY WARRANTY; without even the implied warranty of
56209 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
56210 - Library General Public License for more details.
56211 -
56212 - You should have received a copy of the GNU Library General Public
56213 - License along with this program; if not, write to the Free Software
56214 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
56215 - USA. */
56216 -
56217 -
56218 -/* Tell glibc's <stdio.h> to provide a prototype for getline().
56219 - This must come before <config.h> because <config.h> may include
56220 - <features.h>, and once <features.h> has been included, it's too late. */
56221 -#ifndef _GNU_SOURCE
56222 -# define _GNU_SOURCE 1
56223 -#endif
56224 -
56225 -#ifdef HAVE_CONFIG_H
56226 -# include "config.h"
56227 -#endif
56228 -
56229 -/* Specification. */
56230 -#include "relocatable.h"
56231 -
56232 -#if ENABLE_RELOCATABLE
56233 -
56234 -#include <stddef.h>
56235 -#include <stdio.h>
56236 -#include <stdlib.h>
56237 -#include <string.h>
56238 -
56239 -#ifdef NO_XMALLOC
56240 -# define xmalloc malloc
56241 -#else
56242 -# include "xmalloc.h"
56243 -#endif
56244 -
56245 -#if DEPENDS_ON_LIBCHARSET
56246 -# include <libcharset.h>
56247 -#endif
56248 -#if DEPENDS_ON_LIBICONV && HAVE_ICONV
56249 -# include <iconv.h>
56250 -#endif
56251 -#if DEPENDS_ON_LIBINTL && ENABLE_NLS
56252 -# include <libintl.h>
56253 -#endif
56254 -
56255 -/* Faked cheap 'bool'. */
56256 -#undef bool
56257 -#undef false
56258 -#undef true
56259 -#define bool int
56260 -#define false 0
56261 -#define true 1
56262 -
56263 -/* Pathname support.
56264 - ISSLASH(C) tests whether C is a directory separator character.
56265 - IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
56266 - */
56267 -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
56268 - /* Win32, OS/2, DOS */
56269 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
56270 -# define HAS_DEVICE(P) \
56271 - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
56272 - && (P)[1] == ':')
56273 -# define IS_PATH_WITH_DIR(P) \
56274 - (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
56275 -# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
56276 -#else
56277 - /* Unix */
56278 -# define ISSLASH(C) ((C) == '/')
56279 -# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
56280 -# define FILESYSTEM_PREFIX_LEN(P) 0
56281 -#endif
56282 -
56283 -/* Original installation prefix. */
56284 -static char *orig_prefix;
56285 -static size_t orig_prefix_len;
56286 -/* Current installation prefix. */
56287 -static char *curr_prefix;
56288 -static size_t curr_prefix_len;
56289 -/* These prefixes do not end in a slash. Anything that will be concatenated
56290 - to them must start with a slash. */
56291 -
56292 -/* Sets the original and the current installation prefix of this module.
56293 - Relocation simply replaces a pathname starting with the original prefix
56294 - by the corresponding pathname with the current prefix instead. Both
56295 - prefixes should be directory names without trailing slash (i.e. use ""
56296 - instead of "/"). */
56297 -static void
56298 -set_this_relocation_prefix (const char *orig_prefix_arg,
56299 - const char *curr_prefix_arg)
56300 -{
56301 - if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
56302 - /* Optimization: if orig_prefix and curr_prefix are equal, the
56303 - relocation is a nop. */
56304 - && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
56305 - {
56306 - /* Duplicate the argument strings. */
56307 - char *memory;
56308 -
56309 - orig_prefix_len = strlen (orig_prefix_arg);
56310 - curr_prefix_len = strlen (curr_prefix_arg);
56311 - memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
56312 -#ifdef NO_XMALLOC
56313 - if (memory != NULL)
56314 -#endif
56315 - {
56316 - memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
56317 - orig_prefix = memory;
56318 - memory += orig_prefix_len + 1;
56319 - memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
56320 - curr_prefix = memory;
56321 - return;
56322 - }
56323 - }
56324 - orig_prefix = NULL;
56325 - curr_prefix = NULL;
56326 - /* Don't worry about wasted memory here - this function is usually only
56327 - called once. */
56328 -}
56329 -
56330 -/* Sets the original and the current installation prefix of the package.
56331 - Relocation simply replaces a pathname starting with the original prefix
56332 - by the corresponding pathname with the current prefix instead. Both
56333 - prefixes should be directory names without trailing slash (i.e. use ""
56334 - instead of "/"). */
56335 -void
56336 -set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
56337 -{
56338 - set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
56339 -
56340 - /* Now notify all dependent libraries. */
56341 -#if DEPENDS_ON_LIBCHARSET
56342 - libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
56343 -#endif
56344 -#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
56345 - libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
56346 -#endif
56347 -#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
56348 - libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
56349 -#endif
56350 -}
56351 -
56352 -/* Convenience function:
56353 - Computes the current installation prefix, based on the original
56354 - installation prefix, the original installation directory of a particular
56355 - file, and the current pathname of this file. Returns NULL upon failure. */
56356 -#ifdef IN_LIBRARY
56357 -#define compute_curr_prefix local_compute_curr_prefix
56358 -static
56359 -#endif
56360 -const char *
56361 -compute_curr_prefix (const char *orig_installprefix,
56362 - const char *orig_installdir,
56363 - const char *curr_pathname)
56364 -{
56365 - const char *curr_installdir;
56366 - const char *rel_installdir;
56367 -
56368 - if (curr_pathname == NULL)
56369 - return NULL;
56370 -
56371 - /* Determine the relative installation directory, relative to the prefix.
56372 - This is simply the difference between orig_installprefix and
56373 - orig_installdir. */
56374 - if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
56375 - != 0)
56376 - /* Shouldn't happen - nothing should be installed outside $(prefix). */
56377 - return NULL;
56378 - rel_installdir = orig_installdir + strlen (orig_installprefix);
56379 -
56380 - /* Determine the current installation directory. */
56381 - {
56382 - const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
56383 - const char *p = curr_pathname + strlen (curr_pathname);
56384 - char *q;
56385 -
56386 - while (p > p_base)
56387 - {
56388 - p--;
56389 - if (ISSLASH (*p))
56390 - break;
56391 - }
56392 -
56393 - q = (char *) xmalloc (p - curr_pathname + 1);
56394 -#ifdef NO_XMALLOC
56395 - if (q == NULL)
56396 - return NULL;
56397 -#endif
56398 - memcpy (q, curr_pathname, p - curr_pathname);
56399 - q[p - curr_pathname] = '\0';
56400 - curr_installdir = q;
56401 - }
56402 -
56403 - /* Compute the current installation prefix by removing the trailing
56404 - rel_installdir from it. */
56405 - {
56406 - const char *rp = rel_installdir + strlen (rel_installdir);
56407 - const char *cp = curr_installdir + strlen (curr_installdir);
56408 - const char *cp_base =
56409 - curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
56410 -
56411 - while (rp > rel_installdir && cp > cp_base)
56412 - {
56413 - bool same = false;
56414 - const char *rpi = rp;
56415 - const char *cpi = cp;
56416 -
56417 - while (rpi > rel_installdir && cpi > cp_base)
56418 - {
56419 - rpi--;
56420 - cpi--;
56421 - if (ISSLASH (*rpi) || ISSLASH (*cpi))
56422 - {
56423 - if (ISSLASH (*rpi) && ISSLASH (*cpi))
56424 - same = true;
56425 - break;
56426 - }
56427 -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
56428 - /* Win32, OS/2, DOS - case insignificant filesystem */
56429 - if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
56430 - != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
56431 - break;
56432 -#else
56433 - if (*rpi != *cpi)
56434 - break;
56435 -#endif
56436 - }
56437 - if (!same)
56438 - break;
56439 - /* The last pathname component was the same. opi and cpi now point
56440 - to the slash before it. */
56441 - rp = rpi;
56442 - cp = cpi;
56443 - }
56444 -
56445 - if (rp > rel_installdir)
56446 - /* Unexpected: The curr_installdir does not end with rel_installdir. */
56447 - return NULL;
56448 -
56449 - {
56450 - size_t curr_prefix_len = cp - curr_installdir;
56451 - char *curr_prefix;
56452 -
56453 - curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
56454 -#ifdef NO_XMALLOC
56455 - if (curr_prefix == NULL)
56456 - return NULL;
56457 -#endif
56458 - memcpy (curr_prefix, curr_installdir, curr_prefix_len);
56459 - curr_prefix[curr_prefix_len] = '\0';
56460 -
56461 - return curr_prefix;
56462 - }
56463 - }
56464 -}
56465 -
56466 -#if defined PIC && defined INSTALLDIR
56467 -
56468 -/* Full pathname of shared library, or NULL. */
56469 -static char *shared_library_fullname;
56470 -
56471 -#if defined _WIN32 || defined __WIN32__
56472 -
56473 -/* Determine the full pathname of the shared library when it is loaded. */
56474 -
56475 -BOOL WINAPI
56476 -DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
56477 -{
56478 - (void) reserved;
56479 -
56480 - if (event == DLL_PROCESS_ATTACH)
56481 - {
56482 - /* The DLL is being loaded into an application's address range. */
56483 - static char location[MAX_PATH];
56484 -
56485 - if (!GetModuleFileName (module_handle, location, sizeof (location)))
56486 - /* Shouldn't happen. */
56487 - return FALSE;
56488 -
56489 - if (!IS_PATH_WITH_DIR (location))
56490 - /* Shouldn't happen. */
56491 - return FALSE;
56492 -
56493 - shared_library_fullname = strdup (location);
56494 - }
56495 -
56496 - return TRUE;
56497 -}
56498 -
56499 -#else /* Unix */
56500 -
56501 -static void
56502 -find_shared_library_fullname ()
56503 -{
56504 -#ifdef __linux__
56505 - FILE *fp;
56506 -
56507 - /* Open the current process' maps file. It describes one VMA per line. */
56508 - fp = fopen ("/proc/self/maps", "r");
56509 - if (fp)
56510 - {
56511 - unsigned long address = (unsigned long) &find_shared_library_fullname;
56512 - for (;;)
56513 - {
56514 - unsigned long start, end;
56515 - int c;
56516 -
56517 - if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
56518 - break;
56519 - if (address >= start && address <= end - 1)
56520 - {
56521 - /* Found it. Now see if this line contains a filename. */
56522 - while (c = getc (fp), c != EOF && c != '\n' && c != '/')
56523 - continue;
56524 - if (c == '/')
56525 - {
56526 - size_t size;
56527 - int len;
56528 -
56529 - ungetc (c, fp);
56530 - shared_library_fullname = NULL; size = 0;
56531 - len = getline (&shared_library_fullname, &size, fp);
56532 - if (len >= 0)
56533 - {
56534 - /* Success: filled shared_library_fullname. */
56535 - if (len > 0 && shared_library_fullname[len - 1] == '\n')
56536 - shared_library_fullname[len - 1] = '\0';
56537 - }
56538 - }
56539 - break;
56540 - }
56541 - while (c = getc (fp), c != EOF && c != '\n')
56542 - continue;
56543 - }
56544 - fclose (fp);
56545 - }
56546 -#endif
56547 -}
56548 -
56549 -#endif /* WIN32 / Unix */
56550 -
56551 -/* Return the full pathname of the current shared library.
56552 - Return NULL if unknown.
56553 - Guaranteed to work only on Linux and Woe32. */
56554 -static char *
56555 -get_shared_library_fullname ()
56556 -{
56557 -#if !(defined _WIN32 || defined __WIN32__)
56558 - static bool tried_find_shared_library_fullname;
56559 - if (!tried_find_shared_library_fullname)
56560 - {
56561 - find_shared_library_fullname ();
56562 - tried_find_shared_library_fullname = true;
56563 - }
56564 -#endif
56565 - return shared_library_fullname;
56566 -}
56567 -
56568 -#endif /* PIC */
56569 -
56570 -/* Returns the pathname, relocated according to the current installation
56571 - directory. */
56572 -const char *
56573 -relocate (const char *pathname)
56574 -{
56575 -#if defined PIC && defined INSTALLDIR
56576 - static int initialized;
56577 -
56578 - /* Initialization code for a shared library. */
56579 - if (!initialized)
56580 - {
56581 - /* At this point, orig_prefix and curr_prefix likely have already been
56582 - set through the main program's set_program_name_and_installdir
56583 - function. This is sufficient in the case that the library has
56584 - initially been installed in the same orig_prefix. But we can do
56585 - better, to also cover the cases that 1. it has been installed
56586 - in a different prefix before being moved to orig_prefix and (later)
56587 - to curr_prefix, 2. unlike the program, it has not moved away from
56588 - orig_prefix. */
56589 - const char *orig_installprefix = INSTALLPREFIX;
56590 - const char *orig_installdir = INSTALLDIR;
56591 - const char *curr_prefix_better;
56592 -
56593 - curr_prefix_better =
56594 - compute_curr_prefix (orig_installprefix, orig_installdir,
56595 - get_shared_library_fullname ());
56596 - if (curr_prefix_better == NULL)
56597 - curr_prefix_better = curr_prefix;
56598 -
56599 - set_relocation_prefix (orig_installprefix, curr_prefix_better);
56600 -
56601 - initialized = 1;
56602 - }
56603 -#endif
56604 -
56605 - /* Note: It is not necessary to perform case insensitive comparison here,
56606 - even for DOS-like filesystems, because the pathname argument was
56607 - typically created from the same Makefile variable as orig_prefix came
56608 - from. */
56609 - if (orig_prefix != NULL && curr_prefix != NULL
56610 - && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
56611 - {
56612 - if (pathname[orig_prefix_len] == '\0')
56613 - /* pathname equals orig_prefix. */
56614 - return curr_prefix;
56615 - if (ISSLASH (pathname[orig_prefix_len]))
56616 - {
56617 - /* pathname starts with orig_prefix. */
56618 - const char *pathname_tail = &pathname[orig_prefix_len];
56619 - char *result =
56620 - (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
56621 -
56622 -#ifdef NO_XMALLOC
56623 - if (result != NULL)
56624 -#endif
56625 - {
56626 - memcpy (result, curr_prefix, curr_prefix_len);
56627 - strcpy (result + curr_prefix_len, pathname_tail);
56628 - return result;
56629 - }
56630 - }
56631 - }
56632 - /* Nothing to relocate. */
56633 - return pathname;
56634 -}
56635 -
56636 -#endif
56637 diff -rupN original/intl/relocatable.h new/intl/relocatable.h
56638 --- original/intl/relocatable.h 2009-03-28 22:33:59.000000000 -0430
56639 +++ new/intl/relocatable.h 1969-12-31 20:00:00.000000000 -0400
56640 @@ -1,67 +0,0 @@
56641 -/* Provide relocatable packages.
56642 - Copyright (C) 2003 Free Software Foundation, Inc.
56643 - Written by Bruno Haible <bruno@clisp.org>, 2003.
56644 -
56645 - This program is free software; you can redistribute it and/or modify it
56646 - under the terms of the GNU Library General Public License as published
56647 - by the Free Software Foundation; either version 2, or (at your option)
56648 - any later version.
56649 -
56650 - This program is distributed in the hope that it will be useful,
56651 - but WITHOUT ANY WARRANTY; without even the implied warranty of
56652 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
56653 - Library General Public License for more details.
56654 -
56655 - You should have received a copy of the GNU Library General Public
56656 - License along with this program; if not, write to the Free Software
56657 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
56658 - USA. */
56659 -
56660 -#ifndef _RELOCATABLE_H
56661 -#define _RELOCATABLE_H
56662 -
56663 -/* This can be enabled through the configure --enable-relocatable option. */
56664 -#if ENABLE_RELOCATABLE
56665 -
56666 -/* When building a DLL, we must export some functions. Note that because
56667 - this is a private .h file, we don't need to use __declspec(dllimport)
56668 - in any case. */
56669 -#if defined _MSC_VER && BUILDING_DLL
56670 -# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
56671 -#else
56672 -# define RELOCATABLE_DLL_EXPORTED
56673 -#endif
56674 -
56675 -/* Sets the original and the current installation prefix of the package.
56676 - Relocation simply replaces a pathname starting with the original prefix
56677 - by the corresponding pathname with the current prefix instead. Both
56678 - prefixes should be directory names without trailing slash (i.e. use ""
56679 - instead of "/"). */
56680 -extern RELOCATABLE_DLL_EXPORTED void
56681 - set_relocation_prefix (const char *orig_prefix,
56682 - const char *curr_prefix);
56683 -
56684 -/* Returns the pathname, relocated according to the current installation
56685 - directory. */
56686 -extern const char * relocate (const char *pathname);
56687 -
56688 -/* Memory management: relocate() leaks memory, because it has to construct
56689 - a fresh pathname. If this is a problem because your program calls
56690 - relocate() frequently, think about caching the result. */
56691 -
56692 -/* Convenience function:
56693 - Computes the current installation prefix, based on the original
56694 - installation prefix, the original installation directory of a particular
56695 - file, and the current pathname of this file. Returns NULL upon failure. */
56696 -extern const char * compute_curr_prefix (const char *orig_installprefix,
56697 - const char *orig_installdir,
56698 - const char *curr_pathname);
56699 -
56700 -#else
56701 -
56702 -/* By default, we use the hardwired pathnames. */
56703 -#define relocate(pathname) (pathname)
56704 -
56705 -#endif
56706 -
56707 -#endif /* _RELOCATABLE_H */
56708 diff -rupN original/intl/textdomain.c new/intl/textdomain.c
56709 --- original/intl/textdomain.c 2009-03-28 22:33:59.000000000 -0430
56710 +++ new/intl/textdomain.c 1969-12-31 20:00:00.000000000 -0400
56711 @@ -1,142 +0,0 @@
56712 -/* Implementation of the textdomain(3) function.
56713 - Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
56714 -
56715 - This program is free software; you can redistribute it and/or modify it
56716 - under the terms of the GNU Library General Public License as published
56717 - by the Free Software Foundation; either version 2, or (at your option)
56718 - any later version.
56719 -
56720 - This program is distributed in the hope that it will be useful,
56721 - but WITHOUT ANY WARRANTY; without even the implied warranty of
56722 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
56723 - Library General Public License for more details.
56724 -
56725 - You should have received a copy of the GNU Library General Public
56726 - License along with this program; if not, write to the Free Software
56727 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
56728 - USA. */
56729 -
56730 -#ifdef HAVE_CONFIG_H
56731 -# include <config.h>
56732 -#endif
56733 -
56734 -#include <stdlib.h>
56735 -#include <string.h>
56736 -
56737 -#ifdef _LIBC
56738 -# include <libintl.h>
56739 -#else
56740 -# include "libgnuintl.h"
56741 -#endif
56742 -#include "gettextP.h"
56743 -
56744 -#ifdef _LIBC
56745 -/* We have to handle multi-threaded applications. */
56746 -# include <bits/libc-lock.h>
56747 -#else
56748 -/* Provide dummy implementation if this is outside glibc. */
56749 -# define __libc_rwlock_define(CLASS, NAME)
56750 -# define __libc_rwlock_wrlock(NAME)
56751 -# define __libc_rwlock_unlock(NAME)
56752 -#endif
56753 -
56754 -/* The internal variables in the standalone libintl.a must have different
56755 - names than the internal variables in GNU libc, otherwise programs
56756 - using libintl.a cannot be linked statically. */
56757 -#if !defined _LIBC
56758 -# define _nl_default_default_domain libintl_nl_default_default_domain
56759 -# define _nl_current_default_domain libintl_nl_current_default_domain
56760 -#endif
56761 -
56762 -/* @@ end of prolog @@ */
56763 -
56764 -/* Name of the default text domain. */
56765 -extern const char _nl_default_default_domain[] attribute_hidden;
56766 -
56767 -/* Default text domain in which entries for gettext(3) are to be found. */
56768 -extern const char *_nl_current_default_domain attribute_hidden;
56769 -
56770 -
56771 -/* Names for the libintl functions are a problem. They must not clash
56772 - with existing names and they should follow ANSI C. But this source
56773 - code is also used in GNU C Library where the names have a __
56774 - prefix. So we have to make a difference here. */
56775 -#ifdef _LIBC
56776 -# define TEXTDOMAIN __textdomain
56777 -# ifndef strdup
56778 -# define strdup(str) __strdup (str)
56779 -# endif
56780 -#else
56781 -# define TEXTDOMAIN libintl_textdomain
56782 -#endif
56783 -
56784 -/* Lock variable to protect the global data in the gettext implementation. */
56785 -__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
56786 -
56787 -/* Set the current default message catalog to DOMAINNAME.
56788 - If DOMAINNAME is null, return the current default.
56789 - If DOMAINNAME is "", reset to the default of "messages". */
56790 -char *
56791 -TEXTDOMAIN (domainname)
56792 - const char *domainname;
56793 -{
56794 - char *new_domain;
56795 - char *old_domain;
56796 -
56797 - /* A NULL pointer requests the current setting. */
56798 - if (domainname == NULL)
56799 - return (char *) _nl_current_default_domain;
56800 -
56801 - __libc_rwlock_wrlock (_nl_state_lock);
56802 -
56803 - old_domain = (char *) _nl_current_default_domain;
56804 -
56805 - /* If domain name is the null string set to default domain "messages". */
56806 - if (domainname[0] == '\0'
56807 - || strcmp (domainname, _nl_default_default_domain) == 0)
56808 - {
56809 - _nl_current_default_domain = _nl_default_default_domain;
56810 - new_domain = (char *) _nl_current_default_domain;
56811 - }
56812 - else if (strcmp (domainname, old_domain) == 0)
56813 - /* This can happen and people will use it to signal that some
56814 - environment variable changed. */
56815 - new_domain = old_domain;
56816 - else
56817 - {
56818 - /* If the following malloc fails `_nl_current_default_domain'
56819 - will be NULL. This value will be returned and so signals we
56820 - are out of core. */
56821 -#if defined _LIBC || defined HAVE_STRDUP
56822 - new_domain = strdup (domainname);
56823 -#else
56824 - size_t len = strlen (domainname) + 1;
56825 - new_domain = (char *) malloc (len);
56826 - if (new_domain != NULL)
56827 - memcpy (new_domain, domainname, len);
56828 -#endif
56829 -
56830 - if (new_domain != NULL)
56831 - _nl_current_default_domain = new_domain;
56832 - }
56833 -
56834 - /* We use this possibility to signal a change of the loaded catalogs
56835 - since this is most likely the case and there is no other easy we
56836 - to do it. Do it only when the call was successful. */
56837 - if (new_domain != NULL)
56838 - {
56839 - ++_nl_msg_cat_cntr;
56840 -
56841 - if (old_domain != new_domain && old_domain != _nl_default_default_domain)
56842 - free (old_domain);
56843 - }
56844 -
56845 - __libc_rwlock_unlock (_nl_state_lock);
56846 -
56847 - return new_domain;
56848 -}
56849 -
56850 -#ifdef _LIBC
56851 -/* Alias for function name in GNU C Library. */
56852 -weak_alias (__textdomain, textdomain);
56853 -#endif
56854 diff -rupN original/libpcsxcore/Makefile.in new/libpcsxcore/Makefile.in
56855 --- original/libpcsxcore/Makefile.in 2009-03-29 01:17:40.000000000 -0430
56856 +++ new/libpcsxcore/Makefile.in 1969-12-31 20:00:00.000000000 -0400
56857 @@ -1,916 +0,0 @@
56858 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
56859 -# @configure_input@
56860 -
56861 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
56862 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
56863 -# This Makefile.in is free software; the Free Software Foundation
56864 -# gives unlimited permission to copy and/or distribute it,
56865 -# with or without modifications, as long as this notice is preserved.
56866 -
56867 -# This program is distributed in the hope that it will be useful,
56868 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
56869 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
56870 -# PARTICULAR PURPOSE.
56871 -
56872 -@SET_MAKE@
56873 -
56874 -VPATH = @srcdir@
56875 -pkgdatadir = $(datadir)/@PACKAGE@
56876 -pkglibdir = $(libdir)/@PACKAGE@
56877 -pkgincludedir = $(includedir)/@PACKAGE@
56878 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
56879 -install_sh_DATA = $(install_sh) -c -m 644
56880 -install_sh_PROGRAM = $(install_sh) -c
56881 -install_sh_SCRIPT = $(install_sh) -c
56882 -INSTALL_HEADER = $(INSTALL_DATA)
56883 -transform = $(program_transform_name)
56884 -NORMAL_INSTALL = :
56885 -PRE_INSTALL = :
56886 -POST_INSTALL = :
56887 -NORMAL_UNINSTALL = :
56888 -PRE_UNINSTALL = :
56889 -POST_UNINSTALL = :
56890 -build_triplet = @build@
56891 -host_triplet = @host@
56892 -target_triplet = @target@
56893 -@ARCH_X86_64_TRUE@am__append_1 = \
56894 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
56895 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
56896 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
56897 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
56898 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
56899 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
56900 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
56901 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/
56902 -
56903 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@am__append_2 = \
56904 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@ $(top_builddir)/libpcsxcore/ix86/iR3000A.c \
56905 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@ $(top_builddir)/libpcsxcore/ix86/ix86.c \
56906 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@ $(top_builddir)/libpcsxcore/
56907 -
56908 -@ARCH_PPC_TRUE@am__append_3 = \
56909 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/pR3000A.c \
56910 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/ppc.c \
56911 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/reguse.c \
56912 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/pasm.s \
56913 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/
56914 -
56915 -subdir = libpcsxcore
56916 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
56917 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
56918 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
56919 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
56920 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
56921 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
56922 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
56923 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
56924 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
56925 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
56926 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
56927 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
56928 - $(top_srcdir)/configure.ac
56929 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
56930 - $(ACLOCAL_M4)
56931 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
56932 -CONFIG_HEADER = $(top_builddir)/include/config.h
56933 -CONFIG_CLEAN_FILES =
56934 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
56935 -am__vpath_adj = case $$p in \
56936 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
56937 - *) f=$$p;; \
56938 - esac;
56939 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
56940 -am__installdirs = "$(DESTDIR)$(libdir)"
56941 -libLTLIBRARIES_INSTALL = $(INSTALL)
56942 -LTLIBRARIES = $(lib_LTLIBRARIES)
56943 -am__DEPENDENCIES_1 =
56944 -libpcsxcore_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
56945 -am__libpcsxcore_la_SOURCES_DIST = \
56946 - $(top_builddir)/libpcsxcore/psxbios.c \
56947 - $(top_builddir)/libpcsxcore/cdrom.c \
56948 - $(top_builddir)/libpcsxcore/psxcounters.c \
56949 - $(top_builddir)/libpcsxcore/psxdma.c \
56950 - $(top_builddir)/libpcsxcore/disr3000a.c \
56951 - $(top_builddir)/libpcsxcore/spu.c \
56952 - $(top_builddir)/libpcsxcore/sio.c \
56953 - $(top_builddir)/libpcsxcore/psxhw.c \
56954 - $(top_builddir)/libpcsxcore/mdec.c \
56955 - $(top_builddir)/libpcsxcore/psxmem.c \
56956 - $(top_builddir)/libpcsxcore/misc.c \
56957 - $(top_builddir)/libpcsxcore/plugins.c \
56958 - $(top_builddir)/libpcsxcore/decode_xa.c \
56959 - $(top_builddir)/libpcsxcore/r3000a.c \
56960 - $(top_builddir)/libpcsxcore/psxinterpreter.c \
56961 - $(top_builddir)/libpcsxcore/gte.c \
56962 - $(top_builddir)/libpcsxcore/psxhle.c \
56963 - $(top_builddir)/libpcsxcore/cdrom.h \
56964 - $(top_builddir)/libpcsxcore/coff.h \
56965 - $(top_builddir)/libpcsxcore/debug.h \
56966 - $(top_builddir)/libpcsxcore/decode_xa.h \
56967 - $(top_builddir)/libpcsxcore/gte.h \
56968 - $(top_builddir)/libpcsxcore/mdec.h \
56969 - $(top_builddir)/libpcsxcore/misc.h \
56970 - $(top_builddir)/libpcsxcore/plugins.h \
56971 - $(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
56972 - $(top_builddir)/libpcsxcore/psxbios.h \
56973 - $(top_builddir)/libpcsxcore/psxcommon.h \
56974 - $(top_builddir)/libpcsxcore/psxcounters.h \
56975 - $(top_builddir)/libpcsxcore/psxdma.h \
56976 - $(top_builddir)/libpcsxcore/psxhle.h \
56977 - $(top_builddir)/libpcsxcore/psxhw.h \
56978 - $(top_builddir)/libpcsxcore/psxmem.h \
56979 - $(top_builddir)/libpcsxcore/r3000a.h \
56980 - $(top_builddir)/libpcsxcore/sio.h \
56981 - $(top_builddir)/libpcsxcore/spu.h \
56982 - $(top_builddir)/libpcsxcore/system.h \
56983 - $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
56984 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
56985 - $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
56986 - $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
56987 - $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
56988 - $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
56989 - $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
56990 - $(top_builddir)/libpcsxcore/ \
56991 - $(top_builddir)/libpcsxcore/ix86/iR3000A.c \
56992 - $(top_builddir)/libpcsxcore/ix86/ix86.c \
56993 - $(top_builddir)/libpcsxcore/ppc/pR3000A.c \
56994 - $(top_builddir)/libpcsxcore/ppc/ppc.c \
56995 - $(top_builddir)/libpcsxcore/ppc/reguse.c \
56996 - $(top_builddir)/libpcsxcore/ppc/pasm.s
56997 -@ARCH_X86_64_TRUE@am__objects_1 = iR3000A-64.lo ix86-64.lo \
56998 -@ARCH_X86_64_TRUE@ ix86_cpudetect.lo ix86_fpu.lo ix86_3dnow.lo \
56999 -@ARCH_X86_64_TRUE@ ix86_mmx.lo ix86_sse.lo
57000 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@am__objects_2 = iR3000A.lo ix86.lo
57001 -@ARCH_PPC_TRUE@am__objects_3 = pR3000A.lo ppc.lo reguse.lo \
57002 -@ARCH_PPC_TRUE@ libpcsxcore_la-pasm.lo
57003 -am_libpcsxcore_la_OBJECTS = psxbios.lo cdrom.lo psxcounters.lo \
57004 - psxdma.lo disr3000a.lo spu.lo sio.lo psxhw.lo mdec.lo \
57005 - psxmem.lo misc.lo plugins.lo decode_xa.lo r3000a.lo \
57006 - psxinterpreter.lo gte.lo psxhle.lo $(am__objects_1) \
57007 - $(am__objects_2) $(am__objects_3)
57008 -libpcsxcore_la_OBJECTS = $(am_libpcsxcore_la_OBJECTS)
57009 -libpcsxcore_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
57010 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
57011 - $(libpcsxcore_la_LDFLAGS) $(LDFLAGS) -o $@
57012 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
57013 -depcomp = $(SHELL) $(top_srcdir)/depcomp
57014 -am__depfiles_maybe = depfiles
57015 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
57016 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
57017 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
57018 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
57019 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
57020 -CCLD = $(CC)
57021 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
57022 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
57023 - $(LDFLAGS) -o $@
57024 -CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
57025 -LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
57026 - --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
57027 -SOURCES = $(libpcsxcore_la_SOURCES)
57028 -DIST_SOURCES = $(am__libpcsxcore_la_SOURCES_DIST)
57029 -ETAGS = etags
57030 -CTAGS = ctags
57031 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
57032 -ACLOCAL = @ACLOCAL@
57033 -ALLOCA = @ALLOCA@
57034 -ALL_LINGUAS = @ALL_LINGUAS@
57035 -ALSA_LIBS = @ALSA_LIBS@
57036 -AMTAR = @AMTAR@
57037 -AR = @AR@
57038 -AUTOCONF = @AUTOCONF@
57039 -AUTOHEADER = @AUTOHEADER@
57040 -AUTOMAKE = @AUTOMAKE@
57041 -AWK = @AWK@
57042 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
57043 -BURN_CFLAGS = @BURN_CFLAGS@
57044 -BURN_LIBS = @BURN_LIBS@
57045 -CATOBJEXT = @CATOBJEXT@
57046 -CC = @CC@
57047 -CCAS = @CCAS@
57048 -CCASDEPMODE = @CCASDEPMODE@
57049 -CCASFLAGS = @CCASFLAGS@
57050 -CCDEPMODE = @CCDEPMODE@
57051 -CFLAGS = @CFLAGS@
57052 -CPP = @CPP@
57053 -CPPFLAGS = @CPPFLAGS@
57054 -CXX = @CXX@
57055 -CXXCPP = @CXXCPP@
57056 -CXXDEPMODE = @CXXDEPMODE@
57057 -CXXFLAGS = @CXXFLAGS@
57058 -CYGPATH_W = @CYGPATH_W@
57059 -DATADIRNAME = @DATADIRNAME@
57060 -DEFS = @DEFS@
57061 -DEPDIR = @DEPDIR@
57062 -DFBINIMAGE = @DFBINIMAGE@
57063 -DSYMUTIL = @DSYMUTIL@
57064 -ECHO = @ECHO@
57065 -ECHO_C = @ECHO_C@
57066 -ECHO_N = @ECHO_N@
57067 -ECHO_T = @ECHO_T@
57068 -EGREP = @EGREP@
57069 -EXEEXT = @EXEEXT@
57070 -F77 = @F77@
57071 -FFLAGS = @FFLAGS@
57072 -FLTKCONFIG = @FLTKCONFIG@
57073 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
57074 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
57075 -GENCAT = @GENCAT@
57076 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
57077 -GIO2_CFLAGS = @GIO2_CFLAGS@
57078 -GIO2_LIBS = @GIO2_LIBS@
57079 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
57080 -GLADE2_LIBS = @GLADE2_LIBS@
57081 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
57082 -GLIB2_LIBS = @GLIB2_LIBS@
57083 -GLIBC21 = @GLIBC21@
57084 -GMSGFMT = @GMSGFMT@
57085 -GREP = @GREP@
57086 -GTK2_CFLAGS = @GTK2_CFLAGS@
57087 -GTK2_LIBS = @GTK2_LIBS@
57088 -INSTALL = @INSTALL@
57089 -INSTALL_DATA = @INSTALL_DATA@
57090 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
57091 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
57092 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
57093 -INSTOBJEXT = @INSTOBJEXT@
57094 -INTLBISON = @INTLBISON@
57095 -INTLLIBS = @INTLLIBS@
57096 -INTLOBJS = @INTLOBJS@
57097 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
57098 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
57099 -INTLTOOL_PERL = @INTLTOOL_PERL@
57100 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
57101 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
57102 -LDFLAGS = @LDFLAGS@
57103 -LIBICONV = @LIBICONV@
57104 -LIBINTL = @LIBINTL@
57105 -LIBOBJS = @LIBOBJS@
57106 -LIBS = @LIBS@
57107 -LIBTOOL = @LIBTOOL@
57108 -LN_S = @LN_S@
57109 -LTLIBICONV = @LTLIBICONV@
57110 -LTLIBINTL = @LTLIBINTL@
57111 -LTLIBOBJS = @LTLIBOBJS@
57112 -MAINT = @MAINT@
57113 -MAKEINFO = @MAKEINFO@
57114 -MKDIR_P = @MKDIR_P@
57115 -MKINSTALLDIRS = @MKINSTALLDIRS@
57116 -MSGFMT = @MSGFMT@
57117 -MSGMERGE = @MSGMERGE@
57118 -NASM = @NASM@
57119 -NMEDIT = @NMEDIT@
57120 -OBJEXT = @OBJEXT@
57121 -PACKAGE = @PACKAGE@
57122 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
57123 -PACKAGE_NAME = @PACKAGE_NAME@
57124 -PACKAGE_STRING = @PACKAGE_STRING@
57125 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
57126 -PACKAGE_VERSION = @PACKAGE_VERSION@
57127 -PATH_SEPARATOR = @PATH_SEPARATOR@
57128 -PKG_CONFIG = @PKG_CONFIG@
57129 -POSUB = @POSUB@
57130 -RANLIB = @RANLIB@
57131 -SED = @SED@
57132 -SET_MAKE = @SET_MAKE@
57133 -SHELL = @SHELL@
57134 -STRIP = @STRIP@
57135 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
57136 -USE_NLS = @USE_NLS@
57137 -VERSION = @VERSION@
57138 -XGETTEXT = @XGETTEXT@
57139 -abs_builddir = @abs_builddir@
57140 -abs_srcdir = @abs_srcdir@
57141 -abs_top_builddir = @abs_top_builddir@
57142 -abs_top_srcdir = @abs_top_srcdir@
57143 -ac_ct_CC = @ac_ct_CC@
57144 -ac_ct_CXX = @ac_ct_CXX@
57145 -ac_ct_F77 = @ac_ct_F77@
57146 -am__include = @am__include@
57147 -am__leading_dot = @am__leading_dot@
57148 -am__quote = @am__quote@
57149 -am__tar = @am__tar@
57150 -am__untar = @am__untar@
57151 -bindir = @bindir@
57152 -build = @build@
57153 -build_alias = @build_alias@
57154 -build_cpu = @build_cpu@
57155 -build_os = @build_os@
57156 -build_vendor = @build_vendor@
57157 -builddir = @builddir@
57158 -datadir = @datadir@
57159 -datarootdir = @datarootdir@
57160 -docdir = @docdir@
57161 -dvidir = @dvidir@
57162 -exec_prefix = @exec_prefix@
57163 -host = @host@
57164 -host_alias = @host_alias@
57165 -host_cpu = @host_cpu@
57166 -host_os = @host_os@
57167 -host_vendor = @host_vendor@
57168 -htmldir = @htmldir@
57169 -includedir = @includedir@
57170 -infodir = @infodir@
57171 -install_sh = @install_sh@
57172 -libdir = @libdir@
57173 -libexecdir = @libexecdir@
57174 -localedir = @localedir@
57175 -localstatedir = @localstatedir@
57176 -mandir = @mandir@
57177 -mkdir_p = @mkdir_p@
57178 -oldincludedir = @oldincludedir@
57179 -pdfdir = @pdfdir@
57180 -prefix = @prefix@
57181 -program_transform_name = @program_transform_name@
57182 -psdir = @psdir@
57183 -sbindir = @sbindir@
57184 -sharedstatedir = @sharedstatedir@
57185 -srcdir = @srcdir@
57186 -sysconfdir = @sysconfdir@
57187 -target = @target@
57188 -target_alias = @target_alias@
57189 -target_cpu = @target_cpu@
57190 -target_os = @target_os@
57191 -target_vendor = @target_vendor@
57192 -top_build_prefix = @top_build_prefix@
57193 -top_builddir = @top_builddir@
57194 -top_srcdir = @top_srcdir@
57195 -INCLUDES = -DLOCALE_DIR=\"${datadir}/locale/\" \
57196 - $(GLIB2_CFLAGS) -I$(top_srcdir)/include
57197 -
57198 -lib_LTLIBRARIES = libpcsxcore.la
57199 -libpcsxcore_la_SOURCES = $(top_builddir)/libpcsxcore/psxbios.c \
57200 - $(top_builddir)/libpcsxcore/cdrom.c \
57201 - $(top_builddir)/libpcsxcore/psxcounters.c \
57202 - $(top_builddir)/libpcsxcore/psxdma.c \
57203 - $(top_builddir)/libpcsxcore/disr3000a.c \
57204 - $(top_builddir)/libpcsxcore/spu.c \
57205 - $(top_builddir)/libpcsxcore/sio.c \
57206 - $(top_builddir)/libpcsxcore/psxhw.c \
57207 - $(top_builddir)/libpcsxcore/mdec.c \
57208 - $(top_builddir)/libpcsxcore/psxmem.c \
57209 - $(top_builddir)/libpcsxcore/misc.c \
57210 - $(top_builddir)/libpcsxcore/plugins.c \
57211 - $(top_builddir)/libpcsxcore/decode_xa.c \
57212 - $(top_builddir)/libpcsxcore/r3000a.c \
57213 - $(top_builddir)/libpcsxcore/psxinterpreter.c \
57214 - $(top_builddir)/libpcsxcore/gte.c \
57215 - $(top_builddir)/libpcsxcore/psxhle.c \
57216 - $(top_builddir)/libpcsxcore/cdrom.h \
57217 - $(top_builddir)/libpcsxcore/coff.h \
57218 - $(top_builddir)/libpcsxcore/debug.h \
57219 - $(top_builddir)/libpcsxcore/decode_xa.h \
57220 - $(top_builddir)/libpcsxcore/gte.h \
57221 - $(top_builddir)/libpcsxcore/mdec.h \
57222 - $(top_builddir)/libpcsxcore/misc.h \
57223 - $(top_builddir)/libpcsxcore/plugins.h \
57224 - $(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
57225 - $(top_builddir)/libpcsxcore/psxbios.h \
57226 - $(top_builddir)/libpcsxcore/psxcommon.h \
57227 - $(top_builddir)/libpcsxcore/psxcounters.h \
57228 - $(top_builddir)/libpcsxcore/psxdma.h \
57229 - $(top_builddir)/libpcsxcore/psxhle.h \
57230 - $(top_builddir)/libpcsxcore/psxhw.h \
57231 - $(top_builddir)/libpcsxcore/psxmem.h \
57232 - $(top_builddir)/libpcsxcore/r3000a.h \
57233 - $(top_builddir)/libpcsxcore/sio.h \
57234 - $(top_builddir)/libpcsxcore/spu.h \
57235 - $(top_builddir)/libpcsxcore/system.h $(am__append_1) \
57236 - $(am__append_2) $(am__append_3)
57237 -@ARCH_PPC_TRUE@libpcsxcore_la_CCASFLAGS = -x assembler-with-cpp -mregnames
57238 -libpcsxcore_la_LIBADD = $(GLIB2_LIBS)
57239 -libpcsxcore_la_LDFLAGS = -version-info 0:0:0
57240 -EXTRA_DIST = \
57241 - $(top_builddir)/libpcsxcore/ix86/iGte.h \
57242 - $(top_builddir)/libpcsxcore/ix86/ix86.h \
57243 - $(top_builddir)/libpcsxcore/ix86_64/README \
57244 - $(top_builddir)/libpcsxcore/ix86_64/iGte.h \
57245 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.h \
57246 - $(top_builddir)/libpcsxcore/ppc/pGte.h \
57247 - $(top_builddir)/libpcsxcore/ppc/ppc.h \
57248 - $(top_builddir)/libpcsxcore/ppc/reguse.h \
57249 - $(top_builddir)/libpcsxcore/ppc/ppc_mnemonics.h
57250 -
57251 -all: all-am
57252 -
57253 -.SUFFIXES:
57254 -.SUFFIXES: .c .lo .o .obj .s
57255 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
57256 - @for dep in $?; do \
57257 - case '$(am__configure_deps)' in \
57258 - *$$dep*) \
57259 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
57260 - && exit 0; \
57261 - exit 1;; \
57262 - esac; \
57263 - done; \
57264 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpcsxcore/Makefile'; \
57265 - cd $(top_srcdir) && \
57266 - $(AUTOMAKE) --gnu libpcsxcore/Makefile
57267 -.PRECIOUS: Makefile
57268 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
57269 - @case '$?' in \
57270 - *config.status*) \
57271 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
57272 - *) \
57273 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
57274 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
57275 - esac;
57276 -
57277 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
57278 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
57279 -
57280 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
57281 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
57282 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
57283 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
57284 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
57285 - @$(NORMAL_INSTALL)
57286 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
57287 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
57288 - if test -f $$p; then \
57289 - f=$(am__strip_dir) \
57290 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
57291 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
57292 - else :; fi; \
57293 - done
57294 -
57295 -uninstall-libLTLIBRARIES:
57296 - @$(NORMAL_UNINSTALL)
57297 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
57298 - p=$(am__strip_dir) \
57299 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
57300 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
57301 - done
57302 -
57303 -clean-libLTLIBRARIES:
57304 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
57305 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
57306 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
57307 - test "$$dir" != "$$p" || dir=.; \
57308 - echo "rm -f \"$${dir}/so_locations\""; \
57309 - rm -f "$${dir}/so_locations"; \
57310 - done
57311 -libpcsxcore.la: $(libpcsxcore_la_OBJECTS) $(libpcsxcore_la_DEPENDENCIES)
57312 - $(libpcsxcore_la_LINK) -rpath $(libdir) $(libpcsxcore_la_OBJECTS) $(libpcsxcore_la_LIBADD) $(LIBS)
57313 -
57314 -mostlyclean-compile:
57315 - -rm -f *.$(OBJEXT)
57316 -
57317 -distclean-compile:
57318 - -rm -f *.tab.c
57319 -
57320 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdrom.Plo@am__quote@
57321 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_xa.Plo@am__quote@
57322 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disr3000a.Plo@am__quote@
57323 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gte.Plo@am__quote@
57324 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iR3000A-64.Plo@am__quote@
57325 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iR3000A.Plo@am__quote@
57326 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86-64.Plo@am__quote@
57327 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86.Plo@am__quote@
57328 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_3dnow.Plo@am__quote@
57329 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_cpudetect.Plo@am__quote@
57330 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_fpu.Plo@am__quote@
57331 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_mmx.Plo@am__quote@
57332 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_sse.Plo@am__quote@
57333 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdec.Plo@am__quote@
57334 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
57335 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pR3000A.Plo@am__quote@
57336 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugins.Plo@am__quote@
57337 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc.Plo@am__quote@
57338 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxbios.Plo@am__quote@
57339 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxcounters.Plo@am__quote@
57340 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxdma.Plo@am__quote@
57341 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxhle.Plo@am__quote@
57342 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxhw.Plo@am__quote@
57343 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxinterpreter.Plo@am__quote@
57344 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxmem.Plo@am__quote@
57345 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/r3000a.Plo@am__quote@
57346 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reguse.Plo@am__quote@
57347 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio.Plo@am__quote@
57348 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spu.Plo@am__quote@
57349 -
57350 -.c.o:
57351 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
57352 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
57353 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
57354 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57355 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
57356 -
57357 -.c.obj:
57358 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
57359 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
57360 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
57361 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57362 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
57363 -
57364 -.c.lo:
57365 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
57366 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
57367 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
57368 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57369 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
57370 -
57371 -psxbios.lo: $(top_builddir)/libpcsxcore/psxbios.c
57372 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxbios.lo -MD -MP -MF $(DEPDIR)/psxbios.Tpo -c -o psxbios.lo `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
57373 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Plo
57374 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxbios.c' object='psxbios.lo' libtool=yes @AMDEPBACKSLASH@
57375 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57376 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxbios.lo `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
57377 -
57378 -cdrom.lo: $(top_builddir)/libpcsxcore/cdrom.c
57379 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdrom.lo -MD -MP -MF $(DEPDIR)/cdrom.Tpo -c -o cdrom.lo `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
57380 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Plo
57381 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/cdrom.c' object='cdrom.lo' libtool=yes @AMDEPBACKSLASH@
57382 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57383 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrom.lo `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
57384 -
57385 -psxcounters.lo: $(top_builddir)/libpcsxcore/psxcounters.c
57386 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcounters.lo -MD -MP -MF $(DEPDIR)/psxcounters.Tpo -c -o psxcounters.lo `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
57387 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Plo
57388 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxcounters.c' object='psxcounters.lo' libtool=yes @AMDEPBACKSLASH@
57389 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57390 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcounters.lo `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
57391 -
57392 -psxdma.lo: $(top_builddir)/libpcsxcore/psxdma.c
57393 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxdma.lo -MD -MP -MF $(DEPDIR)/psxdma.Tpo -c -o psxdma.lo `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
57394 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Plo
57395 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxdma.c' object='psxdma.lo' libtool=yes @AMDEPBACKSLASH@
57396 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57397 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxdma.lo `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
57398 -
57399 -disr3000a.lo: $(top_builddir)/libpcsxcore/disr3000a.c
57400 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT disr3000a.lo -MD -MP -MF $(DEPDIR)/disr3000a.Tpo -c -o disr3000a.lo `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
57401 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Plo
57402 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/disr3000a.c' object='disr3000a.lo' libtool=yes @AMDEPBACKSLASH@
57403 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57404 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o disr3000a.lo `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
57405 -
57406 -spu.lo: $(top_builddir)/libpcsxcore/spu.c
57407 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
57408 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
57409 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/spu.c' object='spu.lo' libtool=yes @AMDEPBACKSLASH@
57410 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57411 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
57412 -
57413 -sio.lo: $(top_builddir)/libpcsxcore/sio.c
57414 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sio.lo -MD -MP -MF $(DEPDIR)/sio.Tpo -c -o sio.lo `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
57415 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Plo
57416 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/sio.c' object='sio.lo' libtool=yes @AMDEPBACKSLASH@
57417 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57418 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sio.lo `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
57419 -
57420 -psxhw.lo: $(top_builddir)/libpcsxcore/psxhw.c
57421 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhw.lo -MD -MP -MF $(DEPDIR)/psxhw.Tpo -c -o psxhw.lo `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
57422 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Plo
57423 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxhw.c' object='psxhw.lo' libtool=yes @AMDEPBACKSLASH@
57424 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57425 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhw.lo `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
57426 -
57427 -mdec.lo: $(top_builddir)/libpcsxcore/mdec.c
57428 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdec.lo -MD -MP -MF $(DEPDIR)/mdec.Tpo -c -o mdec.lo `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
57429 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Plo
57430 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/mdec.c' object='mdec.lo' libtool=yes @AMDEPBACKSLASH@
57431 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57432 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdec.lo `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
57433 -
57434 -psxmem.lo: $(top_builddir)/libpcsxcore/psxmem.c
57435 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxmem.lo -MD -MP -MF $(DEPDIR)/psxmem.Tpo -c -o psxmem.lo `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
57436 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Plo
57437 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxmem.c' object='psxmem.lo' libtool=yes @AMDEPBACKSLASH@
57438 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57439 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxmem.lo `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
57440 -
57441 -misc.lo: $(top_builddir)/libpcsxcore/misc.c
57442 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.lo -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.lo `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
57443 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Plo
57444 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/misc.c' object='misc.lo' libtool=yes @AMDEPBACKSLASH@
57445 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57446 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.lo `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
57447 -
57448 -plugins.lo: $(top_builddir)/libpcsxcore/plugins.c
57449 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugins.lo -MD -MP -MF $(DEPDIR)/plugins.Tpo -c -o plugins.lo `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
57450 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Plo
57451 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/plugins.c' object='plugins.lo' libtool=yes @AMDEPBACKSLASH@
57452 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57453 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plugins.lo `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
57454 -
57455 -decode_xa.lo: $(top_builddir)/libpcsxcore/decode_xa.c
57456 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode_xa.lo -MD -MP -MF $(DEPDIR)/decode_xa.Tpo -c -o decode_xa.lo `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
57457 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Plo
57458 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/decode_xa.c' object='decode_xa.lo' libtool=yes @AMDEPBACKSLASH@
57459 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57460 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode_xa.lo `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
57461 -
57462 -r3000a.lo: $(top_builddir)/libpcsxcore/r3000a.c
57463 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT r3000a.lo -MD -MP -MF $(DEPDIR)/r3000a.Tpo -c -o r3000a.lo `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
57464 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Plo
57465 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/r3000a.c' object='r3000a.lo' libtool=yes @AMDEPBACKSLASH@
57466 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57467 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o r3000a.lo `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
57468 -
57469 -psxinterpreter.lo: $(top_builddir)/libpcsxcore/psxinterpreter.c
57470 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxinterpreter.lo -MD -MP -MF $(DEPDIR)/psxinterpreter.Tpo -c -o psxinterpreter.lo `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
57471 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Plo
57472 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxinterpreter.c' object='psxinterpreter.lo' libtool=yes @AMDEPBACKSLASH@
57473 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57474 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxinterpreter.lo `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
57475 -
57476 -gte.lo: $(top_builddir)/libpcsxcore/gte.c
57477 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gte.lo -MD -MP -MF $(DEPDIR)/gte.Tpo -c -o gte.lo `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
57478 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Plo
57479 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/gte.c' object='gte.lo' libtool=yes @AMDEPBACKSLASH@
57480 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57481 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gte.lo `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
57482 -
57483 -psxhle.lo: $(top_builddir)/libpcsxcore/psxhle.c
57484 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhle.lo -MD -MP -MF $(DEPDIR)/psxhle.Tpo -c -o psxhle.lo `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
57485 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Plo
57486 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxhle.c' object='psxhle.lo' libtool=yes @AMDEPBACKSLASH@
57487 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57488 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhle.lo `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
57489 -
57490 -iR3000A-64.lo: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
57491 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.lo -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
57492 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Plo
57493 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' object='iR3000A-64.lo' libtool=yes @AMDEPBACKSLASH@
57494 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57495 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
57496 -
57497 -ix86-64.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
57498 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86-64.lo -MD -MP -MF $(DEPDIR)/ix86-64.Tpo -c -o ix86-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
57499 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Plo
57500 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' object='ix86-64.lo' libtool=yes @AMDEPBACKSLASH@
57501 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57502 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
57503 -
57504 -ix86_cpudetect.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
57505 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_cpudetect.lo -MD -MP -MF $(DEPDIR)/ix86_cpudetect.Tpo -c -o ix86_cpudetect.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
57506 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Plo
57507 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' object='ix86_cpudetect.lo' libtool=yes @AMDEPBACKSLASH@
57508 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57509 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_cpudetect.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
57510 -
57511 -ix86_fpu.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
57512 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_fpu.lo -MD -MP -MF $(DEPDIR)/ix86_fpu.Tpo -c -o ix86_fpu.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
57513 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Plo
57514 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' object='ix86_fpu.lo' libtool=yes @AMDEPBACKSLASH@
57515 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57516 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_fpu.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
57517 -
57518 -ix86_3dnow.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
57519 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_3dnow.lo -MD -MP -MF $(DEPDIR)/ix86_3dnow.Tpo -c -o ix86_3dnow.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
57520 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Plo
57521 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' object='ix86_3dnow.lo' libtool=yes @AMDEPBACKSLASH@
57522 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57523 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_3dnow.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
57524 -
57525 -ix86_mmx.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
57526 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_mmx.lo -MD -MP -MF $(DEPDIR)/ix86_mmx.Tpo -c -o ix86_mmx.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
57527 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Plo
57528 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' object='ix86_mmx.lo' libtool=yes @AMDEPBACKSLASH@
57529 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57530 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_mmx.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
57531 -
57532 -ix86_sse.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
57533 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_sse.lo -MD -MP -MF $(DEPDIR)/ix86_sse.Tpo -c -o ix86_sse.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
57534 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Plo
57535 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' object='ix86_sse.lo' libtool=yes @AMDEPBACKSLASH@
57536 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57537 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_sse.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
57538 -
57539 -iR3000A.lo: $(top_builddir)/libpcsxcore/ix86/iR3000A.c
57540 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A.lo -MD -MP -MF $(DEPDIR)/iR3000A.Tpo -c -o iR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
57541 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Plo
57542 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86/iR3000A.c' object='iR3000A.lo' libtool=yes @AMDEPBACKSLASH@
57543 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57544 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
57545 -
57546 -ix86.lo: $(top_builddir)/libpcsxcore/ix86/ix86.c
57547 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86.lo -MD -MP -MF $(DEPDIR)/ix86.Tpo -c -o ix86.lo `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
57548 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Plo
57549 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86/ix86.c' object='ix86.lo' libtool=yes @AMDEPBACKSLASH@
57550 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57551 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86.lo `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
57552 -
57553 -pR3000A.lo: $(top_builddir)/libpcsxcore/ppc/pR3000A.c
57554 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pR3000A.lo -MD -MP -MF $(DEPDIR)/pR3000A.Tpo -c -o pR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
57555 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Plo
57556 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppc/pR3000A.c' object='pR3000A.lo' libtool=yes @AMDEPBACKSLASH@
57557 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57558 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
57559 -
57560 -ppc.lo: $(top_builddir)/libpcsxcore/ppc/ppc.c
57561 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppc.lo -MD -MP -MF $(DEPDIR)/ppc.Tpo -c -o ppc.lo `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
57562 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Plo
57563 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppc/ppc.c' object='ppc.lo' libtool=yes @AMDEPBACKSLASH@
57564 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57565 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppc.lo `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
57566 -
57567 -reguse.lo: $(top_builddir)/libpcsxcore/ppc/reguse.c
57568 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reguse.lo -MD -MP -MF $(DEPDIR)/reguse.Tpo -c -o reguse.lo `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
57569 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Plo
57570 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppc/reguse.c' object='reguse.lo' libtool=yes @AMDEPBACKSLASH@
57571 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
57572 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reguse.lo `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
57573 -
57574 -.s.o:
57575 - $(CCASCOMPILE) -c -o $@ $<
57576 -
57577 -.s.obj:
57578 - $(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
57579 -
57580 -.s.lo:
57581 - $(LTCCASCOMPILE) -c -o $@ $<
57582 -
57583 -libpcsxcore_la-pasm.lo: $(top_builddir)/libpcsxcore/ppc/pasm.s
57584 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(libpcsxcore_la_CCASFLAGS) $(CCASFLAGS) -c -o libpcsxcore_la-pasm.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pasm.s' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pasm.s
57585 -
57586 -mostlyclean-libtool:
57587 - -rm -f *.lo
57588 -
57589 -clean-libtool:
57590 - -rm -rf .libs _libs
57591 -
57592 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
57593 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
57594 - unique=`for i in $$list; do \
57595 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
57596 - done | \
57597 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
57598 - END { if (nonempty) { for (i in files) print i; }; }'`; \
57599 - mkid -fID $$unique
57600 -tags: TAGS
57601 -
57602 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
57603 - $(TAGS_FILES) $(LISP)
57604 - tags=; \
57605 - here=`pwd`; \
57606 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
57607 - unique=`for i in $$list; do \
57608 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
57609 - done | \
57610 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
57611 - END { if (nonempty) { for (i in files) print i; }; }'`; \
57612 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
57613 - test -n "$$unique" || unique=$$empty_fix; \
57614 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
57615 - $$tags $$unique; \
57616 - fi
57617 -ctags: CTAGS
57618 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
57619 - $(TAGS_FILES) $(LISP)
57620 - tags=; \
57621 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
57622 - unique=`for i in $$list; do \
57623 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
57624 - done | \
57625 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
57626 - END { if (nonempty) { for (i in files) print i; }; }'`; \
57627 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
57628 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
57629 - $$tags $$unique
57630 -
57631 -GTAGS:
57632 - here=`$(am__cd) $(top_builddir) && pwd` \
57633 - && cd $(top_srcdir) \
57634 - && gtags -i $(GTAGS_ARGS) $$here
57635 -
57636 -distclean-tags:
57637 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
57638 -
57639 -distdir: $(DISTFILES)
57640 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
57641 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
57642 - list='$(DISTFILES)'; \
57643 - dist_files=`for file in $$list; do echo $$file; done | \
57644 - sed -e "s|^$$srcdirstrip/||;t" \
57645 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
57646 - case $$dist_files in \
57647 - */*) $(MKDIR_P) `echo "$$dist_files" | \
57648 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
57649 - sort -u` ;; \
57650 - esac; \
57651 - for file in $$dist_files; do \
57652 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
57653 - if test -d $$d/$$file; then \
57654 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
57655 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
57656 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
57657 - fi; \
57658 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
57659 - else \
57660 - test -f $(distdir)/$$file \
57661 - || cp -p $$d/$$file $(distdir)/$$file \
57662 - || exit 1; \
57663 - fi; \
57664 - done
57665 -check-am: all-am
57666 -check: check-am
57667 -all-am: Makefile $(LTLIBRARIES)
57668 -installdirs:
57669 - for dir in "$(DESTDIR)$(libdir)"; do \
57670 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
57671 - done
57672 -install: install-am
57673 -install-exec: install-exec-am
57674 -install-data: install-data-am
57675 -uninstall: uninstall-am
57676 -
57677 -install-am: all-am
57678 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
57679 -
57680 -installcheck: installcheck-am
57681 -install-strip:
57682 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
57683 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57684 - `test -z '$(STRIP)' || \
57685 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
57686 -mostlyclean-generic:
57687 -
57688 -clean-generic:
57689 -
57690 -distclean-generic:
57691 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
57692 -
57693 -maintainer-clean-generic:
57694 - @echo "This command is intended for maintainers to use"
57695 - @echo "it deletes files that may require special tools to rebuild."
57696 -clean: clean-am
57697 -
57698 -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
57699 - mostlyclean-am
57700 -
57701 -distclean: distclean-am
57702 - -rm -rf ./$(DEPDIR)
57703 - -rm -f Makefile
57704 -distclean-am: clean-am distclean-compile distclean-generic \
57705 - distclean-tags
57706 -
57707 -dvi: dvi-am
57708 -
57709 -dvi-am:
57710 -
57711 -html: html-am
57712 -
57713 -info: info-am
57714 -
57715 -info-am:
57716 -
57717 -install-data-am:
57718 -
57719 -install-dvi: install-dvi-am
57720 -
57721 -install-exec-am: install-libLTLIBRARIES
57722 -
57723 -install-html: install-html-am
57724 -
57725 -install-info: install-info-am
57726 -
57727 -install-man:
57728 -
57729 -install-pdf: install-pdf-am
57730 -
57731 -install-ps: install-ps-am
57732 -
57733 -installcheck-am:
57734 -
57735 -maintainer-clean: maintainer-clean-am
57736 - -rm -rf ./$(DEPDIR)
57737 - -rm -f Makefile
57738 -maintainer-clean-am: distclean-am maintainer-clean-generic
57739 -
57740 -mostlyclean: mostlyclean-am
57741 -
57742 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
57743 - mostlyclean-libtool
57744 -
57745 -pdf: pdf-am
57746 -
57747 -pdf-am:
57748 -
57749 -ps: ps-am
57750 -
57751 -ps-am:
57752 -
57753 -uninstall-am: uninstall-libLTLIBRARIES
57754 -
57755 -.MAKE: install-am install-strip
57756 -
57757 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
57758 - clean-libLTLIBRARIES clean-libtool ctags distclean \
57759 - distclean-compile distclean-generic distclean-libtool \
57760 - distclean-tags distdir dvi dvi-am html html-am info info-am \
57761 - install install-am install-data install-data-am install-dvi \
57762 - install-dvi-am install-exec install-exec-am install-html \
57763 - install-html-am install-info install-info-am \
57764 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
57765 - install-ps install-ps-am install-strip installcheck \
57766 - installcheck-am installdirs maintainer-clean \
57767 - maintainer-clean-generic mostlyclean mostlyclean-compile \
57768 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
57769 - tags uninstall uninstall-am uninstall-libLTLIBRARIES
57770 -
57771 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
57772 -# Otherwise a system limit (for SysV at least) may be exceeded.
57773 -.NOEXPORT:
57774 diff -rupN original/libpcsxcore/libpcsxcore/.deps/cdrom.Plo new/libpcsxcore/libpcsxcore/.deps/cdrom.Plo
57775 --- original/libpcsxcore/libpcsxcore/.deps/cdrom.Plo 2009-03-28 22:34:43.000000000 -0430
57776 +++ new/libpcsxcore/libpcsxcore/.deps/cdrom.Plo 1969-12-31 20:00:00.000000000 -0400
57777 @@ -1,364 +0,0 @@
57778 -cdrom.lo: ../libpcsxcore/cdrom.c ../libpcsxcore/cdrom.h \
57779 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
57780 - /usr/include/features.h /usr/include/sys/cdefs.h \
57781 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
57782 - /usr/include/gnu/stubs-32.h \
57783 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
57784 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
57785 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
57786 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
57787 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
57788 - /usr/include/bits/stdio.h /usr/include/string.h \
57789 - /usr/include/bits/string.h /usr/include/bits/string2.h \
57790 - /usr/include/endian.h /usr/include/bits/endian.h \
57791 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
57792 - /usr/include/stdint.h /usr/include/bits/wchar.h \
57793 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
57794 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
57795 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
57796 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
57797 - /usr/include/math.h /usr/include/bits/huge_val.h \
57798 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
57799 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
57800 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
57801 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
57802 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
57803 - /usr/include/glib-2.0/glib/galloca.h \
57804 - /usr/include/glib-2.0/glib/gtypes.h \
57805 - /usr/lib/glib-2.0/include/glibconfig.h \
57806 - /usr/include/glib-2.0/glib/gmacros.h \
57807 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
57808 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
57809 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
57810 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
57811 - /usr/include/bits/posix2_lim.h \
57812 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
57813 - /usr/include/glib-2.0/glib/garray.h \
57814 - /usr/include/glib-2.0/glib/gasyncqueue.h \
57815 - /usr/include/glib-2.0/glib/gthread.h \
57816 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
57817 - /usr/include/glib-2.0/glib/gutils.h \
57818 - /usr/include/glib-2.0/glib/gatomic.h \
57819 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
57820 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
57821 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
57822 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
57823 - /usr/include/glib-2.0/glib/gbase64.h \
57824 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
57825 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
57826 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
57827 - /usr/include/glib-2.0/glib/gchecksum.h \
57828 - /usr/include/glib-2.0/glib/gcompletion.h \
57829 - /usr/include/glib-2.0/glib/gconvert.h \
57830 - /usr/include/glib-2.0/glib/gdataset.h \
57831 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
57832 - /usr/include/glib-2.0/glib/gfileutils.h \
57833 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
57834 - /usr/include/glib-2.0/glib/giochannel.h \
57835 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
57836 - /usr/include/glib-2.0/glib/gslist.h \
57837 - /usr/include/glib-2.0/glib/gstring.h \
57838 - /usr/include/glib-2.0/glib/gunicode.h \
57839 - /usr/include/glib-2.0/glib/gkeyfile.h \
57840 - /usr/include/glib-2.0/glib/gmappedfile.h \
57841 - /usr/include/glib-2.0/glib/gmarkup.h \
57842 - /usr/include/glib-2.0/glib/gmessages.h \
57843 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
57844 - /usr/include/glib-2.0/glib/gpattern.h \
57845 - /usr/include/glib-2.0/glib/gprimes.h \
57846 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
57847 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
57848 - /usr/include/glib-2.0/glib/gregex.h \
57849 - /usr/include/glib-2.0/glib/gscanner.h \
57850 - /usr/include/glib-2.0/glib/gsequence.h \
57851 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
57852 - /usr/include/glib-2.0/glib/gstrfuncs.h \
57853 - /usr/include/glib-2.0/glib/gtestutils.h \
57854 - /usr/include/glib-2.0/glib/gthreadpool.h \
57855 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
57856 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
57857 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
57858 - /usr/include/bits/locale.h ../libpcsxcore/decode_xa.h \
57859 - ../libpcsxcore/r3000a.h ../libpcsxcore/psxmem.h \
57860 - ../libpcsxcore/psxcounters.h ../libpcsxcore/plugins.h \
57861 - ../libpcsxcore/spu.h ../libpcsxcore/psemu_plugin_defs.h \
57862 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
57863 - ../libpcsxcore/sio.h ../libpcsxcore/psxhw.h
57864 -
57865 -../libpcsxcore/cdrom.h:
57866 -
57867 -../libpcsxcore/psxcommon.h:
57868 -
57869 -../include/config.h:
57870 -
57871 -/usr/include/stdio.h:
57872 -
57873 -/usr/include/features.h:
57874 -
57875 -/usr/include/sys/cdefs.h:
57876 -
57877 -/usr/include/bits/wordsize.h:
57878 -
57879 -/usr/include/gnu/stubs.h:
57880 -
57881 -/usr/include/gnu/stubs-32.h:
57882 -
57883 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
57884 -
57885 -/usr/include/bits/types.h:
57886 -
57887 -/usr/include/bits/typesizes.h:
57888 -
57889 -/usr/include/libio.h:
57890 -
57891 -/usr/include/_G_config.h:
57892 -
57893 -/usr/include/wchar.h:
57894 -
57895 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
57896 -
57897 -/usr/include/bits/stdio_lim.h:
57898 -
57899 -/usr/include/bits/sys_errlist.h:
57900 -
57901 -/usr/include/bits/stdio.h:
57902 -
57903 -/usr/include/string.h:
57904 -
57905 -/usr/include/bits/string.h:
57906 -
57907 -/usr/include/bits/string2.h:
57908 -
57909 -/usr/include/endian.h:
57910 -
57911 -/usr/include/bits/endian.h:
57912 -
57913 -/usr/include/bits/byteswap.h:
57914 -
57915 -/usr/include/stdlib.h:
57916 -
57917 -/usr/include/stdint.h:
57918 -
57919 -/usr/include/bits/wchar.h:
57920 -
57921 -/usr/include/sys/types.h:
57922 -
57923 -/usr/include/time.h:
57924 -
57925 -/usr/include/sys/select.h:
57926 -
57927 -/usr/include/bits/select.h:
57928 -
57929 -/usr/include/bits/sigset.h:
57930 -
57931 -/usr/include/bits/time.h:
57932 -
57933 -/usr/include/sys/sysmacros.h:
57934 -
57935 -/usr/include/bits/pthreadtypes.h:
57936 -
57937 -/usr/include/alloca.h:
57938 -
57939 -/usr/include/math.h:
57940 -
57941 -/usr/include/bits/huge_val.h:
57942 -
57943 -/usr/include/bits/mathdef.h:
57944 -
57945 -/usr/include/bits/mathcalls.h:
57946 -
57947 -/usr/include/bits/mathinline.h:
57948 -
57949 -/usr/include/ctype.h:
57950 -
57951 -/usr/include/zlib.h:
57952 -
57953 -/usr/include/zconf.h:
57954 -
57955 -/usr/include/zlibdefs.h:
57956 -
57957 -/usr/include/unistd.h:
57958 -
57959 -/usr/include/bits/posix_opt.h:
57960 -
57961 -/usr/include/bits/confname.h:
57962 -
57963 -/usr/include/getopt.h:
57964 -
57965 -/usr/include/glib-2.0/glib.h:
57966 -
57967 -/usr/include/glib-2.0/glib/galloca.h:
57968 -
57969 -/usr/include/glib-2.0/glib/gtypes.h:
57970 -
57971 -/usr/lib/glib-2.0/include/glibconfig.h:
57972 -
57973 -/usr/include/glib-2.0/glib/gmacros.h:
57974 -
57975 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
57976 -
57977 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
57978 -
57979 -/usr/include/limits.h:
57980 -
57981 -/usr/include/bits/posix1_lim.h:
57982 -
57983 -/usr/include/bits/local_lim.h:
57984 -
57985 -/usr/include/linux/limits.h:
57986 -
57987 -/usr/include/bits/posix2_lim.h:
57988 -
57989 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
57990 -
57991 -/usr/include/glib-2.0/glib/garray.h:
57992 -
57993 -/usr/include/glib-2.0/glib/gasyncqueue.h:
57994 -
57995 -/usr/include/glib-2.0/glib/gthread.h:
57996 -
57997 -/usr/include/glib-2.0/glib/gerror.h:
57998 -
57999 -/usr/include/glib-2.0/glib/gquark.h:
58000 -
58001 -/usr/include/glib-2.0/glib/gutils.h:
58002 -
58003 -/usr/include/glib-2.0/glib/gatomic.h:
58004 -
58005 -/usr/include/glib-2.0/glib/gbacktrace.h:
58006 -
58007 -/usr/include/signal.h:
58008 -
58009 -/usr/include/bits/signum.h:
58010 -
58011 -/usr/include/bits/siginfo.h:
58012 -
58013 -/usr/include/bits/sigaction.h:
58014 -
58015 -/usr/include/bits/sigcontext.h:
58016 -
58017 -/usr/include/bits/sigstack.h:
58018 -
58019 -/usr/include/bits/sigthread.h:
58020 -
58021 -/usr/include/glib-2.0/glib/gbase64.h:
58022 -
58023 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
58024 -
58025 -/usr/include/glib-2.0/glib/gcache.h:
58026 -
58027 -/usr/include/glib-2.0/glib/glist.h:
58028 -
58029 -/usr/include/glib-2.0/glib/gmem.h:
58030 -
58031 -/usr/include/glib-2.0/glib/gslice.h:
58032 -
58033 -/usr/include/glib-2.0/glib/gchecksum.h:
58034 -
58035 -/usr/include/glib-2.0/glib/gcompletion.h:
58036 -
58037 -/usr/include/glib-2.0/glib/gconvert.h:
58038 -
58039 -/usr/include/glib-2.0/glib/gdataset.h:
58040 -
58041 -/usr/include/glib-2.0/glib/gdate.h:
58042 -
58043 -/usr/include/glib-2.0/glib/gdir.h:
58044 -
58045 -/usr/include/glib-2.0/glib/gfileutils.h:
58046 -
58047 -/usr/include/glib-2.0/glib/ghash.h:
58048 -
58049 -/usr/include/glib-2.0/glib/ghook.h:
58050 -
58051 -/usr/include/glib-2.0/glib/giochannel.h:
58052 -
58053 -/usr/include/glib-2.0/glib/gmain.h:
58054 -
58055 -/usr/include/glib-2.0/glib/gpoll.h:
58056 -
58057 -/usr/include/glib-2.0/glib/gslist.h:
58058 -
58059 -/usr/include/glib-2.0/glib/gstring.h:
58060 -
58061 -/usr/include/glib-2.0/glib/gunicode.h:
58062 -
58063 -/usr/include/glib-2.0/glib/gkeyfile.h:
58064 -
58065 -/usr/include/glib-2.0/glib/gmappedfile.h:
58066 -
58067 -/usr/include/glib-2.0/glib/gmarkup.h:
58068 -
58069 -/usr/include/glib-2.0/glib/gmessages.h:
58070 -
58071 -/usr/include/glib-2.0/glib/gnode.h:
58072 -
58073 -/usr/include/glib-2.0/glib/goption.h:
58074 -
58075 -/usr/include/glib-2.0/glib/gpattern.h:
58076 -
58077 -/usr/include/glib-2.0/glib/gprimes.h:
58078 -
58079 -/usr/include/glib-2.0/glib/gqsort.h:
58080 -
58081 -/usr/include/glib-2.0/glib/gqueue.h:
58082 -
58083 -/usr/include/glib-2.0/glib/grand.h:
58084 -
58085 -/usr/include/glib-2.0/glib/grel.h:
58086 -
58087 -/usr/include/glib-2.0/glib/gregex.h:
58088 -
58089 -/usr/include/glib-2.0/glib/gscanner.h:
58090 -
58091 -/usr/include/glib-2.0/glib/gsequence.h:
58092 -
58093 -/usr/include/glib-2.0/glib/gshell.h:
58094 -
58095 -/usr/include/glib-2.0/glib/gspawn.h:
58096 -
58097 -/usr/include/glib-2.0/glib/gstrfuncs.h:
58098 -
58099 -/usr/include/glib-2.0/glib/gtestutils.h:
58100 -
58101 -/usr/include/glib-2.0/glib/gthreadpool.h:
58102 -
58103 -/usr/include/glib-2.0/glib/gtimer.h:
58104 -
58105 -/usr/include/glib-2.0/glib/gtree.h:
58106 -
58107 -/usr/include/glib-2.0/glib/gurifuncs.h:
58108 -
58109 -../libpcsxcore/system.h:
58110 -
58111 -../libpcsxcore/debug.h:
58112 -
58113 -/usr/include/libintl.h:
58114 -
58115 -/usr/include/locale.h:
58116 -
58117 -/usr/include/bits/locale.h:
58118 -
58119 -../libpcsxcore/decode_xa.h:
58120 -
58121 -../libpcsxcore/r3000a.h:
58122 -
58123 -../libpcsxcore/psxmem.h:
58124 -
58125 -../libpcsxcore/psxcounters.h:
58126 -
58127 -../libpcsxcore/plugins.h:
58128 -
58129 -../libpcsxcore/spu.h:
58130 -
58131 -../libpcsxcore/psemu_plugin_defs.h:
58132 -
58133 -../libpcsxcore/psxbios.h:
58134 -
58135 -../libpcsxcore/misc.h:
58136 -
58137 -../libpcsxcore/coff.h:
58138 -
58139 -../libpcsxcore/sio.h:
58140 -
58141 -../libpcsxcore/psxhw.h:
58142 diff -rupN original/libpcsxcore/libpcsxcore/.deps/decode_xa.Plo new/libpcsxcore/libpcsxcore/.deps/decode_xa.Plo
58143 --- original/libpcsxcore/libpcsxcore/.deps/decode_xa.Plo 2009-03-28 22:34:55.000000000 -0430
58144 +++ new/libpcsxcore/libpcsxcore/.deps/decode_xa.Plo 1969-12-31 20:00:00.000000000 -0400
58145 @@ -1,335 +0,0 @@
58146 -decode_xa.lo: ../libpcsxcore/decode_xa.c ../libpcsxcore/decode_xa.h \
58147 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
58148 - /usr/include/features.h /usr/include/sys/cdefs.h \
58149 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
58150 - /usr/include/gnu/stubs-32.h \
58151 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
58152 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
58153 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
58154 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
58155 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
58156 - /usr/include/bits/stdio.h /usr/include/string.h \
58157 - /usr/include/bits/string.h /usr/include/bits/string2.h \
58158 - /usr/include/endian.h /usr/include/bits/endian.h \
58159 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
58160 - /usr/include/stdint.h /usr/include/bits/wchar.h \
58161 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
58162 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
58163 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
58164 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
58165 - /usr/include/math.h /usr/include/bits/huge_val.h \
58166 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
58167 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
58168 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
58169 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
58170 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
58171 - /usr/include/glib-2.0/glib/galloca.h \
58172 - /usr/include/glib-2.0/glib/gtypes.h \
58173 - /usr/lib/glib-2.0/include/glibconfig.h \
58174 - /usr/include/glib-2.0/glib/gmacros.h \
58175 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
58176 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
58177 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
58178 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
58179 - /usr/include/bits/posix2_lim.h \
58180 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
58181 - /usr/include/glib-2.0/glib/garray.h \
58182 - /usr/include/glib-2.0/glib/gasyncqueue.h \
58183 - /usr/include/glib-2.0/glib/gthread.h \
58184 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
58185 - /usr/include/glib-2.0/glib/gutils.h \
58186 - /usr/include/glib-2.0/glib/gatomic.h \
58187 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
58188 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
58189 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
58190 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
58191 - /usr/include/glib-2.0/glib/gbase64.h \
58192 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
58193 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
58194 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
58195 - /usr/include/glib-2.0/glib/gchecksum.h \
58196 - /usr/include/glib-2.0/glib/gcompletion.h \
58197 - /usr/include/glib-2.0/glib/gconvert.h \
58198 - /usr/include/glib-2.0/glib/gdataset.h \
58199 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
58200 - /usr/include/glib-2.0/glib/gfileutils.h \
58201 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
58202 - /usr/include/glib-2.0/glib/giochannel.h \
58203 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
58204 - /usr/include/glib-2.0/glib/gslist.h \
58205 - /usr/include/glib-2.0/glib/gstring.h \
58206 - /usr/include/glib-2.0/glib/gunicode.h \
58207 - /usr/include/glib-2.0/glib/gkeyfile.h \
58208 - /usr/include/glib-2.0/glib/gmappedfile.h \
58209 - /usr/include/glib-2.0/glib/gmarkup.h \
58210 - /usr/include/glib-2.0/glib/gmessages.h \
58211 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
58212 - /usr/include/glib-2.0/glib/gpattern.h \
58213 - /usr/include/glib-2.0/glib/gprimes.h \
58214 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
58215 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
58216 - /usr/include/glib-2.0/glib/gregex.h \
58217 - /usr/include/glib-2.0/glib/gscanner.h \
58218 - /usr/include/glib-2.0/glib/gsequence.h \
58219 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
58220 - /usr/include/glib-2.0/glib/gstrfuncs.h \
58221 - /usr/include/glib-2.0/glib/gtestutils.h \
58222 - /usr/include/glib-2.0/glib/gthreadpool.h \
58223 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
58224 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
58225 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
58226 - /usr/include/bits/locale.h
58227 -
58228 -../libpcsxcore/decode_xa.h:
58229 -
58230 -../libpcsxcore/psxcommon.h:
58231 -
58232 -../include/config.h:
58233 -
58234 -/usr/include/stdio.h:
58235 -
58236 -/usr/include/features.h:
58237 -
58238 -/usr/include/sys/cdefs.h:
58239 -
58240 -/usr/include/bits/wordsize.h:
58241 -
58242 -/usr/include/gnu/stubs.h:
58243 -
58244 -/usr/include/gnu/stubs-32.h:
58245 -
58246 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
58247 -
58248 -/usr/include/bits/types.h:
58249 -
58250 -/usr/include/bits/typesizes.h:
58251 -
58252 -/usr/include/libio.h:
58253 -
58254 -/usr/include/_G_config.h:
58255 -
58256 -/usr/include/wchar.h:
58257 -
58258 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
58259 -
58260 -/usr/include/bits/stdio_lim.h:
58261 -
58262 -/usr/include/bits/sys_errlist.h:
58263 -
58264 -/usr/include/bits/stdio.h:
58265 -
58266 -/usr/include/string.h:
58267 -
58268 -/usr/include/bits/string.h:
58269 -
58270 -/usr/include/bits/string2.h:
58271 -
58272 -/usr/include/endian.h:
58273 -
58274 -/usr/include/bits/endian.h:
58275 -
58276 -/usr/include/bits/byteswap.h:
58277 -
58278 -/usr/include/stdlib.h:
58279 -
58280 -/usr/include/stdint.h:
58281 -
58282 -/usr/include/bits/wchar.h:
58283 -
58284 -/usr/include/sys/types.h:
58285 -
58286 -/usr/include/time.h:
58287 -
58288 -/usr/include/sys/select.h:
58289 -
58290 -/usr/include/bits/select.h:
58291 -
58292 -/usr/include/bits/sigset.h:
58293 -
58294 -/usr/include/bits/time.h:
58295 -
58296 -/usr/include/sys/sysmacros.h:
58297 -
58298 -/usr/include/bits/pthreadtypes.h:
58299 -
58300 -/usr/include/alloca.h:
58301 -
58302 -/usr/include/math.h:
58303 -
58304 -/usr/include/bits/huge_val.h:
58305 -
58306 -/usr/include/bits/mathdef.h:
58307 -
58308 -/usr/include/bits/mathcalls.h:
58309 -
58310 -/usr/include/bits/mathinline.h:
58311 -
58312 -/usr/include/ctype.h:
58313 -
58314 -/usr/include/zlib.h:
58315 -
58316 -/usr/include/zconf.h:
58317 -
58318 -/usr/include/zlibdefs.h:
58319 -
58320 -/usr/include/unistd.h:
58321 -
58322 -/usr/include/bits/posix_opt.h:
58323 -
58324 -/usr/include/bits/confname.h:
58325 -
58326 -/usr/include/getopt.h:
58327 -
58328 -/usr/include/glib-2.0/glib.h:
58329 -
58330 -/usr/include/glib-2.0/glib/galloca.h:
58331 -
58332 -/usr/include/glib-2.0/glib/gtypes.h:
58333 -
58334 -/usr/lib/glib-2.0/include/glibconfig.h:
58335 -
58336 -/usr/include/glib-2.0/glib/gmacros.h:
58337 -
58338 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
58339 -
58340 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
58341 -
58342 -/usr/include/limits.h:
58343 -
58344 -/usr/include/bits/posix1_lim.h:
58345 -
58346 -/usr/include/bits/local_lim.h:
58347 -
58348 -/usr/include/linux/limits.h:
58349 -
58350 -/usr/include/bits/posix2_lim.h:
58351 -
58352 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
58353 -
58354 -/usr/include/glib-2.0/glib/garray.h:
58355 -
58356 -/usr/include/glib-2.0/glib/gasyncqueue.h:
58357 -
58358 -/usr/include/glib-2.0/glib/gthread.h:
58359 -
58360 -/usr/include/glib-2.0/glib/gerror.h:
58361 -
58362 -/usr/include/glib-2.0/glib/gquark.h:
58363 -
58364 -/usr/include/glib-2.0/glib/gutils.h:
58365 -
58366 -/usr/include/glib-2.0/glib/gatomic.h:
58367 -
58368 -/usr/include/glib-2.0/glib/gbacktrace.h:
58369 -
58370 -/usr/include/signal.h:
58371 -
58372 -/usr/include/bits/signum.h:
58373 -
58374 -/usr/include/bits/siginfo.h:
58375 -
58376 -/usr/include/bits/sigaction.h:
58377 -
58378 -/usr/include/bits/sigcontext.h:
58379 -
58380 -/usr/include/bits/sigstack.h:
58381 -
58382 -/usr/include/bits/sigthread.h:
58383 -
58384 -/usr/include/glib-2.0/glib/gbase64.h:
58385 -
58386 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
58387 -
58388 -/usr/include/glib-2.0/glib/gcache.h:
58389 -
58390 -/usr/include/glib-2.0/glib/glist.h:
58391 -
58392 -/usr/include/glib-2.0/glib/gmem.h:
58393 -
58394 -/usr/include/glib-2.0/glib/gslice.h:
58395 -
58396 -/usr/include/glib-2.0/glib/gchecksum.h:
58397 -
58398 -/usr/include/glib-2.0/glib/gcompletion.h:
58399 -
58400 -/usr/include/glib-2.0/glib/gconvert.h:
58401 -
58402 -/usr/include/glib-2.0/glib/gdataset.h:
58403 -
58404 -/usr/include/glib-2.0/glib/gdate.h:
58405 -
58406 -/usr/include/glib-2.0/glib/gdir.h:
58407 -
58408 -/usr/include/glib-2.0/glib/gfileutils.h:
58409 -
58410 -/usr/include/glib-2.0/glib/ghash.h:
58411 -
58412 -/usr/include/glib-2.0/glib/ghook.h:
58413 -
58414 -/usr/include/glib-2.0/glib/giochannel.h:
58415 -
58416 -/usr/include/glib-2.0/glib/gmain.h:
58417 -
58418 -/usr/include/glib-2.0/glib/gpoll.h:
58419 -
58420 -/usr/include/glib-2.0/glib/gslist.h:
58421 -
58422 -/usr/include/glib-2.0/glib/gstring.h:
58423 -
58424 -/usr/include/glib-2.0/glib/gunicode.h:
58425 -
58426 -/usr/include/glib-2.0/glib/gkeyfile.h:
58427 -
58428 -/usr/include/glib-2.0/glib/gmappedfile.h:
58429 -
58430 -/usr/include/glib-2.0/glib/gmarkup.h:
58431 -
58432 -/usr/include/glib-2.0/glib/gmessages.h:
58433 -
58434 -/usr/include/glib-2.0/glib/gnode.h:
58435 -
58436 -/usr/include/glib-2.0/glib/goption.h:
58437 -
58438 -/usr/include/glib-2.0/glib/gpattern.h:
58439 -
58440 -/usr/include/glib-2.0/glib/gprimes.h:
58441 -
58442 -/usr/include/glib-2.0/glib/gqsort.h:
58443 -
58444 -/usr/include/glib-2.0/glib/gqueue.h:
58445 -
58446 -/usr/include/glib-2.0/glib/grand.h:
58447 -
58448 -/usr/include/glib-2.0/glib/grel.h:
58449 -
58450 -/usr/include/glib-2.0/glib/gregex.h:
58451 -
58452 -/usr/include/glib-2.0/glib/gscanner.h:
58453 -
58454 -/usr/include/glib-2.0/glib/gsequence.h:
58455 -
58456 -/usr/include/glib-2.0/glib/gshell.h:
58457 -
58458 -/usr/include/glib-2.0/glib/gspawn.h:
58459 -
58460 -/usr/include/glib-2.0/glib/gstrfuncs.h:
58461 -
58462 -/usr/include/glib-2.0/glib/gtestutils.h:
58463 -
58464 -/usr/include/glib-2.0/glib/gthreadpool.h:
58465 -
58466 -/usr/include/glib-2.0/glib/gtimer.h:
58467 -
58468 -/usr/include/glib-2.0/glib/gtree.h:
58469 -
58470 -/usr/include/glib-2.0/glib/gurifuncs.h:
58471 -
58472 -../libpcsxcore/system.h:
58473 -
58474 -../libpcsxcore/debug.h:
58475 -
58476 -/usr/include/libintl.h:
58477 -
58478 -/usr/include/locale.h:
58479 -
58480 -/usr/include/bits/locale.h:
58481 diff -rupN original/libpcsxcore/libpcsxcore/.deps/disr3000a.Plo new/libpcsxcore/libpcsxcore/.deps/disr3000a.Plo
58482 --- original/libpcsxcore/libpcsxcore/.deps/disr3000a.Plo 2009-03-28 22:34:46.000000000 -0430
58483 +++ new/libpcsxcore/libpcsxcore/.deps/disr3000a.Plo 1969-12-31 20:00:00.000000000 -0400
58484 @@ -1,359 +0,0 @@
58485 -disr3000a.lo: ../libpcsxcore/disr3000a.c ../libpcsxcore/psxcommon.h \
58486 - ../include/config.h /usr/include/stdio.h /usr/include/features.h \
58487 - /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
58488 - /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \
58489 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
58490 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
58491 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
58492 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
58493 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
58494 - /usr/include/bits/stdio.h /usr/include/string.h \
58495 - /usr/include/bits/string.h /usr/include/bits/string2.h \
58496 - /usr/include/endian.h /usr/include/bits/endian.h \
58497 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
58498 - /usr/include/stdint.h /usr/include/bits/wchar.h \
58499 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
58500 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
58501 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
58502 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
58503 - /usr/include/math.h /usr/include/bits/huge_val.h \
58504 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
58505 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
58506 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
58507 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
58508 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
58509 - /usr/include/glib-2.0/glib/galloca.h \
58510 - /usr/include/glib-2.0/glib/gtypes.h \
58511 - /usr/lib/glib-2.0/include/glibconfig.h \
58512 - /usr/include/glib-2.0/glib/gmacros.h \
58513 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
58514 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
58515 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
58516 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
58517 - /usr/include/bits/posix2_lim.h \
58518 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
58519 - /usr/include/glib-2.0/glib/garray.h \
58520 - /usr/include/glib-2.0/glib/gasyncqueue.h \
58521 - /usr/include/glib-2.0/glib/gthread.h \
58522 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
58523 - /usr/include/glib-2.0/glib/gutils.h \
58524 - /usr/include/glib-2.0/glib/gatomic.h \
58525 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
58526 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
58527 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
58528 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
58529 - /usr/include/glib-2.0/glib/gbase64.h \
58530 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
58531 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
58532 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
58533 - /usr/include/glib-2.0/glib/gchecksum.h \
58534 - /usr/include/glib-2.0/glib/gcompletion.h \
58535 - /usr/include/glib-2.0/glib/gconvert.h \
58536 - /usr/include/glib-2.0/glib/gdataset.h \
58537 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
58538 - /usr/include/glib-2.0/glib/gfileutils.h \
58539 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
58540 - /usr/include/glib-2.0/glib/giochannel.h \
58541 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
58542 - /usr/include/glib-2.0/glib/gslist.h \
58543 - /usr/include/glib-2.0/glib/gstring.h \
58544 - /usr/include/glib-2.0/glib/gunicode.h \
58545 - /usr/include/glib-2.0/glib/gkeyfile.h \
58546 - /usr/include/glib-2.0/glib/gmappedfile.h \
58547 - /usr/include/glib-2.0/glib/gmarkup.h \
58548 - /usr/include/glib-2.0/glib/gmessages.h \
58549 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
58550 - /usr/include/glib-2.0/glib/gpattern.h \
58551 - /usr/include/glib-2.0/glib/gprimes.h \
58552 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
58553 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
58554 - /usr/include/glib-2.0/glib/gregex.h \
58555 - /usr/include/glib-2.0/glib/gscanner.h \
58556 - /usr/include/glib-2.0/glib/gsequence.h \
58557 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
58558 - /usr/include/glib-2.0/glib/gstrfuncs.h \
58559 - /usr/include/glib-2.0/glib/gtestutils.h \
58560 - /usr/include/glib-2.0/glib/gthreadpool.h \
58561 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
58562 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
58563 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
58564 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
58565 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
58566 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
58567 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
58568 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
58569 - ../libpcsxcore/sio.h
58570 -
58571 -../libpcsxcore/psxcommon.h:
58572 -
58573 -../include/config.h:
58574 -
58575 -/usr/include/stdio.h:
58576 -
58577 -/usr/include/features.h:
58578 -
58579 -/usr/include/sys/cdefs.h:
58580 -
58581 -/usr/include/bits/wordsize.h:
58582 -
58583 -/usr/include/gnu/stubs.h:
58584 -
58585 -/usr/include/gnu/stubs-32.h:
58586 -
58587 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
58588 -
58589 -/usr/include/bits/types.h:
58590 -
58591 -/usr/include/bits/typesizes.h:
58592 -
58593 -/usr/include/libio.h:
58594 -
58595 -/usr/include/_G_config.h:
58596 -
58597 -/usr/include/wchar.h:
58598 -
58599 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
58600 -
58601 -/usr/include/bits/stdio_lim.h:
58602 -
58603 -/usr/include/bits/sys_errlist.h:
58604 -
58605 -/usr/include/bits/stdio.h:
58606 -
58607 -/usr/include/string.h:
58608 -
58609 -/usr/include/bits/string.h:
58610 -
58611 -/usr/include/bits/string2.h:
58612 -
58613 -/usr/include/endian.h:
58614 -
58615 -/usr/include/bits/endian.h:
58616 -
58617 -/usr/include/bits/byteswap.h:
58618 -
58619 -/usr/include/stdlib.h:
58620 -
58621 -/usr/include/stdint.h:
58622 -
58623 -/usr/include/bits/wchar.h:
58624 -
58625 -/usr/include/sys/types.h:
58626 -
58627 -/usr/include/time.h:
58628 -
58629 -/usr/include/sys/select.h:
58630 -
58631 -/usr/include/bits/select.h:
58632 -
58633 -/usr/include/bits/sigset.h:
58634 -
58635 -/usr/include/bits/time.h:
58636 -
58637 -/usr/include/sys/sysmacros.h:
58638 -
58639 -/usr/include/bits/pthreadtypes.h:
58640 -
58641 -/usr/include/alloca.h:
58642 -
58643 -/usr/include/math.h:
58644 -
58645 -/usr/include/bits/huge_val.h:
58646 -
58647 -/usr/include/bits/mathdef.h:
58648 -
58649 -/usr/include/bits/mathcalls.h:
58650 -
58651 -/usr/include/bits/mathinline.h:
58652 -
58653 -/usr/include/ctype.h:
58654 -
58655 -/usr/include/zlib.h:
58656 -
58657 -/usr/include/zconf.h:
58658 -
58659 -/usr/include/zlibdefs.h:
58660 -
58661 -/usr/include/unistd.h:
58662 -
58663 -/usr/include/bits/posix_opt.h:
58664 -
58665 -/usr/include/bits/confname.h:
58666 -
58667 -/usr/include/getopt.h:
58668 -
58669 -/usr/include/glib-2.0/glib.h:
58670 -
58671 -/usr/include/glib-2.0/glib/galloca.h:
58672 -
58673 -/usr/include/glib-2.0/glib/gtypes.h:
58674 -
58675 -/usr/lib/glib-2.0/include/glibconfig.h:
58676 -
58677 -/usr/include/glib-2.0/glib/gmacros.h:
58678 -
58679 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
58680 -
58681 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
58682 -
58683 -/usr/include/limits.h:
58684 -
58685 -/usr/include/bits/posix1_lim.h:
58686 -
58687 -/usr/include/bits/local_lim.h:
58688 -
58689 -/usr/include/linux/limits.h:
58690 -
58691 -/usr/include/bits/posix2_lim.h:
58692 -
58693 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
58694 -
58695 -/usr/include/glib-2.0/glib/garray.h:
58696 -
58697 -/usr/include/glib-2.0/glib/gasyncqueue.h:
58698 -
58699 -/usr/include/glib-2.0/glib/gthread.h:
58700 -
58701 -/usr/include/glib-2.0/glib/gerror.h:
58702 -
58703 -/usr/include/glib-2.0/glib/gquark.h:
58704 -
58705 -/usr/include/glib-2.0/glib/gutils.h:
58706 -
58707 -/usr/include/glib-2.0/glib/gatomic.h:
58708 -
58709 -/usr/include/glib-2.0/glib/gbacktrace.h:
58710 -
58711 -/usr/include/signal.h:
58712 -
58713 -/usr/include/bits/signum.h:
58714 -
58715 -/usr/include/bits/siginfo.h:
58716 -
58717 -/usr/include/bits/sigaction.h:
58718 -
58719 -/usr/include/bits/sigcontext.h:
58720 -
58721 -/usr/include/bits/sigstack.h:
58722 -
58723 -/usr/include/bits/sigthread.h:
58724 -
58725 -/usr/include/glib-2.0/glib/gbase64.h:
58726 -
58727 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
58728 -
58729 -/usr/include/glib-2.0/glib/gcache.h:
58730 -
58731 -/usr/include/glib-2.0/glib/glist.h:
58732 -
58733 -/usr/include/glib-2.0/glib/gmem.h:
58734 -
58735 -/usr/include/glib-2.0/glib/gslice.h:
58736 -
58737 -/usr/include/glib-2.0/glib/gchecksum.h:
58738 -
58739 -/usr/include/glib-2.0/glib/gcompletion.h:
58740 -
58741 -/usr/include/glib-2.0/glib/gconvert.h:
58742 -
58743 -/usr/include/glib-2.0/glib/gdataset.h:
58744 -
58745 -/usr/include/glib-2.0/glib/gdate.h:
58746 -
58747 -/usr/include/glib-2.0/glib/gdir.h:
58748 -
58749 -/usr/include/glib-2.0/glib/gfileutils.h:
58750 -
58751 -/usr/include/glib-2.0/glib/ghash.h:
58752 -
58753 -/usr/include/glib-2.0/glib/ghook.h:
58754 -
58755 -/usr/include/glib-2.0/glib/giochannel.h:
58756 -
58757 -/usr/include/glib-2.0/glib/gmain.h:
58758 -
58759 -/usr/include/glib-2.0/glib/gpoll.h:
58760 -
58761 -/usr/include/glib-2.0/glib/gslist.h:
58762 -
58763 -/usr/include/glib-2.0/glib/gstring.h:
58764 -
58765 -/usr/include/glib-2.0/glib/gunicode.h:
58766 -
58767 -/usr/include/glib-2.0/glib/gkeyfile.h:
58768 -
58769 -/usr/include/glib-2.0/glib/gmappedfile.h:
58770 -
58771 -/usr/include/glib-2.0/glib/gmarkup.h:
58772 -
58773 -/usr/include/glib-2.0/glib/gmessages.h:
58774 -
58775 -/usr/include/glib-2.0/glib/gnode.h:
58776 -
58777 -/usr/include/glib-2.0/glib/goption.h:
58778 -
58779 -/usr/include/glib-2.0/glib/gpattern.h:
58780 -
58781 -/usr/include/glib-2.0/glib/gprimes.h:
58782 -
58783 -/usr/include/glib-2.0/glib/gqsort.h:
58784 -
58785 -/usr/include/glib-2.0/glib/gqueue.h:
58786 -
58787 -/usr/include/glib-2.0/glib/grand.h:
58788 -
58789 -/usr/include/glib-2.0/glib/grel.h:
58790 -
58791 -/usr/include/glib-2.0/glib/gregex.h:
58792 -
58793 -/usr/include/glib-2.0/glib/gscanner.h:
58794 -
58795 -/usr/include/glib-2.0/glib/gsequence.h:
58796 -
58797 -/usr/include/glib-2.0/glib/gshell.h:
58798 -
58799 -/usr/include/glib-2.0/glib/gspawn.h:
58800 -
58801 -/usr/include/glib-2.0/glib/gstrfuncs.h:
58802 -
58803 -/usr/include/glib-2.0/glib/gtestutils.h:
58804 -
58805 -/usr/include/glib-2.0/glib/gthreadpool.h:
58806 -
58807 -/usr/include/glib-2.0/glib/gtimer.h:
58808 -
58809 -/usr/include/glib-2.0/glib/gtree.h:
58810 -
58811 -/usr/include/glib-2.0/glib/gurifuncs.h:
58812 -
58813 -../libpcsxcore/system.h:
58814 -
58815 -../libpcsxcore/debug.h:
58816 -
58817 -/usr/include/libintl.h:
58818 -
58819 -/usr/include/locale.h:
58820 -
58821 -/usr/include/bits/locale.h:
58822 -
58823 -../libpcsxcore/r3000a.h:
58824 -
58825 -../libpcsxcore/psxmem.h:
58826 -
58827 -../libpcsxcore/psxcounters.h:
58828 -
58829 -../libpcsxcore/plugins.h:
58830 -
58831 -../libpcsxcore/spu.h:
58832 -
58833 -../libpcsxcore/psemu_plugin_defs.h:
58834 -
58835 -../libpcsxcore/decode_xa.h:
58836 -
58837 -../libpcsxcore/psxbios.h:
58838 -
58839 -../libpcsxcore/misc.h:
58840 -
58841 -../libpcsxcore/coff.h:
58842 -
58843 -../libpcsxcore/sio.h:
58844 diff -rupN original/libpcsxcore/libpcsxcore/.deps/gte.Plo new/libpcsxcore/libpcsxcore/.deps/gte.Plo
58845 --- original/libpcsxcore/libpcsxcore/.deps/gte.Plo 2009-03-28 22:35:04.000000000 -0430
58846 +++ new/libpcsxcore/libpcsxcore/.deps/gte.Plo 1969-12-31 20:00:00.000000000 -0400
58847 @@ -1,362 +0,0 @@
58848 -gte.lo: ../libpcsxcore/gte.c ../libpcsxcore/gte.h \
58849 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
58850 - /usr/include/features.h /usr/include/sys/cdefs.h \
58851 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
58852 - /usr/include/gnu/stubs-32.h \
58853 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
58854 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
58855 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
58856 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
58857 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
58858 - /usr/include/bits/stdio.h /usr/include/string.h \
58859 - /usr/include/bits/string.h /usr/include/bits/string2.h \
58860 - /usr/include/endian.h /usr/include/bits/endian.h \
58861 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
58862 - /usr/include/stdint.h /usr/include/bits/wchar.h \
58863 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
58864 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
58865 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
58866 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
58867 - /usr/include/math.h /usr/include/bits/huge_val.h \
58868 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
58869 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
58870 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
58871 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
58872 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
58873 - /usr/include/glib-2.0/glib/galloca.h \
58874 - /usr/include/glib-2.0/glib/gtypes.h \
58875 - /usr/lib/glib-2.0/include/glibconfig.h \
58876 - /usr/include/glib-2.0/glib/gmacros.h \
58877 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
58878 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
58879 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
58880 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
58881 - /usr/include/bits/posix2_lim.h \
58882 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
58883 - /usr/include/glib-2.0/glib/garray.h \
58884 - /usr/include/glib-2.0/glib/gasyncqueue.h \
58885 - /usr/include/glib-2.0/glib/gthread.h \
58886 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
58887 - /usr/include/glib-2.0/glib/gutils.h \
58888 - /usr/include/glib-2.0/glib/gatomic.h \
58889 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
58890 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
58891 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
58892 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
58893 - /usr/include/glib-2.0/glib/gbase64.h \
58894 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
58895 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
58896 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
58897 - /usr/include/glib-2.0/glib/gchecksum.h \
58898 - /usr/include/glib-2.0/glib/gcompletion.h \
58899 - /usr/include/glib-2.0/glib/gconvert.h \
58900 - /usr/include/glib-2.0/glib/gdataset.h \
58901 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
58902 - /usr/include/glib-2.0/glib/gfileutils.h \
58903 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
58904 - /usr/include/glib-2.0/glib/giochannel.h \
58905 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
58906 - /usr/include/glib-2.0/glib/gslist.h \
58907 - /usr/include/glib-2.0/glib/gstring.h \
58908 - /usr/include/glib-2.0/glib/gunicode.h \
58909 - /usr/include/glib-2.0/glib/gkeyfile.h \
58910 - /usr/include/glib-2.0/glib/gmappedfile.h \
58911 - /usr/include/glib-2.0/glib/gmarkup.h \
58912 - /usr/include/glib-2.0/glib/gmessages.h \
58913 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
58914 - /usr/include/glib-2.0/glib/gpattern.h \
58915 - /usr/include/glib-2.0/glib/gprimes.h \
58916 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
58917 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
58918 - /usr/include/glib-2.0/glib/gregex.h \
58919 - /usr/include/glib-2.0/glib/gscanner.h \
58920 - /usr/include/glib-2.0/glib/gsequence.h \
58921 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
58922 - /usr/include/glib-2.0/glib/gstrfuncs.h \
58923 - /usr/include/glib-2.0/glib/gtestutils.h \
58924 - /usr/include/glib-2.0/glib/gthreadpool.h \
58925 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
58926 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
58927 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
58928 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
58929 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
58930 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
58931 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
58932 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
58933 - ../libpcsxcore/sio.h
58934 -
58935 -../libpcsxcore/gte.h:
58936 -
58937 -../libpcsxcore/psxcommon.h:
58938 -
58939 -../include/config.h:
58940 -
58941 -/usr/include/stdio.h:
58942 -
58943 -/usr/include/features.h:
58944 -
58945 -/usr/include/sys/cdefs.h:
58946 -
58947 -/usr/include/bits/wordsize.h:
58948 -
58949 -/usr/include/gnu/stubs.h:
58950 -
58951 -/usr/include/gnu/stubs-32.h:
58952 -
58953 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
58954 -
58955 -/usr/include/bits/types.h:
58956 -
58957 -/usr/include/bits/typesizes.h:
58958 -
58959 -/usr/include/libio.h:
58960 -
58961 -/usr/include/_G_config.h:
58962 -
58963 -/usr/include/wchar.h:
58964 -
58965 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
58966 -
58967 -/usr/include/bits/stdio_lim.h:
58968 -
58969 -/usr/include/bits/sys_errlist.h:
58970 -
58971 -/usr/include/bits/stdio.h:
58972 -
58973 -/usr/include/string.h:
58974 -
58975 -/usr/include/bits/string.h:
58976 -
58977 -/usr/include/bits/string2.h:
58978 -
58979 -/usr/include/endian.h:
58980 -
58981 -/usr/include/bits/endian.h:
58982 -
58983 -/usr/include/bits/byteswap.h:
58984 -
58985 -/usr/include/stdlib.h:
58986 -
58987 -/usr/include/stdint.h:
58988 -
58989 -/usr/include/bits/wchar.h:
58990 -
58991 -/usr/include/sys/types.h:
58992 -
58993 -/usr/include/time.h:
58994 -
58995 -/usr/include/sys/select.h:
58996 -
58997 -/usr/include/bits/select.h:
58998 -
58999 -/usr/include/bits/sigset.h:
59000 -
59001 -/usr/include/bits/time.h:
59002 -
59003 -/usr/include/sys/sysmacros.h:
59004 -
59005 -/usr/include/bits/pthreadtypes.h:
59006 -
59007 -/usr/include/alloca.h:
59008 -
59009 -/usr/include/math.h:
59010 -
59011 -/usr/include/bits/huge_val.h:
59012 -
59013 -/usr/include/bits/mathdef.h:
59014 -
59015 -/usr/include/bits/mathcalls.h:
59016 -
59017 -/usr/include/bits/mathinline.h:
59018 -
59019 -/usr/include/ctype.h:
59020 -
59021 -/usr/include/zlib.h:
59022 -
59023 -/usr/include/zconf.h:
59024 -
59025 -/usr/include/zlibdefs.h:
59026 -
59027 -/usr/include/unistd.h:
59028 -
59029 -/usr/include/bits/posix_opt.h:
59030 -
59031 -/usr/include/bits/confname.h:
59032 -
59033 -/usr/include/getopt.h:
59034 -
59035 -/usr/include/glib-2.0/glib.h:
59036 -
59037 -/usr/include/glib-2.0/glib/galloca.h:
59038 -
59039 -/usr/include/glib-2.0/glib/gtypes.h:
59040 -
59041 -/usr/lib/glib-2.0/include/glibconfig.h:
59042 -
59043 -/usr/include/glib-2.0/glib/gmacros.h:
59044 -
59045 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
59046 -
59047 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
59048 -
59049 -/usr/include/limits.h:
59050 -
59051 -/usr/include/bits/posix1_lim.h:
59052 -
59053 -/usr/include/bits/local_lim.h:
59054 -
59055 -/usr/include/linux/limits.h:
59056 -
59057 -/usr/include/bits/posix2_lim.h:
59058 -
59059 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
59060 -
59061 -/usr/include/glib-2.0/glib/garray.h:
59062 -
59063 -/usr/include/glib-2.0/glib/gasyncqueue.h:
59064 -
59065 -/usr/include/glib-2.0/glib/gthread.h:
59066 -
59067 -/usr/include/glib-2.0/glib/gerror.h:
59068 -
59069 -/usr/include/glib-2.0/glib/gquark.h:
59070 -
59071 -/usr/include/glib-2.0/glib/gutils.h:
59072 -
59073 -/usr/include/glib-2.0/glib/gatomic.h:
59074 -
59075 -/usr/include/glib-2.0/glib/gbacktrace.h:
59076 -
59077 -/usr/include/signal.h:
59078 -
59079 -/usr/include/bits/signum.h:
59080 -
59081 -/usr/include/bits/siginfo.h:
59082 -
59083 -/usr/include/bits/sigaction.h:
59084 -
59085 -/usr/include/bits/sigcontext.h:
59086 -
59087 -/usr/include/bits/sigstack.h:
59088 -
59089 -/usr/include/bits/sigthread.h:
59090 -
59091 -/usr/include/glib-2.0/glib/gbase64.h:
59092 -
59093 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
59094 -
59095 -/usr/include/glib-2.0/glib/gcache.h:
59096 -
59097 -/usr/include/glib-2.0/glib/glist.h:
59098 -
59099 -/usr/include/glib-2.0/glib/gmem.h:
59100 -
59101 -/usr/include/glib-2.0/glib/gslice.h:
59102 -
59103 -/usr/include/glib-2.0/glib/gchecksum.h:
59104 -
59105 -/usr/include/glib-2.0/glib/gcompletion.h:
59106 -
59107 -/usr/include/glib-2.0/glib/gconvert.h:
59108 -
59109 -/usr/include/glib-2.0/glib/gdataset.h:
59110 -
59111 -/usr/include/glib-2.0/glib/gdate.h:
59112 -
59113 -/usr/include/glib-2.0/glib/gdir.h:
59114 -
59115 -/usr/include/glib-2.0/glib/gfileutils.h:
59116 -
59117 -/usr/include/glib-2.0/glib/ghash.h:
59118 -
59119 -/usr/include/glib-2.0/glib/ghook.h:
59120 -
59121 -/usr/include/glib-2.0/glib/giochannel.h:
59122 -
59123 -/usr/include/glib-2.0/glib/gmain.h:
59124 -
59125 -/usr/include/glib-2.0/glib/gpoll.h:
59126 -
59127 -/usr/include/glib-2.0/glib/gslist.h:
59128 -
59129 -/usr/include/glib-2.0/glib/gstring.h:
59130 -
59131 -/usr/include/glib-2.0/glib/gunicode.h:
59132 -
59133 -/usr/include/glib-2.0/glib/gkeyfile.h:
59134 -
59135 -/usr/include/glib-2.0/glib/gmappedfile.h:
59136 -
59137 -/usr/include/glib-2.0/glib/gmarkup.h:
59138 -
59139 -/usr/include/glib-2.0/glib/gmessages.h:
59140 -
59141 -/usr/include/glib-2.0/glib/gnode.h:
59142 -
59143 -/usr/include/glib-2.0/glib/goption.h:
59144 -
59145 -/usr/include/glib-2.0/glib/gpattern.h:
59146 -
59147 -/usr/include/glib-2.0/glib/gprimes.h:
59148 -
59149 -/usr/include/glib-2.0/glib/gqsort.h:
59150 -
59151 -/usr/include/glib-2.0/glib/gqueue.h:
59152 -
59153 -/usr/include/glib-2.0/glib/grand.h:
59154 -
59155 -/usr/include/glib-2.0/glib/grel.h:
59156 -
59157 -/usr/include/glib-2.0/glib/gregex.h:
59158 -
59159 -/usr/include/glib-2.0/glib/gscanner.h:
59160 -
59161 -/usr/include/glib-2.0/glib/gsequence.h:
59162 -
59163 -/usr/include/glib-2.0/glib/gshell.h:
59164 -
59165 -/usr/include/glib-2.0/glib/gspawn.h:
59166 -
59167 -/usr/include/glib-2.0/glib/gstrfuncs.h:
59168 -
59169 -/usr/include/glib-2.0/glib/gtestutils.h:
59170 -
59171 -/usr/include/glib-2.0/glib/gthreadpool.h:
59172 -
59173 -/usr/include/glib-2.0/glib/gtimer.h:
59174 -
59175 -/usr/include/glib-2.0/glib/gtree.h:
59176 -
59177 -/usr/include/glib-2.0/glib/gurifuncs.h:
59178 -
59179 -../libpcsxcore/system.h:
59180 -
59181 -../libpcsxcore/debug.h:
59182 -
59183 -/usr/include/libintl.h:
59184 -
59185 -/usr/include/locale.h:
59186 -
59187 -/usr/include/bits/locale.h:
59188 -
59189 -../libpcsxcore/r3000a.h:
59190 -
59191 -../libpcsxcore/psxmem.h:
59192 -
59193 -../libpcsxcore/psxcounters.h:
59194 -
59195 -../libpcsxcore/plugins.h:
59196 -
59197 -../libpcsxcore/spu.h:
59198 -
59199 -../libpcsxcore/psemu_plugin_defs.h:
59200 -
59201 -../libpcsxcore/decode_xa.h:
59202 -
59203 -../libpcsxcore/psxbios.h:
59204 -
59205 -../libpcsxcore/misc.h:
59206 -
59207 -../libpcsxcore/coff.h:
59208 -
59209 -../libpcsxcore/sio.h:
59210 diff -rupN original/libpcsxcore/libpcsxcore/.deps/iR3000A-64.Plo new/libpcsxcore/libpcsxcore/.deps/iR3000A-64.Plo
59211 --- original/libpcsxcore/libpcsxcore/.deps/iR3000A-64.Plo 2009-03-28 22:34:37.000000000 -0430
59212 +++ new/libpcsxcore/libpcsxcore/.deps/iR3000A-64.Plo 1969-12-31 20:00:00.000000000 -0400
59213 @@ -1 +0,0 @@
59214 -# dummy
59215 diff -rupN original/libpcsxcore/libpcsxcore/.deps/iR3000A.Plo new/libpcsxcore/libpcsxcore/.deps/iR3000A.Plo
59216 --- original/libpcsxcore/libpcsxcore/.deps/iR3000A.Plo 2009-03-28 22:35:08.000000000 -0430
59217 +++ new/libpcsxcore/libpcsxcore/.deps/iR3000A.Plo 1969-12-31 20:00:00.000000000 -0400
59218 @@ -1,380 +0,0 @@
59219 -iR3000A.lo: ../libpcsxcore/ix86/iR3000A.c ../libpcsxcore/ix86/ix86.h \
59220 - ../libpcsxcore/ix86/../psxcommon.h ../include/config.h \
59221 - /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
59222 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
59223 - /usr/include/gnu/stubs-32.h \
59224 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
59225 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
59226 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
59227 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
59228 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
59229 - /usr/include/bits/stdio.h /usr/include/string.h \
59230 - /usr/include/bits/string.h /usr/include/bits/string2.h \
59231 - /usr/include/endian.h /usr/include/bits/endian.h \
59232 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
59233 - /usr/include/stdint.h /usr/include/bits/wchar.h \
59234 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
59235 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
59236 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
59237 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
59238 - /usr/include/math.h /usr/include/bits/huge_val.h \
59239 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
59240 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
59241 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
59242 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
59243 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
59244 - /usr/include/glib-2.0/glib/galloca.h \
59245 - /usr/include/glib-2.0/glib/gtypes.h \
59246 - /usr/lib/glib-2.0/include/glibconfig.h \
59247 - /usr/include/glib-2.0/glib/gmacros.h \
59248 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
59249 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
59250 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
59251 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
59252 - /usr/include/bits/posix2_lim.h \
59253 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
59254 - /usr/include/glib-2.0/glib/garray.h \
59255 - /usr/include/glib-2.0/glib/gasyncqueue.h \
59256 - /usr/include/glib-2.0/glib/gthread.h \
59257 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
59258 - /usr/include/glib-2.0/glib/gutils.h \
59259 - /usr/include/glib-2.0/glib/gatomic.h \
59260 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
59261 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
59262 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
59263 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
59264 - /usr/include/glib-2.0/glib/gbase64.h \
59265 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
59266 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
59267 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
59268 - /usr/include/glib-2.0/glib/gchecksum.h \
59269 - /usr/include/glib-2.0/glib/gcompletion.h \
59270 - /usr/include/glib-2.0/glib/gconvert.h \
59271 - /usr/include/glib-2.0/glib/gdataset.h \
59272 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
59273 - /usr/include/glib-2.0/glib/gfileutils.h \
59274 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
59275 - /usr/include/glib-2.0/glib/giochannel.h \
59276 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
59277 - /usr/include/glib-2.0/glib/gslist.h \
59278 - /usr/include/glib-2.0/glib/gstring.h \
59279 - /usr/include/glib-2.0/glib/gunicode.h \
59280 - /usr/include/glib-2.0/glib/gkeyfile.h \
59281 - /usr/include/glib-2.0/glib/gmappedfile.h \
59282 - /usr/include/glib-2.0/glib/gmarkup.h \
59283 - /usr/include/glib-2.0/glib/gmessages.h \
59284 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
59285 - /usr/include/glib-2.0/glib/gpattern.h \
59286 - /usr/include/glib-2.0/glib/gprimes.h \
59287 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
59288 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
59289 - /usr/include/glib-2.0/glib/gregex.h \
59290 - /usr/include/glib-2.0/glib/gscanner.h \
59291 - /usr/include/glib-2.0/glib/gsequence.h \
59292 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
59293 - /usr/include/glib-2.0/glib/gstrfuncs.h \
59294 - /usr/include/glib-2.0/glib/gtestutils.h \
59295 - /usr/include/glib-2.0/glib/gthreadpool.h \
59296 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
59297 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/ix86/../system.h \
59298 - ../libpcsxcore/ix86/../debug.h /usr/include/libintl.h \
59299 - /usr/include/locale.h /usr/include/bits/locale.h \
59300 - ../libpcsxcore/ix86/../r3000a.h ../libpcsxcore/ix86/../psxcommon.h \
59301 - ../libpcsxcore/ix86/../psxmem.h ../libpcsxcore/ix86/../psxcounters.h \
59302 - ../libpcsxcore/ix86/../r3000a.h ../libpcsxcore/ix86/../plugins.h \
59303 - ../libpcsxcore/ix86/../spu.h ../libpcsxcore/ix86/../psemu_plugin_defs.h \
59304 - ../libpcsxcore/ix86/../decode_xa.h ../libpcsxcore/ix86/../psxbios.h \
59305 - ../libpcsxcore/ix86/../misc.h ../libpcsxcore/ix86/../coff.h \
59306 - ../libpcsxcore/ix86/../sio.h ../libpcsxcore/ix86/../psxhle.h \
59307 - /usr/include/sys/mman.h /usr/include/bits/mman.h \
59308 - ../libpcsxcore/ix86/iGte.h ../libpcsxcore/ix86/../psxmem.h
59309 -
59310 -../libpcsxcore/ix86/ix86.h:
59311 -
59312 -../libpcsxcore/ix86/../psxcommon.h:
59313 -
59314 -../include/config.h:
59315 -
59316 -/usr/include/stdio.h:
59317 -
59318 -/usr/include/features.h:
59319 -
59320 -/usr/include/sys/cdefs.h:
59321 -
59322 -/usr/include/bits/wordsize.h:
59323 -
59324 -/usr/include/gnu/stubs.h:
59325 -
59326 -/usr/include/gnu/stubs-32.h:
59327 -
59328 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
59329 -
59330 -/usr/include/bits/types.h:
59331 -
59332 -/usr/include/bits/typesizes.h:
59333 -
59334 -/usr/include/libio.h:
59335 -
59336 -/usr/include/_G_config.h:
59337 -
59338 -/usr/include/wchar.h:
59339 -
59340 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
59341 -
59342 -/usr/include/bits/stdio_lim.h:
59343 -
59344 -/usr/include/bits/sys_errlist.h:
59345 -
59346 -/usr/include/bits/stdio.h:
59347 -
59348 -/usr/include/string.h:
59349 -
59350 -/usr/include/bits/string.h:
59351 -
59352 -/usr/include/bits/string2.h:
59353 -
59354 -/usr/include/endian.h:
59355 -
59356 -/usr/include/bits/endian.h:
59357 -
59358 -/usr/include/bits/byteswap.h:
59359 -
59360 -/usr/include/stdlib.h:
59361 -
59362 -/usr/include/stdint.h:
59363 -
59364 -/usr/include/bits/wchar.h:
59365 -
59366 -/usr/include/sys/types.h:
59367 -
59368 -/usr/include/time.h:
59369 -
59370 -/usr/include/sys/select.h:
59371 -
59372 -/usr/include/bits/select.h:
59373 -
59374 -/usr/include/bits/sigset.h:
59375 -
59376 -/usr/include/bits/time.h:
59377 -
59378 -/usr/include/sys/sysmacros.h:
59379 -
59380 -/usr/include/bits/pthreadtypes.h:
59381 -
59382 -/usr/include/alloca.h:
59383 -
59384 -/usr/include/math.h:
59385 -
59386 -/usr/include/bits/huge_val.h:
59387 -
59388 -/usr/include/bits/mathdef.h:
59389 -
59390 -/usr/include/bits/mathcalls.h:
59391 -
59392 -/usr/include/bits/mathinline.h:
59393 -
59394 -/usr/include/ctype.h:
59395 -
59396 -/usr/include/zlib.h:
59397 -
59398 -/usr/include/zconf.h:
59399 -
59400 -/usr/include/zlibdefs.h:
59401 -
59402 -/usr/include/unistd.h:
59403 -
59404 -/usr/include/bits/posix_opt.h:
59405 -
59406 -/usr/include/bits/confname.h:
59407 -
59408 -/usr/include/getopt.h:
59409 -
59410 -/usr/include/glib-2.0/glib.h:
59411 -
59412 -/usr/include/glib-2.0/glib/galloca.h:
59413 -
59414 -/usr/include/glib-2.0/glib/gtypes.h:
59415 -
59416 -/usr/lib/glib-2.0/include/glibconfig.h:
59417 -
59418 -/usr/include/glib-2.0/glib/gmacros.h:
59419 -
59420 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
59421 -
59422 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
59423 -
59424 -/usr/include/limits.h:
59425 -
59426 -/usr/include/bits/posix1_lim.h:
59427 -
59428 -/usr/include/bits/local_lim.h:
59429 -
59430 -/usr/include/linux/limits.h:
59431 -
59432 -/usr/include/bits/posix2_lim.h:
59433 -
59434 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
59435 -
59436 -/usr/include/glib-2.0/glib/garray.h:
59437 -
59438 -/usr/include/glib-2.0/glib/gasyncqueue.h:
59439 -
59440 -/usr/include/glib-2.0/glib/gthread.h:
59441 -
59442 -/usr/include/glib-2.0/glib/gerror.h:
59443 -
59444 -/usr/include/glib-2.0/glib/gquark.h:
59445 -
59446 -/usr/include/glib-2.0/glib/gutils.h:
59447 -
59448 -/usr/include/glib-2.0/glib/gatomic.h:
59449 -
59450 -/usr/include/glib-2.0/glib/gbacktrace.h:
59451 -
59452 -/usr/include/signal.h:
59453 -
59454 -/usr/include/bits/signum.h:
59455 -
59456 -/usr/include/bits/siginfo.h:
59457 -
59458 -/usr/include/bits/sigaction.h:
59459 -
59460 -/usr/include/bits/sigcontext.h:
59461 -
59462 -/usr/include/bits/sigstack.h:
59463 -
59464 -/usr/include/bits/sigthread.h:
59465 -
59466 -/usr/include/glib-2.0/glib/gbase64.h:
59467 -
59468 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
59469 -
59470 -/usr/include/glib-2.0/glib/gcache.h:
59471 -
59472 -/usr/include/glib-2.0/glib/glist.h:
59473 -
59474 -/usr/include/glib-2.0/glib/gmem.h:
59475 -
59476 -/usr/include/glib-2.0/glib/gslice.h:
59477 -
59478 -/usr/include/glib-2.0/glib/gchecksum.h:
59479 -
59480 -/usr/include/glib-2.0/glib/gcompletion.h:
59481 -
59482 -/usr/include/glib-2.0/glib/gconvert.h:
59483 -
59484 -/usr/include/glib-2.0/glib/gdataset.h:
59485 -
59486 -/usr/include/glib-2.0/glib/gdate.h:
59487 -
59488 -/usr/include/glib-2.0/glib/gdir.h:
59489 -
59490 -/usr/include/glib-2.0/glib/gfileutils.h:
59491 -
59492 -/usr/include/glib-2.0/glib/ghash.h:
59493 -
59494 -/usr/include/glib-2.0/glib/ghook.h:
59495 -
59496 -/usr/include/glib-2.0/glib/giochannel.h:
59497 -
59498 -/usr/include/glib-2.0/glib/gmain.h:
59499 -
59500 -/usr/include/glib-2.0/glib/gpoll.h:
59501 -
59502 -/usr/include/glib-2.0/glib/gslist.h:
59503 -
59504 -/usr/include/glib-2.0/glib/gstring.h:
59505 -
59506 -/usr/include/glib-2.0/glib/gunicode.h:
59507 -
59508 -/usr/include/glib-2.0/glib/gkeyfile.h:
59509 -
59510 -/usr/include/glib-2.0/glib/gmappedfile.h:
59511 -
59512 -/usr/include/glib-2.0/glib/gmarkup.h:
59513 -
59514 -/usr/include/glib-2.0/glib/gmessages.h:
59515 -
59516 -/usr/include/glib-2.0/glib/gnode.h:
59517 -
59518 -/usr/include/glib-2.0/glib/goption.h:
59519 -
59520 -/usr/include/glib-2.0/glib/gpattern.h:
59521 -
59522 -/usr/include/glib-2.0/glib/gprimes.h:
59523 -
59524 -/usr/include/glib-2.0/glib/gqsort.h:
59525 -
59526 -/usr/include/glib-2.0/glib/gqueue.h:
59527 -
59528 -/usr/include/glib-2.0/glib/grand.h:
59529 -
59530 -/usr/include/glib-2.0/glib/grel.h:
59531 -
59532 -/usr/include/glib-2.0/glib/gregex.h:
59533 -
59534 -/usr/include/glib-2.0/glib/gscanner.h:
59535 -
59536 -/usr/include/glib-2.0/glib/gsequence.h:
59537 -
59538 -/usr/include/glib-2.0/glib/gshell.h:
59539 -
59540 -/usr/include/glib-2.0/glib/gspawn.h:
59541 -
59542 -/usr/include/glib-2.0/glib/gstrfuncs.h:
59543 -
59544 -/usr/include/glib-2.0/glib/gtestutils.h:
59545 -
59546 -/usr/include/glib-2.0/glib/gthreadpool.h:
59547 -
59548 -/usr/include/glib-2.0/glib/gtimer.h:
59549 -
59550 -/usr/include/glib-2.0/glib/gtree.h:
59551 -
59552 -/usr/include/glib-2.0/glib/gurifuncs.h:
59553 -
59554 -../libpcsxcore/ix86/../system.h:
59555 -
59556 -../libpcsxcore/ix86/../debug.h:
59557 -
59558 -/usr/include/libintl.h:
59559 -
59560 -/usr/include/locale.h:
59561 -
59562 -/usr/include/bits/locale.h:
59563 -
59564 -../libpcsxcore/ix86/../r3000a.h:
59565 -
59566 -../libpcsxcore/ix86/../psxcommon.h:
59567 -
59568 -../libpcsxcore/ix86/../psxmem.h:
59569 -
59570 -../libpcsxcore/ix86/../psxcounters.h:
59571 -
59572 -../libpcsxcore/ix86/../r3000a.h:
59573 -
59574 -../libpcsxcore/ix86/../plugins.h:
59575 -
59576 -../libpcsxcore/ix86/../spu.h:
59577 -
59578 -../libpcsxcore/ix86/../psemu_plugin_defs.h:
59579 -
59580 -../libpcsxcore/ix86/../decode_xa.h:
59581 -
59582 -../libpcsxcore/ix86/../psxbios.h:
59583 -
59584 -../libpcsxcore/ix86/../misc.h:
59585 -
59586 -../libpcsxcore/ix86/../coff.h:
59587 -
59588 -../libpcsxcore/ix86/../sio.h:
59589 -
59590 -../libpcsxcore/ix86/../psxhle.h:
59591 -
59592 -/usr/include/sys/mman.h:
59593 -
59594 -/usr/include/bits/mman.h:
59595 -
59596 -../libpcsxcore/ix86/iGte.h:
59597 -
59598 -../libpcsxcore/ix86/../psxmem.h:
59599 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ix86-64.Plo new/libpcsxcore/libpcsxcore/.deps/ix86-64.Plo
59600 --- original/libpcsxcore/libpcsxcore/.deps/ix86-64.Plo 2009-03-28 22:34:37.000000000 -0430
59601 +++ new/libpcsxcore/libpcsxcore/.deps/ix86-64.Plo 1969-12-31 20:00:00.000000000 -0400
59602 @@ -1 +0,0 @@
59603 -# dummy
59604 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ix86.Plo new/libpcsxcore/libpcsxcore/.deps/ix86.Plo
59605 --- original/libpcsxcore/libpcsxcore/.deps/ix86.Plo 2009-03-28 22:35:12.000000000 -0430
59606 +++ new/libpcsxcore/libpcsxcore/.deps/ix86.Plo 1969-12-31 20:00:00.000000000 -0400
59607 @@ -1,370 +0,0 @@
59608 -ix86.lo: ../libpcsxcore/ix86/ix86.c ../libpcsxcore/ix86/ix86.h \
59609 - ../libpcsxcore/ix86/../psxcommon.h ../include/config.h \
59610 - /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
59611 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
59612 - /usr/include/gnu/stubs-32.h \
59613 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
59614 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
59615 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
59616 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
59617 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
59618 - /usr/include/bits/stdio.h /usr/include/string.h \
59619 - /usr/include/bits/string.h /usr/include/bits/string2.h \
59620 - /usr/include/endian.h /usr/include/bits/endian.h \
59621 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
59622 - /usr/include/stdint.h /usr/include/bits/wchar.h \
59623 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
59624 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
59625 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
59626 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
59627 - /usr/include/math.h /usr/include/bits/huge_val.h \
59628 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
59629 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
59630 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
59631 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
59632 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
59633 - /usr/include/glib-2.0/glib/galloca.h \
59634 - /usr/include/glib-2.0/glib/gtypes.h \
59635 - /usr/lib/glib-2.0/include/glibconfig.h \
59636 - /usr/include/glib-2.0/glib/gmacros.h \
59637 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
59638 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
59639 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
59640 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
59641 - /usr/include/bits/posix2_lim.h \
59642 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
59643 - /usr/include/glib-2.0/glib/garray.h \
59644 - /usr/include/glib-2.0/glib/gasyncqueue.h \
59645 - /usr/include/glib-2.0/glib/gthread.h \
59646 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
59647 - /usr/include/glib-2.0/glib/gutils.h \
59648 - /usr/include/glib-2.0/glib/gatomic.h \
59649 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
59650 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
59651 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
59652 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
59653 - /usr/include/glib-2.0/glib/gbase64.h \
59654 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
59655 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
59656 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
59657 - /usr/include/glib-2.0/glib/gchecksum.h \
59658 - /usr/include/glib-2.0/glib/gcompletion.h \
59659 - /usr/include/glib-2.0/glib/gconvert.h \
59660 - /usr/include/glib-2.0/glib/gdataset.h \
59661 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
59662 - /usr/include/glib-2.0/glib/gfileutils.h \
59663 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
59664 - /usr/include/glib-2.0/glib/giochannel.h \
59665 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
59666 - /usr/include/glib-2.0/glib/gslist.h \
59667 - /usr/include/glib-2.0/glib/gstring.h \
59668 - /usr/include/glib-2.0/glib/gunicode.h \
59669 - /usr/include/glib-2.0/glib/gkeyfile.h \
59670 - /usr/include/glib-2.0/glib/gmappedfile.h \
59671 - /usr/include/glib-2.0/glib/gmarkup.h \
59672 - /usr/include/glib-2.0/glib/gmessages.h \
59673 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
59674 - /usr/include/glib-2.0/glib/gpattern.h \
59675 - /usr/include/glib-2.0/glib/gprimes.h \
59676 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
59677 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
59678 - /usr/include/glib-2.0/glib/gregex.h \
59679 - /usr/include/glib-2.0/glib/gscanner.h \
59680 - /usr/include/glib-2.0/glib/gsequence.h \
59681 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
59682 - /usr/include/glib-2.0/glib/gstrfuncs.h \
59683 - /usr/include/glib-2.0/glib/gtestutils.h \
59684 - /usr/include/glib-2.0/glib/gthreadpool.h \
59685 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
59686 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/ix86/../system.h \
59687 - ../libpcsxcore/ix86/../debug.h /usr/include/libintl.h \
59688 - /usr/include/locale.h /usr/include/bits/locale.h \
59689 - ../libpcsxcore/ix86/../r3000a.h ../libpcsxcore/ix86/../psxcommon.h \
59690 - ../libpcsxcore/ix86/../psxmem.h ../libpcsxcore/ix86/../psxcounters.h \
59691 - ../libpcsxcore/ix86/../r3000a.h ../libpcsxcore/ix86/../plugins.h \
59692 - ../libpcsxcore/ix86/../spu.h ../libpcsxcore/ix86/../psemu_plugin_defs.h \
59693 - ../libpcsxcore/ix86/../decode_xa.h ../libpcsxcore/ix86/../psxbios.h \
59694 - ../libpcsxcore/ix86/../misc.h ../libpcsxcore/ix86/../coff.h \
59695 - ../libpcsxcore/ix86/../sio.h ../libpcsxcore/ix86/../psxhle.h
59696 -
59697 -../libpcsxcore/ix86/ix86.h:
59698 -
59699 -../libpcsxcore/ix86/../psxcommon.h:
59700 -
59701 -../include/config.h:
59702 -
59703 -/usr/include/stdio.h:
59704 -
59705 -/usr/include/features.h:
59706 -
59707 -/usr/include/sys/cdefs.h:
59708 -
59709 -/usr/include/bits/wordsize.h:
59710 -
59711 -/usr/include/gnu/stubs.h:
59712 -
59713 -/usr/include/gnu/stubs-32.h:
59714 -
59715 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
59716 -
59717 -/usr/include/bits/types.h:
59718 -
59719 -/usr/include/bits/typesizes.h:
59720 -
59721 -/usr/include/libio.h:
59722 -
59723 -/usr/include/_G_config.h:
59724 -
59725 -/usr/include/wchar.h:
59726 -
59727 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
59728 -
59729 -/usr/include/bits/stdio_lim.h:
59730 -
59731 -/usr/include/bits/sys_errlist.h:
59732 -
59733 -/usr/include/bits/stdio.h:
59734 -
59735 -/usr/include/string.h:
59736 -
59737 -/usr/include/bits/string.h:
59738 -
59739 -/usr/include/bits/string2.h:
59740 -
59741 -/usr/include/endian.h:
59742 -
59743 -/usr/include/bits/endian.h:
59744 -
59745 -/usr/include/bits/byteswap.h:
59746 -
59747 -/usr/include/stdlib.h:
59748 -
59749 -/usr/include/stdint.h:
59750 -
59751 -/usr/include/bits/wchar.h:
59752 -
59753 -/usr/include/sys/types.h:
59754 -
59755 -/usr/include/time.h:
59756 -
59757 -/usr/include/sys/select.h:
59758 -
59759 -/usr/include/bits/select.h:
59760 -
59761 -/usr/include/bits/sigset.h:
59762 -
59763 -/usr/include/bits/time.h:
59764 -
59765 -/usr/include/sys/sysmacros.h:
59766 -
59767 -/usr/include/bits/pthreadtypes.h:
59768 -
59769 -/usr/include/alloca.h:
59770 -
59771 -/usr/include/math.h:
59772 -
59773 -/usr/include/bits/huge_val.h:
59774 -
59775 -/usr/include/bits/mathdef.h:
59776 -
59777 -/usr/include/bits/mathcalls.h:
59778 -
59779 -/usr/include/bits/mathinline.h:
59780 -
59781 -/usr/include/ctype.h:
59782 -
59783 -/usr/include/zlib.h:
59784 -
59785 -/usr/include/zconf.h:
59786 -
59787 -/usr/include/zlibdefs.h:
59788 -
59789 -/usr/include/unistd.h:
59790 -
59791 -/usr/include/bits/posix_opt.h:
59792 -
59793 -/usr/include/bits/confname.h:
59794 -
59795 -/usr/include/getopt.h:
59796 -
59797 -/usr/include/glib-2.0/glib.h:
59798 -
59799 -/usr/include/glib-2.0/glib/galloca.h:
59800 -
59801 -/usr/include/glib-2.0/glib/gtypes.h:
59802 -
59803 -/usr/lib/glib-2.0/include/glibconfig.h:
59804 -
59805 -/usr/include/glib-2.0/glib/gmacros.h:
59806 -
59807 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
59808 -
59809 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
59810 -
59811 -/usr/include/limits.h:
59812 -
59813 -/usr/include/bits/posix1_lim.h:
59814 -
59815 -/usr/include/bits/local_lim.h:
59816 -
59817 -/usr/include/linux/limits.h:
59818 -
59819 -/usr/include/bits/posix2_lim.h:
59820 -
59821 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
59822 -
59823 -/usr/include/glib-2.0/glib/garray.h:
59824 -
59825 -/usr/include/glib-2.0/glib/gasyncqueue.h:
59826 -
59827 -/usr/include/glib-2.0/glib/gthread.h:
59828 -
59829 -/usr/include/glib-2.0/glib/gerror.h:
59830 -
59831 -/usr/include/glib-2.0/glib/gquark.h:
59832 -
59833 -/usr/include/glib-2.0/glib/gutils.h:
59834 -
59835 -/usr/include/glib-2.0/glib/gatomic.h:
59836 -
59837 -/usr/include/glib-2.0/glib/gbacktrace.h:
59838 -
59839 -/usr/include/signal.h:
59840 -
59841 -/usr/include/bits/signum.h:
59842 -
59843 -/usr/include/bits/siginfo.h:
59844 -
59845 -/usr/include/bits/sigaction.h:
59846 -
59847 -/usr/include/bits/sigcontext.h:
59848 -
59849 -/usr/include/bits/sigstack.h:
59850 -
59851 -/usr/include/bits/sigthread.h:
59852 -
59853 -/usr/include/glib-2.0/glib/gbase64.h:
59854 -
59855 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
59856 -
59857 -/usr/include/glib-2.0/glib/gcache.h:
59858 -
59859 -/usr/include/glib-2.0/glib/glist.h:
59860 -
59861 -/usr/include/glib-2.0/glib/gmem.h:
59862 -
59863 -/usr/include/glib-2.0/glib/gslice.h:
59864 -
59865 -/usr/include/glib-2.0/glib/gchecksum.h:
59866 -
59867 -/usr/include/glib-2.0/glib/gcompletion.h:
59868 -
59869 -/usr/include/glib-2.0/glib/gconvert.h:
59870 -
59871 -/usr/include/glib-2.0/glib/gdataset.h:
59872 -
59873 -/usr/include/glib-2.0/glib/gdate.h:
59874 -
59875 -/usr/include/glib-2.0/glib/gdir.h:
59876 -
59877 -/usr/include/glib-2.0/glib/gfileutils.h:
59878 -
59879 -/usr/include/glib-2.0/glib/ghash.h:
59880 -
59881 -/usr/include/glib-2.0/glib/ghook.h:
59882 -
59883 -/usr/include/glib-2.0/glib/giochannel.h:
59884 -
59885 -/usr/include/glib-2.0/glib/gmain.h:
59886 -
59887 -/usr/include/glib-2.0/glib/gpoll.h:
59888 -
59889 -/usr/include/glib-2.0/glib/gslist.h:
59890 -
59891 -/usr/include/glib-2.0/glib/gstring.h:
59892 -
59893 -/usr/include/glib-2.0/glib/gunicode.h:
59894 -
59895 -/usr/include/glib-2.0/glib/gkeyfile.h:
59896 -
59897 -/usr/include/glib-2.0/glib/gmappedfile.h:
59898 -
59899 -/usr/include/glib-2.0/glib/gmarkup.h:
59900 -
59901 -/usr/include/glib-2.0/glib/gmessages.h:
59902 -
59903 -/usr/include/glib-2.0/glib/gnode.h:
59904 -
59905 -/usr/include/glib-2.0/glib/goption.h:
59906 -
59907 -/usr/include/glib-2.0/glib/gpattern.h:
59908 -
59909 -/usr/include/glib-2.0/glib/gprimes.h:
59910 -
59911 -/usr/include/glib-2.0/glib/gqsort.h:
59912 -
59913 -/usr/include/glib-2.0/glib/gqueue.h:
59914 -
59915 -/usr/include/glib-2.0/glib/grand.h:
59916 -
59917 -/usr/include/glib-2.0/glib/grel.h:
59918 -
59919 -/usr/include/glib-2.0/glib/gregex.h:
59920 -
59921 -/usr/include/glib-2.0/glib/gscanner.h:
59922 -
59923 -/usr/include/glib-2.0/glib/gsequence.h:
59924 -
59925 -/usr/include/glib-2.0/glib/gshell.h:
59926 -
59927 -/usr/include/glib-2.0/glib/gspawn.h:
59928 -
59929 -/usr/include/glib-2.0/glib/gstrfuncs.h:
59930 -
59931 -/usr/include/glib-2.0/glib/gtestutils.h:
59932 -
59933 -/usr/include/glib-2.0/glib/gthreadpool.h:
59934 -
59935 -/usr/include/glib-2.0/glib/gtimer.h:
59936 -
59937 -/usr/include/glib-2.0/glib/gtree.h:
59938 -
59939 -/usr/include/glib-2.0/glib/gurifuncs.h:
59940 -
59941 -../libpcsxcore/ix86/../system.h:
59942 -
59943 -../libpcsxcore/ix86/../debug.h:
59944 -
59945 -/usr/include/libintl.h:
59946 -
59947 -/usr/include/locale.h:
59948 -
59949 -/usr/include/bits/locale.h:
59950 -
59951 -../libpcsxcore/ix86/../r3000a.h:
59952 -
59953 -../libpcsxcore/ix86/../psxcommon.h:
59954 -
59955 -../libpcsxcore/ix86/../psxmem.h:
59956 -
59957 -../libpcsxcore/ix86/../psxcounters.h:
59958 -
59959 -../libpcsxcore/ix86/../r3000a.h:
59960 -
59961 -../libpcsxcore/ix86/../plugins.h:
59962 -
59963 -../libpcsxcore/ix86/../spu.h:
59964 -
59965 -../libpcsxcore/ix86/../psemu_plugin_defs.h:
59966 -
59967 -../libpcsxcore/ix86/../decode_xa.h:
59968 -
59969 -../libpcsxcore/ix86/../psxbios.h:
59970 -
59971 -../libpcsxcore/ix86/../misc.h:
59972 -
59973 -../libpcsxcore/ix86/../coff.h:
59974 -
59975 -../libpcsxcore/ix86/../sio.h:
59976 -
59977 -../libpcsxcore/ix86/../psxhle.h:
59978 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ix86_3dnow.Plo new/libpcsxcore/libpcsxcore/.deps/ix86_3dnow.Plo
59979 --- original/libpcsxcore/libpcsxcore/.deps/ix86_3dnow.Plo 2009-03-28 22:34:37.000000000 -0430
59980 +++ new/libpcsxcore/libpcsxcore/.deps/ix86_3dnow.Plo 1969-12-31 20:00:00.000000000 -0400
59981 @@ -1 +0,0 @@
59982 -# dummy
59983 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ix86_cpudetect.Plo new/libpcsxcore/libpcsxcore/.deps/ix86_cpudetect.Plo
59984 --- original/libpcsxcore/libpcsxcore/.deps/ix86_cpudetect.Plo 2009-03-28 22:34:37.000000000 -0430
59985 +++ new/libpcsxcore/libpcsxcore/.deps/ix86_cpudetect.Plo 1969-12-31 20:00:00.000000000 -0400
59986 @@ -1 +0,0 @@
59987 -# dummy
59988 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ix86_fpu.Plo new/libpcsxcore/libpcsxcore/.deps/ix86_fpu.Plo
59989 --- original/libpcsxcore/libpcsxcore/.deps/ix86_fpu.Plo 2009-03-28 22:34:37.000000000 -0430
59990 +++ new/libpcsxcore/libpcsxcore/.deps/ix86_fpu.Plo 1969-12-31 20:00:00.000000000 -0400
59991 @@ -1 +0,0 @@
59992 -# dummy
59993 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ix86_mmx.Plo new/libpcsxcore/libpcsxcore/.deps/ix86_mmx.Plo
59994 --- original/libpcsxcore/libpcsxcore/.deps/ix86_mmx.Plo 2009-03-28 22:34:37.000000000 -0430
59995 +++ new/libpcsxcore/libpcsxcore/.deps/ix86_mmx.Plo 1969-12-31 20:00:00.000000000 -0400
59996 @@ -1 +0,0 @@
59997 -# dummy
59998 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ix86_sse.Plo new/libpcsxcore/libpcsxcore/.deps/ix86_sse.Plo
59999 --- original/libpcsxcore/libpcsxcore/.deps/ix86_sse.Plo 2009-03-28 22:34:37.000000000 -0430
60000 +++ new/libpcsxcore/libpcsxcore/.deps/ix86_sse.Plo 1969-12-31 20:00:00.000000000 -0400
60001 @@ -1 +0,0 @@
60002 -# dummy
60003 diff -rupN original/libpcsxcore/libpcsxcore/.deps/mdec.Plo new/libpcsxcore/libpcsxcore/.deps/mdec.Plo
60004 --- original/libpcsxcore/libpcsxcore/.deps/mdec.Plo 2009-03-28 22:34:50.000000000 -0430
60005 +++ new/libpcsxcore/libpcsxcore/.deps/mdec.Plo 1969-12-31 20:00:00.000000000 -0400
60006 @@ -1,366 +0,0 @@
60007 -mdec.lo: ../libpcsxcore/mdec.c ../libpcsxcore/mdec.h \
60008 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
60009 - /usr/include/features.h /usr/include/sys/cdefs.h \
60010 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
60011 - /usr/include/gnu/stubs-32.h \
60012 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
60013 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
60014 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
60015 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
60016 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
60017 - /usr/include/bits/stdio.h /usr/include/string.h \
60018 - /usr/include/bits/string.h /usr/include/bits/string2.h \
60019 - /usr/include/endian.h /usr/include/bits/endian.h \
60020 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
60021 - /usr/include/stdint.h /usr/include/bits/wchar.h \
60022 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
60023 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
60024 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
60025 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
60026 - /usr/include/math.h /usr/include/bits/huge_val.h \
60027 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
60028 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
60029 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
60030 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
60031 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
60032 - /usr/include/glib-2.0/glib/galloca.h \
60033 - /usr/include/glib-2.0/glib/gtypes.h \
60034 - /usr/lib/glib-2.0/include/glibconfig.h \
60035 - /usr/include/glib-2.0/glib/gmacros.h \
60036 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
60037 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
60038 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
60039 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
60040 - /usr/include/bits/posix2_lim.h \
60041 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
60042 - /usr/include/glib-2.0/glib/garray.h \
60043 - /usr/include/glib-2.0/glib/gasyncqueue.h \
60044 - /usr/include/glib-2.0/glib/gthread.h \
60045 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
60046 - /usr/include/glib-2.0/glib/gutils.h \
60047 - /usr/include/glib-2.0/glib/gatomic.h \
60048 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
60049 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
60050 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
60051 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
60052 - /usr/include/glib-2.0/glib/gbase64.h \
60053 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
60054 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
60055 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
60056 - /usr/include/glib-2.0/glib/gchecksum.h \
60057 - /usr/include/glib-2.0/glib/gcompletion.h \
60058 - /usr/include/glib-2.0/glib/gconvert.h \
60059 - /usr/include/glib-2.0/glib/gdataset.h \
60060 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
60061 - /usr/include/glib-2.0/glib/gfileutils.h \
60062 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
60063 - /usr/include/glib-2.0/glib/giochannel.h \
60064 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
60065 - /usr/include/glib-2.0/glib/gslist.h \
60066 - /usr/include/glib-2.0/glib/gstring.h \
60067 - /usr/include/glib-2.0/glib/gunicode.h \
60068 - /usr/include/glib-2.0/glib/gkeyfile.h \
60069 - /usr/include/glib-2.0/glib/gmappedfile.h \
60070 - /usr/include/glib-2.0/glib/gmarkup.h \
60071 - /usr/include/glib-2.0/glib/gmessages.h \
60072 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
60073 - /usr/include/glib-2.0/glib/gpattern.h \
60074 - /usr/include/glib-2.0/glib/gprimes.h \
60075 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
60076 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
60077 - /usr/include/glib-2.0/glib/gregex.h \
60078 - /usr/include/glib-2.0/glib/gscanner.h \
60079 - /usr/include/glib-2.0/glib/gsequence.h \
60080 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
60081 - /usr/include/glib-2.0/glib/gstrfuncs.h \
60082 - /usr/include/glib-2.0/glib/gtestutils.h \
60083 - /usr/include/glib-2.0/glib/gthreadpool.h \
60084 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
60085 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
60086 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
60087 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
60088 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
60089 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
60090 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
60091 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
60092 - ../libpcsxcore/sio.h ../libpcsxcore/psxhw.h ../libpcsxcore/psxdma.h
60093 -
60094 -../libpcsxcore/mdec.h:
60095 -
60096 -../libpcsxcore/psxcommon.h:
60097 -
60098 -../include/config.h:
60099 -
60100 -/usr/include/stdio.h:
60101 -
60102 -/usr/include/features.h:
60103 -
60104 -/usr/include/sys/cdefs.h:
60105 -
60106 -/usr/include/bits/wordsize.h:
60107 -
60108 -/usr/include/gnu/stubs.h:
60109 -
60110 -/usr/include/gnu/stubs-32.h:
60111 -
60112 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
60113 -
60114 -/usr/include/bits/types.h:
60115 -
60116 -/usr/include/bits/typesizes.h:
60117 -
60118 -/usr/include/libio.h:
60119 -
60120 -/usr/include/_G_config.h:
60121 -
60122 -/usr/include/wchar.h:
60123 -
60124 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
60125 -
60126 -/usr/include/bits/stdio_lim.h:
60127 -
60128 -/usr/include/bits/sys_errlist.h:
60129 -
60130 -/usr/include/bits/stdio.h:
60131 -
60132 -/usr/include/string.h:
60133 -
60134 -/usr/include/bits/string.h:
60135 -
60136 -/usr/include/bits/string2.h:
60137 -
60138 -/usr/include/endian.h:
60139 -
60140 -/usr/include/bits/endian.h:
60141 -
60142 -/usr/include/bits/byteswap.h:
60143 -
60144 -/usr/include/stdlib.h:
60145 -
60146 -/usr/include/stdint.h:
60147 -
60148 -/usr/include/bits/wchar.h:
60149 -
60150 -/usr/include/sys/types.h:
60151 -
60152 -/usr/include/time.h:
60153 -
60154 -/usr/include/sys/select.h:
60155 -
60156 -/usr/include/bits/select.h:
60157 -
60158 -/usr/include/bits/sigset.h:
60159 -
60160 -/usr/include/bits/time.h:
60161 -
60162 -/usr/include/sys/sysmacros.h:
60163 -
60164 -/usr/include/bits/pthreadtypes.h:
60165 -
60166 -/usr/include/alloca.h:
60167 -
60168 -/usr/include/math.h:
60169 -
60170 -/usr/include/bits/huge_val.h:
60171 -
60172 -/usr/include/bits/mathdef.h:
60173 -
60174 -/usr/include/bits/mathcalls.h:
60175 -
60176 -/usr/include/bits/mathinline.h:
60177 -
60178 -/usr/include/ctype.h:
60179 -
60180 -/usr/include/zlib.h:
60181 -
60182 -/usr/include/zconf.h:
60183 -
60184 -/usr/include/zlibdefs.h:
60185 -
60186 -/usr/include/unistd.h:
60187 -
60188 -/usr/include/bits/posix_opt.h:
60189 -
60190 -/usr/include/bits/confname.h:
60191 -
60192 -/usr/include/getopt.h:
60193 -
60194 -/usr/include/glib-2.0/glib.h:
60195 -
60196 -/usr/include/glib-2.0/glib/galloca.h:
60197 -
60198 -/usr/include/glib-2.0/glib/gtypes.h:
60199 -
60200 -/usr/lib/glib-2.0/include/glibconfig.h:
60201 -
60202 -/usr/include/glib-2.0/glib/gmacros.h:
60203 -
60204 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
60205 -
60206 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
60207 -
60208 -/usr/include/limits.h:
60209 -
60210 -/usr/include/bits/posix1_lim.h:
60211 -
60212 -/usr/include/bits/local_lim.h:
60213 -
60214 -/usr/include/linux/limits.h:
60215 -
60216 -/usr/include/bits/posix2_lim.h:
60217 -
60218 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
60219 -
60220 -/usr/include/glib-2.0/glib/garray.h:
60221 -
60222 -/usr/include/glib-2.0/glib/gasyncqueue.h:
60223 -
60224 -/usr/include/glib-2.0/glib/gthread.h:
60225 -
60226 -/usr/include/glib-2.0/glib/gerror.h:
60227 -
60228 -/usr/include/glib-2.0/glib/gquark.h:
60229 -
60230 -/usr/include/glib-2.0/glib/gutils.h:
60231 -
60232 -/usr/include/glib-2.0/glib/gatomic.h:
60233 -
60234 -/usr/include/glib-2.0/glib/gbacktrace.h:
60235 -
60236 -/usr/include/signal.h:
60237 -
60238 -/usr/include/bits/signum.h:
60239 -
60240 -/usr/include/bits/siginfo.h:
60241 -
60242 -/usr/include/bits/sigaction.h:
60243 -
60244 -/usr/include/bits/sigcontext.h:
60245 -
60246 -/usr/include/bits/sigstack.h:
60247 -
60248 -/usr/include/bits/sigthread.h:
60249 -
60250 -/usr/include/glib-2.0/glib/gbase64.h:
60251 -
60252 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
60253 -
60254 -/usr/include/glib-2.0/glib/gcache.h:
60255 -
60256 -/usr/include/glib-2.0/glib/glist.h:
60257 -
60258 -/usr/include/glib-2.0/glib/gmem.h:
60259 -
60260 -/usr/include/glib-2.0/glib/gslice.h:
60261 -
60262 -/usr/include/glib-2.0/glib/gchecksum.h:
60263 -
60264 -/usr/include/glib-2.0/glib/gcompletion.h:
60265 -
60266 -/usr/include/glib-2.0/glib/gconvert.h:
60267 -
60268 -/usr/include/glib-2.0/glib/gdataset.h:
60269 -
60270 -/usr/include/glib-2.0/glib/gdate.h:
60271 -
60272 -/usr/include/glib-2.0/glib/gdir.h:
60273 -
60274 -/usr/include/glib-2.0/glib/gfileutils.h:
60275 -
60276 -/usr/include/glib-2.0/glib/ghash.h:
60277 -
60278 -/usr/include/glib-2.0/glib/ghook.h:
60279 -
60280 -/usr/include/glib-2.0/glib/giochannel.h:
60281 -
60282 -/usr/include/glib-2.0/glib/gmain.h:
60283 -
60284 -/usr/include/glib-2.0/glib/gpoll.h:
60285 -
60286 -/usr/include/glib-2.0/glib/gslist.h:
60287 -
60288 -/usr/include/glib-2.0/glib/gstring.h:
60289 -
60290 -/usr/include/glib-2.0/glib/gunicode.h:
60291 -
60292 -/usr/include/glib-2.0/glib/gkeyfile.h:
60293 -
60294 -/usr/include/glib-2.0/glib/gmappedfile.h:
60295 -
60296 -/usr/include/glib-2.0/glib/gmarkup.h:
60297 -
60298 -/usr/include/glib-2.0/glib/gmessages.h:
60299 -
60300 -/usr/include/glib-2.0/glib/gnode.h:
60301 -
60302 -/usr/include/glib-2.0/glib/goption.h:
60303 -
60304 -/usr/include/glib-2.0/glib/gpattern.h:
60305 -
60306 -/usr/include/glib-2.0/glib/gprimes.h:
60307 -
60308 -/usr/include/glib-2.0/glib/gqsort.h:
60309 -
60310 -/usr/include/glib-2.0/glib/gqueue.h:
60311 -
60312 -/usr/include/glib-2.0/glib/grand.h:
60313 -
60314 -/usr/include/glib-2.0/glib/grel.h:
60315 -
60316 -/usr/include/glib-2.0/glib/gregex.h:
60317 -
60318 -/usr/include/glib-2.0/glib/gscanner.h:
60319 -
60320 -/usr/include/glib-2.0/glib/gsequence.h:
60321 -
60322 -/usr/include/glib-2.0/glib/gshell.h:
60323 -
60324 -/usr/include/glib-2.0/glib/gspawn.h:
60325 -
60326 -/usr/include/glib-2.0/glib/gstrfuncs.h:
60327 -
60328 -/usr/include/glib-2.0/glib/gtestutils.h:
60329 -
60330 -/usr/include/glib-2.0/glib/gthreadpool.h:
60331 -
60332 -/usr/include/glib-2.0/glib/gtimer.h:
60333 -
60334 -/usr/include/glib-2.0/glib/gtree.h:
60335 -
60336 -/usr/include/glib-2.0/glib/gurifuncs.h:
60337 -
60338 -../libpcsxcore/system.h:
60339 -
60340 -../libpcsxcore/debug.h:
60341 -
60342 -/usr/include/libintl.h:
60343 -
60344 -/usr/include/locale.h:
60345 -
60346 -/usr/include/bits/locale.h:
60347 -
60348 -../libpcsxcore/r3000a.h:
60349 -
60350 -../libpcsxcore/psxmem.h:
60351 -
60352 -../libpcsxcore/psxcounters.h:
60353 -
60354 -../libpcsxcore/plugins.h:
60355 -
60356 -../libpcsxcore/spu.h:
60357 -
60358 -../libpcsxcore/psemu_plugin_defs.h:
60359 -
60360 -../libpcsxcore/decode_xa.h:
60361 -
60362 -../libpcsxcore/psxbios.h:
60363 -
60364 -../libpcsxcore/misc.h:
60365 -
60366 -../libpcsxcore/coff.h:
60367 -
60368 -../libpcsxcore/sio.h:
60369 -
60370 -../libpcsxcore/psxhw.h:
60371 -
60372 -../libpcsxcore/psxdma.h:
60373 diff -rupN original/libpcsxcore/libpcsxcore/.deps/misc.Plo new/libpcsxcore/libpcsxcore/.deps/misc.Plo
60374 --- original/libpcsxcore/libpcsxcore/.deps/misc.Plo 2009-03-28 22:34:52.000000000 -0430
60375 +++ new/libpcsxcore/libpcsxcore/.deps/misc.Plo 1969-12-31 20:00:00.000000000 -0400
60376 @@ -1,359 +0,0 @@
60377 -misc.lo: ../libpcsxcore/misc.c ../libpcsxcore/misc.h \
60378 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
60379 - /usr/include/features.h /usr/include/sys/cdefs.h \
60380 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
60381 - /usr/include/gnu/stubs-32.h \
60382 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
60383 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
60384 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
60385 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
60386 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
60387 - /usr/include/bits/stdio.h /usr/include/string.h \
60388 - /usr/include/bits/string.h /usr/include/bits/string2.h \
60389 - /usr/include/endian.h /usr/include/bits/endian.h \
60390 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
60391 - /usr/include/stdint.h /usr/include/bits/wchar.h \
60392 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
60393 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
60394 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
60395 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
60396 - /usr/include/math.h /usr/include/bits/huge_val.h \
60397 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
60398 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
60399 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
60400 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
60401 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
60402 - /usr/include/glib-2.0/glib/galloca.h \
60403 - /usr/include/glib-2.0/glib/gtypes.h \
60404 - /usr/lib/glib-2.0/include/glibconfig.h \
60405 - /usr/include/glib-2.0/glib/gmacros.h \
60406 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
60407 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
60408 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
60409 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
60410 - /usr/include/bits/posix2_lim.h \
60411 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
60412 - /usr/include/glib-2.0/glib/garray.h \
60413 - /usr/include/glib-2.0/glib/gasyncqueue.h \
60414 - /usr/include/glib-2.0/glib/gthread.h \
60415 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
60416 - /usr/include/glib-2.0/glib/gutils.h \
60417 - /usr/include/glib-2.0/glib/gatomic.h \
60418 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
60419 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
60420 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
60421 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
60422 - /usr/include/glib-2.0/glib/gbase64.h \
60423 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
60424 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
60425 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
60426 - /usr/include/glib-2.0/glib/gchecksum.h \
60427 - /usr/include/glib-2.0/glib/gcompletion.h \
60428 - /usr/include/glib-2.0/glib/gconvert.h \
60429 - /usr/include/glib-2.0/glib/gdataset.h \
60430 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
60431 - /usr/include/glib-2.0/glib/gfileutils.h \
60432 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
60433 - /usr/include/glib-2.0/glib/giochannel.h \
60434 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
60435 - /usr/include/glib-2.0/glib/gslist.h \
60436 - /usr/include/glib-2.0/glib/gstring.h \
60437 - /usr/include/glib-2.0/glib/gunicode.h \
60438 - /usr/include/glib-2.0/glib/gkeyfile.h \
60439 - /usr/include/glib-2.0/glib/gmappedfile.h \
60440 - /usr/include/glib-2.0/glib/gmarkup.h \
60441 - /usr/include/glib-2.0/glib/gmessages.h \
60442 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
60443 - /usr/include/glib-2.0/glib/gpattern.h \
60444 - /usr/include/glib-2.0/glib/gprimes.h \
60445 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
60446 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
60447 - /usr/include/glib-2.0/glib/gregex.h \
60448 - /usr/include/glib-2.0/glib/gscanner.h \
60449 - /usr/include/glib-2.0/glib/gsequence.h \
60450 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
60451 - /usr/include/glib-2.0/glib/gstrfuncs.h \
60452 - /usr/include/glib-2.0/glib/gtestutils.h \
60453 - /usr/include/glib-2.0/glib/gthreadpool.h \
60454 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
60455 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
60456 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
60457 - /usr/include/bits/locale.h ../libpcsxcore/coff.h \
60458 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h ../libpcsxcore/r3000a.h \
60459 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
60460 - ../libpcsxcore/psxbios.h ../libpcsxcore/sio.h \
60461 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h
60462 -
60463 -../libpcsxcore/misc.h:
60464 -
60465 -../libpcsxcore/psxcommon.h:
60466 -
60467 -../include/config.h:
60468 -
60469 -/usr/include/stdio.h:
60470 -
60471 -/usr/include/features.h:
60472 -
60473 -/usr/include/sys/cdefs.h:
60474 -
60475 -/usr/include/bits/wordsize.h:
60476 -
60477 -/usr/include/gnu/stubs.h:
60478 -
60479 -/usr/include/gnu/stubs-32.h:
60480 -
60481 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
60482 -
60483 -/usr/include/bits/types.h:
60484 -
60485 -/usr/include/bits/typesizes.h:
60486 -
60487 -/usr/include/libio.h:
60488 -
60489 -/usr/include/_G_config.h:
60490 -
60491 -/usr/include/wchar.h:
60492 -
60493 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
60494 -
60495 -/usr/include/bits/stdio_lim.h:
60496 -
60497 -/usr/include/bits/sys_errlist.h:
60498 -
60499 -/usr/include/bits/stdio.h:
60500 -
60501 -/usr/include/string.h:
60502 -
60503 -/usr/include/bits/string.h:
60504 -
60505 -/usr/include/bits/string2.h:
60506 -
60507 -/usr/include/endian.h:
60508 -
60509 -/usr/include/bits/endian.h:
60510 -
60511 -/usr/include/bits/byteswap.h:
60512 -
60513 -/usr/include/stdlib.h:
60514 -
60515 -/usr/include/stdint.h:
60516 -
60517 -/usr/include/bits/wchar.h:
60518 -
60519 -/usr/include/sys/types.h:
60520 -
60521 -/usr/include/time.h:
60522 -
60523 -/usr/include/sys/select.h:
60524 -
60525 -/usr/include/bits/select.h:
60526 -
60527 -/usr/include/bits/sigset.h:
60528 -
60529 -/usr/include/bits/time.h:
60530 -
60531 -/usr/include/sys/sysmacros.h:
60532 -
60533 -/usr/include/bits/pthreadtypes.h:
60534 -
60535 -/usr/include/alloca.h:
60536 -
60537 -/usr/include/math.h:
60538 -
60539 -/usr/include/bits/huge_val.h:
60540 -
60541 -/usr/include/bits/mathdef.h:
60542 -
60543 -/usr/include/bits/mathcalls.h:
60544 -
60545 -/usr/include/bits/mathinline.h:
60546 -
60547 -/usr/include/ctype.h:
60548 -
60549 -/usr/include/zlib.h:
60550 -
60551 -/usr/include/zconf.h:
60552 -
60553 -/usr/include/zlibdefs.h:
60554 -
60555 -/usr/include/unistd.h:
60556 -
60557 -/usr/include/bits/posix_opt.h:
60558 -
60559 -/usr/include/bits/confname.h:
60560 -
60561 -/usr/include/getopt.h:
60562 -
60563 -/usr/include/glib-2.0/glib.h:
60564 -
60565 -/usr/include/glib-2.0/glib/galloca.h:
60566 -
60567 -/usr/include/glib-2.0/glib/gtypes.h:
60568 -
60569 -/usr/lib/glib-2.0/include/glibconfig.h:
60570 -
60571 -/usr/include/glib-2.0/glib/gmacros.h:
60572 -
60573 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
60574 -
60575 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
60576 -
60577 -/usr/include/limits.h:
60578 -
60579 -/usr/include/bits/posix1_lim.h:
60580 -
60581 -/usr/include/bits/local_lim.h:
60582 -
60583 -/usr/include/linux/limits.h:
60584 -
60585 -/usr/include/bits/posix2_lim.h:
60586 -
60587 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
60588 -
60589 -/usr/include/glib-2.0/glib/garray.h:
60590 -
60591 -/usr/include/glib-2.0/glib/gasyncqueue.h:
60592 -
60593 -/usr/include/glib-2.0/glib/gthread.h:
60594 -
60595 -/usr/include/glib-2.0/glib/gerror.h:
60596 -
60597 -/usr/include/glib-2.0/glib/gquark.h:
60598 -
60599 -/usr/include/glib-2.0/glib/gutils.h:
60600 -
60601 -/usr/include/glib-2.0/glib/gatomic.h:
60602 -
60603 -/usr/include/glib-2.0/glib/gbacktrace.h:
60604 -
60605 -/usr/include/signal.h:
60606 -
60607 -/usr/include/bits/signum.h:
60608 -
60609 -/usr/include/bits/siginfo.h:
60610 -
60611 -/usr/include/bits/sigaction.h:
60612 -
60613 -/usr/include/bits/sigcontext.h:
60614 -
60615 -/usr/include/bits/sigstack.h:
60616 -
60617 -/usr/include/bits/sigthread.h:
60618 -
60619 -/usr/include/glib-2.0/glib/gbase64.h:
60620 -
60621 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
60622 -
60623 -/usr/include/glib-2.0/glib/gcache.h:
60624 -
60625 -/usr/include/glib-2.0/glib/glist.h:
60626 -
60627 -/usr/include/glib-2.0/glib/gmem.h:
60628 -
60629 -/usr/include/glib-2.0/glib/gslice.h:
60630 -
60631 -/usr/include/glib-2.0/glib/gchecksum.h:
60632 -
60633 -/usr/include/glib-2.0/glib/gcompletion.h:
60634 -
60635 -/usr/include/glib-2.0/glib/gconvert.h:
60636 -
60637 -/usr/include/glib-2.0/glib/gdataset.h:
60638 -
60639 -/usr/include/glib-2.0/glib/gdate.h:
60640 -
60641 -/usr/include/glib-2.0/glib/gdir.h:
60642 -
60643 -/usr/include/glib-2.0/glib/gfileutils.h:
60644 -
60645 -/usr/include/glib-2.0/glib/ghash.h:
60646 -
60647 -/usr/include/glib-2.0/glib/ghook.h:
60648 -
60649 -/usr/include/glib-2.0/glib/giochannel.h:
60650 -
60651 -/usr/include/glib-2.0/glib/gmain.h:
60652 -
60653 -/usr/include/glib-2.0/glib/gpoll.h:
60654 -
60655 -/usr/include/glib-2.0/glib/gslist.h:
60656 -
60657 -/usr/include/glib-2.0/glib/gstring.h:
60658 -
60659 -/usr/include/glib-2.0/glib/gunicode.h:
60660 -
60661 -/usr/include/glib-2.0/glib/gkeyfile.h:
60662 -
60663 -/usr/include/glib-2.0/glib/gmappedfile.h:
60664 -
60665 -/usr/include/glib-2.0/glib/gmarkup.h:
60666 -
60667 -/usr/include/glib-2.0/glib/gmessages.h:
60668 -
60669 -/usr/include/glib-2.0/glib/gnode.h:
60670 -
60671 -/usr/include/glib-2.0/glib/goption.h:
60672 -
60673 -/usr/include/glib-2.0/glib/gpattern.h:
60674 -
60675 -/usr/include/glib-2.0/glib/gprimes.h:
60676 -
60677 -/usr/include/glib-2.0/glib/gqsort.h:
60678 -
60679 -/usr/include/glib-2.0/glib/gqueue.h:
60680 -
60681 -/usr/include/glib-2.0/glib/grand.h:
60682 -
60683 -/usr/include/glib-2.0/glib/grel.h:
60684 -
60685 -/usr/include/glib-2.0/glib/gregex.h:
60686 -
60687 -/usr/include/glib-2.0/glib/gscanner.h:
60688 -
60689 -/usr/include/glib-2.0/glib/gsequence.h:
60690 -
60691 -/usr/include/glib-2.0/glib/gshell.h:
60692 -
60693 -/usr/include/glib-2.0/glib/gspawn.h:
60694 -
60695 -/usr/include/glib-2.0/glib/gstrfuncs.h:
60696 -
60697 -/usr/include/glib-2.0/glib/gtestutils.h:
60698 -
60699 -/usr/include/glib-2.0/glib/gthreadpool.h:
60700 -
60701 -/usr/include/glib-2.0/glib/gtimer.h:
60702 -
60703 -/usr/include/glib-2.0/glib/gtree.h:
60704 -
60705 -/usr/include/glib-2.0/glib/gurifuncs.h:
60706 -
60707 -../libpcsxcore/system.h:
60708 -
60709 -../libpcsxcore/debug.h:
60710 -
60711 -/usr/include/libintl.h:
60712 -
60713 -/usr/include/locale.h:
60714 -
60715 -/usr/include/bits/locale.h:
60716 -
60717 -../libpcsxcore/coff.h:
60718 -
60719 -../libpcsxcore/plugins.h:
60720 -
60721 -../libpcsxcore/spu.h:
60722 -
60723 -../libpcsxcore/r3000a.h:
60724 -
60725 -../libpcsxcore/psxmem.h:
60726 -
60727 -../libpcsxcore/psxcounters.h:
60728 -
60729 -../libpcsxcore/psxbios.h:
60730 -
60731 -../libpcsxcore/sio.h:
60732 -
60733 -../libpcsxcore/psemu_plugin_defs.h:
60734 -
60735 -../libpcsxcore/decode_xa.h:
60736 diff -rupN original/libpcsxcore/libpcsxcore/.deps/pR3000A.Plo new/libpcsxcore/libpcsxcore/.deps/pR3000A.Plo
60737 --- original/libpcsxcore/libpcsxcore/.deps/pR3000A.Plo 2009-03-28 22:34:37.000000000 -0430
60738 +++ new/libpcsxcore/libpcsxcore/.deps/pR3000A.Plo 1969-12-31 20:00:00.000000000 -0400
60739 @@ -1 +0,0 @@
60740 -# dummy
60741 diff -rupN original/libpcsxcore/libpcsxcore/.deps/plugins.Plo new/libpcsxcore/libpcsxcore/.deps/plugins.Plo
60742 --- original/libpcsxcore/libpcsxcore/.deps/plugins.Plo 2009-03-28 22:34:54.000000000 -0430
60743 +++ new/libpcsxcore/libpcsxcore/.deps/plugins.Plo 1969-12-31 20:00:00.000000000 -0400
60744 @@ -1,359 +0,0 @@
60745 -plugins.lo: ../libpcsxcore/plugins.c ../libpcsxcore/plugins.h \
60746 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
60747 - /usr/include/features.h /usr/include/sys/cdefs.h \
60748 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
60749 - /usr/include/gnu/stubs-32.h \
60750 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
60751 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
60752 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
60753 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
60754 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
60755 - /usr/include/bits/stdio.h /usr/include/string.h \
60756 - /usr/include/bits/string.h /usr/include/bits/string2.h \
60757 - /usr/include/endian.h /usr/include/bits/endian.h \
60758 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
60759 - /usr/include/stdint.h /usr/include/bits/wchar.h \
60760 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
60761 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
60762 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
60763 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
60764 - /usr/include/math.h /usr/include/bits/huge_val.h \
60765 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
60766 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
60767 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
60768 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
60769 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
60770 - /usr/include/glib-2.0/glib/galloca.h \
60771 - /usr/include/glib-2.0/glib/gtypes.h \
60772 - /usr/lib/glib-2.0/include/glibconfig.h \
60773 - /usr/include/glib-2.0/glib/gmacros.h \
60774 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
60775 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
60776 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
60777 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
60778 - /usr/include/bits/posix2_lim.h \
60779 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
60780 - /usr/include/glib-2.0/glib/garray.h \
60781 - /usr/include/glib-2.0/glib/gasyncqueue.h \
60782 - /usr/include/glib-2.0/glib/gthread.h \
60783 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
60784 - /usr/include/glib-2.0/glib/gutils.h \
60785 - /usr/include/glib-2.0/glib/gatomic.h \
60786 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
60787 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
60788 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
60789 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
60790 - /usr/include/glib-2.0/glib/gbase64.h \
60791 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
60792 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
60793 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
60794 - /usr/include/glib-2.0/glib/gchecksum.h \
60795 - /usr/include/glib-2.0/glib/gcompletion.h \
60796 - /usr/include/glib-2.0/glib/gconvert.h \
60797 - /usr/include/glib-2.0/glib/gdataset.h \
60798 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
60799 - /usr/include/glib-2.0/glib/gfileutils.h \
60800 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
60801 - /usr/include/glib-2.0/glib/giochannel.h \
60802 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
60803 - /usr/include/glib-2.0/glib/gslist.h \
60804 - /usr/include/glib-2.0/glib/gstring.h \
60805 - /usr/include/glib-2.0/glib/gunicode.h \
60806 - /usr/include/glib-2.0/glib/gkeyfile.h \
60807 - /usr/include/glib-2.0/glib/gmappedfile.h \
60808 - /usr/include/glib-2.0/glib/gmarkup.h \
60809 - /usr/include/glib-2.0/glib/gmessages.h \
60810 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
60811 - /usr/include/glib-2.0/glib/gpattern.h \
60812 - /usr/include/glib-2.0/glib/gprimes.h \
60813 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
60814 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
60815 - /usr/include/glib-2.0/glib/gregex.h \
60816 - /usr/include/glib-2.0/glib/gscanner.h \
60817 - /usr/include/glib-2.0/glib/gsequence.h \
60818 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
60819 - /usr/include/glib-2.0/glib/gstrfuncs.h \
60820 - /usr/include/glib-2.0/glib/gtestutils.h \
60821 - /usr/include/glib-2.0/glib/gthreadpool.h \
60822 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
60823 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
60824 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
60825 - /usr/include/bits/locale.h ../libpcsxcore/spu.h ../libpcsxcore/r3000a.h \
60826 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
60827 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
60828 - ../libpcsxcore/sio.h ../libpcsxcore/psemu_plugin_defs.h \
60829 - ../libpcsxcore/decode_xa.h
60830 -
60831 -../libpcsxcore/plugins.h:
60832 -
60833 -../libpcsxcore/psxcommon.h:
60834 -
60835 -../include/config.h:
60836 -
60837 -/usr/include/stdio.h:
60838 -
60839 -/usr/include/features.h:
60840 -
60841 -/usr/include/sys/cdefs.h:
60842 -
60843 -/usr/include/bits/wordsize.h:
60844 -
60845 -/usr/include/gnu/stubs.h:
60846 -
60847 -/usr/include/gnu/stubs-32.h:
60848 -
60849 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
60850 -
60851 -/usr/include/bits/types.h:
60852 -
60853 -/usr/include/bits/typesizes.h:
60854 -
60855 -/usr/include/libio.h:
60856 -
60857 -/usr/include/_G_config.h:
60858 -
60859 -/usr/include/wchar.h:
60860 -
60861 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
60862 -
60863 -/usr/include/bits/stdio_lim.h:
60864 -
60865 -/usr/include/bits/sys_errlist.h:
60866 -
60867 -/usr/include/bits/stdio.h:
60868 -
60869 -/usr/include/string.h:
60870 -
60871 -/usr/include/bits/string.h:
60872 -
60873 -/usr/include/bits/string2.h:
60874 -
60875 -/usr/include/endian.h:
60876 -
60877 -/usr/include/bits/endian.h:
60878 -
60879 -/usr/include/bits/byteswap.h:
60880 -
60881 -/usr/include/stdlib.h:
60882 -
60883 -/usr/include/stdint.h:
60884 -
60885 -/usr/include/bits/wchar.h:
60886 -
60887 -/usr/include/sys/types.h:
60888 -
60889 -/usr/include/time.h:
60890 -
60891 -/usr/include/sys/select.h:
60892 -
60893 -/usr/include/bits/select.h:
60894 -
60895 -/usr/include/bits/sigset.h:
60896 -
60897 -/usr/include/bits/time.h:
60898 -
60899 -/usr/include/sys/sysmacros.h:
60900 -
60901 -/usr/include/bits/pthreadtypes.h:
60902 -
60903 -/usr/include/alloca.h:
60904 -
60905 -/usr/include/math.h:
60906 -
60907 -/usr/include/bits/huge_val.h:
60908 -
60909 -/usr/include/bits/mathdef.h:
60910 -
60911 -/usr/include/bits/mathcalls.h:
60912 -
60913 -/usr/include/bits/mathinline.h:
60914 -
60915 -/usr/include/ctype.h:
60916 -
60917 -/usr/include/zlib.h:
60918 -
60919 -/usr/include/zconf.h:
60920 -
60921 -/usr/include/zlibdefs.h:
60922 -
60923 -/usr/include/unistd.h:
60924 -
60925 -/usr/include/bits/posix_opt.h:
60926 -
60927 -/usr/include/bits/confname.h:
60928 -
60929 -/usr/include/getopt.h:
60930 -
60931 -/usr/include/glib-2.0/glib.h:
60932 -
60933 -/usr/include/glib-2.0/glib/galloca.h:
60934 -
60935 -/usr/include/glib-2.0/glib/gtypes.h:
60936 -
60937 -/usr/lib/glib-2.0/include/glibconfig.h:
60938 -
60939 -/usr/include/glib-2.0/glib/gmacros.h:
60940 -
60941 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
60942 -
60943 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
60944 -
60945 -/usr/include/limits.h:
60946 -
60947 -/usr/include/bits/posix1_lim.h:
60948 -
60949 -/usr/include/bits/local_lim.h:
60950 -
60951 -/usr/include/linux/limits.h:
60952 -
60953 -/usr/include/bits/posix2_lim.h:
60954 -
60955 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
60956 -
60957 -/usr/include/glib-2.0/glib/garray.h:
60958 -
60959 -/usr/include/glib-2.0/glib/gasyncqueue.h:
60960 -
60961 -/usr/include/glib-2.0/glib/gthread.h:
60962 -
60963 -/usr/include/glib-2.0/glib/gerror.h:
60964 -
60965 -/usr/include/glib-2.0/glib/gquark.h:
60966 -
60967 -/usr/include/glib-2.0/glib/gutils.h:
60968 -
60969 -/usr/include/glib-2.0/glib/gatomic.h:
60970 -
60971 -/usr/include/glib-2.0/glib/gbacktrace.h:
60972 -
60973 -/usr/include/signal.h:
60974 -
60975 -/usr/include/bits/signum.h:
60976 -
60977 -/usr/include/bits/siginfo.h:
60978 -
60979 -/usr/include/bits/sigaction.h:
60980 -
60981 -/usr/include/bits/sigcontext.h:
60982 -
60983 -/usr/include/bits/sigstack.h:
60984 -
60985 -/usr/include/bits/sigthread.h:
60986 -
60987 -/usr/include/glib-2.0/glib/gbase64.h:
60988 -
60989 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
60990 -
60991 -/usr/include/glib-2.0/glib/gcache.h:
60992 -
60993 -/usr/include/glib-2.0/glib/glist.h:
60994 -
60995 -/usr/include/glib-2.0/glib/gmem.h:
60996 -
60997 -/usr/include/glib-2.0/glib/gslice.h:
60998 -
60999 -/usr/include/glib-2.0/glib/gchecksum.h:
61000 -
61001 -/usr/include/glib-2.0/glib/gcompletion.h:
61002 -
61003 -/usr/include/glib-2.0/glib/gconvert.h:
61004 -
61005 -/usr/include/glib-2.0/glib/gdataset.h:
61006 -
61007 -/usr/include/glib-2.0/glib/gdate.h:
61008 -
61009 -/usr/include/glib-2.0/glib/gdir.h:
61010 -
61011 -/usr/include/glib-2.0/glib/gfileutils.h:
61012 -
61013 -/usr/include/glib-2.0/glib/ghash.h:
61014 -
61015 -/usr/include/glib-2.0/glib/ghook.h:
61016 -
61017 -/usr/include/glib-2.0/glib/giochannel.h:
61018 -
61019 -/usr/include/glib-2.0/glib/gmain.h:
61020 -
61021 -/usr/include/glib-2.0/glib/gpoll.h:
61022 -
61023 -/usr/include/glib-2.0/glib/gslist.h:
61024 -
61025 -/usr/include/glib-2.0/glib/gstring.h:
61026 -
61027 -/usr/include/glib-2.0/glib/gunicode.h:
61028 -
61029 -/usr/include/glib-2.0/glib/gkeyfile.h:
61030 -
61031 -/usr/include/glib-2.0/glib/gmappedfile.h:
61032 -
61033 -/usr/include/glib-2.0/glib/gmarkup.h:
61034 -
61035 -/usr/include/glib-2.0/glib/gmessages.h:
61036 -
61037 -/usr/include/glib-2.0/glib/gnode.h:
61038 -
61039 -/usr/include/glib-2.0/glib/goption.h:
61040 -
61041 -/usr/include/glib-2.0/glib/gpattern.h:
61042 -
61043 -/usr/include/glib-2.0/glib/gprimes.h:
61044 -
61045 -/usr/include/glib-2.0/glib/gqsort.h:
61046 -
61047 -/usr/include/glib-2.0/glib/gqueue.h:
61048 -
61049 -/usr/include/glib-2.0/glib/grand.h:
61050 -
61051 -/usr/include/glib-2.0/glib/grel.h:
61052 -
61053 -/usr/include/glib-2.0/glib/gregex.h:
61054 -
61055 -/usr/include/glib-2.0/glib/gscanner.h:
61056 -
61057 -/usr/include/glib-2.0/glib/gsequence.h:
61058 -
61059 -/usr/include/glib-2.0/glib/gshell.h:
61060 -
61061 -/usr/include/glib-2.0/glib/gspawn.h:
61062 -
61063 -/usr/include/glib-2.0/glib/gstrfuncs.h:
61064 -
61065 -/usr/include/glib-2.0/glib/gtestutils.h:
61066 -
61067 -/usr/include/glib-2.0/glib/gthreadpool.h:
61068 -
61069 -/usr/include/glib-2.0/glib/gtimer.h:
61070 -
61071 -/usr/include/glib-2.0/glib/gtree.h:
61072 -
61073 -/usr/include/glib-2.0/glib/gurifuncs.h:
61074 -
61075 -../libpcsxcore/system.h:
61076 -
61077 -../libpcsxcore/debug.h:
61078 -
61079 -/usr/include/libintl.h:
61080 -
61081 -/usr/include/locale.h:
61082 -
61083 -/usr/include/bits/locale.h:
61084 -
61085 -../libpcsxcore/spu.h:
61086 -
61087 -../libpcsxcore/r3000a.h:
61088 -
61089 -../libpcsxcore/psxmem.h:
61090 -
61091 -../libpcsxcore/psxcounters.h:
61092 -
61093 -../libpcsxcore/psxbios.h:
61094 -
61095 -../libpcsxcore/misc.h:
61096 -
61097 -../libpcsxcore/coff.h:
61098 -
61099 -../libpcsxcore/sio.h:
61100 -
61101 -../libpcsxcore/psemu_plugin_defs.h:
61102 -
61103 -../libpcsxcore/decode_xa.h:
61104 diff -rupN original/libpcsxcore/libpcsxcore/.deps/ppc.Plo new/libpcsxcore/libpcsxcore/.deps/ppc.Plo
61105 --- original/libpcsxcore/libpcsxcore/.deps/ppc.Plo 2009-03-28 22:34:37.000000000 -0430
61106 +++ new/libpcsxcore/libpcsxcore/.deps/ppc.Plo 1969-12-31 20:00:00.000000000 -0400
61107 @@ -1 +0,0 @@
61108 -# dummy
61109 diff -rupN original/libpcsxcore/libpcsxcore/.deps/psxbios.Plo new/libpcsxcore/libpcsxcore/.deps/psxbios.Plo
61110 --- original/libpcsxcore/libpcsxcore/.deps/psxbios.Plo 2009-03-28 22:34:42.000000000 -0430
61111 +++ new/libpcsxcore/libpcsxcore/.deps/psxbios.Plo 1969-12-31 20:00:00.000000000 -0400
61112 @@ -1,359 +0,0 @@
61113 -psxbios.lo: ../libpcsxcore/psxbios.c ../libpcsxcore/psxbios.h \
61114 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
61115 - /usr/include/features.h /usr/include/sys/cdefs.h \
61116 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
61117 - /usr/include/gnu/stubs-32.h \
61118 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
61119 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
61120 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
61121 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
61122 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
61123 - /usr/include/bits/stdio.h /usr/include/string.h \
61124 - /usr/include/bits/string.h /usr/include/bits/string2.h \
61125 - /usr/include/endian.h /usr/include/bits/endian.h \
61126 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
61127 - /usr/include/stdint.h /usr/include/bits/wchar.h \
61128 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
61129 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
61130 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
61131 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
61132 - /usr/include/math.h /usr/include/bits/huge_val.h \
61133 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
61134 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
61135 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
61136 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
61137 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
61138 - /usr/include/glib-2.0/glib/galloca.h \
61139 - /usr/include/glib-2.0/glib/gtypes.h \
61140 - /usr/lib/glib-2.0/include/glibconfig.h \
61141 - /usr/include/glib-2.0/glib/gmacros.h \
61142 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
61143 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
61144 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
61145 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
61146 - /usr/include/bits/posix2_lim.h \
61147 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
61148 - /usr/include/glib-2.0/glib/garray.h \
61149 - /usr/include/glib-2.0/glib/gasyncqueue.h \
61150 - /usr/include/glib-2.0/glib/gthread.h \
61151 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
61152 - /usr/include/glib-2.0/glib/gutils.h \
61153 - /usr/include/glib-2.0/glib/gatomic.h \
61154 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
61155 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
61156 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
61157 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
61158 - /usr/include/glib-2.0/glib/gbase64.h \
61159 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
61160 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
61161 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
61162 - /usr/include/glib-2.0/glib/gchecksum.h \
61163 - /usr/include/glib-2.0/glib/gcompletion.h \
61164 - /usr/include/glib-2.0/glib/gconvert.h \
61165 - /usr/include/glib-2.0/glib/gdataset.h \
61166 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
61167 - /usr/include/glib-2.0/glib/gfileutils.h \
61168 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
61169 - /usr/include/glib-2.0/glib/giochannel.h \
61170 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
61171 - /usr/include/glib-2.0/glib/gslist.h \
61172 - /usr/include/glib-2.0/glib/gstring.h \
61173 - /usr/include/glib-2.0/glib/gunicode.h \
61174 - /usr/include/glib-2.0/glib/gkeyfile.h \
61175 - /usr/include/glib-2.0/glib/gmappedfile.h \
61176 - /usr/include/glib-2.0/glib/gmarkup.h \
61177 - /usr/include/glib-2.0/glib/gmessages.h \
61178 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
61179 - /usr/include/glib-2.0/glib/gpattern.h \
61180 - /usr/include/glib-2.0/glib/gprimes.h \
61181 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
61182 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
61183 - /usr/include/glib-2.0/glib/gregex.h \
61184 - /usr/include/glib-2.0/glib/gscanner.h \
61185 - /usr/include/glib-2.0/glib/gsequence.h \
61186 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
61187 - /usr/include/glib-2.0/glib/gstrfuncs.h \
61188 - /usr/include/glib-2.0/glib/gtestutils.h \
61189 - /usr/include/glib-2.0/glib/gthreadpool.h \
61190 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
61191 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
61192 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
61193 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
61194 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
61195 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
61196 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
61197 - ../libpcsxcore/misc.h ../libpcsxcore/coff.h ../libpcsxcore/sio.h
61198 -
61199 -../libpcsxcore/psxbios.h:
61200 -
61201 -../libpcsxcore/psxcommon.h:
61202 -
61203 -../include/config.h:
61204 -
61205 -/usr/include/stdio.h:
61206 -
61207 -/usr/include/features.h:
61208 -
61209 -/usr/include/sys/cdefs.h:
61210 -
61211 -/usr/include/bits/wordsize.h:
61212 -
61213 -/usr/include/gnu/stubs.h:
61214 -
61215 -/usr/include/gnu/stubs-32.h:
61216 -
61217 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
61218 -
61219 -/usr/include/bits/types.h:
61220 -
61221 -/usr/include/bits/typesizes.h:
61222 -
61223 -/usr/include/libio.h:
61224 -
61225 -/usr/include/_G_config.h:
61226 -
61227 -/usr/include/wchar.h:
61228 -
61229 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
61230 -
61231 -/usr/include/bits/stdio_lim.h:
61232 -
61233 -/usr/include/bits/sys_errlist.h:
61234 -
61235 -/usr/include/bits/stdio.h:
61236 -
61237 -/usr/include/string.h:
61238 -
61239 -/usr/include/bits/string.h:
61240 -
61241 -/usr/include/bits/string2.h:
61242 -
61243 -/usr/include/endian.h:
61244 -
61245 -/usr/include/bits/endian.h:
61246 -
61247 -/usr/include/bits/byteswap.h:
61248 -
61249 -/usr/include/stdlib.h:
61250 -
61251 -/usr/include/stdint.h:
61252 -
61253 -/usr/include/bits/wchar.h:
61254 -
61255 -/usr/include/sys/types.h:
61256 -
61257 -/usr/include/time.h:
61258 -
61259 -/usr/include/sys/select.h:
61260 -
61261 -/usr/include/bits/select.h:
61262 -
61263 -/usr/include/bits/sigset.h:
61264 -
61265 -/usr/include/bits/time.h:
61266 -
61267 -/usr/include/sys/sysmacros.h:
61268 -
61269 -/usr/include/bits/pthreadtypes.h:
61270 -
61271 -/usr/include/alloca.h:
61272 -
61273 -/usr/include/math.h:
61274 -
61275 -/usr/include/bits/huge_val.h:
61276 -
61277 -/usr/include/bits/mathdef.h:
61278 -
61279 -/usr/include/bits/mathcalls.h:
61280 -
61281 -/usr/include/bits/mathinline.h:
61282 -
61283 -/usr/include/ctype.h:
61284 -
61285 -/usr/include/zlib.h:
61286 -
61287 -/usr/include/zconf.h:
61288 -
61289 -/usr/include/zlibdefs.h:
61290 -
61291 -/usr/include/unistd.h:
61292 -
61293 -/usr/include/bits/posix_opt.h:
61294 -
61295 -/usr/include/bits/confname.h:
61296 -
61297 -/usr/include/getopt.h:
61298 -
61299 -/usr/include/glib-2.0/glib.h:
61300 -
61301 -/usr/include/glib-2.0/glib/galloca.h:
61302 -
61303 -/usr/include/glib-2.0/glib/gtypes.h:
61304 -
61305 -/usr/lib/glib-2.0/include/glibconfig.h:
61306 -
61307 -/usr/include/glib-2.0/glib/gmacros.h:
61308 -
61309 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
61310 -
61311 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
61312 -
61313 -/usr/include/limits.h:
61314 -
61315 -/usr/include/bits/posix1_lim.h:
61316 -
61317 -/usr/include/bits/local_lim.h:
61318 -
61319 -/usr/include/linux/limits.h:
61320 -
61321 -/usr/include/bits/posix2_lim.h:
61322 -
61323 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
61324 -
61325 -/usr/include/glib-2.0/glib/garray.h:
61326 -
61327 -/usr/include/glib-2.0/glib/gasyncqueue.h:
61328 -
61329 -/usr/include/glib-2.0/glib/gthread.h:
61330 -
61331 -/usr/include/glib-2.0/glib/gerror.h:
61332 -
61333 -/usr/include/glib-2.0/glib/gquark.h:
61334 -
61335 -/usr/include/glib-2.0/glib/gutils.h:
61336 -
61337 -/usr/include/glib-2.0/glib/gatomic.h:
61338 -
61339 -/usr/include/glib-2.0/glib/gbacktrace.h:
61340 -
61341 -/usr/include/signal.h:
61342 -
61343 -/usr/include/bits/signum.h:
61344 -
61345 -/usr/include/bits/siginfo.h:
61346 -
61347 -/usr/include/bits/sigaction.h:
61348 -
61349 -/usr/include/bits/sigcontext.h:
61350 -
61351 -/usr/include/bits/sigstack.h:
61352 -
61353 -/usr/include/bits/sigthread.h:
61354 -
61355 -/usr/include/glib-2.0/glib/gbase64.h:
61356 -
61357 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
61358 -
61359 -/usr/include/glib-2.0/glib/gcache.h:
61360 -
61361 -/usr/include/glib-2.0/glib/glist.h:
61362 -
61363 -/usr/include/glib-2.0/glib/gmem.h:
61364 -
61365 -/usr/include/glib-2.0/glib/gslice.h:
61366 -
61367 -/usr/include/glib-2.0/glib/gchecksum.h:
61368 -
61369 -/usr/include/glib-2.0/glib/gcompletion.h:
61370 -
61371 -/usr/include/glib-2.0/glib/gconvert.h:
61372 -
61373 -/usr/include/glib-2.0/glib/gdataset.h:
61374 -
61375 -/usr/include/glib-2.0/glib/gdate.h:
61376 -
61377 -/usr/include/glib-2.0/glib/gdir.h:
61378 -
61379 -/usr/include/glib-2.0/glib/gfileutils.h:
61380 -
61381 -/usr/include/glib-2.0/glib/ghash.h:
61382 -
61383 -/usr/include/glib-2.0/glib/ghook.h:
61384 -
61385 -/usr/include/glib-2.0/glib/giochannel.h:
61386 -
61387 -/usr/include/glib-2.0/glib/gmain.h:
61388 -
61389 -/usr/include/glib-2.0/glib/gpoll.h:
61390 -
61391 -/usr/include/glib-2.0/glib/gslist.h:
61392 -
61393 -/usr/include/glib-2.0/glib/gstring.h:
61394 -
61395 -/usr/include/glib-2.0/glib/gunicode.h:
61396 -
61397 -/usr/include/glib-2.0/glib/gkeyfile.h:
61398 -
61399 -/usr/include/glib-2.0/glib/gmappedfile.h:
61400 -
61401 -/usr/include/glib-2.0/glib/gmarkup.h:
61402 -
61403 -/usr/include/glib-2.0/glib/gmessages.h:
61404 -
61405 -/usr/include/glib-2.0/glib/gnode.h:
61406 -
61407 -/usr/include/glib-2.0/glib/goption.h:
61408 -
61409 -/usr/include/glib-2.0/glib/gpattern.h:
61410 -
61411 -/usr/include/glib-2.0/glib/gprimes.h:
61412 -
61413 -/usr/include/glib-2.0/glib/gqsort.h:
61414 -
61415 -/usr/include/glib-2.0/glib/gqueue.h:
61416 -
61417 -/usr/include/glib-2.0/glib/grand.h:
61418 -
61419 -/usr/include/glib-2.0/glib/grel.h:
61420 -
61421 -/usr/include/glib-2.0/glib/gregex.h:
61422 -
61423 -/usr/include/glib-2.0/glib/gscanner.h:
61424 -
61425 -/usr/include/glib-2.0/glib/gsequence.h:
61426 -
61427 -/usr/include/glib-2.0/glib/gshell.h:
61428 -
61429 -/usr/include/glib-2.0/glib/gspawn.h:
61430 -
61431 -/usr/include/glib-2.0/glib/gstrfuncs.h:
61432 -
61433 -/usr/include/glib-2.0/glib/gtestutils.h:
61434 -
61435 -/usr/include/glib-2.0/glib/gthreadpool.h:
61436 -
61437 -/usr/include/glib-2.0/glib/gtimer.h:
61438 -
61439 -/usr/include/glib-2.0/glib/gtree.h:
61440 -
61441 -/usr/include/glib-2.0/glib/gurifuncs.h:
61442 -
61443 -../libpcsxcore/system.h:
61444 -
61445 -../libpcsxcore/debug.h:
61446 -
61447 -/usr/include/libintl.h:
61448 -
61449 -/usr/include/locale.h:
61450 -
61451 -/usr/include/bits/locale.h:
61452 -
61453 -../libpcsxcore/r3000a.h:
61454 -
61455 -../libpcsxcore/psxmem.h:
61456 -
61457 -../libpcsxcore/psxcounters.h:
61458 -
61459 -../libpcsxcore/plugins.h:
61460 -
61461 -../libpcsxcore/spu.h:
61462 -
61463 -../libpcsxcore/psemu_plugin_defs.h:
61464 -
61465 -../libpcsxcore/decode_xa.h:
61466 -
61467 -../libpcsxcore/misc.h:
61468 -
61469 -../libpcsxcore/coff.h:
61470 -
61471 -../libpcsxcore/sio.h:
61472 diff -rupN original/libpcsxcore/libpcsxcore/.deps/psxcounters.Plo new/libpcsxcore/libpcsxcore/.deps/psxcounters.Plo
61473 --- original/libpcsxcore/libpcsxcore/.deps/psxcounters.Plo 2009-03-28 22:34:44.000000000 -0430
61474 +++ new/libpcsxcore/libpcsxcore/.deps/psxcounters.Plo 1969-12-31 20:00:00.000000000 -0400
61475 @@ -1,359 +0,0 @@
61476 -psxcounters.lo: ../libpcsxcore/psxcounters.c ../libpcsxcore/psxcounters.h \
61477 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
61478 - /usr/include/features.h /usr/include/sys/cdefs.h \
61479 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
61480 - /usr/include/gnu/stubs-32.h \
61481 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
61482 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
61483 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
61484 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
61485 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
61486 - /usr/include/bits/stdio.h /usr/include/string.h \
61487 - /usr/include/bits/string.h /usr/include/bits/string2.h \
61488 - /usr/include/endian.h /usr/include/bits/endian.h \
61489 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
61490 - /usr/include/stdint.h /usr/include/bits/wchar.h \
61491 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
61492 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
61493 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
61494 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
61495 - /usr/include/math.h /usr/include/bits/huge_val.h \
61496 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
61497 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
61498 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
61499 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
61500 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
61501 - /usr/include/glib-2.0/glib/galloca.h \
61502 - /usr/include/glib-2.0/glib/gtypes.h \
61503 - /usr/lib/glib-2.0/include/glibconfig.h \
61504 - /usr/include/glib-2.0/glib/gmacros.h \
61505 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
61506 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
61507 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
61508 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
61509 - /usr/include/bits/posix2_lim.h \
61510 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
61511 - /usr/include/glib-2.0/glib/garray.h \
61512 - /usr/include/glib-2.0/glib/gasyncqueue.h \
61513 - /usr/include/glib-2.0/glib/gthread.h \
61514 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
61515 - /usr/include/glib-2.0/glib/gutils.h \
61516 - /usr/include/glib-2.0/glib/gatomic.h \
61517 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
61518 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
61519 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
61520 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
61521 - /usr/include/glib-2.0/glib/gbase64.h \
61522 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
61523 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
61524 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
61525 - /usr/include/glib-2.0/glib/gchecksum.h \
61526 - /usr/include/glib-2.0/glib/gcompletion.h \
61527 - /usr/include/glib-2.0/glib/gconvert.h \
61528 - /usr/include/glib-2.0/glib/gdataset.h \
61529 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
61530 - /usr/include/glib-2.0/glib/gfileutils.h \
61531 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
61532 - /usr/include/glib-2.0/glib/giochannel.h \
61533 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
61534 - /usr/include/glib-2.0/glib/gslist.h \
61535 - /usr/include/glib-2.0/glib/gstring.h \
61536 - /usr/include/glib-2.0/glib/gunicode.h \
61537 - /usr/include/glib-2.0/glib/gkeyfile.h \
61538 - /usr/include/glib-2.0/glib/gmappedfile.h \
61539 - /usr/include/glib-2.0/glib/gmarkup.h \
61540 - /usr/include/glib-2.0/glib/gmessages.h \
61541 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
61542 - /usr/include/glib-2.0/glib/gpattern.h \
61543 - /usr/include/glib-2.0/glib/gprimes.h \
61544 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
61545 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
61546 - /usr/include/glib-2.0/glib/gregex.h \
61547 - /usr/include/glib-2.0/glib/gscanner.h \
61548 - /usr/include/glib-2.0/glib/gsequence.h \
61549 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
61550 - /usr/include/glib-2.0/glib/gstrfuncs.h \
61551 - /usr/include/glib-2.0/glib/gtestutils.h \
61552 - /usr/include/glib-2.0/glib/gthreadpool.h \
61553 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
61554 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
61555 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
61556 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
61557 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h \
61558 - ../libpcsxcore/coff.h ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
61559 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
61560 - ../libpcsxcore/sio.h
61561 -
61562 -../libpcsxcore/psxcounters.h:
61563 -
61564 -../libpcsxcore/psxcommon.h:
61565 -
61566 -../include/config.h:
61567 -
61568 -/usr/include/stdio.h:
61569 -
61570 -/usr/include/features.h:
61571 -
61572 -/usr/include/sys/cdefs.h:
61573 -
61574 -/usr/include/bits/wordsize.h:
61575 -
61576 -/usr/include/gnu/stubs.h:
61577 -
61578 -/usr/include/gnu/stubs-32.h:
61579 -
61580 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
61581 -
61582 -/usr/include/bits/types.h:
61583 -
61584 -/usr/include/bits/typesizes.h:
61585 -
61586 -/usr/include/libio.h:
61587 -
61588 -/usr/include/_G_config.h:
61589 -
61590 -/usr/include/wchar.h:
61591 -
61592 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
61593 -
61594 -/usr/include/bits/stdio_lim.h:
61595 -
61596 -/usr/include/bits/sys_errlist.h:
61597 -
61598 -/usr/include/bits/stdio.h:
61599 -
61600 -/usr/include/string.h:
61601 -
61602 -/usr/include/bits/string.h:
61603 -
61604 -/usr/include/bits/string2.h:
61605 -
61606 -/usr/include/endian.h:
61607 -
61608 -/usr/include/bits/endian.h:
61609 -
61610 -/usr/include/bits/byteswap.h:
61611 -
61612 -/usr/include/stdlib.h:
61613 -
61614 -/usr/include/stdint.h:
61615 -
61616 -/usr/include/bits/wchar.h:
61617 -
61618 -/usr/include/sys/types.h:
61619 -
61620 -/usr/include/time.h:
61621 -
61622 -/usr/include/sys/select.h:
61623 -
61624 -/usr/include/bits/select.h:
61625 -
61626 -/usr/include/bits/sigset.h:
61627 -
61628 -/usr/include/bits/time.h:
61629 -
61630 -/usr/include/sys/sysmacros.h:
61631 -
61632 -/usr/include/bits/pthreadtypes.h:
61633 -
61634 -/usr/include/alloca.h:
61635 -
61636 -/usr/include/math.h:
61637 -
61638 -/usr/include/bits/huge_val.h:
61639 -
61640 -/usr/include/bits/mathdef.h:
61641 -
61642 -/usr/include/bits/mathcalls.h:
61643 -
61644 -/usr/include/bits/mathinline.h:
61645 -
61646 -/usr/include/ctype.h:
61647 -
61648 -/usr/include/zlib.h:
61649 -
61650 -/usr/include/zconf.h:
61651 -
61652 -/usr/include/zlibdefs.h:
61653 -
61654 -/usr/include/unistd.h:
61655 -
61656 -/usr/include/bits/posix_opt.h:
61657 -
61658 -/usr/include/bits/confname.h:
61659 -
61660 -/usr/include/getopt.h:
61661 -
61662 -/usr/include/glib-2.0/glib.h:
61663 -
61664 -/usr/include/glib-2.0/glib/galloca.h:
61665 -
61666 -/usr/include/glib-2.0/glib/gtypes.h:
61667 -
61668 -/usr/lib/glib-2.0/include/glibconfig.h:
61669 -
61670 -/usr/include/glib-2.0/glib/gmacros.h:
61671 -
61672 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
61673 -
61674 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
61675 -
61676 -/usr/include/limits.h:
61677 -
61678 -/usr/include/bits/posix1_lim.h:
61679 -
61680 -/usr/include/bits/local_lim.h:
61681 -
61682 -/usr/include/linux/limits.h:
61683 -
61684 -/usr/include/bits/posix2_lim.h:
61685 -
61686 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
61687 -
61688 -/usr/include/glib-2.0/glib/garray.h:
61689 -
61690 -/usr/include/glib-2.0/glib/gasyncqueue.h:
61691 -
61692 -/usr/include/glib-2.0/glib/gthread.h:
61693 -
61694 -/usr/include/glib-2.0/glib/gerror.h:
61695 -
61696 -/usr/include/glib-2.0/glib/gquark.h:
61697 -
61698 -/usr/include/glib-2.0/glib/gutils.h:
61699 -
61700 -/usr/include/glib-2.0/glib/gatomic.h:
61701 -
61702 -/usr/include/glib-2.0/glib/gbacktrace.h:
61703 -
61704 -/usr/include/signal.h:
61705 -
61706 -/usr/include/bits/signum.h:
61707 -
61708 -/usr/include/bits/siginfo.h:
61709 -
61710 -/usr/include/bits/sigaction.h:
61711 -
61712 -/usr/include/bits/sigcontext.h:
61713 -
61714 -/usr/include/bits/sigstack.h:
61715 -
61716 -/usr/include/bits/sigthread.h:
61717 -
61718 -/usr/include/glib-2.0/glib/gbase64.h:
61719 -
61720 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
61721 -
61722 -/usr/include/glib-2.0/glib/gcache.h:
61723 -
61724 -/usr/include/glib-2.0/glib/glist.h:
61725 -
61726 -/usr/include/glib-2.0/glib/gmem.h:
61727 -
61728 -/usr/include/glib-2.0/glib/gslice.h:
61729 -
61730 -/usr/include/glib-2.0/glib/gchecksum.h:
61731 -
61732 -/usr/include/glib-2.0/glib/gcompletion.h:
61733 -
61734 -/usr/include/glib-2.0/glib/gconvert.h:
61735 -
61736 -/usr/include/glib-2.0/glib/gdataset.h:
61737 -
61738 -/usr/include/glib-2.0/glib/gdate.h:
61739 -
61740 -/usr/include/glib-2.0/glib/gdir.h:
61741 -
61742 -/usr/include/glib-2.0/glib/gfileutils.h:
61743 -
61744 -/usr/include/glib-2.0/glib/ghash.h:
61745 -
61746 -/usr/include/glib-2.0/glib/ghook.h:
61747 -
61748 -/usr/include/glib-2.0/glib/giochannel.h:
61749 -
61750 -/usr/include/glib-2.0/glib/gmain.h:
61751 -
61752 -/usr/include/glib-2.0/glib/gpoll.h:
61753 -
61754 -/usr/include/glib-2.0/glib/gslist.h:
61755 -
61756 -/usr/include/glib-2.0/glib/gstring.h:
61757 -
61758 -/usr/include/glib-2.0/glib/gunicode.h:
61759 -
61760 -/usr/include/glib-2.0/glib/gkeyfile.h:
61761 -
61762 -/usr/include/glib-2.0/glib/gmappedfile.h:
61763 -
61764 -/usr/include/glib-2.0/glib/gmarkup.h:
61765 -
61766 -/usr/include/glib-2.0/glib/gmessages.h:
61767 -
61768 -/usr/include/glib-2.0/glib/gnode.h:
61769 -
61770 -/usr/include/glib-2.0/glib/goption.h:
61771 -
61772 -/usr/include/glib-2.0/glib/gpattern.h:
61773 -
61774 -/usr/include/glib-2.0/glib/gprimes.h:
61775 -
61776 -/usr/include/glib-2.0/glib/gqsort.h:
61777 -
61778 -/usr/include/glib-2.0/glib/gqueue.h:
61779 -
61780 -/usr/include/glib-2.0/glib/grand.h:
61781 -
61782 -/usr/include/glib-2.0/glib/grel.h:
61783 -
61784 -/usr/include/glib-2.0/glib/gregex.h:
61785 -
61786 -/usr/include/glib-2.0/glib/gscanner.h:
61787 -
61788 -/usr/include/glib-2.0/glib/gsequence.h:
61789 -
61790 -/usr/include/glib-2.0/glib/gshell.h:
61791 -
61792 -/usr/include/glib-2.0/glib/gspawn.h:
61793 -
61794 -/usr/include/glib-2.0/glib/gstrfuncs.h:
61795 -
61796 -/usr/include/glib-2.0/glib/gtestutils.h:
61797 -
61798 -/usr/include/glib-2.0/glib/gthreadpool.h:
61799 -
61800 -/usr/include/glib-2.0/glib/gtimer.h:
61801 -
61802 -/usr/include/glib-2.0/glib/gtree.h:
61803 -
61804 -/usr/include/glib-2.0/glib/gurifuncs.h:
61805 -
61806 -../libpcsxcore/system.h:
61807 -
61808 -../libpcsxcore/debug.h:
61809 -
61810 -/usr/include/libintl.h:
61811 -
61812 -/usr/include/locale.h:
61813 -
61814 -/usr/include/bits/locale.h:
61815 -
61816 -../libpcsxcore/r3000a.h:
61817 -
61818 -../libpcsxcore/psxmem.h:
61819 -
61820 -../libpcsxcore/psxbios.h:
61821 -
61822 -../libpcsxcore/misc.h:
61823 -
61824 -../libpcsxcore/coff.h:
61825 -
61826 -../libpcsxcore/plugins.h:
61827 -
61828 -../libpcsxcore/spu.h:
61829 -
61830 -../libpcsxcore/psemu_plugin_defs.h:
61831 -
61832 -../libpcsxcore/decode_xa.h:
61833 -
61834 -../libpcsxcore/sio.h:
61835 diff -rupN original/libpcsxcore/libpcsxcore/.deps/psxdma.Plo new/libpcsxcore/libpcsxcore/.deps/psxdma.Plo
61836 --- original/libpcsxcore/libpcsxcore/.deps/psxdma.Plo 2009-03-28 22:34:44.000000000 -0430
61837 +++ new/libpcsxcore/libpcsxcore/.deps/psxdma.Plo 1969-12-31 20:00:00.000000000 -0400
61838 @@ -1,364 +0,0 @@
61839 -psxdma.lo: ../libpcsxcore/psxdma.c ../libpcsxcore/psxdma.h \
61840 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
61841 - /usr/include/features.h /usr/include/sys/cdefs.h \
61842 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
61843 - /usr/include/gnu/stubs-32.h \
61844 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
61845 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
61846 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
61847 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
61848 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
61849 - /usr/include/bits/stdio.h /usr/include/string.h \
61850 - /usr/include/bits/string.h /usr/include/bits/string2.h \
61851 - /usr/include/endian.h /usr/include/bits/endian.h \
61852 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
61853 - /usr/include/stdint.h /usr/include/bits/wchar.h \
61854 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
61855 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
61856 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
61857 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
61858 - /usr/include/math.h /usr/include/bits/huge_val.h \
61859 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
61860 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
61861 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
61862 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
61863 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
61864 - /usr/include/glib-2.0/glib/galloca.h \
61865 - /usr/include/glib-2.0/glib/gtypes.h \
61866 - /usr/lib/glib-2.0/include/glibconfig.h \
61867 - /usr/include/glib-2.0/glib/gmacros.h \
61868 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
61869 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
61870 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
61871 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
61872 - /usr/include/bits/posix2_lim.h \
61873 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
61874 - /usr/include/glib-2.0/glib/garray.h \
61875 - /usr/include/glib-2.0/glib/gasyncqueue.h \
61876 - /usr/include/glib-2.0/glib/gthread.h \
61877 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
61878 - /usr/include/glib-2.0/glib/gutils.h \
61879 - /usr/include/glib-2.0/glib/gatomic.h \
61880 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
61881 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
61882 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
61883 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
61884 - /usr/include/glib-2.0/glib/gbase64.h \
61885 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
61886 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
61887 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
61888 - /usr/include/glib-2.0/glib/gchecksum.h \
61889 - /usr/include/glib-2.0/glib/gcompletion.h \
61890 - /usr/include/glib-2.0/glib/gconvert.h \
61891 - /usr/include/glib-2.0/glib/gdataset.h \
61892 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
61893 - /usr/include/glib-2.0/glib/gfileutils.h \
61894 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
61895 - /usr/include/glib-2.0/glib/giochannel.h \
61896 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
61897 - /usr/include/glib-2.0/glib/gslist.h \
61898 - /usr/include/glib-2.0/glib/gstring.h \
61899 - /usr/include/glib-2.0/glib/gunicode.h \
61900 - /usr/include/glib-2.0/glib/gkeyfile.h \
61901 - /usr/include/glib-2.0/glib/gmappedfile.h \
61902 - /usr/include/glib-2.0/glib/gmarkup.h \
61903 - /usr/include/glib-2.0/glib/gmessages.h \
61904 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
61905 - /usr/include/glib-2.0/glib/gpattern.h \
61906 - /usr/include/glib-2.0/glib/gprimes.h \
61907 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
61908 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
61909 - /usr/include/glib-2.0/glib/gregex.h \
61910 - /usr/include/glib-2.0/glib/gscanner.h \
61911 - /usr/include/glib-2.0/glib/gsequence.h \
61912 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
61913 - /usr/include/glib-2.0/glib/gstrfuncs.h \
61914 - /usr/include/glib-2.0/glib/gtestutils.h \
61915 - /usr/include/glib-2.0/glib/gthreadpool.h \
61916 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
61917 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
61918 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
61919 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
61920 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
61921 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
61922 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
61923 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
61924 - ../libpcsxcore/sio.h ../libpcsxcore/psxhw.h
61925 -
61926 -../libpcsxcore/psxdma.h:
61927 -
61928 -../libpcsxcore/psxcommon.h:
61929 -
61930 -../include/config.h:
61931 -
61932 -/usr/include/stdio.h:
61933 -
61934 -/usr/include/features.h:
61935 -
61936 -/usr/include/sys/cdefs.h:
61937 -
61938 -/usr/include/bits/wordsize.h:
61939 -
61940 -/usr/include/gnu/stubs.h:
61941 -
61942 -/usr/include/gnu/stubs-32.h:
61943 -
61944 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
61945 -
61946 -/usr/include/bits/types.h:
61947 -
61948 -/usr/include/bits/typesizes.h:
61949 -
61950 -/usr/include/libio.h:
61951 -
61952 -/usr/include/_G_config.h:
61953 -
61954 -/usr/include/wchar.h:
61955 -
61956 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
61957 -
61958 -/usr/include/bits/stdio_lim.h:
61959 -
61960 -/usr/include/bits/sys_errlist.h:
61961 -
61962 -/usr/include/bits/stdio.h:
61963 -
61964 -/usr/include/string.h:
61965 -
61966 -/usr/include/bits/string.h:
61967 -
61968 -/usr/include/bits/string2.h:
61969 -
61970 -/usr/include/endian.h:
61971 -
61972 -/usr/include/bits/endian.h:
61973 -
61974 -/usr/include/bits/byteswap.h:
61975 -
61976 -/usr/include/stdlib.h:
61977 -
61978 -/usr/include/stdint.h:
61979 -
61980 -/usr/include/bits/wchar.h:
61981 -
61982 -/usr/include/sys/types.h:
61983 -
61984 -/usr/include/time.h:
61985 -
61986 -/usr/include/sys/select.h:
61987 -
61988 -/usr/include/bits/select.h:
61989 -
61990 -/usr/include/bits/sigset.h:
61991 -
61992 -/usr/include/bits/time.h:
61993 -
61994 -/usr/include/sys/sysmacros.h:
61995 -
61996 -/usr/include/bits/pthreadtypes.h:
61997 -
61998 -/usr/include/alloca.h:
61999 -
62000 -/usr/include/math.h:
62001 -
62002 -/usr/include/bits/huge_val.h:
62003 -
62004 -/usr/include/bits/mathdef.h:
62005 -
62006 -/usr/include/bits/mathcalls.h:
62007 -
62008 -/usr/include/bits/mathinline.h:
62009 -
62010 -/usr/include/ctype.h:
62011 -
62012 -/usr/include/zlib.h:
62013 -
62014 -/usr/include/zconf.h:
62015 -
62016 -/usr/include/zlibdefs.h:
62017 -
62018 -/usr/include/unistd.h:
62019 -
62020 -/usr/include/bits/posix_opt.h:
62021 -
62022 -/usr/include/bits/confname.h:
62023 -
62024 -/usr/include/getopt.h:
62025 -
62026 -/usr/include/glib-2.0/glib.h:
62027 -
62028 -/usr/include/glib-2.0/glib/galloca.h:
62029 -
62030 -/usr/include/glib-2.0/glib/gtypes.h:
62031 -
62032 -/usr/lib/glib-2.0/include/glibconfig.h:
62033 -
62034 -/usr/include/glib-2.0/glib/gmacros.h:
62035 -
62036 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
62037 -
62038 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
62039 -
62040 -/usr/include/limits.h:
62041 -
62042 -/usr/include/bits/posix1_lim.h:
62043 -
62044 -/usr/include/bits/local_lim.h:
62045 -
62046 -/usr/include/linux/limits.h:
62047 -
62048 -/usr/include/bits/posix2_lim.h:
62049 -
62050 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
62051 -
62052 -/usr/include/glib-2.0/glib/garray.h:
62053 -
62054 -/usr/include/glib-2.0/glib/gasyncqueue.h:
62055 -
62056 -/usr/include/glib-2.0/glib/gthread.h:
62057 -
62058 -/usr/include/glib-2.0/glib/gerror.h:
62059 -
62060 -/usr/include/glib-2.0/glib/gquark.h:
62061 -
62062 -/usr/include/glib-2.0/glib/gutils.h:
62063 -
62064 -/usr/include/glib-2.0/glib/gatomic.h:
62065 -
62066 -/usr/include/glib-2.0/glib/gbacktrace.h:
62067 -
62068 -/usr/include/signal.h:
62069 -
62070 -/usr/include/bits/signum.h:
62071 -
62072 -/usr/include/bits/siginfo.h:
62073 -
62074 -/usr/include/bits/sigaction.h:
62075 -
62076 -/usr/include/bits/sigcontext.h:
62077 -
62078 -/usr/include/bits/sigstack.h:
62079 -
62080 -/usr/include/bits/sigthread.h:
62081 -
62082 -/usr/include/glib-2.0/glib/gbase64.h:
62083 -
62084 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
62085 -
62086 -/usr/include/glib-2.0/glib/gcache.h:
62087 -
62088 -/usr/include/glib-2.0/glib/glist.h:
62089 -
62090 -/usr/include/glib-2.0/glib/gmem.h:
62091 -
62092 -/usr/include/glib-2.0/glib/gslice.h:
62093 -
62094 -/usr/include/glib-2.0/glib/gchecksum.h:
62095 -
62096 -/usr/include/glib-2.0/glib/gcompletion.h:
62097 -
62098 -/usr/include/glib-2.0/glib/gconvert.h:
62099 -
62100 -/usr/include/glib-2.0/glib/gdataset.h:
62101 -
62102 -/usr/include/glib-2.0/glib/gdate.h:
62103 -
62104 -/usr/include/glib-2.0/glib/gdir.h:
62105 -
62106 -/usr/include/glib-2.0/glib/gfileutils.h:
62107 -
62108 -/usr/include/glib-2.0/glib/ghash.h:
62109 -
62110 -/usr/include/glib-2.0/glib/ghook.h:
62111 -
62112 -/usr/include/glib-2.0/glib/giochannel.h:
62113 -
62114 -/usr/include/glib-2.0/glib/gmain.h:
62115 -
62116 -/usr/include/glib-2.0/glib/gpoll.h:
62117 -
62118 -/usr/include/glib-2.0/glib/gslist.h:
62119 -
62120 -/usr/include/glib-2.0/glib/gstring.h:
62121 -
62122 -/usr/include/glib-2.0/glib/gunicode.h:
62123 -
62124 -/usr/include/glib-2.0/glib/gkeyfile.h:
62125 -
62126 -/usr/include/glib-2.0/glib/gmappedfile.h:
62127 -
62128 -/usr/include/glib-2.0/glib/gmarkup.h:
62129 -
62130 -/usr/include/glib-2.0/glib/gmessages.h:
62131 -
62132 -/usr/include/glib-2.0/glib/gnode.h:
62133 -
62134 -/usr/include/glib-2.0/glib/goption.h:
62135 -
62136 -/usr/include/glib-2.0/glib/gpattern.h:
62137 -
62138 -/usr/include/glib-2.0/glib/gprimes.h:
62139 -
62140 -/usr/include/glib-2.0/glib/gqsort.h:
62141 -
62142 -/usr/include/glib-2.0/glib/gqueue.h:
62143 -
62144 -/usr/include/glib-2.0/glib/grand.h:
62145 -
62146 -/usr/include/glib-2.0/glib/grel.h:
62147 -
62148 -/usr/include/glib-2.0/glib/gregex.h:
62149 -
62150 -/usr/include/glib-2.0/glib/gscanner.h:
62151 -
62152 -/usr/include/glib-2.0/glib/gsequence.h:
62153 -
62154 -/usr/include/glib-2.0/glib/gshell.h:
62155 -
62156 -/usr/include/glib-2.0/glib/gspawn.h:
62157 -
62158 -/usr/include/glib-2.0/glib/gstrfuncs.h:
62159 -
62160 -/usr/include/glib-2.0/glib/gtestutils.h:
62161 -
62162 -/usr/include/glib-2.0/glib/gthreadpool.h:
62163 -
62164 -/usr/include/glib-2.0/glib/gtimer.h:
62165 -
62166 -/usr/include/glib-2.0/glib/gtree.h:
62167 -
62168 -/usr/include/glib-2.0/glib/gurifuncs.h:
62169 -
62170 -../libpcsxcore/system.h:
62171 -
62172 -../libpcsxcore/debug.h:
62173 -
62174 -/usr/include/libintl.h:
62175 -
62176 -/usr/include/locale.h:
62177 -
62178 -/usr/include/bits/locale.h:
62179 -
62180 -../libpcsxcore/r3000a.h:
62181 -
62182 -../libpcsxcore/psxmem.h:
62183 -
62184 -../libpcsxcore/psxcounters.h:
62185 -
62186 -../libpcsxcore/plugins.h:
62187 -
62188 -../libpcsxcore/spu.h:
62189 -
62190 -../libpcsxcore/psemu_plugin_defs.h:
62191 -
62192 -../libpcsxcore/decode_xa.h:
62193 -
62194 -../libpcsxcore/psxbios.h:
62195 -
62196 -../libpcsxcore/misc.h:
62197 -
62198 -../libpcsxcore/coff.h:
62199 -
62200 -../libpcsxcore/sio.h:
62201 -
62202 -../libpcsxcore/psxhw.h:
62203 diff -rupN original/libpcsxcore/libpcsxcore/.deps/psxhle.Plo new/libpcsxcore/libpcsxcore/.deps/psxhle.Plo
62204 --- original/libpcsxcore/libpcsxcore/.deps/psxhle.Plo 2009-03-28 22:35:04.000000000 -0430
62205 +++ new/libpcsxcore/libpcsxcore/.deps/psxhle.Plo 1969-12-31 20:00:00.000000000 -0400
62206 @@ -1,362 +0,0 @@
62207 -psxhle.lo: ../libpcsxcore/psxhle.c ../libpcsxcore/psxhle.h \
62208 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
62209 - /usr/include/features.h /usr/include/sys/cdefs.h \
62210 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
62211 - /usr/include/gnu/stubs-32.h \
62212 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
62213 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
62214 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
62215 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
62216 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
62217 - /usr/include/bits/stdio.h /usr/include/string.h \
62218 - /usr/include/bits/string.h /usr/include/bits/string2.h \
62219 - /usr/include/endian.h /usr/include/bits/endian.h \
62220 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
62221 - /usr/include/stdint.h /usr/include/bits/wchar.h \
62222 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
62223 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
62224 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
62225 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
62226 - /usr/include/math.h /usr/include/bits/huge_val.h \
62227 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
62228 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
62229 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
62230 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
62231 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
62232 - /usr/include/glib-2.0/glib/galloca.h \
62233 - /usr/include/glib-2.0/glib/gtypes.h \
62234 - /usr/lib/glib-2.0/include/glibconfig.h \
62235 - /usr/include/glib-2.0/glib/gmacros.h \
62236 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
62237 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
62238 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
62239 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
62240 - /usr/include/bits/posix2_lim.h \
62241 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
62242 - /usr/include/glib-2.0/glib/garray.h \
62243 - /usr/include/glib-2.0/glib/gasyncqueue.h \
62244 - /usr/include/glib-2.0/glib/gthread.h \
62245 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
62246 - /usr/include/glib-2.0/glib/gutils.h \
62247 - /usr/include/glib-2.0/glib/gatomic.h \
62248 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
62249 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
62250 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
62251 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
62252 - /usr/include/glib-2.0/glib/gbase64.h \
62253 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
62254 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
62255 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
62256 - /usr/include/glib-2.0/glib/gchecksum.h \
62257 - /usr/include/glib-2.0/glib/gcompletion.h \
62258 - /usr/include/glib-2.0/glib/gconvert.h \
62259 - /usr/include/glib-2.0/glib/gdataset.h \
62260 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
62261 - /usr/include/glib-2.0/glib/gfileutils.h \
62262 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
62263 - /usr/include/glib-2.0/glib/giochannel.h \
62264 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
62265 - /usr/include/glib-2.0/glib/gslist.h \
62266 - /usr/include/glib-2.0/glib/gstring.h \
62267 - /usr/include/glib-2.0/glib/gunicode.h \
62268 - /usr/include/glib-2.0/glib/gkeyfile.h \
62269 - /usr/include/glib-2.0/glib/gmappedfile.h \
62270 - /usr/include/glib-2.0/glib/gmarkup.h \
62271 - /usr/include/glib-2.0/glib/gmessages.h \
62272 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
62273 - /usr/include/glib-2.0/glib/gpattern.h \
62274 - /usr/include/glib-2.0/glib/gprimes.h \
62275 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
62276 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
62277 - /usr/include/glib-2.0/glib/gregex.h \
62278 - /usr/include/glib-2.0/glib/gscanner.h \
62279 - /usr/include/glib-2.0/glib/gsequence.h \
62280 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
62281 - /usr/include/glib-2.0/glib/gstrfuncs.h \
62282 - /usr/include/glib-2.0/glib/gtestutils.h \
62283 - /usr/include/glib-2.0/glib/gthreadpool.h \
62284 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
62285 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
62286 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
62287 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
62288 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
62289 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
62290 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
62291 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
62292 - ../libpcsxcore/sio.h
62293 -
62294 -../libpcsxcore/psxhle.h:
62295 -
62296 -../libpcsxcore/psxcommon.h:
62297 -
62298 -../include/config.h:
62299 -
62300 -/usr/include/stdio.h:
62301 -
62302 -/usr/include/features.h:
62303 -
62304 -/usr/include/sys/cdefs.h:
62305 -
62306 -/usr/include/bits/wordsize.h:
62307 -
62308 -/usr/include/gnu/stubs.h:
62309 -
62310 -/usr/include/gnu/stubs-32.h:
62311 -
62312 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
62313 -
62314 -/usr/include/bits/types.h:
62315 -
62316 -/usr/include/bits/typesizes.h:
62317 -
62318 -/usr/include/libio.h:
62319 -
62320 -/usr/include/_G_config.h:
62321 -
62322 -/usr/include/wchar.h:
62323 -
62324 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
62325 -
62326 -/usr/include/bits/stdio_lim.h:
62327 -
62328 -/usr/include/bits/sys_errlist.h:
62329 -
62330 -/usr/include/bits/stdio.h:
62331 -
62332 -/usr/include/string.h:
62333 -
62334 -/usr/include/bits/string.h:
62335 -
62336 -/usr/include/bits/string2.h:
62337 -
62338 -/usr/include/endian.h:
62339 -
62340 -/usr/include/bits/endian.h:
62341 -
62342 -/usr/include/bits/byteswap.h:
62343 -
62344 -/usr/include/stdlib.h:
62345 -
62346 -/usr/include/stdint.h:
62347 -
62348 -/usr/include/bits/wchar.h:
62349 -
62350 -/usr/include/sys/types.h:
62351 -
62352 -/usr/include/time.h:
62353 -
62354 -/usr/include/sys/select.h:
62355 -
62356 -/usr/include/bits/select.h:
62357 -
62358 -/usr/include/bits/sigset.h:
62359 -
62360 -/usr/include/bits/time.h:
62361 -
62362 -/usr/include/sys/sysmacros.h:
62363 -
62364 -/usr/include/bits/pthreadtypes.h:
62365 -
62366 -/usr/include/alloca.h:
62367 -
62368 -/usr/include/math.h:
62369 -
62370 -/usr/include/bits/huge_val.h:
62371 -
62372 -/usr/include/bits/mathdef.h:
62373 -
62374 -/usr/include/bits/mathcalls.h:
62375 -
62376 -/usr/include/bits/mathinline.h:
62377 -
62378 -/usr/include/ctype.h:
62379 -
62380 -/usr/include/zlib.h:
62381 -
62382 -/usr/include/zconf.h:
62383 -
62384 -/usr/include/zlibdefs.h:
62385 -
62386 -/usr/include/unistd.h:
62387 -
62388 -/usr/include/bits/posix_opt.h:
62389 -
62390 -/usr/include/bits/confname.h:
62391 -
62392 -/usr/include/getopt.h:
62393 -
62394 -/usr/include/glib-2.0/glib.h:
62395 -
62396 -/usr/include/glib-2.0/glib/galloca.h:
62397 -
62398 -/usr/include/glib-2.0/glib/gtypes.h:
62399 -
62400 -/usr/lib/glib-2.0/include/glibconfig.h:
62401 -
62402 -/usr/include/glib-2.0/glib/gmacros.h:
62403 -
62404 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
62405 -
62406 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
62407 -
62408 -/usr/include/limits.h:
62409 -
62410 -/usr/include/bits/posix1_lim.h:
62411 -
62412 -/usr/include/bits/local_lim.h:
62413 -
62414 -/usr/include/linux/limits.h:
62415 -
62416 -/usr/include/bits/posix2_lim.h:
62417 -
62418 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
62419 -
62420 -/usr/include/glib-2.0/glib/garray.h:
62421 -
62422 -/usr/include/glib-2.0/glib/gasyncqueue.h:
62423 -
62424 -/usr/include/glib-2.0/glib/gthread.h:
62425 -
62426 -/usr/include/glib-2.0/glib/gerror.h:
62427 -
62428 -/usr/include/glib-2.0/glib/gquark.h:
62429 -
62430 -/usr/include/glib-2.0/glib/gutils.h:
62431 -
62432 -/usr/include/glib-2.0/glib/gatomic.h:
62433 -
62434 -/usr/include/glib-2.0/glib/gbacktrace.h:
62435 -
62436 -/usr/include/signal.h:
62437 -
62438 -/usr/include/bits/signum.h:
62439 -
62440 -/usr/include/bits/siginfo.h:
62441 -
62442 -/usr/include/bits/sigaction.h:
62443 -
62444 -/usr/include/bits/sigcontext.h:
62445 -
62446 -/usr/include/bits/sigstack.h:
62447 -
62448 -/usr/include/bits/sigthread.h:
62449 -
62450 -/usr/include/glib-2.0/glib/gbase64.h:
62451 -
62452 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
62453 -
62454 -/usr/include/glib-2.0/glib/gcache.h:
62455 -
62456 -/usr/include/glib-2.0/glib/glist.h:
62457 -
62458 -/usr/include/glib-2.0/glib/gmem.h:
62459 -
62460 -/usr/include/glib-2.0/glib/gslice.h:
62461 -
62462 -/usr/include/glib-2.0/glib/gchecksum.h:
62463 -
62464 -/usr/include/glib-2.0/glib/gcompletion.h:
62465 -
62466 -/usr/include/glib-2.0/glib/gconvert.h:
62467 -
62468 -/usr/include/glib-2.0/glib/gdataset.h:
62469 -
62470 -/usr/include/glib-2.0/glib/gdate.h:
62471 -
62472 -/usr/include/glib-2.0/glib/gdir.h:
62473 -
62474 -/usr/include/glib-2.0/glib/gfileutils.h:
62475 -
62476 -/usr/include/glib-2.0/glib/ghash.h:
62477 -
62478 -/usr/include/glib-2.0/glib/ghook.h:
62479 -
62480 -/usr/include/glib-2.0/glib/giochannel.h:
62481 -
62482 -/usr/include/glib-2.0/glib/gmain.h:
62483 -
62484 -/usr/include/glib-2.0/glib/gpoll.h:
62485 -
62486 -/usr/include/glib-2.0/glib/gslist.h:
62487 -
62488 -/usr/include/glib-2.0/glib/gstring.h:
62489 -
62490 -/usr/include/glib-2.0/glib/gunicode.h:
62491 -
62492 -/usr/include/glib-2.0/glib/gkeyfile.h:
62493 -
62494 -/usr/include/glib-2.0/glib/gmappedfile.h:
62495 -
62496 -/usr/include/glib-2.0/glib/gmarkup.h:
62497 -
62498 -/usr/include/glib-2.0/glib/gmessages.h:
62499 -
62500 -/usr/include/glib-2.0/glib/gnode.h:
62501 -
62502 -/usr/include/glib-2.0/glib/goption.h:
62503 -
62504 -/usr/include/glib-2.0/glib/gpattern.h:
62505 -
62506 -/usr/include/glib-2.0/glib/gprimes.h:
62507 -
62508 -/usr/include/glib-2.0/glib/gqsort.h:
62509 -
62510 -/usr/include/glib-2.0/glib/gqueue.h:
62511 -
62512 -/usr/include/glib-2.0/glib/grand.h:
62513 -
62514 -/usr/include/glib-2.0/glib/grel.h:
62515 -
62516 -/usr/include/glib-2.0/glib/gregex.h:
62517 -
62518 -/usr/include/glib-2.0/glib/gscanner.h:
62519 -
62520 -/usr/include/glib-2.0/glib/gsequence.h:
62521 -
62522 -/usr/include/glib-2.0/glib/gshell.h:
62523 -
62524 -/usr/include/glib-2.0/glib/gspawn.h:
62525 -
62526 -/usr/include/glib-2.0/glib/gstrfuncs.h:
62527 -
62528 -/usr/include/glib-2.0/glib/gtestutils.h:
62529 -
62530 -/usr/include/glib-2.0/glib/gthreadpool.h:
62531 -
62532 -/usr/include/glib-2.0/glib/gtimer.h:
62533 -
62534 -/usr/include/glib-2.0/glib/gtree.h:
62535 -
62536 -/usr/include/glib-2.0/glib/gurifuncs.h:
62537 -
62538 -../libpcsxcore/system.h:
62539 -
62540 -../libpcsxcore/debug.h:
62541 -
62542 -/usr/include/libintl.h:
62543 -
62544 -/usr/include/locale.h:
62545 -
62546 -/usr/include/bits/locale.h:
62547 -
62548 -../libpcsxcore/r3000a.h:
62549 -
62550 -../libpcsxcore/psxmem.h:
62551 -
62552 -../libpcsxcore/psxcounters.h:
62553 -
62554 -../libpcsxcore/plugins.h:
62555 -
62556 -../libpcsxcore/spu.h:
62557 -
62558 -../libpcsxcore/psemu_plugin_defs.h:
62559 -
62560 -../libpcsxcore/decode_xa.h:
62561 -
62562 -../libpcsxcore/psxbios.h:
62563 -
62564 -../libpcsxcore/misc.h:
62565 -
62566 -../libpcsxcore/coff.h:
62567 -
62568 -../libpcsxcore/sio.h:
62569 diff -rupN original/libpcsxcore/libpcsxcore/.deps/psxhw.Plo new/libpcsxcore/libpcsxcore/.deps/psxhw.Plo
62570 --- original/libpcsxcore/libpcsxcore/.deps/psxhw.Plo 2009-03-28 22:34:49.000000000 -0430
62571 +++ new/libpcsxcore/libpcsxcore/.deps/psxhw.Plo 1969-12-31 20:00:00.000000000 -0400
62572 @@ -1,362 +0,0 @@
62573 -psxhw.lo: ../libpcsxcore/psxhw.c ../libpcsxcore/psxhw.h \
62574 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
62575 - /usr/include/features.h /usr/include/sys/cdefs.h \
62576 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
62577 - /usr/include/gnu/stubs-32.h \
62578 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
62579 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
62580 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
62581 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
62582 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
62583 - /usr/include/bits/stdio.h /usr/include/string.h \
62584 - /usr/include/bits/string.h /usr/include/bits/string2.h \
62585 - /usr/include/endian.h /usr/include/bits/endian.h \
62586 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
62587 - /usr/include/stdint.h /usr/include/bits/wchar.h \
62588 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
62589 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
62590 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
62591 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
62592 - /usr/include/math.h /usr/include/bits/huge_val.h \
62593 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
62594 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
62595 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
62596 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
62597 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
62598 - /usr/include/glib-2.0/glib/galloca.h \
62599 - /usr/include/glib-2.0/glib/gtypes.h \
62600 - /usr/lib/glib-2.0/include/glibconfig.h \
62601 - /usr/include/glib-2.0/glib/gmacros.h \
62602 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
62603 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
62604 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
62605 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
62606 - /usr/include/bits/posix2_lim.h \
62607 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
62608 - /usr/include/glib-2.0/glib/garray.h \
62609 - /usr/include/glib-2.0/glib/gasyncqueue.h \
62610 - /usr/include/glib-2.0/glib/gthread.h \
62611 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
62612 - /usr/include/glib-2.0/glib/gutils.h \
62613 - /usr/include/glib-2.0/glib/gatomic.h \
62614 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
62615 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
62616 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
62617 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
62618 - /usr/include/glib-2.0/glib/gbase64.h \
62619 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
62620 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
62621 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
62622 - /usr/include/glib-2.0/glib/gchecksum.h \
62623 - /usr/include/glib-2.0/glib/gcompletion.h \
62624 - /usr/include/glib-2.0/glib/gconvert.h \
62625 - /usr/include/glib-2.0/glib/gdataset.h \
62626 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
62627 - /usr/include/glib-2.0/glib/gfileutils.h \
62628 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
62629 - /usr/include/glib-2.0/glib/giochannel.h \
62630 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
62631 - /usr/include/glib-2.0/glib/gslist.h \
62632 - /usr/include/glib-2.0/glib/gstring.h \
62633 - /usr/include/glib-2.0/glib/gunicode.h \
62634 - /usr/include/glib-2.0/glib/gkeyfile.h \
62635 - /usr/include/glib-2.0/glib/gmappedfile.h \
62636 - /usr/include/glib-2.0/glib/gmarkup.h \
62637 - /usr/include/glib-2.0/glib/gmessages.h \
62638 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
62639 - /usr/include/glib-2.0/glib/gpattern.h \
62640 - /usr/include/glib-2.0/glib/gprimes.h \
62641 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
62642 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
62643 - /usr/include/glib-2.0/glib/gregex.h \
62644 - /usr/include/glib-2.0/glib/gscanner.h \
62645 - /usr/include/glib-2.0/glib/gsequence.h \
62646 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
62647 - /usr/include/glib-2.0/glib/gstrfuncs.h \
62648 - /usr/include/glib-2.0/glib/gtestutils.h \
62649 - /usr/include/glib-2.0/glib/gthreadpool.h \
62650 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
62651 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
62652 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
62653 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
62654 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
62655 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
62656 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
62657 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
62658 - ../libpcsxcore/sio.h
62659 -
62660 -../libpcsxcore/psxhw.h:
62661 -
62662 -../libpcsxcore/psxcommon.h:
62663 -
62664 -../include/config.h:
62665 -
62666 -/usr/include/stdio.h:
62667 -
62668 -/usr/include/features.h:
62669 -
62670 -/usr/include/sys/cdefs.h:
62671 -
62672 -/usr/include/bits/wordsize.h:
62673 -
62674 -/usr/include/gnu/stubs.h:
62675 -
62676 -/usr/include/gnu/stubs-32.h:
62677 -
62678 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
62679 -
62680 -/usr/include/bits/types.h:
62681 -
62682 -/usr/include/bits/typesizes.h:
62683 -
62684 -/usr/include/libio.h:
62685 -
62686 -/usr/include/_G_config.h:
62687 -
62688 -/usr/include/wchar.h:
62689 -
62690 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
62691 -
62692 -/usr/include/bits/stdio_lim.h:
62693 -
62694 -/usr/include/bits/sys_errlist.h:
62695 -
62696 -/usr/include/bits/stdio.h:
62697 -
62698 -/usr/include/string.h:
62699 -
62700 -/usr/include/bits/string.h:
62701 -
62702 -/usr/include/bits/string2.h:
62703 -
62704 -/usr/include/endian.h:
62705 -
62706 -/usr/include/bits/endian.h:
62707 -
62708 -/usr/include/bits/byteswap.h:
62709 -
62710 -/usr/include/stdlib.h:
62711 -
62712 -/usr/include/stdint.h:
62713 -
62714 -/usr/include/bits/wchar.h:
62715 -
62716 -/usr/include/sys/types.h:
62717 -
62718 -/usr/include/time.h:
62719 -
62720 -/usr/include/sys/select.h:
62721 -
62722 -/usr/include/bits/select.h:
62723 -
62724 -/usr/include/bits/sigset.h:
62725 -
62726 -/usr/include/bits/time.h:
62727 -
62728 -/usr/include/sys/sysmacros.h:
62729 -
62730 -/usr/include/bits/pthreadtypes.h:
62731 -
62732 -/usr/include/alloca.h:
62733 -
62734 -/usr/include/math.h:
62735 -
62736 -/usr/include/bits/huge_val.h:
62737 -
62738 -/usr/include/bits/mathdef.h:
62739 -
62740 -/usr/include/bits/mathcalls.h:
62741 -
62742 -/usr/include/bits/mathinline.h:
62743 -
62744 -/usr/include/ctype.h:
62745 -
62746 -/usr/include/zlib.h:
62747 -
62748 -/usr/include/zconf.h:
62749 -
62750 -/usr/include/zlibdefs.h:
62751 -
62752 -/usr/include/unistd.h:
62753 -
62754 -/usr/include/bits/posix_opt.h:
62755 -
62756 -/usr/include/bits/confname.h:
62757 -
62758 -/usr/include/getopt.h:
62759 -
62760 -/usr/include/glib-2.0/glib.h:
62761 -
62762 -/usr/include/glib-2.0/glib/galloca.h:
62763 -
62764 -/usr/include/glib-2.0/glib/gtypes.h:
62765 -
62766 -/usr/lib/glib-2.0/include/glibconfig.h:
62767 -
62768 -/usr/include/glib-2.0/glib/gmacros.h:
62769 -
62770 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
62771 -
62772 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
62773 -
62774 -/usr/include/limits.h:
62775 -
62776 -/usr/include/bits/posix1_lim.h:
62777 -
62778 -/usr/include/bits/local_lim.h:
62779 -
62780 -/usr/include/linux/limits.h:
62781 -
62782 -/usr/include/bits/posix2_lim.h:
62783 -
62784 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
62785 -
62786 -/usr/include/glib-2.0/glib/garray.h:
62787 -
62788 -/usr/include/glib-2.0/glib/gasyncqueue.h:
62789 -
62790 -/usr/include/glib-2.0/glib/gthread.h:
62791 -
62792 -/usr/include/glib-2.0/glib/gerror.h:
62793 -
62794 -/usr/include/glib-2.0/glib/gquark.h:
62795 -
62796 -/usr/include/glib-2.0/glib/gutils.h:
62797 -
62798 -/usr/include/glib-2.0/glib/gatomic.h:
62799 -
62800 -/usr/include/glib-2.0/glib/gbacktrace.h:
62801 -
62802 -/usr/include/signal.h:
62803 -
62804 -/usr/include/bits/signum.h:
62805 -
62806 -/usr/include/bits/siginfo.h:
62807 -
62808 -/usr/include/bits/sigaction.h:
62809 -
62810 -/usr/include/bits/sigcontext.h:
62811 -
62812 -/usr/include/bits/sigstack.h:
62813 -
62814 -/usr/include/bits/sigthread.h:
62815 -
62816 -/usr/include/glib-2.0/glib/gbase64.h:
62817 -
62818 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
62819 -
62820 -/usr/include/glib-2.0/glib/gcache.h:
62821 -
62822 -/usr/include/glib-2.0/glib/glist.h:
62823 -
62824 -/usr/include/glib-2.0/glib/gmem.h:
62825 -
62826 -/usr/include/glib-2.0/glib/gslice.h:
62827 -
62828 -/usr/include/glib-2.0/glib/gchecksum.h:
62829 -
62830 -/usr/include/glib-2.0/glib/gcompletion.h:
62831 -
62832 -/usr/include/glib-2.0/glib/gconvert.h:
62833 -
62834 -/usr/include/glib-2.0/glib/gdataset.h:
62835 -
62836 -/usr/include/glib-2.0/glib/gdate.h:
62837 -
62838 -/usr/include/glib-2.0/glib/gdir.h:
62839 -
62840 -/usr/include/glib-2.0/glib/gfileutils.h:
62841 -
62842 -/usr/include/glib-2.0/glib/ghash.h:
62843 -
62844 -/usr/include/glib-2.0/glib/ghook.h:
62845 -
62846 -/usr/include/glib-2.0/glib/giochannel.h:
62847 -
62848 -/usr/include/glib-2.0/glib/gmain.h:
62849 -
62850 -/usr/include/glib-2.0/glib/gpoll.h:
62851 -
62852 -/usr/include/glib-2.0/glib/gslist.h:
62853 -
62854 -/usr/include/glib-2.0/glib/gstring.h:
62855 -
62856 -/usr/include/glib-2.0/glib/gunicode.h:
62857 -
62858 -/usr/include/glib-2.0/glib/gkeyfile.h:
62859 -
62860 -/usr/include/glib-2.0/glib/gmappedfile.h:
62861 -
62862 -/usr/include/glib-2.0/glib/gmarkup.h:
62863 -
62864 -/usr/include/glib-2.0/glib/gmessages.h:
62865 -
62866 -/usr/include/glib-2.0/glib/gnode.h:
62867 -
62868 -/usr/include/glib-2.0/glib/goption.h:
62869 -
62870 -/usr/include/glib-2.0/glib/gpattern.h:
62871 -
62872 -/usr/include/glib-2.0/glib/gprimes.h:
62873 -
62874 -/usr/include/glib-2.0/glib/gqsort.h:
62875 -
62876 -/usr/include/glib-2.0/glib/gqueue.h:
62877 -
62878 -/usr/include/glib-2.0/glib/grand.h:
62879 -
62880 -/usr/include/glib-2.0/glib/grel.h:
62881 -
62882 -/usr/include/glib-2.0/glib/gregex.h:
62883 -
62884 -/usr/include/glib-2.0/glib/gscanner.h:
62885 -
62886 -/usr/include/glib-2.0/glib/gsequence.h:
62887 -
62888 -/usr/include/glib-2.0/glib/gshell.h:
62889 -
62890 -/usr/include/glib-2.0/glib/gspawn.h:
62891 -
62892 -/usr/include/glib-2.0/glib/gstrfuncs.h:
62893 -
62894 -/usr/include/glib-2.0/glib/gtestutils.h:
62895 -
62896 -/usr/include/glib-2.0/glib/gthreadpool.h:
62897 -
62898 -/usr/include/glib-2.0/glib/gtimer.h:
62899 -
62900 -/usr/include/glib-2.0/glib/gtree.h:
62901 -
62902 -/usr/include/glib-2.0/glib/gurifuncs.h:
62903 -
62904 -../libpcsxcore/system.h:
62905 -
62906 -../libpcsxcore/debug.h:
62907 -
62908 -/usr/include/libintl.h:
62909 -
62910 -/usr/include/locale.h:
62911 -
62912 -/usr/include/bits/locale.h:
62913 -
62914 -../libpcsxcore/r3000a.h:
62915 -
62916 -../libpcsxcore/psxmem.h:
62917 -
62918 -../libpcsxcore/psxcounters.h:
62919 -
62920 -../libpcsxcore/plugins.h:
62921 -
62922 -../libpcsxcore/spu.h:
62923 -
62924 -../libpcsxcore/psemu_plugin_defs.h:
62925 -
62926 -../libpcsxcore/decode_xa.h:
62927 -
62928 -../libpcsxcore/psxbios.h:
62929 -
62930 -../libpcsxcore/misc.h:
62931 -
62932 -../libpcsxcore/coff.h:
62933 -
62934 -../libpcsxcore/sio.h:
62935 diff -rupN original/libpcsxcore/libpcsxcore/.deps/psxinterpreter.Plo new/libpcsxcore/libpcsxcore/.deps/psxinterpreter.Plo
62936 --- original/libpcsxcore/libpcsxcore/.deps/psxinterpreter.Plo 2009-03-28 22:34:58.000000000 -0430
62937 +++ new/libpcsxcore/libpcsxcore/.deps/psxinterpreter.Plo 1969-12-31 20:00:00.000000000 -0400
62938 @@ -1,367 +0,0 @@
62939 -psxinterpreter.lo: ../libpcsxcore/psxinterpreter.c \
62940 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
62941 - /usr/include/features.h /usr/include/sys/cdefs.h \
62942 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
62943 - /usr/include/gnu/stubs-32.h \
62944 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
62945 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
62946 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
62947 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
62948 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
62949 - /usr/include/bits/stdio.h /usr/include/string.h \
62950 - /usr/include/bits/string.h /usr/include/bits/string2.h \
62951 - /usr/include/endian.h /usr/include/bits/endian.h \
62952 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
62953 - /usr/include/stdint.h /usr/include/bits/wchar.h \
62954 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
62955 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
62956 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
62957 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
62958 - /usr/include/math.h /usr/include/bits/huge_val.h \
62959 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
62960 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
62961 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
62962 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
62963 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
62964 - /usr/include/glib-2.0/glib/galloca.h \
62965 - /usr/include/glib-2.0/glib/gtypes.h \
62966 - /usr/lib/glib-2.0/include/glibconfig.h \
62967 - /usr/include/glib-2.0/glib/gmacros.h \
62968 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
62969 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
62970 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
62971 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
62972 - /usr/include/bits/posix2_lim.h \
62973 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
62974 - /usr/include/glib-2.0/glib/garray.h \
62975 - /usr/include/glib-2.0/glib/gasyncqueue.h \
62976 - /usr/include/glib-2.0/glib/gthread.h \
62977 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
62978 - /usr/include/glib-2.0/glib/gutils.h \
62979 - /usr/include/glib-2.0/glib/gatomic.h \
62980 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
62981 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
62982 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
62983 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
62984 - /usr/include/glib-2.0/glib/gbase64.h \
62985 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
62986 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
62987 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
62988 - /usr/include/glib-2.0/glib/gchecksum.h \
62989 - /usr/include/glib-2.0/glib/gcompletion.h \
62990 - /usr/include/glib-2.0/glib/gconvert.h \
62991 - /usr/include/glib-2.0/glib/gdataset.h \
62992 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
62993 - /usr/include/glib-2.0/glib/gfileutils.h \
62994 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
62995 - /usr/include/glib-2.0/glib/giochannel.h \
62996 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
62997 - /usr/include/glib-2.0/glib/gslist.h \
62998 - /usr/include/glib-2.0/glib/gstring.h \
62999 - /usr/include/glib-2.0/glib/gunicode.h \
63000 - /usr/include/glib-2.0/glib/gkeyfile.h \
63001 - /usr/include/glib-2.0/glib/gmappedfile.h \
63002 - /usr/include/glib-2.0/glib/gmarkup.h \
63003 - /usr/include/glib-2.0/glib/gmessages.h \
63004 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
63005 - /usr/include/glib-2.0/glib/gpattern.h \
63006 - /usr/include/glib-2.0/glib/gprimes.h \
63007 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
63008 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
63009 - /usr/include/glib-2.0/glib/gregex.h \
63010 - /usr/include/glib-2.0/glib/gscanner.h \
63011 - /usr/include/glib-2.0/glib/gsequence.h \
63012 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
63013 - /usr/include/glib-2.0/glib/gstrfuncs.h \
63014 - /usr/include/glib-2.0/glib/gtestutils.h \
63015 - /usr/include/glib-2.0/glib/gthreadpool.h \
63016 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
63017 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
63018 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
63019 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
63020 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
63021 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
63022 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
63023 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
63024 - ../libpcsxcore/sio.h ../libpcsxcore/gte.h ../libpcsxcore/psxhle.h \
63025 - ../libpcsxcore/../gui/hdebug.h
63026 -
63027 -../libpcsxcore/psxcommon.h:
63028 -
63029 -../include/config.h:
63030 -
63031 -/usr/include/stdio.h:
63032 -
63033 -/usr/include/features.h:
63034 -
63035 -/usr/include/sys/cdefs.h:
63036 -
63037 -/usr/include/bits/wordsize.h:
63038 -
63039 -/usr/include/gnu/stubs.h:
63040 -
63041 -/usr/include/gnu/stubs-32.h:
63042 -
63043 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
63044 -
63045 -/usr/include/bits/types.h:
63046 -
63047 -/usr/include/bits/typesizes.h:
63048 -
63049 -/usr/include/libio.h:
63050 -
63051 -/usr/include/_G_config.h:
63052 -
63053 -/usr/include/wchar.h:
63054 -
63055 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
63056 -
63057 -/usr/include/bits/stdio_lim.h:
63058 -
63059 -/usr/include/bits/sys_errlist.h:
63060 -
63061 -/usr/include/bits/stdio.h:
63062 -
63063 -/usr/include/string.h:
63064 -
63065 -/usr/include/bits/string.h:
63066 -
63067 -/usr/include/bits/string2.h:
63068 -
63069 -/usr/include/endian.h:
63070 -
63071 -/usr/include/bits/endian.h:
63072 -
63073 -/usr/include/bits/byteswap.h:
63074 -
63075 -/usr/include/stdlib.h:
63076 -
63077 -/usr/include/stdint.h:
63078 -
63079 -/usr/include/bits/wchar.h:
63080 -
63081 -/usr/include/sys/types.h:
63082 -
63083 -/usr/include/time.h:
63084 -
63085 -/usr/include/sys/select.h:
63086 -
63087 -/usr/include/bits/select.h:
63088 -
63089 -/usr/include/bits/sigset.h:
63090 -
63091 -/usr/include/bits/time.h:
63092 -
63093 -/usr/include/sys/sysmacros.h:
63094 -
63095 -/usr/include/bits/pthreadtypes.h:
63096 -
63097 -/usr/include/alloca.h:
63098 -
63099 -/usr/include/math.h:
63100 -
63101 -/usr/include/bits/huge_val.h:
63102 -
63103 -/usr/include/bits/mathdef.h:
63104 -
63105 -/usr/include/bits/mathcalls.h:
63106 -
63107 -/usr/include/bits/mathinline.h:
63108 -
63109 -/usr/include/ctype.h:
63110 -
63111 -/usr/include/zlib.h:
63112 -
63113 -/usr/include/zconf.h:
63114 -
63115 -/usr/include/zlibdefs.h:
63116 -
63117 -/usr/include/unistd.h:
63118 -
63119 -/usr/include/bits/posix_opt.h:
63120 -
63121 -/usr/include/bits/confname.h:
63122 -
63123 -/usr/include/getopt.h:
63124 -
63125 -/usr/include/glib-2.0/glib.h:
63126 -
63127 -/usr/include/glib-2.0/glib/galloca.h:
63128 -
63129 -/usr/include/glib-2.0/glib/gtypes.h:
63130 -
63131 -/usr/lib/glib-2.0/include/glibconfig.h:
63132 -
63133 -/usr/include/glib-2.0/glib/gmacros.h:
63134 -
63135 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
63136 -
63137 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
63138 -
63139 -/usr/include/limits.h:
63140 -
63141 -/usr/include/bits/posix1_lim.h:
63142 -
63143 -/usr/include/bits/local_lim.h:
63144 -
63145 -/usr/include/linux/limits.h:
63146 -
63147 -/usr/include/bits/posix2_lim.h:
63148 -
63149 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
63150 -
63151 -/usr/include/glib-2.0/glib/garray.h:
63152 -
63153 -/usr/include/glib-2.0/glib/gasyncqueue.h:
63154 -
63155 -/usr/include/glib-2.0/glib/gthread.h:
63156 -
63157 -/usr/include/glib-2.0/glib/gerror.h:
63158 -
63159 -/usr/include/glib-2.0/glib/gquark.h:
63160 -
63161 -/usr/include/glib-2.0/glib/gutils.h:
63162 -
63163 -/usr/include/glib-2.0/glib/gatomic.h:
63164 -
63165 -/usr/include/glib-2.0/glib/gbacktrace.h:
63166 -
63167 -/usr/include/signal.h:
63168 -
63169 -/usr/include/bits/signum.h:
63170 -
63171 -/usr/include/bits/siginfo.h:
63172 -
63173 -/usr/include/bits/sigaction.h:
63174 -
63175 -/usr/include/bits/sigcontext.h:
63176 -
63177 -/usr/include/bits/sigstack.h:
63178 -
63179 -/usr/include/bits/sigthread.h:
63180 -
63181 -/usr/include/glib-2.0/glib/gbase64.h:
63182 -
63183 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
63184 -
63185 -/usr/include/glib-2.0/glib/gcache.h:
63186 -
63187 -/usr/include/glib-2.0/glib/glist.h:
63188 -
63189 -/usr/include/glib-2.0/glib/gmem.h:
63190 -
63191 -/usr/include/glib-2.0/glib/gslice.h:
63192 -
63193 -/usr/include/glib-2.0/glib/gchecksum.h:
63194 -
63195 -/usr/include/glib-2.0/glib/gcompletion.h:
63196 -
63197 -/usr/include/glib-2.0/glib/gconvert.h:
63198 -
63199 -/usr/include/glib-2.0/glib/gdataset.h:
63200 -
63201 -/usr/include/glib-2.0/glib/gdate.h:
63202 -
63203 -/usr/include/glib-2.0/glib/gdir.h:
63204 -
63205 -/usr/include/glib-2.0/glib/gfileutils.h:
63206 -
63207 -/usr/include/glib-2.0/glib/ghash.h:
63208 -
63209 -/usr/include/glib-2.0/glib/ghook.h:
63210 -
63211 -/usr/include/glib-2.0/glib/giochannel.h:
63212 -
63213 -/usr/include/glib-2.0/glib/gmain.h:
63214 -
63215 -/usr/include/glib-2.0/glib/gpoll.h:
63216 -
63217 -/usr/include/glib-2.0/glib/gslist.h:
63218 -
63219 -/usr/include/glib-2.0/glib/gstring.h:
63220 -
63221 -/usr/include/glib-2.0/glib/gunicode.h:
63222 -
63223 -/usr/include/glib-2.0/glib/gkeyfile.h:
63224 -
63225 -/usr/include/glib-2.0/glib/gmappedfile.h:
63226 -
63227 -/usr/include/glib-2.0/glib/gmarkup.h:
63228 -
63229 -/usr/include/glib-2.0/glib/gmessages.h:
63230 -
63231 -/usr/include/glib-2.0/glib/gnode.h:
63232 -
63233 -/usr/include/glib-2.0/glib/goption.h:
63234 -
63235 -/usr/include/glib-2.0/glib/gpattern.h:
63236 -
63237 -/usr/include/glib-2.0/glib/gprimes.h:
63238 -
63239 -/usr/include/glib-2.0/glib/gqsort.h:
63240 -
63241 -/usr/include/glib-2.0/glib/gqueue.h:
63242 -
63243 -/usr/include/glib-2.0/glib/grand.h:
63244 -
63245 -/usr/include/glib-2.0/glib/grel.h:
63246 -
63247 -/usr/include/glib-2.0/glib/gregex.h:
63248 -
63249 -/usr/include/glib-2.0/glib/gscanner.h:
63250 -
63251 -/usr/include/glib-2.0/glib/gsequence.h:
63252 -
63253 -/usr/include/glib-2.0/glib/gshell.h:
63254 -
63255 -/usr/include/glib-2.0/glib/gspawn.h:
63256 -
63257 -/usr/include/glib-2.0/glib/gstrfuncs.h:
63258 -
63259 -/usr/include/glib-2.0/glib/gtestutils.h:
63260 -
63261 -/usr/include/glib-2.0/glib/gthreadpool.h:
63262 -
63263 -/usr/include/glib-2.0/glib/gtimer.h:
63264 -
63265 -/usr/include/glib-2.0/glib/gtree.h:
63266 -
63267 -/usr/include/glib-2.0/glib/gurifuncs.h:
63268 -
63269 -../libpcsxcore/system.h:
63270 -
63271 -../libpcsxcore/debug.h:
63272 -
63273 -/usr/include/libintl.h:
63274 -
63275 -/usr/include/locale.h:
63276 -
63277 -/usr/include/bits/locale.h:
63278 -
63279 -../libpcsxcore/r3000a.h:
63280 -
63281 -../libpcsxcore/psxmem.h:
63282 -
63283 -../libpcsxcore/psxcounters.h:
63284 -
63285 -../libpcsxcore/plugins.h:
63286 -
63287 -../libpcsxcore/spu.h:
63288 -
63289 -../libpcsxcore/psemu_plugin_defs.h:
63290 -
63291 -../libpcsxcore/decode_xa.h:
63292 -
63293 -../libpcsxcore/psxbios.h:
63294 -
63295 -../libpcsxcore/misc.h:
63296 -
63297 -../libpcsxcore/coff.h:
63298 -
63299 -../libpcsxcore/sio.h:
63300 -
63301 -../libpcsxcore/gte.h:
63302 -
63303 -../libpcsxcore/psxhle.h:
63304 -
63305 -../libpcsxcore/../gui/hdebug.h:
63306 diff -rupN original/libpcsxcore/libpcsxcore/.deps/psxmem.Plo new/libpcsxcore/libpcsxcore/.deps/psxmem.Plo
63307 --- original/libpcsxcore/libpcsxcore/.deps/psxmem.Plo 2009-03-28 22:34:51.000000000 -0430
63308 +++ new/libpcsxcore/libpcsxcore/.deps/psxmem.Plo 1969-12-31 20:00:00.000000000 -0400
63309 @@ -1,364 +0,0 @@
63310 -psxmem.lo: ../libpcsxcore/psxmem.c ../libpcsxcore/psxmem.h \
63311 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
63312 - /usr/include/features.h /usr/include/sys/cdefs.h \
63313 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
63314 - /usr/include/gnu/stubs-32.h \
63315 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
63316 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
63317 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
63318 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
63319 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
63320 - /usr/include/bits/stdio.h /usr/include/string.h \
63321 - /usr/include/bits/string.h /usr/include/bits/string2.h \
63322 - /usr/include/endian.h /usr/include/bits/endian.h \
63323 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
63324 - /usr/include/stdint.h /usr/include/bits/wchar.h \
63325 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
63326 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
63327 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
63328 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
63329 - /usr/include/math.h /usr/include/bits/huge_val.h \
63330 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
63331 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
63332 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
63333 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
63334 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
63335 - /usr/include/glib-2.0/glib/galloca.h \
63336 - /usr/include/glib-2.0/glib/gtypes.h \
63337 - /usr/lib/glib-2.0/include/glibconfig.h \
63338 - /usr/include/glib-2.0/glib/gmacros.h \
63339 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
63340 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
63341 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
63342 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
63343 - /usr/include/bits/posix2_lim.h \
63344 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
63345 - /usr/include/glib-2.0/glib/garray.h \
63346 - /usr/include/glib-2.0/glib/gasyncqueue.h \
63347 - /usr/include/glib-2.0/glib/gthread.h \
63348 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
63349 - /usr/include/glib-2.0/glib/gutils.h \
63350 - /usr/include/glib-2.0/glib/gatomic.h \
63351 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
63352 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
63353 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
63354 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
63355 - /usr/include/glib-2.0/glib/gbase64.h \
63356 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
63357 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
63358 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
63359 - /usr/include/glib-2.0/glib/gchecksum.h \
63360 - /usr/include/glib-2.0/glib/gcompletion.h \
63361 - /usr/include/glib-2.0/glib/gconvert.h \
63362 - /usr/include/glib-2.0/glib/gdataset.h \
63363 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
63364 - /usr/include/glib-2.0/glib/gfileutils.h \
63365 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
63366 - /usr/include/glib-2.0/glib/giochannel.h \
63367 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
63368 - /usr/include/glib-2.0/glib/gslist.h \
63369 - /usr/include/glib-2.0/glib/gstring.h \
63370 - /usr/include/glib-2.0/glib/gunicode.h \
63371 - /usr/include/glib-2.0/glib/gkeyfile.h \
63372 - /usr/include/glib-2.0/glib/gmappedfile.h \
63373 - /usr/include/glib-2.0/glib/gmarkup.h \
63374 - /usr/include/glib-2.0/glib/gmessages.h \
63375 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
63376 - /usr/include/glib-2.0/glib/gpattern.h \
63377 - /usr/include/glib-2.0/glib/gprimes.h \
63378 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
63379 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
63380 - /usr/include/glib-2.0/glib/gregex.h \
63381 - /usr/include/glib-2.0/glib/gscanner.h \
63382 - /usr/include/glib-2.0/glib/gsequence.h \
63383 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
63384 - /usr/include/glib-2.0/glib/gstrfuncs.h \
63385 - /usr/include/glib-2.0/glib/gtestutils.h \
63386 - /usr/include/glib-2.0/glib/gthreadpool.h \
63387 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
63388 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
63389 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
63390 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
63391 - ../libpcsxcore/psxcounters.h ../libpcsxcore/plugins.h \
63392 - ../libpcsxcore/spu.h ../libpcsxcore/psemu_plugin_defs.h \
63393 - ../libpcsxcore/decode_xa.h ../libpcsxcore/psxbios.h \
63394 - ../libpcsxcore/misc.h ../libpcsxcore/coff.h ../libpcsxcore/sio.h \
63395 - /usr/include/sys/mman.h /usr/include/bits/mman.h
63396 -
63397 -../libpcsxcore/psxmem.h:
63398 -
63399 -../libpcsxcore/psxcommon.h:
63400 -
63401 -../include/config.h:
63402 -
63403 -/usr/include/stdio.h:
63404 -
63405 -/usr/include/features.h:
63406 -
63407 -/usr/include/sys/cdefs.h:
63408 -
63409 -/usr/include/bits/wordsize.h:
63410 -
63411 -/usr/include/gnu/stubs.h:
63412 -
63413 -/usr/include/gnu/stubs-32.h:
63414 -
63415 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
63416 -
63417 -/usr/include/bits/types.h:
63418 -
63419 -/usr/include/bits/typesizes.h:
63420 -
63421 -/usr/include/libio.h:
63422 -
63423 -/usr/include/_G_config.h:
63424 -
63425 -/usr/include/wchar.h:
63426 -
63427 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
63428 -
63429 -/usr/include/bits/stdio_lim.h:
63430 -
63431 -/usr/include/bits/sys_errlist.h:
63432 -
63433 -/usr/include/bits/stdio.h:
63434 -
63435 -/usr/include/string.h:
63436 -
63437 -/usr/include/bits/string.h:
63438 -
63439 -/usr/include/bits/string2.h:
63440 -
63441 -/usr/include/endian.h:
63442 -
63443 -/usr/include/bits/endian.h:
63444 -
63445 -/usr/include/bits/byteswap.h:
63446 -
63447 -/usr/include/stdlib.h:
63448 -
63449 -/usr/include/stdint.h:
63450 -
63451 -/usr/include/bits/wchar.h:
63452 -
63453 -/usr/include/sys/types.h:
63454 -
63455 -/usr/include/time.h:
63456 -
63457 -/usr/include/sys/select.h:
63458 -
63459 -/usr/include/bits/select.h:
63460 -
63461 -/usr/include/bits/sigset.h:
63462 -
63463 -/usr/include/bits/time.h:
63464 -
63465 -/usr/include/sys/sysmacros.h:
63466 -
63467 -/usr/include/bits/pthreadtypes.h:
63468 -
63469 -/usr/include/alloca.h:
63470 -
63471 -/usr/include/math.h:
63472 -
63473 -/usr/include/bits/huge_val.h:
63474 -
63475 -/usr/include/bits/mathdef.h:
63476 -
63477 -/usr/include/bits/mathcalls.h:
63478 -
63479 -/usr/include/bits/mathinline.h:
63480 -
63481 -/usr/include/ctype.h:
63482 -
63483 -/usr/include/zlib.h:
63484 -
63485 -/usr/include/zconf.h:
63486 -
63487 -/usr/include/zlibdefs.h:
63488 -
63489 -/usr/include/unistd.h:
63490 -
63491 -/usr/include/bits/posix_opt.h:
63492 -
63493 -/usr/include/bits/confname.h:
63494 -
63495 -/usr/include/getopt.h:
63496 -
63497 -/usr/include/glib-2.0/glib.h:
63498 -
63499 -/usr/include/glib-2.0/glib/galloca.h:
63500 -
63501 -/usr/include/glib-2.0/glib/gtypes.h:
63502 -
63503 -/usr/lib/glib-2.0/include/glibconfig.h:
63504 -
63505 -/usr/include/glib-2.0/glib/gmacros.h:
63506 -
63507 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
63508 -
63509 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
63510 -
63511 -/usr/include/limits.h:
63512 -
63513 -/usr/include/bits/posix1_lim.h:
63514 -
63515 -/usr/include/bits/local_lim.h:
63516 -
63517 -/usr/include/linux/limits.h:
63518 -
63519 -/usr/include/bits/posix2_lim.h:
63520 -
63521 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
63522 -
63523 -/usr/include/glib-2.0/glib/garray.h:
63524 -
63525 -/usr/include/glib-2.0/glib/gasyncqueue.h:
63526 -
63527 -/usr/include/glib-2.0/glib/gthread.h:
63528 -
63529 -/usr/include/glib-2.0/glib/gerror.h:
63530 -
63531 -/usr/include/glib-2.0/glib/gquark.h:
63532 -
63533 -/usr/include/glib-2.0/glib/gutils.h:
63534 -
63535 -/usr/include/glib-2.0/glib/gatomic.h:
63536 -
63537 -/usr/include/glib-2.0/glib/gbacktrace.h:
63538 -
63539 -/usr/include/signal.h:
63540 -
63541 -/usr/include/bits/signum.h:
63542 -
63543 -/usr/include/bits/siginfo.h:
63544 -
63545 -/usr/include/bits/sigaction.h:
63546 -
63547 -/usr/include/bits/sigcontext.h:
63548 -
63549 -/usr/include/bits/sigstack.h:
63550 -
63551 -/usr/include/bits/sigthread.h:
63552 -
63553 -/usr/include/glib-2.0/glib/gbase64.h:
63554 -
63555 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
63556 -
63557 -/usr/include/glib-2.0/glib/gcache.h:
63558 -
63559 -/usr/include/glib-2.0/glib/glist.h:
63560 -
63561 -/usr/include/glib-2.0/glib/gmem.h:
63562 -
63563 -/usr/include/glib-2.0/glib/gslice.h:
63564 -
63565 -/usr/include/glib-2.0/glib/gchecksum.h:
63566 -
63567 -/usr/include/glib-2.0/glib/gcompletion.h:
63568 -
63569 -/usr/include/glib-2.0/glib/gconvert.h:
63570 -
63571 -/usr/include/glib-2.0/glib/gdataset.h:
63572 -
63573 -/usr/include/glib-2.0/glib/gdate.h:
63574 -
63575 -/usr/include/glib-2.0/glib/gdir.h:
63576 -
63577 -/usr/include/glib-2.0/glib/gfileutils.h:
63578 -
63579 -/usr/include/glib-2.0/glib/ghash.h:
63580 -
63581 -/usr/include/glib-2.0/glib/ghook.h:
63582 -
63583 -/usr/include/glib-2.0/glib/giochannel.h:
63584 -
63585 -/usr/include/glib-2.0/glib/gmain.h:
63586 -
63587 -/usr/include/glib-2.0/glib/gpoll.h:
63588 -
63589 -/usr/include/glib-2.0/glib/gslist.h:
63590 -
63591 -/usr/include/glib-2.0/glib/gstring.h:
63592 -
63593 -/usr/include/glib-2.0/glib/gunicode.h:
63594 -
63595 -/usr/include/glib-2.0/glib/gkeyfile.h:
63596 -
63597 -/usr/include/glib-2.0/glib/gmappedfile.h:
63598 -
63599 -/usr/include/glib-2.0/glib/gmarkup.h:
63600 -
63601 -/usr/include/glib-2.0/glib/gmessages.h:
63602 -
63603 -/usr/include/glib-2.0/glib/gnode.h:
63604 -
63605 -/usr/include/glib-2.0/glib/goption.h:
63606 -
63607 -/usr/include/glib-2.0/glib/gpattern.h:
63608 -
63609 -/usr/include/glib-2.0/glib/gprimes.h:
63610 -
63611 -/usr/include/glib-2.0/glib/gqsort.h:
63612 -
63613 -/usr/include/glib-2.0/glib/gqueue.h:
63614 -
63615 -/usr/include/glib-2.0/glib/grand.h:
63616 -
63617 -/usr/include/glib-2.0/glib/grel.h:
63618 -
63619 -/usr/include/glib-2.0/glib/gregex.h:
63620 -
63621 -/usr/include/glib-2.0/glib/gscanner.h:
63622 -
63623 -/usr/include/glib-2.0/glib/gsequence.h:
63624 -
63625 -/usr/include/glib-2.0/glib/gshell.h:
63626 -
63627 -/usr/include/glib-2.0/glib/gspawn.h:
63628 -
63629 -/usr/include/glib-2.0/glib/gstrfuncs.h:
63630 -
63631 -/usr/include/glib-2.0/glib/gtestutils.h:
63632 -
63633 -/usr/include/glib-2.0/glib/gthreadpool.h:
63634 -
63635 -/usr/include/glib-2.0/glib/gtimer.h:
63636 -
63637 -/usr/include/glib-2.0/glib/gtree.h:
63638 -
63639 -/usr/include/glib-2.0/glib/gurifuncs.h:
63640 -
63641 -../libpcsxcore/system.h:
63642 -
63643 -../libpcsxcore/debug.h:
63644 -
63645 -/usr/include/libintl.h:
63646 -
63647 -/usr/include/locale.h:
63648 -
63649 -/usr/include/bits/locale.h:
63650 -
63651 -../libpcsxcore/r3000a.h:
63652 -
63653 -../libpcsxcore/psxcounters.h:
63654 -
63655 -../libpcsxcore/plugins.h:
63656 -
63657 -../libpcsxcore/spu.h:
63658 -
63659 -../libpcsxcore/psemu_plugin_defs.h:
63660 -
63661 -../libpcsxcore/decode_xa.h:
63662 -
63663 -../libpcsxcore/psxbios.h:
63664 -
63665 -../libpcsxcore/misc.h:
63666 -
63667 -../libpcsxcore/coff.h:
63668 -
63669 -../libpcsxcore/sio.h:
63670 -
63671 -/usr/include/sys/mman.h:
63672 -
63673 -/usr/include/bits/mman.h:
63674 diff -rupN original/libpcsxcore/libpcsxcore/.deps/r3000a.Plo new/libpcsxcore/libpcsxcore/.deps/r3000a.Plo
63675 --- original/libpcsxcore/libpcsxcore/.deps/r3000a.Plo 2009-03-28 22:34:56.000000000 -0430
63676 +++ new/libpcsxcore/libpcsxcore/.deps/r3000a.Plo 1969-12-31 20:00:00.000000000 -0400
63677 @@ -1,359 +0,0 @@
63678 -r3000a.lo: ../libpcsxcore/r3000a.c ../libpcsxcore/r3000a.h \
63679 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
63680 - /usr/include/features.h /usr/include/sys/cdefs.h \
63681 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
63682 - /usr/include/gnu/stubs-32.h \
63683 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
63684 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
63685 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
63686 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
63687 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
63688 - /usr/include/bits/stdio.h /usr/include/string.h \
63689 - /usr/include/bits/string.h /usr/include/bits/string2.h \
63690 - /usr/include/endian.h /usr/include/bits/endian.h \
63691 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
63692 - /usr/include/stdint.h /usr/include/bits/wchar.h \
63693 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
63694 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
63695 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
63696 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
63697 - /usr/include/math.h /usr/include/bits/huge_val.h \
63698 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
63699 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
63700 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
63701 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
63702 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
63703 - /usr/include/glib-2.0/glib/galloca.h \
63704 - /usr/include/glib-2.0/glib/gtypes.h \
63705 - /usr/lib/glib-2.0/include/glibconfig.h \
63706 - /usr/include/glib-2.0/glib/gmacros.h \
63707 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
63708 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
63709 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
63710 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
63711 - /usr/include/bits/posix2_lim.h \
63712 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
63713 - /usr/include/glib-2.0/glib/garray.h \
63714 - /usr/include/glib-2.0/glib/gasyncqueue.h \
63715 - /usr/include/glib-2.0/glib/gthread.h \
63716 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
63717 - /usr/include/glib-2.0/glib/gutils.h \
63718 - /usr/include/glib-2.0/glib/gatomic.h \
63719 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
63720 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
63721 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
63722 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
63723 - /usr/include/glib-2.0/glib/gbase64.h \
63724 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
63725 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
63726 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
63727 - /usr/include/glib-2.0/glib/gchecksum.h \
63728 - /usr/include/glib-2.0/glib/gcompletion.h \
63729 - /usr/include/glib-2.0/glib/gconvert.h \
63730 - /usr/include/glib-2.0/glib/gdataset.h \
63731 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
63732 - /usr/include/glib-2.0/glib/gfileutils.h \
63733 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
63734 - /usr/include/glib-2.0/glib/giochannel.h \
63735 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
63736 - /usr/include/glib-2.0/glib/gslist.h \
63737 - /usr/include/glib-2.0/glib/gstring.h \
63738 - /usr/include/glib-2.0/glib/gunicode.h \
63739 - /usr/include/glib-2.0/glib/gkeyfile.h \
63740 - /usr/include/glib-2.0/glib/gmappedfile.h \
63741 - /usr/include/glib-2.0/glib/gmarkup.h \
63742 - /usr/include/glib-2.0/glib/gmessages.h \
63743 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
63744 - /usr/include/glib-2.0/glib/gpattern.h \
63745 - /usr/include/glib-2.0/glib/gprimes.h \
63746 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
63747 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
63748 - /usr/include/glib-2.0/glib/gregex.h \
63749 - /usr/include/glib-2.0/glib/gscanner.h \
63750 - /usr/include/glib-2.0/glib/gsequence.h \
63751 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
63752 - /usr/include/glib-2.0/glib/gstrfuncs.h \
63753 - /usr/include/glib-2.0/glib/gtestutils.h \
63754 - /usr/include/glib-2.0/glib/gthreadpool.h \
63755 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
63756 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
63757 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
63758 - /usr/include/bits/locale.h ../libpcsxcore/psxmem.h \
63759 - ../libpcsxcore/psxcounters.h ../libpcsxcore/plugins.h \
63760 - ../libpcsxcore/spu.h ../libpcsxcore/psemu_plugin_defs.h \
63761 - ../libpcsxcore/decode_xa.h ../libpcsxcore/psxbios.h \
63762 - ../libpcsxcore/misc.h ../libpcsxcore/coff.h ../libpcsxcore/sio.h
63763 -
63764 -../libpcsxcore/r3000a.h:
63765 -
63766 -../libpcsxcore/psxcommon.h:
63767 -
63768 -../include/config.h:
63769 -
63770 -/usr/include/stdio.h:
63771 -
63772 -/usr/include/features.h:
63773 -
63774 -/usr/include/sys/cdefs.h:
63775 -
63776 -/usr/include/bits/wordsize.h:
63777 -
63778 -/usr/include/gnu/stubs.h:
63779 -
63780 -/usr/include/gnu/stubs-32.h:
63781 -
63782 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
63783 -
63784 -/usr/include/bits/types.h:
63785 -
63786 -/usr/include/bits/typesizes.h:
63787 -
63788 -/usr/include/libio.h:
63789 -
63790 -/usr/include/_G_config.h:
63791 -
63792 -/usr/include/wchar.h:
63793 -
63794 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
63795 -
63796 -/usr/include/bits/stdio_lim.h:
63797 -
63798 -/usr/include/bits/sys_errlist.h:
63799 -
63800 -/usr/include/bits/stdio.h:
63801 -
63802 -/usr/include/string.h:
63803 -
63804 -/usr/include/bits/string.h:
63805 -
63806 -/usr/include/bits/string2.h:
63807 -
63808 -/usr/include/endian.h:
63809 -
63810 -/usr/include/bits/endian.h:
63811 -
63812 -/usr/include/bits/byteswap.h:
63813 -
63814 -/usr/include/stdlib.h:
63815 -
63816 -/usr/include/stdint.h:
63817 -
63818 -/usr/include/bits/wchar.h:
63819 -
63820 -/usr/include/sys/types.h:
63821 -
63822 -/usr/include/time.h:
63823 -
63824 -/usr/include/sys/select.h:
63825 -
63826 -/usr/include/bits/select.h:
63827 -
63828 -/usr/include/bits/sigset.h:
63829 -
63830 -/usr/include/bits/time.h:
63831 -
63832 -/usr/include/sys/sysmacros.h:
63833 -
63834 -/usr/include/bits/pthreadtypes.h:
63835 -
63836 -/usr/include/alloca.h:
63837 -
63838 -/usr/include/math.h:
63839 -
63840 -/usr/include/bits/huge_val.h:
63841 -
63842 -/usr/include/bits/mathdef.h:
63843 -
63844 -/usr/include/bits/mathcalls.h:
63845 -
63846 -/usr/include/bits/mathinline.h:
63847 -
63848 -/usr/include/ctype.h:
63849 -
63850 -/usr/include/zlib.h:
63851 -
63852 -/usr/include/zconf.h:
63853 -
63854 -/usr/include/zlibdefs.h:
63855 -
63856 -/usr/include/unistd.h:
63857 -
63858 -/usr/include/bits/posix_opt.h:
63859 -
63860 -/usr/include/bits/confname.h:
63861 -
63862 -/usr/include/getopt.h:
63863 -
63864 -/usr/include/glib-2.0/glib.h:
63865 -
63866 -/usr/include/glib-2.0/glib/galloca.h:
63867 -
63868 -/usr/include/glib-2.0/glib/gtypes.h:
63869 -
63870 -/usr/lib/glib-2.0/include/glibconfig.h:
63871 -
63872 -/usr/include/glib-2.0/glib/gmacros.h:
63873 -
63874 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
63875 -
63876 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
63877 -
63878 -/usr/include/limits.h:
63879 -
63880 -/usr/include/bits/posix1_lim.h:
63881 -
63882 -/usr/include/bits/local_lim.h:
63883 -
63884 -/usr/include/linux/limits.h:
63885 -
63886 -/usr/include/bits/posix2_lim.h:
63887 -
63888 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
63889 -
63890 -/usr/include/glib-2.0/glib/garray.h:
63891 -
63892 -/usr/include/glib-2.0/glib/gasyncqueue.h:
63893 -
63894 -/usr/include/glib-2.0/glib/gthread.h:
63895 -
63896 -/usr/include/glib-2.0/glib/gerror.h:
63897 -
63898 -/usr/include/glib-2.0/glib/gquark.h:
63899 -
63900 -/usr/include/glib-2.0/glib/gutils.h:
63901 -
63902 -/usr/include/glib-2.0/glib/gatomic.h:
63903 -
63904 -/usr/include/glib-2.0/glib/gbacktrace.h:
63905 -
63906 -/usr/include/signal.h:
63907 -
63908 -/usr/include/bits/signum.h:
63909 -
63910 -/usr/include/bits/siginfo.h:
63911 -
63912 -/usr/include/bits/sigaction.h:
63913 -
63914 -/usr/include/bits/sigcontext.h:
63915 -
63916 -/usr/include/bits/sigstack.h:
63917 -
63918 -/usr/include/bits/sigthread.h:
63919 -
63920 -/usr/include/glib-2.0/glib/gbase64.h:
63921 -
63922 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
63923 -
63924 -/usr/include/glib-2.0/glib/gcache.h:
63925 -
63926 -/usr/include/glib-2.0/glib/glist.h:
63927 -
63928 -/usr/include/glib-2.0/glib/gmem.h:
63929 -
63930 -/usr/include/glib-2.0/glib/gslice.h:
63931 -
63932 -/usr/include/glib-2.0/glib/gchecksum.h:
63933 -
63934 -/usr/include/glib-2.0/glib/gcompletion.h:
63935 -
63936 -/usr/include/glib-2.0/glib/gconvert.h:
63937 -
63938 -/usr/include/glib-2.0/glib/gdataset.h:
63939 -
63940 -/usr/include/glib-2.0/glib/gdate.h:
63941 -
63942 -/usr/include/glib-2.0/glib/gdir.h:
63943 -
63944 -/usr/include/glib-2.0/glib/gfileutils.h:
63945 -
63946 -/usr/include/glib-2.0/glib/ghash.h:
63947 -
63948 -/usr/include/glib-2.0/glib/ghook.h:
63949 -
63950 -/usr/include/glib-2.0/glib/giochannel.h:
63951 -
63952 -/usr/include/glib-2.0/glib/gmain.h:
63953 -
63954 -/usr/include/glib-2.0/glib/gpoll.h:
63955 -
63956 -/usr/include/glib-2.0/glib/gslist.h:
63957 -
63958 -/usr/include/glib-2.0/glib/gstring.h:
63959 -
63960 -/usr/include/glib-2.0/glib/gunicode.h:
63961 -
63962 -/usr/include/glib-2.0/glib/gkeyfile.h:
63963 -
63964 -/usr/include/glib-2.0/glib/gmappedfile.h:
63965 -
63966 -/usr/include/glib-2.0/glib/gmarkup.h:
63967 -
63968 -/usr/include/glib-2.0/glib/gmessages.h:
63969 -
63970 -/usr/include/glib-2.0/glib/gnode.h:
63971 -
63972 -/usr/include/glib-2.0/glib/goption.h:
63973 -
63974 -/usr/include/glib-2.0/glib/gpattern.h:
63975 -
63976 -/usr/include/glib-2.0/glib/gprimes.h:
63977 -
63978 -/usr/include/glib-2.0/glib/gqsort.h:
63979 -
63980 -/usr/include/glib-2.0/glib/gqueue.h:
63981 -
63982 -/usr/include/glib-2.0/glib/grand.h:
63983 -
63984 -/usr/include/glib-2.0/glib/grel.h:
63985 -
63986 -/usr/include/glib-2.0/glib/gregex.h:
63987 -
63988 -/usr/include/glib-2.0/glib/gscanner.h:
63989 -
63990 -/usr/include/glib-2.0/glib/gsequence.h:
63991 -
63992 -/usr/include/glib-2.0/glib/gshell.h:
63993 -
63994 -/usr/include/glib-2.0/glib/gspawn.h:
63995 -
63996 -/usr/include/glib-2.0/glib/gstrfuncs.h:
63997 -
63998 -/usr/include/glib-2.0/glib/gtestutils.h:
63999 -
64000 -/usr/include/glib-2.0/glib/gthreadpool.h:
64001 -
64002 -/usr/include/glib-2.0/glib/gtimer.h:
64003 -
64004 -/usr/include/glib-2.0/glib/gtree.h:
64005 -
64006 -/usr/include/glib-2.0/glib/gurifuncs.h:
64007 -
64008 -../libpcsxcore/system.h:
64009 -
64010 -../libpcsxcore/debug.h:
64011 -
64012 -/usr/include/libintl.h:
64013 -
64014 -/usr/include/locale.h:
64015 -
64016 -/usr/include/bits/locale.h:
64017 -
64018 -../libpcsxcore/psxmem.h:
64019 -
64020 -../libpcsxcore/psxcounters.h:
64021 -
64022 -../libpcsxcore/plugins.h:
64023 -
64024 -../libpcsxcore/spu.h:
64025 -
64026 -../libpcsxcore/psemu_plugin_defs.h:
64027 -
64028 -../libpcsxcore/decode_xa.h:
64029 -
64030 -../libpcsxcore/psxbios.h:
64031 -
64032 -../libpcsxcore/misc.h:
64033 -
64034 -../libpcsxcore/coff.h:
64035 -
64036 -../libpcsxcore/sio.h:
64037 diff -rupN original/libpcsxcore/libpcsxcore/.deps/reguse.Plo new/libpcsxcore/libpcsxcore/.deps/reguse.Plo
64038 --- original/libpcsxcore/libpcsxcore/.deps/reguse.Plo 2009-03-28 22:34:37.000000000 -0430
64039 +++ new/libpcsxcore/libpcsxcore/.deps/reguse.Plo 1969-12-31 20:00:00.000000000 -0400
64040 @@ -1 +0,0 @@
64041 -# dummy
64042 diff -rupN original/libpcsxcore/libpcsxcore/.deps/sio.Plo new/libpcsxcore/libpcsxcore/.deps/sio.Plo
64043 --- original/libpcsxcore/libpcsxcore/.deps/sio.Plo 2009-03-28 22:34:48.000000000 -0430
64044 +++ new/libpcsxcore/libpcsxcore/.deps/sio.Plo 1969-12-31 20:00:00.000000000 -0400
64045 @@ -1,364 +0,0 @@
64046 -sio.lo: ../libpcsxcore/sio.c ../libpcsxcore/sio.h \
64047 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
64048 - /usr/include/features.h /usr/include/sys/cdefs.h \
64049 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
64050 - /usr/include/gnu/stubs-32.h \
64051 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
64052 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
64053 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
64054 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
64055 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
64056 - /usr/include/bits/stdio.h /usr/include/string.h \
64057 - /usr/include/bits/string.h /usr/include/bits/string2.h \
64058 - /usr/include/endian.h /usr/include/bits/endian.h \
64059 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
64060 - /usr/include/stdint.h /usr/include/bits/wchar.h \
64061 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
64062 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
64063 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
64064 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
64065 - /usr/include/math.h /usr/include/bits/huge_val.h \
64066 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
64067 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
64068 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
64069 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
64070 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
64071 - /usr/include/glib-2.0/glib/galloca.h \
64072 - /usr/include/glib-2.0/glib/gtypes.h \
64073 - /usr/lib/glib-2.0/include/glibconfig.h \
64074 - /usr/include/glib-2.0/glib/gmacros.h \
64075 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
64076 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
64077 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
64078 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
64079 - /usr/include/bits/posix2_lim.h \
64080 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
64081 - /usr/include/glib-2.0/glib/garray.h \
64082 - /usr/include/glib-2.0/glib/gasyncqueue.h \
64083 - /usr/include/glib-2.0/glib/gthread.h \
64084 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
64085 - /usr/include/glib-2.0/glib/gutils.h \
64086 - /usr/include/glib-2.0/glib/gatomic.h \
64087 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
64088 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
64089 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
64090 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
64091 - /usr/include/glib-2.0/glib/gbase64.h \
64092 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
64093 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
64094 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
64095 - /usr/include/glib-2.0/glib/gchecksum.h \
64096 - /usr/include/glib-2.0/glib/gcompletion.h \
64097 - /usr/include/glib-2.0/glib/gconvert.h \
64098 - /usr/include/glib-2.0/glib/gdataset.h \
64099 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
64100 - /usr/include/glib-2.0/glib/gfileutils.h \
64101 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
64102 - /usr/include/glib-2.0/glib/giochannel.h \
64103 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
64104 - /usr/include/glib-2.0/glib/gslist.h \
64105 - /usr/include/glib-2.0/glib/gstring.h \
64106 - /usr/include/glib-2.0/glib/gunicode.h \
64107 - /usr/include/glib-2.0/glib/gkeyfile.h \
64108 - /usr/include/glib-2.0/glib/gmappedfile.h \
64109 - /usr/include/glib-2.0/glib/gmarkup.h \
64110 - /usr/include/glib-2.0/glib/gmessages.h \
64111 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
64112 - /usr/include/glib-2.0/glib/gpattern.h \
64113 - /usr/include/glib-2.0/glib/gprimes.h \
64114 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
64115 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
64116 - /usr/include/glib-2.0/glib/gregex.h \
64117 - /usr/include/glib-2.0/glib/gscanner.h \
64118 - /usr/include/glib-2.0/glib/gsequence.h \
64119 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
64120 - /usr/include/glib-2.0/glib/gstrfuncs.h \
64121 - /usr/include/glib-2.0/glib/gtestutils.h \
64122 - /usr/include/glib-2.0/glib/gthreadpool.h \
64123 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
64124 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
64125 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
64126 - /usr/include/bits/locale.h ../libpcsxcore/r3000a.h \
64127 - ../libpcsxcore/psxmem.h ../libpcsxcore/psxcounters.h \
64128 - ../libpcsxcore/plugins.h ../libpcsxcore/spu.h \
64129 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
64130 - ../libpcsxcore/psxbios.h ../libpcsxcore/misc.h ../libpcsxcore/coff.h \
64131 - /usr/include/sys/stat.h /usr/include/bits/stat.h
64132 -
64133 -../libpcsxcore/sio.h:
64134 -
64135 -../libpcsxcore/psxcommon.h:
64136 -
64137 -../include/config.h:
64138 -
64139 -/usr/include/stdio.h:
64140 -
64141 -/usr/include/features.h:
64142 -
64143 -/usr/include/sys/cdefs.h:
64144 -
64145 -/usr/include/bits/wordsize.h:
64146 -
64147 -/usr/include/gnu/stubs.h:
64148 -
64149 -/usr/include/gnu/stubs-32.h:
64150 -
64151 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
64152 -
64153 -/usr/include/bits/types.h:
64154 -
64155 -/usr/include/bits/typesizes.h:
64156 -
64157 -/usr/include/libio.h:
64158 -
64159 -/usr/include/_G_config.h:
64160 -
64161 -/usr/include/wchar.h:
64162 -
64163 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
64164 -
64165 -/usr/include/bits/stdio_lim.h:
64166 -
64167 -/usr/include/bits/sys_errlist.h:
64168 -
64169 -/usr/include/bits/stdio.h:
64170 -
64171 -/usr/include/string.h:
64172 -
64173 -/usr/include/bits/string.h:
64174 -
64175 -/usr/include/bits/string2.h:
64176 -
64177 -/usr/include/endian.h:
64178 -
64179 -/usr/include/bits/endian.h:
64180 -
64181 -/usr/include/bits/byteswap.h:
64182 -
64183 -/usr/include/stdlib.h:
64184 -
64185 -/usr/include/stdint.h:
64186 -
64187 -/usr/include/bits/wchar.h:
64188 -
64189 -/usr/include/sys/types.h:
64190 -
64191 -/usr/include/time.h:
64192 -
64193 -/usr/include/sys/select.h:
64194 -
64195 -/usr/include/bits/select.h:
64196 -
64197 -/usr/include/bits/sigset.h:
64198 -
64199 -/usr/include/bits/time.h:
64200 -
64201 -/usr/include/sys/sysmacros.h:
64202 -
64203 -/usr/include/bits/pthreadtypes.h:
64204 -
64205 -/usr/include/alloca.h:
64206 -
64207 -/usr/include/math.h:
64208 -
64209 -/usr/include/bits/huge_val.h:
64210 -
64211 -/usr/include/bits/mathdef.h:
64212 -
64213 -/usr/include/bits/mathcalls.h:
64214 -
64215 -/usr/include/bits/mathinline.h:
64216 -
64217 -/usr/include/ctype.h:
64218 -
64219 -/usr/include/zlib.h:
64220 -
64221 -/usr/include/zconf.h:
64222 -
64223 -/usr/include/zlibdefs.h:
64224 -
64225 -/usr/include/unistd.h:
64226 -
64227 -/usr/include/bits/posix_opt.h:
64228 -
64229 -/usr/include/bits/confname.h:
64230 -
64231 -/usr/include/getopt.h:
64232 -
64233 -/usr/include/glib-2.0/glib.h:
64234 -
64235 -/usr/include/glib-2.0/glib/galloca.h:
64236 -
64237 -/usr/include/glib-2.0/glib/gtypes.h:
64238 -
64239 -/usr/lib/glib-2.0/include/glibconfig.h:
64240 -
64241 -/usr/include/glib-2.0/glib/gmacros.h:
64242 -
64243 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
64244 -
64245 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
64246 -
64247 -/usr/include/limits.h:
64248 -
64249 -/usr/include/bits/posix1_lim.h:
64250 -
64251 -/usr/include/bits/local_lim.h:
64252 -
64253 -/usr/include/linux/limits.h:
64254 -
64255 -/usr/include/bits/posix2_lim.h:
64256 -
64257 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
64258 -
64259 -/usr/include/glib-2.0/glib/garray.h:
64260 -
64261 -/usr/include/glib-2.0/glib/gasyncqueue.h:
64262 -
64263 -/usr/include/glib-2.0/glib/gthread.h:
64264 -
64265 -/usr/include/glib-2.0/glib/gerror.h:
64266 -
64267 -/usr/include/glib-2.0/glib/gquark.h:
64268 -
64269 -/usr/include/glib-2.0/glib/gutils.h:
64270 -
64271 -/usr/include/glib-2.0/glib/gatomic.h:
64272 -
64273 -/usr/include/glib-2.0/glib/gbacktrace.h:
64274 -
64275 -/usr/include/signal.h:
64276 -
64277 -/usr/include/bits/signum.h:
64278 -
64279 -/usr/include/bits/siginfo.h:
64280 -
64281 -/usr/include/bits/sigaction.h:
64282 -
64283 -/usr/include/bits/sigcontext.h:
64284 -
64285 -/usr/include/bits/sigstack.h:
64286 -
64287 -/usr/include/bits/sigthread.h:
64288 -
64289 -/usr/include/glib-2.0/glib/gbase64.h:
64290 -
64291 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
64292 -
64293 -/usr/include/glib-2.0/glib/gcache.h:
64294 -
64295 -/usr/include/glib-2.0/glib/glist.h:
64296 -
64297 -/usr/include/glib-2.0/glib/gmem.h:
64298 -
64299 -/usr/include/glib-2.0/glib/gslice.h:
64300 -
64301 -/usr/include/glib-2.0/glib/gchecksum.h:
64302 -
64303 -/usr/include/glib-2.0/glib/gcompletion.h:
64304 -
64305 -/usr/include/glib-2.0/glib/gconvert.h:
64306 -
64307 -/usr/include/glib-2.0/glib/gdataset.h:
64308 -
64309 -/usr/include/glib-2.0/glib/gdate.h:
64310 -
64311 -/usr/include/glib-2.0/glib/gdir.h:
64312 -
64313 -/usr/include/glib-2.0/glib/gfileutils.h:
64314 -
64315 -/usr/include/glib-2.0/glib/ghash.h:
64316 -
64317 -/usr/include/glib-2.0/glib/ghook.h:
64318 -
64319 -/usr/include/glib-2.0/glib/giochannel.h:
64320 -
64321 -/usr/include/glib-2.0/glib/gmain.h:
64322 -
64323 -/usr/include/glib-2.0/glib/gpoll.h:
64324 -
64325 -/usr/include/glib-2.0/glib/gslist.h:
64326 -
64327 -/usr/include/glib-2.0/glib/gstring.h:
64328 -
64329 -/usr/include/glib-2.0/glib/gunicode.h:
64330 -
64331 -/usr/include/glib-2.0/glib/gkeyfile.h:
64332 -
64333 -/usr/include/glib-2.0/glib/gmappedfile.h:
64334 -
64335 -/usr/include/glib-2.0/glib/gmarkup.h:
64336 -
64337 -/usr/include/glib-2.0/glib/gmessages.h:
64338 -
64339 -/usr/include/glib-2.0/glib/gnode.h:
64340 -
64341 -/usr/include/glib-2.0/glib/goption.h:
64342 -
64343 -/usr/include/glib-2.0/glib/gpattern.h:
64344 -
64345 -/usr/include/glib-2.0/glib/gprimes.h:
64346 -
64347 -/usr/include/glib-2.0/glib/gqsort.h:
64348 -
64349 -/usr/include/glib-2.0/glib/gqueue.h:
64350 -
64351 -/usr/include/glib-2.0/glib/grand.h:
64352 -
64353 -/usr/include/glib-2.0/glib/grel.h:
64354 -
64355 -/usr/include/glib-2.0/glib/gregex.h:
64356 -
64357 -/usr/include/glib-2.0/glib/gscanner.h:
64358 -
64359 -/usr/include/glib-2.0/glib/gsequence.h:
64360 -
64361 -/usr/include/glib-2.0/glib/gshell.h:
64362 -
64363 -/usr/include/glib-2.0/glib/gspawn.h:
64364 -
64365 -/usr/include/glib-2.0/glib/gstrfuncs.h:
64366 -
64367 -/usr/include/glib-2.0/glib/gtestutils.h:
64368 -
64369 -/usr/include/glib-2.0/glib/gthreadpool.h:
64370 -
64371 -/usr/include/glib-2.0/glib/gtimer.h:
64372 -
64373 -/usr/include/glib-2.0/glib/gtree.h:
64374 -
64375 -/usr/include/glib-2.0/glib/gurifuncs.h:
64376 -
64377 -../libpcsxcore/system.h:
64378 -
64379 -../libpcsxcore/debug.h:
64380 -
64381 -/usr/include/libintl.h:
64382 -
64383 -/usr/include/locale.h:
64384 -
64385 -/usr/include/bits/locale.h:
64386 -
64387 -../libpcsxcore/r3000a.h:
64388 -
64389 -../libpcsxcore/psxmem.h:
64390 -
64391 -../libpcsxcore/psxcounters.h:
64392 -
64393 -../libpcsxcore/plugins.h:
64394 -
64395 -../libpcsxcore/spu.h:
64396 -
64397 -../libpcsxcore/psemu_plugin_defs.h:
64398 -
64399 -../libpcsxcore/decode_xa.h:
64400 -
64401 -../libpcsxcore/psxbios.h:
64402 -
64403 -../libpcsxcore/misc.h:
64404 -
64405 -../libpcsxcore/coff.h:
64406 -
64407 -/usr/include/sys/stat.h:
64408 -
64409 -/usr/include/bits/stat.h:
64410 diff -rupN original/libpcsxcore/libpcsxcore/.deps/spu.Plo new/libpcsxcore/libpcsxcore/.deps/spu.Plo
64411 --- original/libpcsxcore/libpcsxcore/.deps/spu.Plo 2009-03-28 22:34:47.000000000 -0430
64412 +++ new/libpcsxcore/libpcsxcore/.deps/spu.Plo 1969-12-31 20:00:00.000000000 -0400
64413 @@ -1,359 +0,0 @@
64414 -spu.lo: ../libpcsxcore/spu.c ../libpcsxcore/spu.h \
64415 - ../libpcsxcore/psxcommon.h ../include/config.h /usr/include/stdio.h \
64416 - /usr/include/features.h /usr/include/sys/cdefs.h \
64417 - /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
64418 - /usr/include/gnu/stubs-32.h \
64419 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \
64420 - /usr/include/bits/types.h /usr/include/bits/typesizes.h \
64421 - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
64422 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \
64423 - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
64424 - /usr/include/bits/stdio.h /usr/include/string.h \
64425 - /usr/include/bits/string.h /usr/include/bits/string2.h \
64426 - /usr/include/endian.h /usr/include/bits/endian.h \
64427 - /usr/include/bits/byteswap.h /usr/include/stdlib.h \
64428 - /usr/include/stdint.h /usr/include/bits/wchar.h \
64429 - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
64430 - /usr/include/bits/select.h /usr/include/bits/sigset.h \
64431 - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
64432 - /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
64433 - /usr/include/math.h /usr/include/bits/huge_val.h \
64434 - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
64435 - /usr/include/bits/mathinline.h /usr/include/ctype.h /usr/include/zlib.h \
64436 - /usr/include/zconf.h /usr/include/zlibdefs.h /usr/include/unistd.h \
64437 - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
64438 - /usr/include/getopt.h /usr/include/glib-2.0/glib.h \
64439 - /usr/include/glib-2.0/glib/galloca.h \
64440 - /usr/include/glib-2.0/glib/gtypes.h \
64441 - /usr/lib/glib-2.0/include/glibconfig.h \
64442 - /usr/include/glib-2.0/glib/gmacros.h \
64443 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h \
64444 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h \
64445 - /usr/include/limits.h /usr/include/bits/posix1_lim.h \
64446 - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
64447 - /usr/include/bits/posix2_lim.h \
64448 - /usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h \
64449 - /usr/include/glib-2.0/glib/garray.h \
64450 - /usr/include/glib-2.0/glib/gasyncqueue.h \
64451 - /usr/include/glib-2.0/glib/gthread.h \
64452 - /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
64453 - /usr/include/glib-2.0/glib/gutils.h \
64454 - /usr/include/glib-2.0/glib/gatomic.h \
64455 - /usr/include/glib-2.0/glib/gbacktrace.h /usr/include/signal.h \
64456 - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
64457 - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
64458 - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
64459 - /usr/include/glib-2.0/glib/gbase64.h \
64460 - /usr/include/glib-2.0/glib/gbookmarkfile.h \
64461 - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
64462 - /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
64463 - /usr/include/glib-2.0/glib/gchecksum.h \
64464 - /usr/include/glib-2.0/glib/gcompletion.h \
64465 - /usr/include/glib-2.0/glib/gconvert.h \
64466 - /usr/include/glib-2.0/glib/gdataset.h \
64467 - /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
64468 - /usr/include/glib-2.0/glib/gfileutils.h \
64469 - /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
64470 - /usr/include/glib-2.0/glib/giochannel.h \
64471 - /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gpoll.h \
64472 - /usr/include/glib-2.0/glib/gslist.h \
64473 - /usr/include/glib-2.0/glib/gstring.h \
64474 - /usr/include/glib-2.0/glib/gunicode.h \
64475 - /usr/include/glib-2.0/glib/gkeyfile.h \
64476 - /usr/include/glib-2.0/glib/gmappedfile.h \
64477 - /usr/include/glib-2.0/glib/gmarkup.h \
64478 - /usr/include/glib-2.0/glib/gmessages.h \
64479 - /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
64480 - /usr/include/glib-2.0/glib/gpattern.h \
64481 - /usr/include/glib-2.0/glib/gprimes.h \
64482 - /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
64483 - /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
64484 - /usr/include/glib-2.0/glib/gregex.h \
64485 - /usr/include/glib-2.0/glib/gscanner.h \
64486 - /usr/include/glib-2.0/glib/gsequence.h \
64487 - /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
64488 - /usr/include/glib-2.0/glib/gstrfuncs.h \
64489 - /usr/include/glib-2.0/glib/gtestutils.h \
64490 - /usr/include/glib-2.0/glib/gthreadpool.h \
64491 - /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
64492 - /usr/include/glib-2.0/glib/gurifuncs.h ../libpcsxcore/system.h \
64493 - ../libpcsxcore/debug.h /usr/include/libintl.h /usr/include/locale.h \
64494 - /usr/include/bits/locale.h ../libpcsxcore/plugins.h \
64495 - ../libpcsxcore/psemu_plugin_defs.h ../libpcsxcore/decode_xa.h \
64496 - ../libpcsxcore/r3000a.h ../libpcsxcore/psxmem.h \
64497 - ../libpcsxcore/psxcounters.h ../libpcsxcore/psxbios.h \
64498 - ../libpcsxcore/misc.h ../libpcsxcore/coff.h ../libpcsxcore/sio.h
64499 -
64500 -../libpcsxcore/spu.h:
64501 -
64502 -../libpcsxcore/psxcommon.h:
64503 -
64504 -../include/config.h:
64505 -
64506 -/usr/include/stdio.h:
64507 -
64508 -/usr/include/features.h:
64509 -
64510 -/usr/include/sys/cdefs.h:
64511 -
64512 -/usr/include/bits/wordsize.h:
64513 -
64514 -/usr/include/gnu/stubs.h:
64515 -
64516 -/usr/include/gnu/stubs-32.h:
64517 -
64518 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h:
64519 -
64520 -/usr/include/bits/types.h:
64521 -
64522 -/usr/include/bits/typesizes.h:
64523 -
64524 -/usr/include/libio.h:
64525 -
64526 -/usr/include/_G_config.h:
64527 -
64528 -/usr/include/wchar.h:
64529 -
64530 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h:
64531 -
64532 -/usr/include/bits/stdio_lim.h:
64533 -
64534 -/usr/include/bits/sys_errlist.h:
64535 -
64536 -/usr/include/bits/stdio.h:
64537 -
64538 -/usr/include/string.h:
64539 -
64540 -/usr/include/bits/string.h:
64541 -
64542 -/usr/include/bits/string2.h:
64543 -
64544 -/usr/include/endian.h:
64545 -
64546 -/usr/include/bits/endian.h:
64547 -
64548 -/usr/include/bits/byteswap.h:
64549 -
64550 -/usr/include/stdlib.h:
64551 -
64552 -/usr/include/stdint.h:
64553 -
64554 -/usr/include/bits/wchar.h:
64555 -
64556 -/usr/include/sys/types.h:
64557 -
64558 -/usr/include/time.h:
64559 -
64560 -/usr/include/sys/select.h:
64561 -
64562 -/usr/include/bits/select.h:
64563 -
64564 -/usr/include/bits/sigset.h:
64565 -
64566 -/usr/include/bits/time.h:
64567 -
64568 -/usr/include/sys/sysmacros.h:
64569 -
64570 -/usr/include/bits/pthreadtypes.h:
64571 -
64572 -/usr/include/alloca.h:
64573 -
64574 -/usr/include/math.h:
64575 -
64576 -/usr/include/bits/huge_val.h:
64577 -
64578 -/usr/include/bits/mathdef.h:
64579 -
64580 -/usr/include/bits/mathcalls.h:
64581 -
64582 -/usr/include/bits/mathinline.h:
64583 -
64584 -/usr/include/ctype.h:
64585 -
64586 -/usr/include/zlib.h:
64587 -
64588 -/usr/include/zconf.h:
64589 -
64590 -/usr/include/zlibdefs.h:
64591 -
64592 -/usr/include/unistd.h:
64593 -
64594 -/usr/include/bits/posix_opt.h:
64595 -
64596 -/usr/include/bits/confname.h:
64597 -
64598 -/usr/include/getopt.h:
64599 -
64600 -/usr/include/glib-2.0/glib.h:
64601 -
64602 -/usr/include/glib-2.0/glib/galloca.h:
64603 -
64604 -/usr/include/glib-2.0/glib/gtypes.h:
64605 -
64606 -/usr/lib/glib-2.0/include/glibconfig.h:
64607 -
64608 -/usr/include/glib-2.0/glib/gmacros.h:
64609 -
64610 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/limits.h:
64611 -
64612 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include-fixed/syslimits.h:
64613 -
64614 -/usr/include/limits.h:
64615 -
64616 -/usr/include/bits/posix1_lim.h:
64617 -
64618 -/usr/include/bits/local_lim.h:
64619 -
64620 -/usr/include/linux/limits.h:
64621 -
64622 -/usr/include/bits/posix2_lim.h:
64623 -
64624 -/usr/lib/gcc/i486-linux-gnu/4.3.3/include/float.h:
64625 -
64626 -/usr/include/glib-2.0/glib/garray.h:
64627 -
64628 -/usr/include/glib-2.0/glib/gasyncqueue.h:
64629 -
64630 -/usr/include/glib-2.0/glib/gthread.h:
64631 -
64632 -/usr/include/glib-2.0/glib/gerror.h:
64633 -
64634 -/usr/include/glib-2.0/glib/gquark.h:
64635 -
64636 -/usr/include/glib-2.0/glib/gutils.h:
64637 -
64638 -/usr/include/glib-2.0/glib/gatomic.h:
64639 -
64640 -/usr/include/glib-2.0/glib/gbacktrace.h:
64641 -
64642 -/usr/include/signal.h:
64643 -
64644 -/usr/include/bits/signum.h:
64645 -
64646 -/usr/include/bits/siginfo.h:
64647 -
64648 -/usr/include/bits/sigaction.h:
64649 -
64650 -/usr/include/bits/sigcontext.h:
64651 -
64652 -/usr/include/bits/sigstack.h:
64653 -
64654 -/usr/include/bits/sigthread.h:
64655 -
64656 -/usr/include/glib-2.0/glib/gbase64.h:
64657 -
64658 -/usr/include/glib-2.0/glib/gbookmarkfile.h:
64659 -
64660 -/usr/include/glib-2.0/glib/gcache.h:
64661 -
64662 -/usr/include/glib-2.0/glib/glist.h:
64663 -
64664 -/usr/include/glib-2.0/glib/gmem.h:
64665 -
64666 -/usr/include/glib-2.0/glib/gslice.h:
64667 -
64668 -/usr/include/glib-2.0/glib/gchecksum.h:
64669 -
64670 -/usr/include/glib-2.0/glib/gcompletion.h:
64671 -
64672 -/usr/include/glib-2.0/glib/gconvert.h:
64673 -
64674 -/usr/include/glib-2.0/glib/gdataset.h:
64675 -
64676 -/usr/include/glib-2.0/glib/gdate.h:
64677 -
64678 -/usr/include/glib-2.0/glib/gdir.h:
64679 -
64680 -/usr/include/glib-2.0/glib/gfileutils.h:
64681 -
64682 -/usr/include/glib-2.0/glib/ghash.h:
64683 -
64684 -/usr/include/glib-2.0/glib/ghook.h:
64685 -
64686 -/usr/include/glib-2.0/glib/giochannel.h:
64687 -
64688 -/usr/include/glib-2.0/glib/gmain.h:
64689 -
64690 -/usr/include/glib-2.0/glib/gpoll.h:
64691 -
64692 -/usr/include/glib-2.0/glib/gslist.h:
64693 -
64694 -/usr/include/glib-2.0/glib/gstring.h:
64695 -
64696 -/usr/include/glib-2.0/glib/gunicode.h:
64697 -
64698 -/usr/include/glib-2.0/glib/gkeyfile.h:
64699 -
64700 -/usr/include/glib-2.0/glib/gmappedfile.h:
64701 -
64702 -/usr/include/glib-2.0/glib/gmarkup.h:
64703 -
64704 -/usr/include/glib-2.0/glib/gmessages.h:
64705 -
64706 -/usr/include/glib-2.0/glib/gnode.h:
64707 -
64708 -/usr/include/glib-2.0/glib/goption.h:
64709 -
64710 -/usr/include/glib-2.0/glib/gpattern.h:
64711 -
64712 -/usr/include/glib-2.0/glib/gprimes.h:
64713 -
64714 -/usr/include/glib-2.0/glib/gqsort.h:
64715 -
64716 -/usr/include/glib-2.0/glib/gqueue.h:
64717 -
64718 -/usr/include/glib-2.0/glib/grand.h:
64719 -
64720 -/usr/include/glib-2.0/glib/grel.h:
64721 -
64722 -/usr/include/glib-2.0/glib/gregex.h:
64723 -
64724 -/usr/include/glib-2.0/glib/gscanner.h:
64725 -
64726 -/usr/include/glib-2.0/glib/gsequence.h:
64727 -
64728 -/usr/include/glib-2.0/glib/gshell.h:
64729 -
64730 -/usr/include/glib-2.0/glib/gspawn.h:
64731 -
64732 -/usr/include/glib-2.0/glib/gstrfuncs.h:
64733 -
64734 -/usr/include/glib-2.0/glib/gtestutils.h:
64735 -
64736 -/usr/include/glib-2.0/glib/gthreadpool.h:
64737 -
64738 -/usr/include/glib-2.0/glib/gtimer.h:
64739 -
64740 -/usr/include/glib-2.0/glib/gtree.h:
64741 -
64742 -/usr/include/glib-2.0/glib/gurifuncs.h:
64743 -
64744 -../libpcsxcore/system.h:
64745 -
64746 -../libpcsxcore/debug.h:
64747 -
64748 -/usr/include/libintl.h:
64749 -
64750 -/usr/include/locale.h:
64751 -
64752 -/usr/include/bits/locale.h:
64753 -
64754 -../libpcsxcore/plugins.h:
64755 -
64756 -../libpcsxcore/psemu_plugin_defs.h:
64757 -
64758 -../libpcsxcore/decode_xa.h:
64759 -
64760 -../libpcsxcore/r3000a.h:
64761 -
64762 -../libpcsxcore/psxmem.h:
64763 -
64764 -../libpcsxcore/psxcounters.h:
64765 -
64766 -../libpcsxcore/psxbios.h:
64767 -
64768 -../libpcsxcore/misc.h:
64769 -
64770 -../libpcsxcore/coff.h:
64771 -
64772 -../libpcsxcore/sio.h:
64773 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/cdrom.o y new/libpcsxcore/libpcsxcore/.libs/cdrom.o son distintos
64774 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/decode_xa.o y new/libpcsxcore/libpcsxcore/.libs/decode_xa.o son distintos
64775 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/disr3000a.o y new/libpcsxcore/libpcsxcore/.libs/disr3000a.o son distintos
64776 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/gte.o y new/libpcsxcore/libpcsxcore/.libs/gte.o son distintos
64777 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/iR3000A.o y new/libpcsxcore/libpcsxcore/.libs/iR3000A.o son distintos
64778 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/ix86.o y new/libpcsxcore/libpcsxcore/.libs/ix86.o son distintos
64779 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.a y new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.a son distintos
64780 diff -rupN original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.la new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.la
64781 --- original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.la 2009-03-28 22:35:12.000000000 -0430
64782 +++ new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.la 1969-12-31 20:00:00.000000000 -0400
64783 @@ -1,35 +0,0 @@
64784 -# libpcsxcore.la - a libtool library file
64785 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
64786 -#
64787 -# Please DO NOT delete this file!
64788 -# It is necessary for linking the library.
64789 -
64790 -# The name that we can dlopen(3).
64791 -dlname='libpcsxcore.so.0'
64792 -
64793 -# Names of this library.
64794 -library_names='libpcsxcore.so.0.0.0 libpcsxcore.so.0 libpcsxcore.so'
64795 -
64796 -# The name of the static archive.
64797 -old_library='libpcsxcore.a'
64798 -
64799 -# Libraries that this one depends upon.
64800 -dependency_libs=' /usr/lib/libglib-2.0.la'
64801 -
64802 -# Version information for libpcsxcore.
64803 -current=0
64804 -age=0
64805 -revision=0
64806 -
64807 -# Is this an already installed library?
64808 -installed=no
64809 -
64810 -# Should we warn about portability when linking against -modules?
64811 -shouldnotlink=no
64812 -
64813 -# Files to dlopen/dlpreopen
64814 -dlopen=''
64815 -dlpreopen=''
64816 -
64817 -# Directory that this library needs to be installed in:
64818 -libdir='/usr/local/lib'
64819 diff -rupN original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.lai new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.lai
64820 --- original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.lai 2009-03-28 22:35:12.000000000 -0430
64821 +++ new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.lai 1969-12-31 20:00:00.000000000 -0400
64822 @@ -1,35 +0,0 @@
64823 -# libpcsxcore.la - a libtool library file
64824 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
64825 -#
64826 -# Please DO NOT delete this file!
64827 -# It is necessary for linking the library.
64828 -
64829 -# The name that we can dlopen(3).
64830 -dlname='libpcsxcore.so.0'
64831 -
64832 -# Names of this library.
64833 -library_names='libpcsxcore.so.0.0.0 libpcsxcore.so.0 libpcsxcore.so'
64834 -
64835 -# The name of the static archive.
64836 -old_library='libpcsxcore.a'
64837 -
64838 -# Libraries that this one depends upon.
64839 -dependency_libs=' /usr/lib/libglib-2.0.la'
64840 -
64841 -# Version information for libpcsxcore.
64842 -current=0
64843 -age=0
64844 -revision=0
64845 -
64846 -# Is this an already installed library?
64847 -installed=yes
64848 -
64849 -# Should we warn about portability when linking against -modules?
64850 -shouldnotlink=no
64851 -
64852 -# Files to dlopen/dlpreopen
64853 -dlopen=''
64854 -dlpreopen=''
64855 -
64856 -# Directory that this library needs to be installed in:
64857 -libdir='/usr/local/lib'
64858 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.so y new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.so son distintos
64859 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.so.0 y new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.so.0 son distintos
64860 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/libpcsxcore.so.0.0.0 y new/libpcsxcore/libpcsxcore/.libs/libpcsxcore.so.0.0.0 son distintos
64861 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/mdec.o y new/libpcsxcore/libpcsxcore/.libs/mdec.o son distintos
64862 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/misc.o y new/libpcsxcore/libpcsxcore/.libs/misc.o son distintos
64863 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/plugins.o y new/libpcsxcore/libpcsxcore/.libs/plugins.o son distintos
64864 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/psxbios.o y new/libpcsxcore/libpcsxcore/.libs/psxbios.o son distintos
64865 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/psxcounters.o y new/libpcsxcore/libpcsxcore/.libs/psxcounters.o son distintos
64866 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/psxdma.o y new/libpcsxcore/libpcsxcore/.libs/psxdma.o son distintos
64867 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/psxhle.o y new/libpcsxcore/libpcsxcore/.libs/psxhle.o son distintos
64868 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/psxhw.o y new/libpcsxcore/libpcsxcore/.libs/psxhw.o son distintos
64869 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/psxinterpreter.o y new/libpcsxcore/libpcsxcore/.libs/psxinterpreter.o son distintos
64870 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/psxmem.o y new/libpcsxcore/libpcsxcore/.libs/psxmem.o son distintos
64871 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/r3000a.o y new/libpcsxcore/libpcsxcore/.libs/r3000a.o son distintos
64872 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/sio.o y new/libpcsxcore/libpcsxcore/.libs/sio.o son distintos
64873 Los ficheros binarios original/libpcsxcore/libpcsxcore/.libs/spu.o y new/libpcsxcore/libpcsxcore/.libs/spu.o son distintos
64874 diff -rupN original/libpcsxcore/libpcsxcore/CVS/Entries new/libpcsxcore/libpcsxcore/CVS/Entries
64875 --- original/libpcsxcore/libpcsxcore/CVS/Entries 2009-03-28 22:23:08.000000000 -0430
64876 +++ new/libpcsxcore/libpcsxcore/CVS/Entries 1969-12-31 20:00:00.000000000 -0400
64877 @@ -1,39 +0,0 @@
64878 -/Makefile.am/1.2/Sun Mar 29 02:25:29 2009//
64879 -/cdrom.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
64880 -/cdrom.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64881 -/coff.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64882 -/debug.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64883 -/decode_xa.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
64884 -/decode_xa.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64885 -/disr3000a.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
64886 -/gte.c/1.1.1.1/Mon Oct 8 21:13:27 2007//
64887 -/gte.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64888 -/mdec.c/1.2/Tue May 6 17:54:17 2008//
64889 -/mdec.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64890 -/misc.c/1.4/Wed Jan 16 23:23:06 2008//
64891 -/misc.h/1.2/Sat Dec 29 22:18:00 2007//
64892 -/plugins.c/1.6/Mon Mar 9 12:20:58 2009//
64893 -/plugins.h/1.2/Sat Nov 29 06:29:36 2008//
64894 -/psemu_plugin_defs.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64895 -/psxbios.c/1.7/Sun Mar 9 12:01:37 2008//
64896 -/psxbios.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64897 -/psxcommon.h/1.3/Sat Nov 29 06:29:36 2008//
64898 -/psxcounters.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
64899 -/psxcounters.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64900 -/psxdma.c/1.1.1.1/Mon Oct 8 21:13:27 2007//
64901 -/psxdma.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64902 -/psxhle.c/1.2/Mon Feb 25 18:40:45 2008//
64903 -/psxhle.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64904 -/psxhw.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
64905 -/psxhw.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64906 -/psxinterpreter.c/1.4/Mon Feb 25 18:40:45 2008//
64907 -/psxmem.c/1.2/Sat Dec 29 22:18:00 2007//
64908 -/psxmem.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64909 -/r3000a.c/1.2/Sat Jan 12 15:13:30 2008//
64910 -/r3000a.h/1.2/Sat Jan 12 15:13:30 2008//
64911 -/sio.c/1.2/Sun Nov 30 04:20:19 2008//
64912 -/sio.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64913 -/spu.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
64914 -/spu.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
64915 -/system.h/1.1.1.1/Mon Oct 8 21:13:27 2007//
64916 -D
64917 diff -rupN original/libpcsxcore/libpcsxcore/CVS/Entries.Log new/libpcsxcore/libpcsxcore/CVS/Entries.Log
64918 --- original/libpcsxcore/libpcsxcore/CVS/Entries.Log 2009-03-28 22:23:37.000000000 -0430
64919 +++ new/libpcsxcore/libpcsxcore/CVS/Entries.Log 1969-12-31 20:00:00.000000000 -0400
64920 @@ -1,3 +0,0 @@
64921 -A D/ix86////
64922 -A D/ix86_64////
64923 -A D/ppc////
64924 diff -rupN original/libpcsxcore/libpcsxcore/CVS/Repository new/libpcsxcore/libpcsxcore/CVS/Repository
64925 --- original/libpcsxcore/libpcsxcore/CVS/Repository 2009-03-28 22:22:50.000000000 -0430
64926 +++ new/libpcsxcore/libpcsxcore/CVS/Repository 1969-12-31 20:00:00.000000000 -0400
64927 @@ -1 +0,0 @@
64928 -pcsx-df/libpcsxcore
64929 diff -rupN original/libpcsxcore/libpcsxcore/CVS/Root new/libpcsxcore/libpcsxcore/CVS/Root
64930 --- original/libpcsxcore/libpcsxcore/CVS/Root 2009-03-28 22:22:50.000000000 -0430
64931 +++ new/libpcsxcore/libpcsxcore/CVS/Root 1969-12-31 20:00:00.000000000 -0400
64932 @@ -1 +0,0 @@
64933 -:pserver:anonymous@pcsx-df.cvs.sourceforge.net:/cvsroot/pcsx-df
64934 diff -rupN original/libpcsxcore/libpcsxcore/Makefile new/libpcsxcore/libpcsxcore/Makefile
64935 --- original/libpcsxcore/libpcsxcore/Makefile 2009-03-29 01:17:52.000000000 -0430
64936 +++ new/libpcsxcore/libpcsxcore/Makefile 1969-12-31 20:00:00.000000000 -0400
64937 @@ -1,916 +0,0 @@
64938 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
64939 -# libpcsxcore/Makefile. Generated from Makefile.in by configure.
64940 -
64941 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
64942 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
64943 -# This Makefile.in is free software; the Free Software Foundation
64944 -# gives unlimited permission to copy and/or distribute it,
64945 -# with or without modifications, as long as this notice is preserved.
64946 -
64947 -# This program is distributed in the hope that it will be useful,
64948 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
64949 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
64950 -# PARTICULAR PURPOSE.
64951 -
64952 -
64953 -
64954 -
64955 -pkgdatadir = $(datadir)/pcsx-df
64956 -pkglibdir = $(libdir)/pcsx-df
64957 -pkgincludedir = $(includedir)/pcsx-df
64958 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
64959 -install_sh_DATA = $(install_sh) -c -m 644
64960 -install_sh_PROGRAM = $(install_sh) -c
64961 -install_sh_SCRIPT = $(install_sh) -c
64962 -INSTALL_HEADER = $(INSTALL_DATA)
64963 -transform = $(program_transform_name)
64964 -NORMAL_INSTALL = :
64965 -PRE_INSTALL = :
64966 -POST_INSTALL = :
64967 -NORMAL_UNINSTALL = :
64968 -PRE_UNINSTALL = :
64969 -POST_UNINSTALL = :
64970 -build_triplet = i686-pc-linux-gnu
64971 -host_triplet = i686-pc-linux-gnu
64972 -target_triplet = i686-pc-linux-gnu
64973 -#am__append_1 = \
64974 -# $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
64975 -# $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
64976 -# $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
64977 -# $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
64978 -# $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
64979 -# $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
64980 -# $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
64981 -# $(top_builddir)/libpcsxcore/
64982 -
64983 -am__append_2 = \
64984 - $(top_builddir)/libpcsxcore/ix86/iR3000A.c \
64985 - $(top_builddir)/libpcsxcore/ix86/ix86.c \
64986 - $(top_builddir)/libpcsxcore/
64987 -
64988 -#am__append_3 = \
64989 -# $(top_builddir)/libpcsxcore/ppc/pR3000A.c \
64990 -# $(top_builddir)/libpcsxcore/ppc/ppc.c \
64991 -# $(top_builddir)/libpcsxcore/ppc/reguse.c \
64992 -# $(top_builddir)/libpcsxcore/ppc/pasm.s \
64993 -# $(top_builddir)/libpcsxcore/
64994 -
64995 -subdir = libpcsxcore
64996 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
64997 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64998 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
64999 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
65000 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
65001 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
65002 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
65003 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
65004 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
65005 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
65006 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
65007 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
65008 - $(top_srcdir)/configure.ac
65009 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
65010 - $(ACLOCAL_M4)
65011 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
65012 -CONFIG_HEADER = $(top_builddir)/include/config.h
65013 -CONFIG_CLEAN_FILES =
65014 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
65015 -am__vpath_adj = case $$p in \
65016 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
65017 - *) f=$$p;; \
65018 - esac;
65019 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
65020 -am__installdirs = "$(DESTDIR)$(libdir)"
65021 -libLTLIBRARIES_INSTALL = $(INSTALL)
65022 -LTLIBRARIES = $(lib_LTLIBRARIES)
65023 -am__DEPENDENCIES_1 =
65024 -libpcsxcore_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
65025 -am__libpcsxcore_la_SOURCES_DIST = \
65026 - $(top_builddir)/libpcsxcore/psxbios.c \
65027 - $(top_builddir)/libpcsxcore/cdrom.c \
65028 - $(top_builddir)/libpcsxcore/psxcounters.c \
65029 - $(top_builddir)/libpcsxcore/psxdma.c \
65030 - $(top_builddir)/libpcsxcore/disr3000a.c \
65031 - $(top_builddir)/libpcsxcore/spu.c \
65032 - $(top_builddir)/libpcsxcore/sio.c \
65033 - $(top_builddir)/libpcsxcore/psxhw.c \
65034 - $(top_builddir)/libpcsxcore/mdec.c \
65035 - $(top_builddir)/libpcsxcore/psxmem.c \
65036 - $(top_builddir)/libpcsxcore/misc.c \
65037 - $(top_builddir)/libpcsxcore/plugins.c \
65038 - $(top_builddir)/libpcsxcore/decode_xa.c \
65039 - $(top_builddir)/libpcsxcore/r3000a.c \
65040 - $(top_builddir)/libpcsxcore/psxinterpreter.c \
65041 - $(top_builddir)/libpcsxcore/gte.c \
65042 - $(top_builddir)/libpcsxcore/psxhle.c \
65043 - $(top_builddir)/libpcsxcore/cdrom.h \
65044 - $(top_builddir)/libpcsxcore/coff.h \
65045 - $(top_builddir)/libpcsxcore/debug.h \
65046 - $(top_builddir)/libpcsxcore/decode_xa.h \
65047 - $(top_builddir)/libpcsxcore/gte.h \
65048 - $(top_builddir)/libpcsxcore/mdec.h \
65049 - $(top_builddir)/libpcsxcore/misc.h \
65050 - $(top_builddir)/libpcsxcore/plugins.h \
65051 - $(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
65052 - $(top_builddir)/libpcsxcore/psxbios.h \
65053 - $(top_builddir)/libpcsxcore/psxcommon.h \
65054 - $(top_builddir)/libpcsxcore/psxcounters.h \
65055 - $(top_builddir)/libpcsxcore/psxdma.h \
65056 - $(top_builddir)/libpcsxcore/psxhle.h \
65057 - $(top_builddir)/libpcsxcore/psxhw.h \
65058 - $(top_builddir)/libpcsxcore/psxmem.h \
65059 - $(top_builddir)/libpcsxcore/r3000a.h \
65060 - $(top_builddir)/libpcsxcore/sio.h \
65061 - $(top_builddir)/libpcsxcore/spu.h \
65062 - $(top_builddir)/libpcsxcore/system.h \
65063 - $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
65064 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
65065 - $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
65066 - $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
65067 - $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
65068 - $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
65069 - $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
65070 - $(top_builddir)/libpcsxcore/ \
65071 - $(top_builddir)/libpcsxcore/ix86/iR3000A.c \
65072 - $(top_builddir)/libpcsxcore/ix86/ix86.c \
65073 - $(top_builddir)/libpcsxcore/ppc/pR3000A.c \
65074 - $(top_builddir)/libpcsxcore/ppc/ppc.c \
65075 - $(top_builddir)/libpcsxcore/ppc/reguse.c \
65076 - $(top_builddir)/libpcsxcore/ppc/pasm.s
65077 -#am__objects_1 = iR3000A-64.lo ix86-64.lo \
65078 -# ix86_cpudetect.lo ix86_fpu.lo ix86_3dnow.lo \
65079 -# ix86_mmx.lo ix86_sse.lo
65080 -am__objects_2 = iR3000A.lo ix86.lo
65081 -#am__objects_3 = pR3000A.lo ppc.lo reguse.lo \
65082 -# libpcsxcore_la-pasm.lo
65083 -am_libpcsxcore_la_OBJECTS = psxbios.lo cdrom.lo psxcounters.lo \
65084 - psxdma.lo disr3000a.lo spu.lo sio.lo psxhw.lo mdec.lo \
65085 - psxmem.lo misc.lo plugins.lo decode_xa.lo r3000a.lo \
65086 - psxinterpreter.lo gte.lo psxhle.lo $(am__objects_1) \
65087 - $(am__objects_2) $(am__objects_3)
65088 -libpcsxcore_la_OBJECTS = $(am_libpcsxcore_la_OBJECTS)
65089 -libpcsxcore_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
65090 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
65091 - $(libpcsxcore_la_LDFLAGS) $(LDFLAGS) -o $@
65092 -DEFAULT_INCLUDES = -I. -I$(top_builddir)/include
65093 -depcomp = $(SHELL) $(top_srcdir)/depcomp
65094 -am__depfiles_maybe = depfiles
65095 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
65096 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
65097 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
65098 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
65099 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
65100 -CCLD = $(CC)
65101 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
65102 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
65103 - $(LDFLAGS) -o $@
65104 -CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
65105 -LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
65106 - --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
65107 -SOURCES = $(libpcsxcore_la_SOURCES)
65108 -DIST_SOURCES = $(am__libpcsxcore_la_SOURCES_DIST)
65109 -ETAGS = etags
65110 -CTAGS = ctags
65111 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
65112 -ACLOCAL = ${SHELL} /home/andrew/projects/common_projects/pcsx-df/missing --run aclocal-1.10
65113 -ALLOCA =
65114 -ALL_LINGUAS =
65115 -ALSA_LIBS = -lasound
65116 -AMTAR = ${SHELL} /home/andrew/projects/common_projects/pcsx-df/missing --run tar
65117 -AR = ar
65118 -AUTOCONF = ${SHELL} /home/andrew/projects/common_projects/pcsx-df/missing --run autoconf
65119 -AUTOHEADER = ${SHELL} /home/andrew/projects/common_projects/pcsx-df/missing --run autoheader
65120 -AUTOMAKE = ${SHELL} /home/andrew/projects/common_projects/pcsx-df/missing --run automake-1.10
65121 -AWK = gawk
65122 -BUILD_INCLUDED_LIBINTL = no
65123 -BURN_CFLAGS =
65124 -BURN_LIBS =
65125 -CATOBJEXT = .gmo
65126 -CC = gcc
65127 -CCAS = gcc
65128 -CCASDEPMODE = depmode=gcc3
65129 -CCASFLAGS = -g -O2
65130 -CCDEPMODE = depmode=gcc3
65131 -CFLAGS = -g -O2
65132 -CPP = gcc -E
65133 -CPPFLAGS =
65134 -CXX = g++
65135 -CXXCPP = g++ -E
65136 -CXXDEPMODE = depmode=gcc3
65137 -CXXFLAGS = -g -O2
65138 -CYGPATH_W = echo
65139 -DATADIRNAME = share
65140 -DEFS = -DHAVE_CONFIG_H
65141 -DEPDIR = .deps
65142 -DFBINIMAGE =
65143 -DSYMUTIL =
65144 -ECHO = echo
65145 -ECHO_C =
65146 -ECHO_N = -n
65147 -ECHO_T =
65148 -EGREP = /bin/grep -E
65149 -EXEEXT =
65150 -F77 =
65151 -FFLAGS =
65152 -FLTKCONFIG =
65153 -FLTK_CXXFLAGS =
65154 -FLTK_LDFLAGS =
65155 -GENCAT = gencat
65156 -GETTEXT_PACKAGE = pcsx-df
65157 -GIO2_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
65158 -GIO2_LIBS = -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
65159 -GLADE2_CFLAGS = -D_REENTRANT -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12
65160 -GLADE2_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
65161 -GLIB2_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
65162 -GLIB2_LIBS = -lglib-2.0
65163 -GLIBC21 = yes
65164 -GMSGFMT = /usr/bin/msgfmt
65165 -GREP = /bin/grep
65166 -GTK2_CFLAGS = -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12
65167 -GTK2_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
65168 -INSTALL = /usr/bin/install -c
65169 -INSTALL_DATA = ${INSTALL} -m 644
65170 -INSTALL_PROGRAM = ${INSTALL}
65171 -INSTALL_SCRIPT = ${INSTALL}
65172 -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
65173 -INSTOBJEXT = .mo
65174 -INTLBISON = bison
65175 -INTLLIBS =
65176 -INTLOBJS =
65177 -INTLTOOL_EXTRACT = /usr/bin/intltool-extract
65178 -INTLTOOL_MERGE = /usr/bin/intltool-merge
65179 -INTLTOOL_PERL = /usr/bin/perl
65180 -INTLTOOL_UPDATE = /usr/bin/intltool-update
65181 -INTL_LIBTOOL_SUFFIX_PREFIX =
65182 -LDFLAGS =
65183 -LIBICONV =
65184 -LIBINTL =
65185 -LIBOBJS =
65186 -LIBS =
65187 -LIBTOOL = $(SHELL) $(top_builddir)/libtool
65188 -LN_S = ln -s
65189 -LTLIBICONV =
65190 -LTLIBINTL =
65191 -LTLIBOBJS =
65192 -MAINT = #
65193 -MAKEINFO = ${SHELL} /home/andrew/projects/common_projects/pcsx-df/missing --run makeinfo
65194 -MKDIR_P = /bin/mkdir -p
65195 -MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
65196 -MSGFMT = /usr/bin/msgfmt
65197 -MSGMERGE = /usr/bin/msgmerge
65198 -NASM = /usr/bin/nasm
65199 -NMEDIT =
65200 -OBJEXT = o
65201 -PACKAGE = pcsx-df
65202 -PACKAGE_BUGREPORT =
65203 -PACKAGE_NAME =
65204 -PACKAGE_STRING =
65205 -PACKAGE_TARNAME =
65206 -PACKAGE_VERSION =
65207 -PATH_SEPARATOR = :
65208 -PKG_CONFIG = /usr/bin/pkg-config
65209 -POSUB = po
65210 -RANLIB = ranlib
65211 -SED = /bin/sed
65212 -SET_MAKE =
65213 -SHELL = /bin/sh
65214 -STRIP = strip
65215 -USE_INCLUDED_LIBINTL = no
65216 -USE_NLS = yes
65217 -VERSION = 1.10
65218 -XGETTEXT = /usr/bin/xgettext
65219 -abs_builddir = /home/andrew/projects/common_projects/pcsx-df/libpcsxcore
65220 -abs_srcdir = /home/andrew/projects/common_projects/pcsx-df/libpcsxcore
65221 -abs_top_builddir = /home/andrew/projects/common_projects/pcsx-df
65222 -abs_top_srcdir = /home/andrew/projects/common_projects/pcsx-df
65223 -ac_ct_CC = gcc
65224 -ac_ct_CXX = g++
65225 -ac_ct_F77 =
65226 -am__include = include
65227 -am__leading_dot = .
65228 -am__quote =
65229 -am__tar = ${AMTAR} chof - "$$tardir"
65230 -am__untar = ${AMTAR} xf -
65231 -bindir = ${exec_prefix}/bin
65232 -build = i686-pc-linux-gnu
65233 -build_alias =
65234 -build_cpu = i686
65235 -build_os = linux-gnu
65236 -build_vendor = pc
65237 -builddir = .
65238 -datadir = ${datarootdir}
65239 -datarootdir = ${prefix}/share
65240 -docdir = ${datarootdir}/doc/${PACKAGE}
65241 -dvidir = ${docdir}
65242 -exec_prefix = ${prefix}
65243 -host = i686-pc-linux-gnu
65244 -host_alias =
65245 -host_cpu = i686
65246 -host_os = linux-gnu
65247 -host_vendor = pc
65248 -htmldir = ${docdir}
65249 -includedir = ${prefix}/include
65250 -infodir = ${datarootdir}/info
65251 -install_sh = $(SHELL) /home/andrew/projects/common_projects/pcsx-df/install-sh
65252 -libdir = ${exec_prefix}/lib
65253 -libexecdir = ${exec_prefix}/libexec
65254 -localedir = ${datarootdir}/locale
65255 -localstatedir = ${prefix}/var
65256 -mandir = ${datarootdir}/man
65257 -mkdir_p = /bin/mkdir -p
65258 -oldincludedir = /usr/include
65259 -pdfdir = ${docdir}
65260 -prefix = /usr/local
65261 -program_transform_name = s,x,x,
65262 -psdir = ${docdir}
65263 -sbindir = ${exec_prefix}/sbin
65264 -sharedstatedir = ${prefix}/com
65265 -srcdir = .
65266 -sysconfdir = ${prefix}/etc
65267 -target = i686-pc-linux-gnu
65268 -target_alias =
65269 -target_cpu = i686
65270 -target_os = linux-gnu
65271 -target_vendor = pc
65272 -top_build_prefix = ../
65273 -top_builddir = ..
65274 -top_srcdir = ..
65275 -INCLUDES = -DLOCALE_DIR=\"${datadir}/locale/\" \
65276 - $(GLIB2_CFLAGS) -I$(top_srcdir)/include
65277 -
65278 -lib_LTLIBRARIES = libpcsxcore.la
65279 -libpcsxcore_la_SOURCES = $(top_builddir)/libpcsxcore/psxbios.c \
65280 - $(top_builddir)/libpcsxcore/cdrom.c \
65281 - $(top_builddir)/libpcsxcore/psxcounters.c \
65282 - $(top_builddir)/libpcsxcore/psxdma.c \
65283 - $(top_builddir)/libpcsxcore/disr3000a.c \
65284 - $(top_builddir)/libpcsxcore/spu.c \
65285 - $(top_builddir)/libpcsxcore/sio.c \
65286 - $(top_builddir)/libpcsxcore/psxhw.c \
65287 - $(top_builddir)/libpcsxcore/mdec.c \
65288 - $(top_builddir)/libpcsxcore/psxmem.c \
65289 - $(top_builddir)/libpcsxcore/misc.c \
65290 - $(top_builddir)/libpcsxcore/plugins.c \
65291 - $(top_builddir)/libpcsxcore/decode_xa.c \
65292 - $(top_builddir)/libpcsxcore/r3000a.c \
65293 - $(top_builddir)/libpcsxcore/psxinterpreter.c \
65294 - $(top_builddir)/libpcsxcore/gte.c \
65295 - $(top_builddir)/libpcsxcore/psxhle.c \
65296 - $(top_builddir)/libpcsxcore/cdrom.h \
65297 - $(top_builddir)/libpcsxcore/coff.h \
65298 - $(top_builddir)/libpcsxcore/debug.h \
65299 - $(top_builddir)/libpcsxcore/decode_xa.h \
65300 - $(top_builddir)/libpcsxcore/gte.h \
65301 - $(top_builddir)/libpcsxcore/mdec.h \
65302 - $(top_builddir)/libpcsxcore/misc.h \
65303 - $(top_builddir)/libpcsxcore/plugins.h \
65304 - $(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
65305 - $(top_builddir)/libpcsxcore/psxbios.h \
65306 - $(top_builddir)/libpcsxcore/psxcommon.h \
65307 - $(top_builddir)/libpcsxcore/psxcounters.h \
65308 - $(top_builddir)/libpcsxcore/psxdma.h \
65309 - $(top_builddir)/libpcsxcore/psxhle.h \
65310 - $(top_builddir)/libpcsxcore/psxhw.h \
65311 - $(top_builddir)/libpcsxcore/psxmem.h \
65312 - $(top_builddir)/libpcsxcore/r3000a.h \
65313 - $(top_builddir)/libpcsxcore/sio.h \
65314 - $(top_builddir)/libpcsxcore/spu.h \
65315 - $(top_builddir)/libpcsxcore/system.h $(am__append_1) \
65316 - $(am__append_2) $(am__append_3)
65317 -#libpcsxcore_la_CCASFLAGS = -x assembler-with-cpp -mregnames
65318 -libpcsxcore_la_LIBADD = $(GLIB2_LIBS)
65319 -libpcsxcore_la_LDFLAGS = -version-info 0:0:0
65320 -EXTRA_DIST = \
65321 - $(top_builddir)/libpcsxcore/ix86/iGte.h \
65322 - $(top_builddir)/libpcsxcore/ix86/ix86.h \
65323 - $(top_builddir)/libpcsxcore/ix86_64/README \
65324 - $(top_builddir)/libpcsxcore/ix86_64/iGte.h \
65325 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.h \
65326 - $(top_builddir)/libpcsxcore/ppc/pGte.h \
65327 - $(top_builddir)/libpcsxcore/ppc/ppc.h \
65328 - $(top_builddir)/libpcsxcore/ppc/reguse.h \
65329 - $(top_builddir)/libpcsxcore/ppc/ppc_mnemonics.h
65330 -
65331 -all: all-am
65332 -
65333 -.SUFFIXES:
65334 -.SUFFIXES: .c .lo .o .obj .s
65335 -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
65336 - @for dep in $?; do \
65337 - case '$(am__configure_deps)' in \
65338 - *$$dep*) \
65339 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
65340 - && exit 0; \
65341 - exit 1;; \
65342 - esac; \
65343 - done; \
65344 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpcsxcore/Makefile'; \
65345 - cd $(top_srcdir) && \
65346 - $(AUTOMAKE) --gnu libpcsxcore/Makefile
65347 -.PRECIOUS: Makefile
65348 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
65349 - @case '$?' in \
65350 - *config.status*) \
65351 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
65352 - *) \
65353 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
65354 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
65355 - esac;
65356 -
65357 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
65358 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
65359 -
65360 -$(top_srcdir)/configure: # $(am__configure_deps)
65361 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
65362 -$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
65363 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
65364 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
65365 - @$(NORMAL_INSTALL)
65366 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
65367 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
65368 - if test -f $$p; then \
65369 - f=$(am__strip_dir) \
65370 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
65371 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
65372 - else :; fi; \
65373 - done
65374 -
65375 -uninstall-libLTLIBRARIES:
65376 - @$(NORMAL_UNINSTALL)
65377 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
65378 - p=$(am__strip_dir) \
65379 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
65380 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
65381 - done
65382 -
65383 -clean-libLTLIBRARIES:
65384 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
65385 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
65386 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
65387 - test "$$dir" != "$$p" || dir=.; \
65388 - echo "rm -f \"$${dir}/so_locations\""; \
65389 - rm -f "$${dir}/so_locations"; \
65390 - done
65391 -libpcsxcore.la: $(libpcsxcore_la_OBJECTS) $(libpcsxcore_la_DEPENDENCIES)
65392 - $(libpcsxcore_la_LINK) -rpath $(libdir) $(libpcsxcore_la_OBJECTS) $(libpcsxcore_la_LIBADD) $(LIBS)
65393 -
65394 -mostlyclean-compile:
65395 - -rm -f *.$(OBJEXT)
65396 -
65397 -distclean-compile:
65398 - -rm -f *.tab.c
65399 -
65400 -include ./$(DEPDIR)/cdrom.Plo
65401 -include ./$(DEPDIR)/decode_xa.Plo
65402 -include ./$(DEPDIR)/disr3000a.Plo
65403 -include ./$(DEPDIR)/gte.Plo
65404 -include ./$(DEPDIR)/iR3000A-64.Plo
65405 -include ./$(DEPDIR)/iR3000A.Plo
65406 -include ./$(DEPDIR)/ix86-64.Plo
65407 -include ./$(DEPDIR)/ix86.Plo
65408 -include ./$(DEPDIR)/ix86_3dnow.Plo
65409 -include ./$(DEPDIR)/ix86_cpudetect.Plo
65410 -include ./$(DEPDIR)/ix86_fpu.Plo
65411 -include ./$(DEPDIR)/ix86_mmx.Plo
65412 -include ./$(DEPDIR)/ix86_sse.Plo
65413 -include ./$(DEPDIR)/mdec.Plo
65414 -include ./$(DEPDIR)/misc.Plo
65415 -include ./$(DEPDIR)/pR3000A.Plo
65416 -include ./$(DEPDIR)/plugins.Plo
65417 -include ./$(DEPDIR)/ppc.Plo
65418 -include ./$(DEPDIR)/psxbios.Plo
65419 -include ./$(DEPDIR)/psxcounters.Plo
65420 -include ./$(DEPDIR)/psxdma.Plo
65421 -include ./$(DEPDIR)/psxhle.Plo
65422 -include ./$(DEPDIR)/psxhw.Plo
65423 -include ./$(DEPDIR)/psxinterpreter.Plo
65424 -include ./$(DEPDIR)/psxmem.Plo
65425 -include ./$(DEPDIR)/r3000a.Plo
65426 -include ./$(DEPDIR)/reguse.Plo
65427 -include ./$(DEPDIR)/sio.Plo
65428 -include ./$(DEPDIR)/spu.Plo
65429 -
65430 -.c.o:
65431 - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
65432 - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
65433 -# source='$<' object='$@' libtool=no \
65434 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65435 -# $(COMPILE) -c $<
65436 -
65437 -.c.obj:
65438 - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
65439 - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
65440 -# source='$<' object='$@' libtool=no \
65441 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65442 -# $(COMPILE) -c `$(CYGPATH_W) '$<'`
65443 -
65444 -.c.lo:
65445 - $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
65446 - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
65447 -# source='$<' object='$@' libtool=yes \
65448 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65449 -# $(LTCOMPILE) -c -o $@ $<
65450 -
65451 -psxbios.lo: $(top_builddir)/libpcsxcore/psxbios.c
65452 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxbios.lo -MD -MP -MF $(DEPDIR)/psxbios.Tpo -c -o psxbios.lo `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
65453 - mv -f $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Plo
65454 -# source='$(top_builddir)/libpcsxcore/psxbios.c' object='psxbios.lo' libtool=yes \
65455 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65456 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxbios.lo `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
65457 -
65458 -cdrom.lo: $(top_builddir)/libpcsxcore/cdrom.c
65459 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdrom.lo -MD -MP -MF $(DEPDIR)/cdrom.Tpo -c -o cdrom.lo `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
65460 - mv -f $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Plo
65461 -# source='$(top_builddir)/libpcsxcore/cdrom.c' object='cdrom.lo' libtool=yes \
65462 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65463 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrom.lo `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
65464 -
65465 -psxcounters.lo: $(top_builddir)/libpcsxcore/psxcounters.c
65466 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcounters.lo -MD -MP -MF $(DEPDIR)/psxcounters.Tpo -c -o psxcounters.lo `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
65467 - mv -f $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Plo
65468 -# source='$(top_builddir)/libpcsxcore/psxcounters.c' object='psxcounters.lo' libtool=yes \
65469 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65470 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcounters.lo `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
65471 -
65472 -psxdma.lo: $(top_builddir)/libpcsxcore/psxdma.c
65473 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxdma.lo -MD -MP -MF $(DEPDIR)/psxdma.Tpo -c -o psxdma.lo `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
65474 - mv -f $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Plo
65475 -# source='$(top_builddir)/libpcsxcore/psxdma.c' object='psxdma.lo' libtool=yes \
65476 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65477 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxdma.lo `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
65478 -
65479 -disr3000a.lo: $(top_builddir)/libpcsxcore/disr3000a.c
65480 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT disr3000a.lo -MD -MP -MF $(DEPDIR)/disr3000a.Tpo -c -o disr3000a.lo `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
65481 - mv -f $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Plo
65482 -# source='$(top_builddir)/libpcsxcore/disr3000a.c' object='disr3000a.lo' libtool=yes \
65483 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65484 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o disr3000a.lo `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
65485 -
65486 -spu.lo: $(top_builddir)/libpcsxcore/spu.c
65487 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
65488 - mv -f $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
65489 -# source='$(top_builddir)/libpcsxcore/spu.c' object='spu.lo' libtool=yes \
65490 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65491 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
65492 -
65493 -sio.lo: $(top_builddir)/libpcsxcore/sio.c
65494 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sio.lo -MD -MP -MF $(DEPDIR)/sio.Tpo -c -o sio.lo `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
65495 - mv -f $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Plo
65496 -# source='$(top_builddir)/libpcsxcore/sio.c' object='sio.lo' libtool=yes \
65497 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65498 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sio.lo `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
65499 -
65500 -psxhw.lo: $(top_builddir)/libpcsxcore/psxhw.c
65501 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhw.lo -MD -MP -MF $(DEPDIR)/psxhw.Tpo -c -o psxhw.lo `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
65502 - mv -f $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Plo
65503 -# source='$(top_builddir)/libpcsxcore/psxhw.c' object='psxhw.lo' libtool=yes \
65504 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65505 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhw.lo `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
65506 -
65507 -mdec.lo: $(top_builddir)/libpcsxcore/mdec.c
65508 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdec.lo -MD -MP -MF $(DEPDIR)/mdec.Tpo -c -o mdec.lo `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
65509 - mv -f $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Plo
65510 -# source='$(top_builddir)/libpcsxcore/mdec.c' object='mdec.lo' libtool=yes \
65511 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65512 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdec.lo `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
65513 -
65514 -psxmem.lo: $(top_builddir)/libpcsxcore/psxmem.c
65515 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxmem.lo -MD -MP -MF $(DEPDIR)/psxmem.Tpo -c -o psxmem.lo `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
65516 - mv -f $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Plo
65517 -# source='$(top_builddir)/libpcsxcore/psxmem.c' object='psxmem.lo' libtool=yes \
65518 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65519 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxmem.lo `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
65520 -
65521 -misc.lo: $(top_builddir)/libpcsxcore/misc.c
65522 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.lo -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.lo `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
65523 - mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Plo
65524 -# source='$(top_builddir)/libpcsxcore/misc.c' object='misc.lo' libtool=yes \
65525 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65526 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.lo `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
65527 -
65528 -plugins.lo: $(top_builddir)/libpcsxcore/plugins.c
65529 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugins.lo -MD -MP -MF $(DEPDIR)/plugins.Tpo -c -o plugins.lo `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
65530 - mv -f $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Plo
65531 -# source='$(top_builddir)/libpcsxcore/plugins.c' object='plugins.lo' libtool=yes \
65532 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65533 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plugins.lo `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
65534 -
65535 -decode_xa.lo: $(top_builddir)/libpcsxcore/decode_xa.c
65536 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode_xa.lo -MD -MP -MF $(DEPDIR)/decode_xa.Tpo -c -o decode_xa.lo `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
65537 - mv -f $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Plo
65538 -# source='$(top_builddir)/libpcsxcore/decode_xa.c' object='decode_xa.lo' libtool=yes \
65539 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65540 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode_xa.lo `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
65541 -
65542 -r3000a.lo: $(top_builddir)/libpcsxcore/r3000a.c
65543 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT r3000a.lo -MD -MP -MF $(DEPDIR)/r3000a.Tpo -c -o r3000a.lo `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
65544 - mv -f $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Plo
65545 -# source='$(top_builddir)/libpcsxcore/r3000a.c' object='r3000a.lo' libtool=yes \
65546 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65547 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o r3000a.lo `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
65548 -
65549 -psxinterpreter.lo: $(top_builddir)/libpcsxcore/psxinterpreter.c
65550 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxinterpreter.lo -MD -MP -MF $(DEPDIR)/psxinterpreter.Tpo -c -o psxinterpreter.lo `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
65551 - mv -f $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Plo
65552 -# source='$(top_builddir)/libpcsxcore/psxinterpreter.c' object='psxinterpreter.lo' libtool=yes \
65553 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65554 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxinterpreter.lo `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
65555 -
65556 -gte.lo: $(top_builddir)/libpcsxcore/gte.c
65557 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gte.lo -MD -MP -MF $(DEPDIR)/gte.Tpo -c -o gte.lo `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
65558 - mv -f $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Plo
65559 -# source='$(top_builddir)/libpcsxcore/gte.c' object='gte.lo' libtool=yes \
65560 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65561 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gte.lo `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
65562 -
65563 -psxhle.lo: $(top_builddir)/libpcsxcore/psxhle.c
65564 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhle.lo -MD -MP -MF $(DEPDIR)/psxhle.Tpo -c -o psxhle.lo `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
65565 - mv -f $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Plo
65566 -# source='$(top_builddir)/libpcsxcore/psxhle.c' object='psxhle.lo' libtool=yes \
65567 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65568 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhle.lo `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
65569 -
65570 -iR3000A-64.lo: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
65571 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.lo -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
65572 - mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Plo
65573 -# source='$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' object='iR3000A-64.lo' libtool=yes \
65574 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65575 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
65576 -
65577 -ix86-64.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
65578 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86-64.lo -MD -MP -MF $(DEPDIR)/ix86-64.Tpo -c -o ix86-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
65579 - mv -f $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Plo
65580 -# source='$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' object='ix86-64.lo' libtool=yes \
65581 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65582 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
65583 -
65584 -ix86_cpudetect.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
65585 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_cpudetect.lo -MD -MP -MF $(DEPDIR)/ix86_cpudetect.Tpo -c -o ix86_cpudetect.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
65586 - mv -f $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Plo
65587 -# source='$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' object='ix86_cpudetect.lo' libtool=yes \
65588 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65589 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_cpudetect.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
65590 -
65591 -ix86_fpu.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
65592 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_fpu.lo -MD -MP -MF $(DEPDIR)/ix86_fpu.Tpo -c -o ix86_fpu.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
65593 - mv -f $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Plo
65594 -# source='$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' object='ix86_fpu.lo' libtool=yes \
65595 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65596 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_fpu.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
65597 -
65598 -ix86_3dnow.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
65599 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_3dnow.lo -MD -MP -MF $(DEPDIR)/ix86_3dnow.Tpo -c -o ix86_3dnow.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
65600 - mv -f $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Plo
65601 -# source='$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' object='ix86_3dnow.lo' libtool=yes \
65602 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65603 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_3dnow.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
65604 -
65605 -ix86_mmx.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
65606 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_mmx.lo -MD -MP -MF $(DEPDIR)/ix86_mmx.Tpo -c -o ix86_mmx.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
65607 - mv -f $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Plo
65608 -# source='$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' object='ix86_mmx.lo' libtool=yes \
65609 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65610 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_mmx.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
65611 -
65612 -ix86_sse.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
65613 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_sse.lo -MD -MP -MF $(DEPDIR)/ix86_sse.Tpo -c -o ix86_sse.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
65614 - mv -f $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Plo
65615 -# source='$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' object='ix86_sse.lo' libtool=yes \
65616 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65617 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_sse.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
65618 -
65619 -iR3000A.lo: $(top_builddir)/libpcsxcore/ix86/iR3000A.c
65620 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A.lo -MD -MP -MF $(DEPDIR)/iR3000A.Tpo -c -o iR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
65621 - mv -f $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Plo
65622 -# source='$(top_builddir)/libpcsxcore/ix86/iR3000A.c' object='iR3000A.lo' libtool=yes \
65623 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65624 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
65625 -
65626 -ix86.lo: $(top_builddir)/libpcsxcore/ix86/ix86.c
65627 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86.lo -MD -MP -MF $(DEPDIR)/ix86.Tpo -c -o ix86.lo `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
65628 - mv -f $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Plo
65629 -# source='$(top_builddir)/libpcsxcore/ix86/ix86.c' object='ix86.lo' libtool=yes \
65630 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65631 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86.lo `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
65632 -
65633 -pR3000A.lo: $(top_builddir)/libpcsxcore/ppc/pR3000A.c
65634 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pR3000A.lo -MD -MP -MF $(DEPDIR)/pR3000A.Tpo -c -o pR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
65635 - mv -f $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Plo
65636 -# source='$(top_builddir)/libpcsxcore/ppc/pR3000A.c' object='pR3000A.lo' libtool=yes \
65637 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65638 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
65639 -
65640 -ppc.lo: $(top_builddir)/libpcsxcore/ppc/ppc.c
65641 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppc.lo -MD -MP -MF $(DEPDIR)/ppc.Tpo -c -o ppc.lo `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
65642 - mv -f $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Plo
65643 -# source='$(top_builddir)/libpcsxcore/ppc/ppc.c' object='ppc.lo' libtool=yes \
65644 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65645 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppc.lo `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
65646 -
65647 -reguse.lo: $(top_builddir)/libpcsxcore/ppc/reguse.c
65648 - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reguse.lo -MD -MP -MF $(DEPDIR)/reguse.Tpo -c -o reguse.lo `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
65649 - mv -f $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Plo
65650 -# source='$(top_builddir)/libpcsxcore/ppc/reguse.c' object='reguse.lo' libtool=yes \
65651 -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
65652 -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reguse.lo `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
65653 -
65654 -.s.o:
65655 - $(CCASCOMPILE) -c -o $@ $<
65656 -
65657 -.s.obj:
65658 - $(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
65659 -
65660 -.s.lo:
65661 - $(LTCCASCOMPILE) -c -o $@ $<
65662 -
65663 -libpcsxcore_la-pasm.lo: $(top_builddir)/libpcsxcore/ppc/pasm.s
65664 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(libpcsxcore_la_CCASFLAGS) $(CCASFLAGS) -c -o libpcsxcore_la-pasm.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pasm.s' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pasm.s
65665 -
65666 -mostlyclean-libtool:
65667 - -rm -f *.lo
65668 -
65669 -clean-libtool:
65670 - -rm -rf .libs _libs
65671 -
65672 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
65673 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
65674 - unique=`for i in $$list; do \
65675 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
65676 - done | \
65677 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
65678 - END { if (nonempty) { for (i in files) print i; }; }'`; \
65679 - mkid -fID $$unique
65680 -tags: TAGS
65681 -
65682 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
65683 - $(TAGS_FILES) $(LISP)
65684 - tags=; \
65685 - here=`pwd`; \
65686 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
65687 - unique=`for i in $$list; do \
65688 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
65689 - done | \
65690 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
65691 - END { if (nonempty) { for (i in files) print i; }; }'`; \
65692 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
65693 - test -n "$$unique" || unique=$$empty_fix; \
65694 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
65695 - $$tags $$unique; \
65696 - fi
65697 -ctags: CTAGS
65698 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
65699 - $(TAGS_FILES) $(LISP)
65700 - tags=; \
65701 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
65702 - unique=`for i in $$list; do \
65703 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
65704 - done | \
65705 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
65706 - END { if (nonempty) { for (i in files) print i; }; }'`; \
65707 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
65708 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
65709 - $$tags $$unique
65710 -
65711 -GTAGS:
65712 - here=`$(am__cd) $(top_builddir) && pwd` \
65713 - && cd $(top_srcdir) \
65714 - && gtags -i $(GTAGS_ARGS) $$here
65715 -
65716 -distclean-tags:
65717 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
65718 -
65719 -distdir: $(DISTFILES)
65720 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
65721 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
65722 - list='$(DISTFILES)'; \
65723 - dist_files=`for file in $$list; do echo $$file; done | \
65724 - sed -e "s|^$$srcdirstrip/||;t" \
65725 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
65726 - case $$dist_files in \
65727 - */*) $(MKDIR_P) `echo "$$dist_files" | \
65728 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
65729 - sort -u` ;; \
65730 - esac; \
65731 - for file in $$dist_files; do \
65732 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
65733 - if test -d $$d/$$file; then \
65734 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
65735 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
65736 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
65737 - fi; \
65738 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
65739 - else \
65740 - test -f $(distdir)/$$file \
65741 - || cp -p $$d/$$file $(distdir)/$$file \
65742 - || exit 1; \
65743 - fi; \
65744 - done
65745 -check-am: all-am
65746 -check: check-am
65747 -all-am: Makefile $(LTLIBRARIES)
65748 -installdirs:
65749 - for dir in "$(DESTDIR)$(libdir)"; do \
65750 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
65751 - done
65752 -install: install-am
65753 -install-exec: install-exec-am
65754 -install-data: install-data-am
65755 -uninstall: uninstall-am
65756 -
65757 -install-am: all-am
65758 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
65759 -
65760 -installcheck: installcheck-am
65761 -install-strip:
65762 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
65763 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
65764 - `test -z '$(STRIP)' || \
65765 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
65766 -mostlyclean-generic:
65767 -
65768 -clean-generic:
65769 -
65770 -distclean-generic:
65771 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
65772 -
65773 -maintainer-clean-generic:
65774 - @echo "This command is intended for maintainers to use"
65775 - @echo "it deletes files that may require special tools to rebuild."
65776 -clean: clean-am
65777 -
65778 -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
65779 - mostlyclean-am
65780 -
65781 -distclean: distclean-am
65782 - -rm -rf ./$(DEPDIR)
65783 - -rm -f Makefile
65784 -distclean-am: clean-am distclean-compile distclean-generic \
65785 - distclean-tags
65786 -
65787 -dvi: dvi-am
65788 -
65789 -dvi-am:
65790 -
65791 -html: html-am
65792 -
65793 -info: info-am
65794 -
65795 -info-am:
65796 -
65797 -install-data-am:
65798 -
65799 -install-dvi: install-dvi-am
65800 -
65801 -install-exec-am: install-libLTLIBRARIES
65802 -
65803 -install-html: install-html-am
65804 -
65805 -install-info: install-info-am
65806 -
65807 -install-man:
65808 -
65809 -install-pdf: install-pdf-am
65810 -
65811 -install-ps: install-ps-am
65812 -
65813 -installcheck-am:
65814 -
65815 -maintainer-clean: maintainer-clean-am
65816 - -rm -rf ./$(DEPDIR)
65817 - -rm -f Makefile
65818 -maintainer-clean-am: distclean-am maintainer-clean-generic
65819 -
65820 -mostlyclean: mostlyclean-am
65821 -
65822 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
65823 - mostlyclean-libtool
65824 -
65825 -pdf: pdf-am
65826 -
65827 -pdf-am:
65828 -
65829 -ps: ps-am
65830 -
65831 -ps-am:
65832 -
65833 -uninstall-am: uninstall-libLTLIBRARIES
65834 -
65835 -.MAKE: install-am install-strip
65836 -
65837 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
65838 - clean-libLTLIBRARIES clean-libtool ctags distclean \
65839 - distclean-compile distclean-generic distclean-libtool \
65840 - distclean-tags distdir dvi dvi-am html html-am info info-am \
65841 - install install-am install-data install-data-am install-dvi \
65842 - install-dvi-am install-exec install-exec-am install-html \
65843 - install-html-am install-info install-info-am \
65844 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
65845 - install-ps install-ps-am install-strip installcheck \
65846 - installcheck-am installdirs maintainer-clean \
65847 - maintainer-clean-generic mostlyclean mostlyclean-compile \
65848 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
65849 - tags uninstall uninstall-am uninstall-libLTLIBRARIES
65850 -
65851 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
65852 -# Otherwise a system limit (for SysV at least) may be exceeded.
65853 -.NOEXPORT:
65854 diff -rupN original/libpcsxcore/libpcsxcore/Makefile.am new/libpcsxcore/libpcsxcore/Makefile.am
65855 --- original/libpcsxcore/libpcsxcore/Makefile.am 2009-03-28 21:55:29.000000000 -0430
65856 +++ new/libpcsxcore/libpcsxcore/Makefile.am 1969-12-31 20:00:00.000000000 -0400
65857 @@ -1,88 +0,0 @@
65858 -INCLUDES = -DLOCALE_DIR=\"${datadir}/locale/\" \
65859 - $(GLIB2_CFLAGS) -I$(top_srcdir)/include
65860 -
65861 -lib_LTLIBRARIES = libpcsxcore.la
65862 -
65863 -libpcsxcore_la_SOURCES = \
65864 - $(top_builddir)/libpcsxcore/psxbios.c \
65865 - $(top_builddir)/libpcsxcore/cdrom.c \
65866 - $(top_builddir)/libpcsxcore/psxcounters.c \
65867 - $(top_builddir)/libpcsxcore/psxdma.c \
65868 - $(top_builddir)/libpcsxcore/disr3000a.c \
65869 - $(top_builddir)/libpcsxcore/spu.c \
65870 - $(top_builddir)/libpcsxcore/sio.c \
65871 - $(top_builddir)/libpcsxcore/psxhw.c \
65872 - $(top_builddir)/libpcsxcore/mdec.c \
65873 - $(top_builddir)/libpcsxcore/psxmem.c \
65874 - $(top_builddir)/libpcsxcore/misc.c \
65875 - $(top_builddir)/libpcsxcore/plugins.c \
65876 - $(top_builddir)/libpcsxcore/decode_xa.c \
65877 - $(top_builddir)/libpcsxcore/r3000a.c \
65878 - $(top_builddir)/libpcsxcore/psxinterpreter.c \
65879 - $(top_builddir)/libpcsxcore/gte.c \
65880 - $(top_builddir)/libpcsxcore/psxhle.c \
65881 - $(top_builddir)/libpcsxcore/cdrom.h \
65882 - $(top_builddir)/libpcsxcore/coff.h \
65883 - $(top_builddir)/libpcsxcore/debug.h \
65884 - $(top_builddir)/libpcsxcore/decode_xa.h \
65885 - $(top_builddir)/libpcsxcore/gte.h \
65886 - $(top_builddir)/libpcsxcore/mdec.h \
65887 - $(top_builddir)/libpcsxcore/misc.h \
65888 - $(top_builddir)/libpcsxcore/plugins.h \
65889 - $(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
65890 - $(top_builddir)/libpcsxcore/psxbios.h \
65891 - $(top_builddir)/libpcsxcore/psxcommon.h \
65892 - $(top_builddir)/libpcsxcore/psxcounters.h \
65893 - $(top_builddir)/libpcsxcore/psxdma.h \
65894 - $(top_builddir)/libpcsxcore/psxhle.h \
65895 - $(top_builddir)/libpcsxcore/psxhw.h \
65896 - $(top_builddir)/libpcsxcore/psxmem.h \
65897 - $(top_builddir)/libpcsxcore/r3000a.h \
65898 - $(top_builddir)/libpcsxcore/sio.h \
65899 - $(top_builddir)/libpcsxcore/spu.h \
65900 - $(top_builddir)/libpcsxcore/system.h
65901 -
65902 -if ARCH_X86_64
65903 -libpcsxcore_la_SOURCES += \
65904 - $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
65905 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
65906 - $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
65907 - $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
65908 - $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
65909 - $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
65910 - $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
65911 - $(top_builddir)/libpcsxcore/
65912 -else
65913 -if ARCH_X86
65914 -libpcsxcore_la_SOURCES += \
65915 - $(top_builddir)/libpcsxcore/ix86/iR3000A.c \
65916 - $(top_builddir)/libpcsxcore/ix86/ix86.c \
65917 - $(top_builddir)/libpcsxcore/
65918 -endif
65919 -endif
65920 -
65921 -if ARCH_PPC
65922 -libpcsxcore_la_SOURCES += \
65923 - $(top_builddir)/libpcsxcore/ppc/pR3000A.c \
65924 - $(top_builddir)/libpcsxcore/ppc/ppc.c \
65925 - $(top_builddir)/libpcsxcore/ppc/reguse.c \
65926 - $(top_builddir)/libpcsxcore/ppc/pasm.s \
65927 - $(top_builddir)/libpcsxcore/
65928 -libpcsxcore_la_CCASFLAGS = -x assembler-with-cpp -mregnames
65929 -endif
65930 -
65931 -libpcsxcore_la_LIBADD = $(GLIB2_LIBS)
65932 -
65933 -libpcsxcore_la_LDFLAGS = -version-info 0:0:0
65934 -
65935 -EXTRA_DIST = \
65936 - $(top_builddir)/libpcsxcore/ix86/iGte.h \
65937 - $(top_builddir)/libpcsxcore/ix86/ix86.h \
65938 - $(top_builddir)/libpcsxcore/ix86_64/README \
65939 - $(top_builddir)/libpcsxcore/ix86_64/iGte.h \
65940 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.h \
65941 - $(top_builddir)/libpcsxcore/ppc/pGte.h \
65942 - $(top_builddir)/libpcsxcore/ppc/ppc.h \
65943 - $(top_builddir)/libpcsxcore/ppc/reguse.h \
65944 - $(top_builddir)/libpcsxcore/ppc/ppc_mnemonics.h
65945 -
65946 diff -rupN original/libpcsxcore/libpcsxcore/Makefile.in new/libpcsxcore/libpcsxcore/Makefile.in
65947 --- original/libpcsxcore/libpcsxcore/Makefile.in 2009-03-29 01:17:40.000000000 -0430
65948 +++ new/libpcsxcore/libpcsxcore/Makefile.in 1969-12-31 20:00:00.000000000 -0400
65949 @@ -1,916 +0,0 @@
65950 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
65951 -# @configure_input@
65952 -
65953 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
65954 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
65955 -# This Makefile.in is free software; the Free Software Foundation
65956 -# gives unlimited permission to copy and/or distribute it,
65957 -# with or without modifications, as long as this notice is preserved.
65958 -
65959 -# This program is distributed in the hope that it will be useful,
65960 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
65961 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
65962 -# PARTICULAR PURPOSE.
65963 -
65964 -@SET_MAKE@
65965 -
65966 -VPATH = @srcdir@
65967 -pkgdatadir = $(datadir)/@PACKAGE@
65968 -pkglibdir = $(libdir)/@PACKAGE@
65969 -pkgincludedir = $(includedir)/@PACKAGE@
65970 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
65971 -install_sh_DATA = $(install_sh) -c -m 644
65972 -install_sh_PROGRAM = $(install_sh) -c
65973 -install_sh_SCRIPT = $(install_sh) -c
65974 -INSTALL_HEADER = $(INSTALL_DATA)
65975 -transform = $(program_transform_name)
65976 -NORMAL_INSTALL = :
65977 -PRE_INSTALL = :
65978 -POST_INSTALL = :
65979 -NORMAL_UNINSTALL = :
65980 -PRE_UNINSTALL = :
65981 -POST_UNINSTALL = :
65982 -build_triplet = @build@
65983 -host_triplet = @host@
65984 -target_triplet = @target@
65985 -@ARCH_X86_64_TRUE@am__append_1 = \
65986 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
65987 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
65988 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
65989 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
65990 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
65991 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
65992 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
65993 -@ARCH_X86_64_TRUE@ $(top_builddir)/libpcsxcore/
65994 -
65995 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@am__append_2 = \
65996 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@ $(top_builddir)/libpcsxcore/ix86/iR3000A.c \
65997 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@ $(top_builddir)/libpcsxcore/ix86/ix86.c \
65998 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@ $(top_builddir)/libpcsxcore/
65999 -
66000 -@ARCH_PPC_TRUE@am__append_3 = \
66001 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/pR3000A.c \
66002 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/ppc.c \
66003 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/reguse.c \
66004 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/ppc/pasm.s \
66005 -@ARCH_PPC_TRUE@ $(top_builddir)/libpcsxcore/
66006 -
66007 -subdir = libpcsxcore
66008 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
66009 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66010 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
66011 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
66012 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
66013 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
66014 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
66015 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
66016 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
66017 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
66018 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
66019 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
66020 - $(top_srcdir)/configure.ac
66021 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
66022 - $(ACLOCAL_M4)
66023 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
66024 -CONFIG_HEADER = $(top_builddir)/include/config.h
66025 -CONFIG_CLEAN_FILES =
66026 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
66027 -am__vpath_adj = case $$p in \
66028 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
66029 - *) f=$$p;; \
66030 - esac;
66031 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
66032 -am__installdirs = "$(DESTDIR)$(libdir)"
66033 -libLTLIBRARIES_INSTALL = $(INSTALL)
66034 -LTLIBRARIES = $(lib_LTLIBRARIES)
66035 -am__DEPENDENCIES_1 =
66036 -libpcsxcore_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
66037 -am__libpcsxcore_la_SOURCES_DIST = \
66038 - $(top_builddir)/libpcsxcore/psxbios.c \
66039 - $(top_builddir)/libpcsxcore/cdrom.c \
66040 - $(top_builddir)/libpcsxcore/psxcounters.c \
66041 - $(top_builddir)/libpcsxcore/psxdma.c \
66042 - $(top_builddir)/libpcsxcore/disr3000a.c \
66043 - $(top_builddir)/libpcsxcore/spu.c \
66044 - $(top_builddir)/libpcsxcore/sio.c \
66045 - $(top_builddir)/libpcsxcore/psxhw.c \
66046 - $(top_builddir)/libpcsxcore/mdec.c \
66047 - $(top_builddir)/libpcsxcore/psxmem.c \
66048 - $(top_builddir)/libpcsxcore/misc.c \
66049 - $(top_builddir)/libpcsxcore/plugins.c \
66050 - $(top_builddir)/libpcsxcore/decode_xa.c \
66051 - $(top_builddir)/libpcsxcore/r3000a.c \
66052 - $(top_builddir)/libpcsxcore/psxinterpreter.c \
66053 - $(top_builddir)/libpcsxcore/gte.c \
66054 - $(top_builddir)/libpcsxcore/psxhle.c \
66055 - $(top_builddir)/libpcsxcore/cdrom.h \
66056 - $(top_builddir)/libpcsxcore/coff.h \
66057 - $(top_builddir)/libpcsxcore/debug.h \
66058 - $(top_builddir)/libpcsxcore/decode_xa.h \
66059 - $(top_builddir)/libpcsxcore/gte.h \
66060 - $(top_builddir)/libpcsxcore/mdec.h \
66061 - $(top_builddir)/libpcsxcore/misc.h \
66062 - $(top_builddir)/libpcsxcore/plugins.h \
66063 - $(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
66064 - $(top_builddir)/libpcsxcore/psxbios.h \
66065 - $(top_builddir)/libpcsxcore/psxcommon.h \
66066 - $(top_builddir)/libpcsxcore/psxcounters.h \
66067 - $(top_builddir)/libpcsxcore/psxdma.h \
66068 - $(top_builddir)/libpcsxcore/psxhle.h \
66069 - $(top_builddir)/libpcsxcore/psxhw.h \
66070 - $(top_builddir)/libpcsxcore/psxmem.h \
66071 - $(top_builddir)/libpcsxcore/r3000a.h \
66072 - $(top_builddir)/libpcsxcore/sio.h \
66073 - $(top_builddir)/libpcsxcore/spu.h \
66074 - $(top_builddir)/libpcsxcore/system.h \
66075 - $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
66076 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
66077 - $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
66078 - $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
66079 - $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
66080 - $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
66081 - $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
66082 - $(top_builddir)/libpcsxcore/ \
66083 - $(top_builddir)/libpcsxcore/ix86/iR3000A.c \
66084 - $(top_builddir)/libpcsxcore/ix86/ix86.c \
66085 - $(top_builddir)/libpcsxcore/ppc/pR3000A.c \
66086 - $(top_builddir)/libpcsxcore/ppc/ppc.c \
66087 - $(top_builddir)/libpcsxcore/ppc/reguse.c \
66088 - $(top_builddir)/libpcsxcore/ppc/pasm.s
66089 -@ARCH_X86_64_TRUE@am__objects_1 = iR3000A-64.lo ix86-64.lo \
66090 -@ARCH_X86_64_TRUE@ ix86_cpudetect.lo ix86_fpu.lo ix86_3dnow.lo \
66091 -@ARCH_X86_64_TRUE@ ix86_mmx.lo ix86_sse.lo
66092 -@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@am__objects_2 = iR3000A.lo ix86.lo
66093 -@ARCH_PPC_TRUE@am__objects_3 = pR3000A.lo ppc.lo reguse.lo \
66094 -@ARCH_PPC_TRUE@ libpcsxcore_la-pasm.lo
66095 -am_libpcsxcore_la_OBJECTS = psxbios.lo cdrom.lo psxcounters.lo \
66096 - psxdma.lo disr3000a.lo spu.lo sio.lo psxhw.lo mdec.lo \
66097 - psxmem.lo misc.lo plugins.lo decode_xa.lo r3000a.lo \
66098 - psxinterpreter.lo gte.lo psxhle.lo $(am__objects_1) \
66099 - $(am__objects_2) $(am__objects_3)
66100 -libpcsxcore_la_OBJECTS = $(am_libpcsxcore_la_OBJECTS)
66101 -libpcsxcore_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
66102 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
66103 - $(libpcsxcore_la_LDFLAGS) $(LDFLAGS) -o $@
66104 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
66105 -depcomp = $(SHELL) $(top_srcdir)/depcomp
66106 -am__depfiles_maybe = depfiles
66107 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
66108 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
66109 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
66110 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
66111 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
66112 -CCLD = $(CC)
66113 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
66114 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
66115 - $(LDFLAGS) -o $@
66116 -CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
66117 -LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
66118 - --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
66119 -SOURCES = $(libpcsxcore_la_SOURCES)
66120 -DIST_SOURCES = $(am__libpcsxcore_la_SOURCES_DIST)
66121 -ETAGS = etags
66122 -CTAGS = ctags
66123 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
66124 -ACLOCAL = @ACLOCAL@
66125 -ALLOCA = @ALLOCA@
66126 -ALL_LINGUAS = @ALL_LINGUAS@
66127 -ALSA_LIBS = @ALSA_LIBS@
66128 -AMTAR = @AMTAR@
66129 -AR = @AR@
66130 -AUTOCONF = @AUTOCONF@
66131 -AUTOHEADER = @AUTOHEADER@
66132 -AUTOMAKE = @AUTOMAKE@
66133 -AWK = @AWK@
66134 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
66135 -BURN_CFLAGS = @BURN_CFLAGS@
66136 -BURN_LIBS = @BURN_LIBS@
66137 -CATOBJEXT = @CATOBJEXT@
66138 -CC = @CC@
66139 -CCAS = @CCAS@
66140 -CCASDEPMODE = @CCASDEPMODE@
66141 -CCASFLAGS = @CCASFLAGS@
66142 -CCDEPMODE = @CCDEPMODE@
66143 -CFLAGS = @CFLAGS@
66144 -CPP = @CPP@
66145 -CPPFLAGS = @CPPFLAGS@
66146 -CXX = @CXX@
66147 -CXXCPP = @CXXCPP@
66148 -CXXDEPMODE = @CXXDEPMODE@
66149 -CXXFLAGS = @CXXFLAGS@
66150 -CYGPATH_W = @CYGPATH_W@
66151 -DATADIRNAME = @DATADIRNAME@
66152 -DEFS = @DEFS@
66153 -DEPDIR = @DEPDIR@
66154 -DFBINIMAGE = @DFBINIMAGE@
66155 -DSYMUTIL = @DSYMUTIL@
66156 -ECHO = @ECHO@
66157 -ECHO_C = @ECHO_C@
66158 -ECHO_N = @ECHO_N@
66159 -ECHO_T = @ECHO_T@
66160 -EGREP = @EGREP@
66161 -EXEEXT = @EXEEXT@
66162 -F77 = @F77@
66163 -FFLAGS = @FFLAGS@
66164 -FLTKCONFIG = @FLTKCONFIG@
66165 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
66166 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
66167 -GENCAT = @GENCAT@
66168 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
66169 -GIO2_CFLAGS = @GIO2_CFLAGS@
66170 -GIO2_LIBS = @GIO2_LIBS@
66171 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
66172 -GLADE2_LIBS = @GLADE2_LIBS@
66173 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
66174 -GLIB2_LIBS = @GLIB2_LIBS@
66175 -GLIBC21 = @GLIBC21@
66176 -GMSGFMT = @GMSGFMT@
66177 -GREP = @GREP@
66178 -GTK2_CFLAGS = @GTK2_CFLAGS@
66179 -GTK2_LIBS = @GTK2_LIBS@
66180 -INSTALL = @INSTALL@
66181 -INSTALL_DATA = @INSTALL_DATA@
66182 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
66183 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
66184 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
66185 -INSTOBJEXT = @INSTOBJEXT@
66186 -INTLBISON = @INTLBISON@
66187 -INTLLIBS = @INTLLIBS@
66188 -INTLOBJS = @INTLOBJS@
66189 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
66190 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
66191 -INTLTOOL_PERL = @INTLTOOL_PERL@
66192 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
66193 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
66194 -LDFLAGS = @LDFLAGS@
66195 -LIBICONV = @LIBICONV@
66196 -LIBINTL = @LIBINTL@
66197 -LIBOBJS = @LIBOBJS@
66198 -LIBS = @LIBS@
66199 -LIBTOOL = @LIBTOOL@
66200 -LN_S = @LN_S@
66201 -LTLIBICONV = @LTLIBICONV@
66202 -LTLIBINTL = @LTLIBINTL@
66203 -LTLIBOBJS = @LTLIBOBJS@
66204 -MAINT = @MAINT@
66205 -MAKEINFO = @MAKEINFO@
66206 -MKDIR_P = @MKDIR_P@
66207 -MKINSTALLDIRS = @MKINSTALLDIRS@
66208 -MSGFMT = @MSGFMT@
66209 -MSGMERGE = @MSGMERGE@
66210 -NASM = @NASM@
66211 -NMEDIT = @NMEDIT@
66212 -OBJEXT = @OBJEXT@
66213 -PACKAGE = @PACKAGE@
66214 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
66215 -PACKAGE_NAME = @PACKAGE_NAME@
66216 -PACKAGE_STRING = @PACKAGE_STRING@
66217 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
66218 -PACKAGE_VERSION = @PACKAGE_VERSION@
66219 -PATH_SEPARATOR = @PATH_SEPARATOR@
66220 -PKG_CONFIG = @PKG_CONFIG@
66221 -POSUB = @POSUB@
66222 -RANLIB = @RANLIB@
66223 -SED = @SED@
66224 -SET_MAKE = @SET_MAKE@
66225 -SHELL = @SHELL@
66226 -STRIP = @STRIP@
66227 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
66228 -USE_NLS = @USE_NLS@
66229 -VERSION = @VERSION@
66230 -XGETTEXT = @XGETTEXT@
66231 -abs_builddir = @abs_builddir@
66232 -abs_srcdir = @abs_srcdir@
66233 -abs_top_builddir = @abs_top_builddir@
66234 -abs_top_srcdir = @abs_top_srcdir@
66235 -ac_ct_CC = @ac_ct_CC@
66236 -ac_ct_CXX = @ac_ct_CXX@
66237 -ac_ct_F77 = @ac_ct_F77@
66238 -am__include = @am__include@
66239 -am__leading_dot = @am__leading_dot@
66240 -am__quote = @am__quote@
66241 -am__tar = @am__tar@
66242 -am__untar = @am__untar@
66243 -bindir = @bindir@
66244 -build = @build@
66245 -build_alias = @build_alias@
66246 -build_cpu = @build_cpu@
66247 -build_os = @build_os@
66248 -build_vendor = @build_vendor@
66249 -builddir = @builddir@
66250 -datadir = @datadir@
66251 -datarootdir = @datarootdir@
66252 -docdir = @docdir@
66253 -dvidir = @dvidir@
66254 -exec_prefix = @exec_prefix@
66255 -host = @host@
66256 -host_alias = @host_alias@
66257 -host_cpu = @host_cpu@
66258 -host_os = @host_os@
66259 -host_vendor = @host_vendor@
66260 -htmldir = @htmldir@
66261 -includedir = @includedir@
66262 -infodir = @infodir@
66263 -install_sh = @install_sh@
66264 -libdir = @libdir@
66265 -libexecdir = @libexecdir@
66266 -localedir = @localedir@
66267 -localstatedir = @localstatedir@
66268 -mandir = @mandir@
66269 -mkdir_p = @mkdir_p@
66270 -oldincludedir = @oldincludedir@
66271 -pdfdir = @pdfdir@
66272 -prefix = @prefix@
66273 -program_transform_name = @program_transform_name@
66274 -psdir = @psdir@
66275 -sbindir = @sbindir@
66276 -sharedstatedir = @sharedstatedir@
66277 -srcdir = @srcdir@
66278 -sysconfdir = @sysconfdir@
66279 -target = @target@
66280 -target_alias = @target_alias@
66281 -target_cpu = @target_cpu@
66282 -target_os = @target_os@
66283 -target_vendor = @target_vendor@
66284 -top_build_prefix = @top_build_prefix@
66285 -top_builddir = @top_builddir@
66286 -top_srcdir = @top_srcdir@
66287 -INCLUDES = -DLOCALE_DIR=\"${datadir}/locale/\" \
66288 - $(GLIB2_CFLAGS) -I$(top_srcdir)/include
66289 -
66290 -lib_LTLIBRARIES = libpcsxcore.la
66291 -libpcsxcore_la_SOURCES = $(top_builddir)/libpcsxcore/psxbios.c \
66292 - $(top_builddir)/libpcsxcore/cdrom.c \
66293 - $(top_builddir)/libpcsxcore/psxcounters.c \
66294 - $(top_builddir)/libpcsxcore/psxdma.c \
66295 - $(top_builddir)/libpcsxcore/disr3000a.c \
66296 - $(top_builddir)/libpcsxcore/spu.c \
66297 - $(top_builddir)/libpcsxcore/sio.c \
66298 - $(top_builddir)/libpcsxcore/psxhw.c \
66299 - $(top_builddir)/libpcsxcore/mdec.c \
66300 - $(top_builddir)/libpcsxcore/psxmem.c \
66301 - $(top_builddir)/libpcsxcore/misc.c \
66302 - $(top_builddir)/libpcsxcore/plugins.c \
66303 - $(top_builddir)/libpcsxcore/decode_xa.c \
66304 - $(top_builddir)/libpcsxcore/r3000a.c \
66305 - $(top_builddir)/libpcsxcore/psxinterpreter.c \
66306 - $(top_builddir)/libpcsxcore/gte.c \
66307 - $(top_builddir)/libpcsxcore/psxhle.c \
66308 - $(top_builddir)/libpcsxcore/cdrom.h \
66309 - $(top_builddir)/libpcsxcore/coff.h \
66310 - $(top_builddir)/libpcsxcore/debug.h \
66311 - $(top_builddir)/libpcsxcore/decode_xa.h \
66312 - $(top_builddir)/libpcsxcore/gte.h \
66313 - $(top_builddir)/libpcsxcore/mdec.h \
66314 - $(top_builddir)/libpcsxcore/misc.h \
66315 - $(top_builddir)/libpcsxcore/plugins.h \
66316 - $(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
66317 - $(top_builddir)/libpcsxcore/psxbios.h \
66318 - $(top_builddir)/libpcsxcore/psxcommon.h \
66319 - $(top_builddir)/libpcsxcore/psxcounters.h \
66320 - $(top_builddir)/libpcsxcore/psxdma.h \
66321 - $(top_builddir)/libpcsxcore/psxhle.h \
66322 - $(top_builddir)/libpcsxcore/psxhw.h \
66323 - $(top_builddir)/libpcsxcore/psxmem.h \
66324 - $(top_builddir)/libpcsxcore/r3000a.h \
66325 - $(top_builddir)/libpcsxcore/sio.h \
66326 - $(top_builddir)/libpcsxcore/spu.h \
66327 - $(top_builddir)/libpcsxcore/system.h $(am__append_1) \
66328 - $(am__append_2) $(am__append_3)
66329 -@ARCH_PPC_TRUE@libpcsxcore_la_CCASFLAGS = -x assembler-with-cpp -mregnames
66330 -libpcsxcore_la_LIBADD = $(GLIB2_LIBS)
66331 -libpcsxcore_la_LDFLAGS = -version-info 0:0:0
66332 -EXTRA_DIST = \
66333 - $(top_builddir)/libpcsxcore/ix86/iGte.h \
66334 - $(top_builddir)/libpcsxcore/ix86/ix86.h \
66335 - $(top_builddir)/libpcsxcore/ix86_64/README \
66336 - $(top_builddir)/libpcsxcore/ix86_64/iGte.h \
66337 - $(top_builddir)/libpcsxcore/ix86_64/ix86-64.h \
66338 - $(top_builddir)/libpcsxcore/ppc/pGte.h \
66339 - $(top_builddir)/libpcsxcore/ppc/ppc.h \
66340 - $(top_builddir)/libpcsxcore/ppc/reguse.h \
66341 - $(top_builddir)/libpcsxcore/ppc/ppc_mnemonics.h
66342 -
66343 -all: all-am
66344 -
66345 -.SUFFIXES:
66346 -.SUFFIXES: .c .lo .o .obj .s
66347 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
66348 - @for dep in $?; do \
66349 - case '$(am__configure_deps)' in \
66350 - *$$dep*) \
66351 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
66352 - && exit 0; \
66353 - exit 1;; \
66354 - esac; \
66355 - done; \
66356 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpcsxcore/Makefile'; \
66357 - cd $(top_srcdir) && \
66358 - $(AUTOMAKE) --gnu libpcsxcore/Makefile
66359 -.PRECIOUS: Makefile
66360 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
66361 - @case '$?' in \
66362 - *config.status*) \
66363 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
66364 - *) \
66365 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
66366 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
66367 - esac;
66368 -
66369 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
66370 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
66371 -
66372 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
66373 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
66374 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
66375 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
66376 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
66377 - @$(NORMAL_INSTALL)
66378 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
66379 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
66380 - if test -f $$p; then \
66381 - f=$(am__strip_dir) \
66382 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
66383 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
66384 - else :; fi; \
66385 - done
66386 -
66387 -uninstall-libLTLIBRARIES:
66388 - @$(NORMAL_UNINSTALL)
66389 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
66390 - p=$(am__strip_dir) \
66391 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
66392 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
66393 - done
66394 -
66395 -clean-libLTLIBRARIES:
66396 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
66397 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
66398 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
66399 - test "$$dir" != "$$p" || dir=.; \
66400 - echo "rm -f \"$${dir}/so_locations\""; \
66401 - rm -f "$${dir}/so_locations"; \
66402 - done
66403 -libpcsxcore.la: $(libpcsxcore_la_OBJECTS) $(libpcsxcore_la_DEPENDENCIES)
66404 - $(libpcsxcore_la_LINK) -rpath $(libdir) $(libpcsxcore_la_OBJECTS) $(libpcsxcore_la_LIBADD) $(LIBS)
66405 -
66406 -mostlyclean-compile:
66407 - -rm -f *.$(OBJEXT)
66408 -
66409 -distclean-compile:
66410 - -rm -f *.tab.c
66411 -
66412 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdrom.Plo@am__quote@
66413 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_xa.Plo@am__quote@
66414 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disr3000a.Plo@am__quote@
66415 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gte.Plo@am__quote@
66416 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iR3000A-64.Plo@am__quote@
66417 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iR3000A.Plo@am__quote@
66418 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86-64.Plo@am__quote@
66419 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86.Plo@am__quote@
66420 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_3dnow.Plo@am__quote@
66421 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_cpudetect.Plo@am__quote@
66422 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_fpu.Plo@am__quote@
66423 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_mmx.Plo@am__quote@
66424 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_sse.Plo@am__quote@
66425 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdec.Plo@am__quote@
66426 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
66427 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pR3000A.Plo@am__quote@
66428 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugins.Plo@am__quote@
66429 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc.Plo@am__quote@
66430 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxbios.Plo@am__quote@
66431 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxcounters.Plo@am__quote@
66432 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxdma.Plo@am__quote@
66433 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxhle.Plo@am__quote@
66434 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxhw.Plo@am__quote@
66435 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxinterpreter.Plo@am__quote@
66436 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxmem.Plo@am__quote@
66437 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/r3000a.Plo@am__quote@
66438 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reguse.Plo@am__quote@
66439 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio.Plo@am__quote@
66440 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spu.Plo@am__quote@
66441 -
66442 -.c.o:
66443 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
66444 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
66445 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
66446 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66447 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
66448 -
66449 -.c.obj:
66450 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
66451 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
66452 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
66453 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66454 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
66455 -
66456 -.c.lo:
66457 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
66458 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
66459 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
66460 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66461 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
66462 -
66463 -psxbios.lo: $(top_builddir)/libpcsxcore/psxbios.c
66464 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxbios.lo -MD -MP -MF $(DEPDIR)/psxbios.Tpo -c -o psxbios.lo `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
66465 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Plo
66466 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxbios.c' object='psxbios.lo' libtool=yes @AMDEPBACKSLASH@
66467 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66468 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxbios.lo `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
66469 -
66470 -cdrom.lo: $(top_builddir)/libpcsxcore/cdrom.c
66471 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdrom.lo -MD -MP -MF $(DEPDIR)/cdrom.Tpo -c -o cdrom.lo `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
66472 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Plo
66473 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/cdrom.c' object='cdrom.lo' libtool=yes @AMDEPBACKSLASH@
66474 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66475 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrom.lo `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
66476 -
66477 -psxcounters.lo: $(top_builddir)/libpcsxcore/psxcounters.c
66478 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcounters.lo -MD -MP -MF $(DEPDIR)/psxcounters.Tpo -c -o psxcounters.lo `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
66479 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Plo
66480 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxcounters.c' object='psxcounters.lo' libtool=yes @AMDEPBACKSLASH@
66481 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66482 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcounters.lo `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
66483 -
66484 -psxdma.lo: $(top_builddir)/libpcsxcore/psxdma.c
66485 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxdma.lo -MD -MP -MF $(DEPDIR)/psxdma.Tpo -c -o psxdma.lo `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
66486 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Plo
66487 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxdma.c' object='psxdma.lo' libtool=yes @AMDEPBACKSLASH@
66488 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66489 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxdma.lo `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
66490 -
66491 -disr3000a.lo: $(top_builddir)/libpcsxcore/disr3000a.c
66492 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT disr3000a.lo -MD -MP -MF $(DEPDIR)/disr3000a.Tpo -c -o disr3000a.lo `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
66493 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Plo
66494 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/disr3000a.c' object='disr3000a.lo' libtool=yes @AMDEPBACKSLASH@
66495 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66496 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o disr3000a.lo `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
66497 -
66498 -spu.lo: $(top_builddir)/libpcsxcore/spu.c
66499 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
66500 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
66501 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/spu.c' object='spu.lo' libtool=yes @AMDEPBACKSLASH@
66502 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66503 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
66504 -
66505 -sio.lo: $(top_builddir)/libpcsxcore/sio.c
66506 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sio.lo -MD -MP -MF $(DEPDIR)/sio.Tpo -c -o sio.lo `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
66507 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Plo
66508 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/sio.c' object='sio.lo' libtool=yes @AMDEPBACKSLASH@
66509 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66510 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sio.lo `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
66511 -
66512 -psxhw.lo: $(top_builddir)/libpcsxcore/psxhw.c
66513 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhw.lo -MD -MP -MF $(DEPDIR)/psxhw.Tpo -c -o psxhw.lo `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
66514 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Plo
66515 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxhw.c' object='psxhw.lo' libtool=yes @AMDEPBACKSLASH@
66516 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66517 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhw.lo `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
66518 -
66519 -mdec.lo: $(top_builddir)/libpcsxcore/mdec.c
66520 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdec.lo -MD -MP -MF $(DEPDIR)/mdec.Tpo -c -o mdec.lo `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
66521 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Plo
66522 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/mdec.c' object='mdec.lo' libtool=yes @AMDEPBACKSLASH@
66523 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66524 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdec.lo `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
66525 -
66526 -psxmem.lo: $(top_builddir)/libpcsxcore/psxmem.c
66527 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxmem.lo -MD -MP -MF $(DEPDIR)/psxmem.Tpo -c -o psxmem.lo `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
66528 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Plo
66529 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxmem.c' object='psxmem.lo' libtool=yes @AMDEPBACKSLASH@
66530 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66531 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxmem.lo `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
66532 -
66533 -misc.lo: $(top_builddir)/libpcsxcore/misc.c
66534 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.lo -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.lo `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
66535 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Plo
66536 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/misc.c' object='misc.lo' libtool=yes @AMDEPBACKSLASH@
66537 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66538 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.lo `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
66539 -
66540 -plugins.lo: $(top_builddir)/libpcsxcore/plugins.c
66541 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugins.lo -MD -MP -MF $(DEPDIR)/plugins.Tpo -c -o plugins.lo `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
66542 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Plo
66543 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/plugins.c' object='plugins.lo' libtool=yes @AMDEPBACKSLASH@
66544 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66545 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plugins.lo `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
66546 -
66547 -decode_xa.lo: $(top_builddir)/libpcsxcore/decode_xa.c
66548 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode_xa.lo -MD -MP -MF $(DEPDIR)/decode_xa.Tpo -c -o decode_xa.lo `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
66549 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Plo
66550 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/decode_xa.c' object='decode_xa.lo' libtool=yes @AMDEPBACKSLASH@
66551 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66552 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode_xa.lo `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
66553 -
66554 -r3000a.lo: $(top_builddir)/libpcsxcore/r3000a.c
66555 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT r3000a.lo -MD -MP -MF $(DEPDIR)/r3000a.Tpo -c -o r3000a.lo `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
66556 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Plo
66557 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/r3000a.c' object='r3000a.lo' libtool=yes @AMDEPBACKSLASH@
66558 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66559 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o r3000a.lo `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
66560 -
66561 -psxinterpreter.lo: $(top_builddir)/libpcsxcore/psxinterpreter.c
66562 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxinterpreter.lo -MD -MP -MF $(DEPDIR)/psxinterpreter.Tpo -c -o psxinterpreter.lo `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
66563 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Plo
66564 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxinterpreter.c' object='psxinterpreter.lo' libtool=yes @AMDEPBACKSLASH@
66565 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66566 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxinterpreter.lo `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
66567 -
66568 -gte.lo: $(top_builddir)/libpcsxcore/gte.c
66569 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gte.lo -MD -MP -MF $(DEPDIR)/gte.Tpo -c -o gte.lo `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
66570 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Plo
66571 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/gte.c' object='gte.lo' libtool=yes @AMDEPBACKSLASH@
66572 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66573 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gte.lo `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
66574 -
66575 -psxhle.lo: $(top_builddir)/libpcsxcore/psxhle.c
66576 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhle.lo -MD -MP -MF $(DEPDIR)/psxhle.Tpo -c -o psxhle.lo `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
66577 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Plo
66578 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/psxhle.c' object='psxhle.lo' libtool=yes @AMDEPBACKSLASH@
66579 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66580 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhle.lo `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
66581 -
66582 -iR3000A-64.lo: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
66583 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.lo -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
66584 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Plo
66585 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' object='iR3000A-64.lo' libtool=yes @AMDEPBACKSLASH@
66586 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66587 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
66588 -
66589 -ix86-64.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
66590 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86-64.lo -MD -MP -MF $(DEPDIR)/ix86-64.Tpo -c -o ix86-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
66591 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Plo
66592 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' object='ix86-64.lo' libtool=yes @AMDEPBACKSLASH@
66593 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66594 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86-64.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
66595 -
66596 -ix86_cpudetect.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
66597 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_cpudetect.lo -MD -MP -MF $(DEPDIR)/ix86_cpudetect.Tpo -c -o ix86_cpudetect.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
66598 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Plo
66599 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' object='ix86_cpudetect.lo' libtool=yes @AMDEPBACKSLASH@
66600 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66601 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_cpudetect.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
66602 -
66603 -ix86_fpu.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
66604 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_fpu.lo -MD -MP -MF $(DEPDIR)/ix86_fpu.Tpo -c -o ix86_fpu.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
66605 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Plo
66606 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' object='ix86_fpu.lo' libtool=yes @AMDEPBACKSLASH@
66607 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66608 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_fpu.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
66609 -
66610 -ix86_3dnow.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
66611 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_3dnow.lo -MD -MP -MF $(DEPDIR)/ix86_3dnow.Tpo -c -o ix86_3dnow.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
66612 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Plo
66613 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' object='ix86_3dnow.lo' libtool=yes @AMDEPBACKSLASH@
66614 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66615 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_3dnow.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
66616 -
66617 -ix86_mmx.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
66618 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_mmx.lo -MD -MP -MF $(DEPDIR)/ix86_mmx.Tpo -c -o ix86_mmx.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
66619 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Plo
66620 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' object='ix86_mmx.lo' libtool=yes @AMDEPBACKSLASH@
66621 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66622 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_mmx.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
66623 -
66624 -ix86_sse.lo: $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
66625 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_sse.lo -MD -MP -MF $(DEPDIR)/ix86_sse.Tpo -c -o ix86_sse.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
66626 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Plo
66627 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' object='ix86_sse.lo' libtool=yes @AMDEPBACKSLASH@
66628 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66629 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_sse.lo `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
66630 -
66631 -iR3000A.lo: $(top_builddir)/libpcsxcore/ix86/iR3000A.c
66632 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A.lo -MD -MP -MF $(DEPDIR)/iR3000A.Tpo -c -o iR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
66633 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Plo
66634 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86/iR3000A.c' object='iR3000A.lo' libtool=yes @AMDEPBACKSLASH@
66635 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66636 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
66637 -
66638 -ix86.lo: $(top_builddir)/libpcsxcore/ix86/ix86.c
66639 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86.lo -MD -MP -MF $(DEPDIR)/ix86.Tpo -c -o ix86.lo `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
66640 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Plo
66641 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ix86/ix86.c' object='ix86.lo' libtool=yes @AMDEPBACKSLASH@
66642 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66643 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86.lo `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
66644 -
66645 -pR3000A.lo: $(top_builddir)/libpcsxcore/ppc/pR3000A.c
66646 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pR3000A.lo -MD -MP -MF $(DEPDIR)/pR3000A.Tpo -c -o pR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
66647 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Plo
66648 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppc/pR3000A.c' object='pR3000A.lo' libtool=yes @AMDEPBACKSLASH@
66649 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66650 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pR3000A.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
66651 -
66652 -ppc.lo: $(top_builddir)/libpcsxcore/ppc/ppc.c
66653 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppc.lo -MD -MP -MF $(DEPDIR)/ppc.Tpo -c -o ppc.lo `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
66654 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Plo
66655 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppc/ppc.c' object='ppc.lo' libtool=yes @AMDEPBACKSLASH@
66656 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66657 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppc.lo `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
66658 -
66659 -reguse.lo: $(top_builddir)/libpcsxcore/ppc/reguse.c
66660 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reguse.lo -MD -MP -MF $(DEPDIR)/reguse.Tpo -c -o reguse.lo `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
66661 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Plo
66662 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppc/reguse.c' object='reguse.lo' libtool=yes @AMDEPBACKSLASH@
66663 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
66664 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reguse.lo `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
66665 -
66666 -.s.o:
66667 - $(CCASCOMPILE) -c -o $@ $<
66668 -
66669 -.s.obj:
66670 - $(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
66671 -
66672 -.s.lo:
66673 - $(LTCCASCOMPILE) -c -o $@ $<
66674 -
66675 -libpcsxcore_la-pasm.lo: $(top_builddir)/libpcsxcore/ppc/pasm.s
66676 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(libpcsxcore_la_CCASFLAGS) $(CCASFLAGS) -c -o libpcsxcore_la-pasm.lo `test -f '$(top_builddir)/libpcsxcore/ppc/pasm.s' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pasm.s
66677 -
66678 -mostlyclean-libtool:
66679 - -rm -f *.lo
66680 -
66681 -clean-libtool:
66682 - -rm -rf .libs _libs
66683 -
66684 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
66685 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
66686 - unique=`for i in $$list; do \
66687 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
66688 - done | \
66689 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
66690 - END { if (nonempty) { for (i in files) print i; }; }'`; \
66691 - mkid -fID $$unique
66692 -tags: TAGS
66693 -
66694 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
66695 - $(TAGS_FILES) $(LISP)
66696 - tags=; \
66697 - here=`pwd`; \
66698 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
66699 - unique=`for i in $$list; do \
66700 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
66701 - done | \
66702 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
66703 - END { if (nonempty) { for (i in files) print i; }; }'`; \
66704 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
66705 - test -n "$$unique" || unique=$$empty_fix; \
66706 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
66707 - $$tags $$unique; \
66708 - fi
66709 -ctags: CTAGS
66710 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
66711 - $(TAGS_FILES) $(LISP)
66712 - tags=; \
66713 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
66714 - unique=`for i in $$list; do \
66715 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
66716 - done | \
66717 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
66718 - END { if (nonempty) { for (i in files) print i; }; }'`; \
66719 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
66720 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
66721 - $$tags $$unique
66722 -
66723 -GTAGS:
66724 - here=`$(am__cd) $(top_builddir) && pwd` \
66725 - && cd $(top_srcdir) \
66726 - && gtags -i $(GTAGS_ARGS) $$here
66727 -
66728 -distclean-tags:
66729 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
66730 -
66731 -distdir: $(DISTFILES)
66732 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
66733 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
66734 - list='$(DISTFILES)'; \
66735 - dist_files=`for file in $$list; do echo $$file; done | \
66736 - sed -e "s|^$$srcdirstrip/||;t" \
66737 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
66738 - case $$dist_files in \
66739 - */*) $(MKDIR_P) `echo "$$dist_files" | \
66740 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
66741 - sort -u` ;; \
66742 - esac; \
66743 - for file in $$dist_files; do \
66744 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
66745 - if test -d $$d/$$file; then \
66746 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
66747 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
66748 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
66749 - fi; \
66750 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
66751 - else \
66752 - test -f $(distdir)/$$file \
66753 - || cp -p $$d/$$file $(distdir)/$$file \
66754 - || exit 1; \
66755 - fi; \
66756 - done
66757 -check-am: all-am
66758 -check: check-am
66759 -all-am: Makefile $(LTLIBRARIES)
66760 -installdirs:
66761 - for dir in "$(DESTDIR)$(libdir)"; do \
66762 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
66763 - done
66764 -install: install-am
66765 -install-exec: install-exec-am
66766 -install-data: install-data-am
66767 -uninstall: uninstall-am
66768 -
66769 -install-am: all-am
66770 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
66771 -
66772 -installcheck: installcheck-am
66773 -install-strip:
66774 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
66775 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
66776 - `test -z '$(STRIP)' || \
66777 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
66778 -mostlyclean-generic:
66779 -
66780 -clean-generic:
66781 -
66782 -distclean-generic:
66783 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
66784 -
66785 -maintainer-clean-generic:
66786 - @echo "This command is intended for maintainers to use"
66787 - @echo "it deletes files that may require special tools to rebuild."
66788 -clean: clean-am
66789 -
66790 -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
66791 - mostlyclean-am
66792 -
66793 -distclean: distclean-am
66794 - -rm -rf ./$(DEPDIR)
66795 - -rm -f Makefile
66796 -distclean-am: clean-am distclean-compile distclean-generic \
66797 - distclean-tags
66798 -
66799 -dvi: dvi-am
66800 -
66801 -dvi-am:
66802 -
66803 -html: html-am
66804 -
66805 -info: info-am
66806 -
66807 -info-am:
66808 -
66809 -install-data-am:
66810 -
66811 -install-dvi: install-dvi-am
66812 -
66813 -install-exec-am: install-libLTLIBRARIES
66814 -
66815 -install-html: install-html-am
66816 -
66817 -install-info: install-info-am
66818 -
66819 -install-man:
66820 -
66821 -install-pdf: install-pdf-am
66822 -
66823 -install-ps: install-ps-am
66824 -
66825 -installcheck-am:
66826 -
66827 -maintainer-clean: maintainer-clean-am
66828 - -rm -rf ./$(DEPDIR)
66829 - -rm -f Makefile
66830 -maintainer-clean-am: distclean-am maintainer-clean-generic
66831 -
66832 -mostlyclean: mostlyclean-am
66833 -
66834 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
66835 - mostlyclean-libtool
66836 -
66837 -pdf: pdf-am
66838 -
66839 -pdf-am:
66840 -
66841 -ps: ps-am
66842 -
66843 -ps-am:
66844 -
66845 -uninstall-am: uninstall-libLTLIBRARIES
66846 -
66847 -.MAKE: install-am install-strip
66848 -
66849 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
66850 - clean-libLTLIBRARIES clean-libtool ctags distclean \
66851 - distclean-compile distclean-generic distclean-libtool \
66852 - distclean-tags distdir dvi dvi-am html html-am info info-am \
66853 - install install-am install-data install-data-am install-dvi \
66854 - install-dvi-am install-exec install-exec-am install-html \
66855 - install-html-am install-info install-info-am \
66856 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
66857 - install-ps install-ps-am install-strip installcheck \
66858 - installcheck-am installdirs maintainer-clean \
66859 - maintainer-clean-generic mostlyclean mostlyclean-compile \
66860 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
66861 - tags uninstall uninstall-am uninstall-libLTLIBRARIES
66862 -
66863 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
66864 -# Otherwise a system limit (for SysV at least) may be exceeded.
66865 -.NOEXPORT:
66866 diff -rupN original/libpcsxcore/libpcsxcore/cdrom.c new/libpcsxcore/libpcsxcore/cdrom.c
66867 --- original/libpcsxcore/libpcsxcore/cdrom.c 2007-10-08 17:13:28.000000000 -0400
66868 +++ new/libpcsxcore/libpcsxcore/cdrom.c 1969-12-31 20:00:00.000000000 -0400
66869 @@ -1,1073 +0,0 @@
66870 -/***************************************************************************
66871 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
66872 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
66873 - * *
66874 - * This program is free software; you can redistribute it and/or modify *
66875 - * it under the terms of the GNU General Public License as published by *
66876 - * the Free Software Foundation; either version 2 of the License, or *
66877 - * (at your option) any later version. *
66878 - * *
66879 - * This program is distributed in the hope that it will be useful, *
66880 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
66881 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
66882 - * GNU General Public License for more details. *
66883 - * *
66884 - * You should have received a copy of the GNU General Public License *
66885 - * along with this program; if not, write to the *
66886 - * Free Software Foundation, Inc., *
66887 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
66888 - ***************************************************************************/
66889 -
66890 -/*
66891 -* Handles all CD-ROM registers and functions.
66892 -*/
66893 -
66894 -#include "cdrom.h"
66895 -
66896 -/* CD-ROM magic numbers */
66897 -#define CdlSync 0
66898 -#define CdlNop 1
66899 -#define CdlSetloc 2
66900 -#define CdlPlay 3
66901 -#define CdlForward 4
66902 -#define CdlBackward 5
66903 -#define CdlReadN 6
66904 -#define CdlStandby 7
66905 -#define CdlStop 8
66906 -#define CdlPause 9
66907 -#define CdlInit 10
66908 -#define CdlMute 11
66909 -#define CdlDemute 12
66910 -#define CdlSetfilter 13
66911 -#define CdlSetmode 14
66912 -#define CdlGetmode 15
66913 -#define CdlGetlocL 16
66914 -#define CdlGetlocP 17
66915 -#define Cdl18 18
66916 -#define CdlGetTN 19
66917 -#define CdlGetTD 20
66918 -#define CdlSeekL 21
66919 -#define CdlSeekP 22
66920 -#define CdlTest 25
66921 -#define CdlID 26
66922 -#define CdlReadS 27
66923 -#define CdlReset 28
66924 -#define CdlReadToc 30
66925 -
66926 -#define AUTOPAUSE 249
66927 -#define READ_ACK 250
66928 -#define READ 251
66929 -#define REPPLAY_ACK 252
66930 -#define REPPLAY 253
66931 -#define ASYNC 254
66932 -/* don't set 255, it's reserved */
66933 -
66934 -char *CmdName[0x100]= {
66935 - "CdlSync", "CdlNop", "CdlSetloc", "CdlPlay",
66936 - "CdlForward", "CdlBackward", "CdlReadN", "CdlStandby",
66937 - "CdlStop", "CdlPause", "CdlInit", "CdlMute",
66938 - "CdlDemute", "CdlSetfilter", "CdlSetmode", "CdlGetmode",
66939 - "CdlGetlocL", "CdlGetlocP", "Cdl18", "CdlGetTN",
66940 - "CdlGetTD", "CdlSeekL", "CdlSeekP", NULL,
66941 - NULL, "CdlTest", "CdlID", "CdlReadS",
66942 - "CdlReset", NULL, "CDlReadToc", NULL
66943 -};
66944 -
66945 -unsigned char Test04[] = { 0 };
66946 -unsigned char Test05[] = { 0 };
66947 -unsigned char Test20[] = { 0x98, 0x06, 0x10, 0xC3 };
66948 -unsigned char Test22[] = { 0x66, 0x6F, 0x72, 0x20, 0x45, 0x75, 0x72, 0x6F };
66949 -unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
66950 -
66951 -// 1x = 75 sectors per second
66952 -// PSXCLK = 1 sec in the ps
66953 -// so (PSXCLK / 75) / BIAS = cdr read time (linuzappz)
66954 -#define cdReadTime ((PSXCLK / 75) / BIAS)
66955 -
66956 -#define btoi(b) ((b)/16*10 + (b)%16) /* BCD to u_char */
66957 -#define itob(i) ((i)/10*16 + (i)%10) /* u_char to BCD */
66958 -
66959 -static struct CdrStat stat;
66960 -static struct SubQ *subq;
66961 -
66962 -#define CDR_INT(eCycle) { \
66963 - psxRegs.interrupt|= 0x4; \
66964 - psxRegs.intCycle[2+1] = eCycle; \
66965 - psxRegs.intCycle[2] = psxRegs.cycle; }
66966 -
66967 -#define CDREAD_INT(eCycle) { \
66968 - psxRegs.interrupt|= 0x40000; \
66969 - psxRegs.intCycle[2+16+1] = eCycle; \
66970 - psxRegs.intCycle[2+16] = psxRegs.cycle; }
66971 -
66972 -#define StartReading(type) { \
66973 - cdr.Reading = type; \
66974 - cdr.FirstSector = 1; \
66975 - cdr.Readed = 0xff; \
66976 - AddIrqQueue(READ_ACK, 0x800); \
66977 -}
66978 -
66979 -#define StopReading() { \
66980 - if (cdr.Reading) { \
66981 - cdr.Reading = 0; \
66982 - psxRegs.interrupt&=~0x40000; \
66983 - } \
66984 -}
66985 -
66986 -#define StopCdda() { \
66987 - if (cdr.Play) { \
66988 - if (!Config.Cdda) CDR_stop(); \
66989 - cdr.StatP&=~0x80; \
66990 - cdr.Play = 0; \
66991 - } \
66992 -}
66993 -
66994 -#define SetResultSize(size) { \
66995 - cdr.ResultP = 0; \
66996 - cdr.ResultC = size; \
66997 - cdr.ResultReady = 1; \
66998 -}
66999 -
67000 -void ReadTrack() {
67001 - cdr.Prev[0] = itob(cdr.SetSector[0]);
67002 - cdr.Prev[1] = itob(cdr.SetSector[1]);
67003 - cdr.Prev[2] = itob(cdr.SetSector[2]);
67004 -
67005 -#ifdef CDR_LOG
67006 - CDR_LOG("ReadTrack() Log: KEY *** %x:%x:%x\n", cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
67007 -#endif
67008 - cdr.RErr = CDR_readTrack(cdr.Prev);
67009 -}
67010 -
67011 -// cdr.Stat:
67012 -#define NoIntr 0
67013 -#define DataReady 1
67014 -#define Complete 2
67015 -#define Acknowledge 3
67016 -#define DataEnd 4
67017 -#define DiskError 5
67018 -
67019 -void AddIrqQueue(unsigned char irq, unsigned long ecycle) {
67020 - cdr.Irq = irq;
67021 - if (cdr.Stat) {
67022 - cdr.eCycle = ecycle;
67023 - } else {
67024 - CDR_INT(ecycle);
67025 - }
67026 -}
67027 -
67028 -void cdrInterrupt() {
67029 - int i;
67030 - unsigned char Irq = cdr.Irq;
67031 -
67032 - if (cdr.Stat) {
67033 - CDR_INT(0x800);
67034 - return;
67035 - }
67036 -
67037 - cdr.Irq = 0xff;
67038 - cdr.Ctrl&=~0x80;
67039 -
67040 - switch (Irq) {
67041 - case CdlSync:
67042 - SetResultSize(1);
67043 - cdr.StatP|= 0x2;
67044 - cdr.Result[0] = cdr.StatP;
67045 - cdr.Stat = Acknowledge;
67046 - break;
67047 -
67048 - case CdlNop:
67049 - SetResultSize(1);
67050 - cdr.Result[0] = cdr.StatP;
67051 - cdr.Stat = Acknowledge;
67052 - i = stat.Status;
67053 - if (CDR_getStatus(&stat) != -1) {
67054 - if (stat.Type == 0xff) cdr.Stat = DiskError;
67055 - if (stat.Status & 0x10) {
67056 - cdr.Stat = DiskError;
67057 - cdr.Result[0]|= 0x11;
67058 - cdr.Result[0]&=~0x02;
67059 - }
67060 - else if (i & 0x10) {
67061 - cdr.StatP |= 0x2;
67062 - cdr.Result[0]|= 0x2;
67063 - CheckCdrom();
67064 - }
67065 - }
67066 - break;
67067 -
67068 - case CdlSetloc:
67069 - cdr.CmdProcess = 0;
67070 - SetResultSize(1);
67071 - cdr.StatP|= 0x2;
67072 - cdr.Result[0] = cdr.StatP;
67073 - cdr.Stat = Acknowledge;
67074 - break;
67075 -
67076 - case CdlPlay:
67077 - cdr.CmdProcess = 0;
67078 - SetResultSize(1);
67079 - cdr.StatP|= 0x2;
67080 - cdr.Result[0] = cdr.StatP;
67081 - cdr.Stat = Acknowledge;
67082 - cdr.StatP|= 0x80;
67083 -// if ((cdr.Mode & 0x5) == 0x5) AddIrqQueue(REPPLAY, cdReadTime);
67084 - break;
67085 -
67086 - case CdlForward:
67087 - cdr.CmdProcess = 0;
67088 - SetResultSize(1);
67089 - cdr.StatP|= 0x2;
67090 - cdr.Result[0] = cdr.StatP;
67091 - cdr.Stat = Complete;
67092 - break;
67093 -
67094 - case CdlBackward:
67095 - cdr.CmdProcess = 0;
67096 - SetResultSize(1);
67097 - cdr.StatP|= 0x2;
67098 - cdr.Result[0] = cdr.StatP;
67099 - cdr.Stat = Complete;
67100 - break;
67101 -
67102 - case CdlStandby:
67103 - cdr.CmdProcess = 0;
67104 - SetResultSize(1);
67105 - cdr.StatP|= 0x2;
67106 - cdr.Result[0] = cdr.StatP;
67107 - cdr.Stat = Complete;
67108 - break;
67109 -
67110 - case CdlStop:
67111 - cdr.CmdProcess = 0;
67112 - SetResultSize(1);
67113 - cdr.StatP&=~0x2;
67114 - cdr.Result[0] = cdr.StatP;
67115 - cdr.Stat = Complete;
67116 -// cdr.Stat = Acknowledge;
67117 - break;
67118 -
67119 - case CdlPause:
67120 - SetResultSize(1);
67121 - cdr.Result[0] = cdr.StatP;
67122 - cdr.Stat = Acknowledge;
67123 - AddIrqQueue(CdlPause + 0x20, 0x800);
67124 - cdr.Ctrl|= 0x80;
67125 - break;
67126 -
67127 - case CdlPause + 0x20:
67128 - SetResultSize(1);
67129 - cdr.StatP&=~0x20;
67130 - cdr.StatP|= 0x2;
67131 - cdr.Result[0] = cdr.StatP;
67132 - cdr.Stat = Complete;
67133 - break;
67134 -
67135 - case CdlInit:
67136 - SetResultSize(1);
67137 - cdr.StatP = 0x2;
67138 - cdr.Result[0] = cdr.StatP;
67139 - cdr.Stat = Acknowledge;
67140 -// if (!cdr.Init) {
67141 - AddIrqQueue(CdlInit + 0x20, 0x800);
67142 -// }
67143 - break;
67144 -
67145 - case CdlInit + 0x20:
67146 - SetResultSize(1);
67147 - cdr.Result[0] = cdr.StatP;
67148 - cdr.Stat = Complete;
67149 - cdr.Init = 1;
67150 - break;
67151 -
67152 - case CdlMute:
67153 - SetResultSize(1);
67154 - cdr.StatP|= 0x2;
67155 - cdr.Result[0] = cdr.StatP;
67156 - cdr.Stat = Acknowledge;
67157 - break;
67158 -
67159 - case CdlDemute:
67160 - SetResultSize(1);
67161 - cdr.StatP|= 0x2;
67162 - cdr.Result[0] = cdr.StatP;
67163 - cdr.Stat = Acknowledge;
67164 - break;
67165 -
67166 - case CdlSetfilter:
67167 - SetResultSize(1);
67168 - cdr.StatP|= 0x2;
67169 - cdr.Result[0] = cdr.StatP;
67170 - cdr.Stat = Acknowledge;
67171 - break;
67172 -
67173 - case CdlSetmode:
67174 - SetResultSize(1);
67175 - cdr.StatP|= 0x2;
67176 - cdr.Result[0] = cdr.StatP;
67177 - cdr.Stat = Acknowledge;
67178 - break;
67179 -
67180 - case CdlGetmode:
67181 - SetResultSize(6);
67182 - cdr.StatP|= 0x2;
67183 - cdr.Result[0] = cdr.StatP;
67184 - cdr.Result[1] = cdr.Mode;
67185 - cdr.Result[2] = cdr.File;
67186 - cdr.Result[3] = cdr.Channel;
67187 - cdr.Result[4] = 0;
67188 - cdr.Result[5] = 0;
67189 - cdr.Stat = Acknowledge;
67190 - break;
67191 -
67192 - case CdlGetlocL:
67193 - SetResultSize(8);
67194 -// for (i=0; i<8; i++) cdr.Result[i] = itob(cdr.Transfer[i]);
67195 - for (i=0; i<8; i++) cdr.Result[i] = cdr.Transfer[i];
67196 - cdr.Stat = Acknowledge;
67197 - break;
67198 -
67199 - case CdlGetlocP:
67200 - SetResultSize(8);
67201 - subq = (struct SubQ*) CDR_getBufferSub();
67202 - if (subq != NULL) {
67203 - cdr.Result[0] = subq->TrackNumber;
67204 - cdr.Result[1] = subq->IndexNumber;
67205 - memcpy(cdr.Result+2, subq->TrackRelativeAddress, 3);
67206 - memcpy(cdr.Result+5, subq->AbsoluteAddress, 3);
67207 - } else {
67208 - cdr.Result[0] = 1;
67209 - cdr.Result[1] = 1;
67210 - cdr.Result[2] = cdr.Prev[0];
67211 - cdr.Result[3] = itob((btoi(cdr.Prev[1])) - 2);
67212 - cdr.Result[4] = cdr.Prev[2];
67213 - memcpy(cdr.Result+5, cdr.Prev, 3);
67214 - }
67215 - cdr.Stat = Acknowledge;
67216 - break;
67217 -
67218 - case CdlGetTN:
67219 - cdr.CmdProcess = 0;
67220 - SetResultSize(3);
67221 - cdr.StatP|= 0x2;
67222 - cdr.Result[0] = cdr.StatP;
67223 - if (CDR_getTN(cdr.ResultTN) == -1) {
67224 - cdr.Stat = DiskError;
67225 - cdr.Result[0]|= 0x01;
67226 - } else {
67227 - cdr.Stat = Acknowledge;
67228 - cdr.Result[1] = itob(cdr.ResultTN[0]);
67229 - cdr.Result[2] = itob(cdr.ResultTN[1]);
67230 - }
67231 - break;
67232 -
67233 - case CdlGetTD:
67234 - cdr.CmdProcess = 0;
67235 - cdr.Track = btoi(cdr.Param[0]);
67236 - SetResultSize(4);
67237 - cdr.StatP|= 0x2;
67238 - if (CDR_getTD(cdr.Track, cdr.ResultTD) == -1) {
67239 - cdr.Stat = DiskError;
67240 - cdr.Result[0]|= 0x01;
67241 - } else {
67242 - cdr.Stat = Acknowledge;
67243 - cdr.Result[0] = cdr.StatP;
67244 - cdr.Result[1] = itob(cdr.ResultTD[2]);
67245 - cdr.Result[2] = itob(cdr.ResultTD[1]);
67246 - cdr.Result[3] = itob(cdr.ResultTD[0]);
67247 - }
67248 - break;
67249 -
67250 - case CdlSeekL:
67251 - SetResultSize(1);
67252 - cdr.StatP|= 0x2;
67253 - cdr.Result[0] = cdr.StatP;
67254 - cdr.StatP|= 0x40;
67255 - cdr.Stat = Acknowledge;
67256 - cdr.Seeked = 1;
67257 - AddIrqQueue(CdlSeekL + 0x20, 0x800);
67258 - break;
67259 -
67260 - case CdlSeekL + 0x20:
67261 - SetResultSize(1);
67262 - cdr.StatP|= 0x2;
67263 - cdr.StatP&=~0x40;
67264 - cdr.Result[0] = cdr.StatP;
67265 - cdr.Stat = Complete;
67266 - break;
67267 -
67268 - case CdlSeekP:
67269 - SetResultSize(1);
67270 - cdr.StatP|= 0x2;
67271 - cdr.Result[0] = cdr.StatP;
67272 - cdr.StatP|= 0x40;
67273 - cdr.Stat = Acknowledge;
67274 - AddIrqQueue(CdlSeekP + 0x20, 0x800);
67275 - break;
67276 -
67277 - case CdlSeekP + 0x20:
67278 - SetResultSize(1);
67279 - cdr.StatP|= 0x2;
67280 - cdr.StatP&=~0x40;
67281 - cdr.Result[0] = cdr.StatP;
67282 - cdr.Stat = Complete;
67283 - break;
67284 -
67285 - case CdlTest:
67286 - cdr.Stat = Acknowledge;
67287 - switch (cdr.Param[0]) {
67288 - case 0x20: // System Controller ROM Version
67289 - SetResultSize(4);
67290 - memcpy(cdr.Result, Test20, 4);
67291 - break;
67292 - case 0x22:
67293 - SetResultSize(8);
67294 - memcpy(cdr.Result, Test22, 4);
67295 - break;
67296 - case 0x23: case 0x24:
67297 - SetResultSize(8);
67298 - memcpy(cdr.Result, Test23, 4);
67299 - break;
67300 - }
67301 - break;
67302 -
67303 - case CdlID:
67304 - SetResultSize(1);
67305 - cdr.StatP|= 0x2;
67306 - cdr.Result[0] = cdr.StatP;
67307 - cdr.Stat = Acknowledge;
67308 - AddIrqQueue(CdlID + 0x20, 0x800);
67309 - break;
67310 -
67311 - case CdlID + 0x20:
67312 - SetResultSize(8);
67313 - if (CDR_getStatus(&stat) == -1) {
67314 - cdr.Result[0] = 0x00; // 0x08 and cdr.Result[1]|0x10 : audio cd, enters cd player
67315 - cdr.Result[1] = 0x00; // 0x80 leads to the menu in the bios, else loads CD
67316 - }
67317 - else {
67318 - if (stat.Type == 2) {
67319 - cdr.Result[0] = 0x08;
67320 - cdr.Result[1] = 0x10;
67321 - }
67322 - else {
67323 - cdr.Result[0] = 0x00;
67324 - cdr.Result[1] = 0x00;
67325 - }
67326 - }
67327 - if (!LoadCdBios) cdr.Result[1] |= 0x80;
67328 -
67329 - cdr.Result[2] = 0x00;
67330 - cdr.Result[3] = 0x00;
67331 - strncpy((char *)&cdr.Result[4], "PCSX", 4);
67332 - cdr.Stat = Complete;
67333 - break;
67334 -
67335 - case CdlReset:
67336 - SetResultSize(1);
67337 - cdr.StatP = 0x2;
67338 - cdr.Result[0] = cdr.StatP;
67339 - cdr.Stat = Acknowledge;
67340 - break;
67341 -
67342 - case CdlReadToc:
67343 - SetResultSize(1);
67344 - cdr.StatP|= 0x2;
67345 - cdr.Result[0] = cdr.StatP;
67346 - cdr.Stat = Acknowledge;
67347 - AddIrqQueue(CdlReadToc + 0x20, 0x800);
67348 - break;
67349 -
67350 - case CdlReadToc + 0x20:
67351 - SetResultSize(1);
67352 - cdr.StatP|= 0x2;
67353 - cdr.Result[0] = cdr.StatP;
67354 - cdr.Stat = Complete;
67355 - break;
67356 -
67357 - case AUTOPAUSE:
67358 - cdr.OCUP = 0;
67359 -/* SetResultSize(1);
67360 - StopCdda();
67361 - StopReading();
67362 - cdr.OCUP = 0;
67363 - cdr.StatP&=~0x20;
67364 - cdr.StatP|= 0x2;
67365 - cdr.Result[0] = cdr.StatP;
67366 - cdr.Stat = DataEnd;
67367 -*/ AddIrqQueue(CdlPause, 0x400);
67368 - break;
67369 -
67370 - case READ_ACK:
67371 - if (!cdr.Reading) return;
67372 -
67373 - SetResultSize(1);
67374 - cdr.StatP|= 0x2;
67375 - cdr.Result[0] = cdr.StatP;
67376 - if (cdr.Seeked == 0) {
67377 - cdr.Seeked = 1;
67378 - cdr.StatP|= 0x40;
67379 - }
67380 - cdr.StatP|= 0x20;
67381 - cdr.Stat = Acknowledge;
67382 -
67383 - ReadTrack();
67384 -
67385 -// CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
67386 - CDREAD_INT(0x40000);
67387 - break;
67388 -
67389 - case REPPLAY_ACK:
67390 - cdr.Stat = Acknowledge;
67391 - cdr.Result[0] = cdr.StatP;
67392 - SetResultSize(1);
67393 - AddIrqQueue(REPPLAY, cdReadTime);
67394 - break;
67395 -
67396 - case REPPLAY:
67397 - if ((cdr.Mode & 5) != 5) break;
67398 -/* if (CDR_getStatus(&stat) == -1) {
67399 - cdr.Result[0] = 0;
67400 - cdr.Result[1] = 0;
67401 - cdr.Result[2] = 0;
67402 - cdr.Result[3] = 0;
67403 - cdr.Result[4] = 0;
67404 - cdr.Result[5] = 0;
67405 - cdr.Result[6] = 0;
67406 - cdr.Result[7] = 0;
67407 - } else memcpy(cdr.Result, &stat.Track, 8);
67408 - cdr.Stat = 1;
67409 - SetResultSize(8);
67410 - AddIrqQueue(REPPLAY_ACK, cdReadTime);
67411 -*/ break;
67412 -
67413 - case 0xff:
67414 - return;
67415 -
67416 - default:
67417 - cdr.Stat = Complete;
67418 - break;
67419 - }
67420 -
67421 - if (cdr.Stat != NoIntr && cdr.Reg2 != 0x18) {
67422 - psxHu32ref(0x1070)|= SWAP32((u32)0x4);
67423 - psxRegs.interrupt|= 0x80000000;
67424 - }
67425 -
67426 -#ifdef CDR_LOG
67427 - CDR_LOG("cdrInterrupt() Log: CDR Interrupt IRQ %x\n", Irq);
67428 -#endif
67429 -}
67430 -
67431 -void cdrReadInterrupt() {
67432 - u8 *buf;
67433 -
67434 - if (!cdr.Reading) return;
67435 -
67436 - if (cdr.Stat) {
67437 - CDREAD_INT(0x800);
67438 - return;
67439 - }
67440 -
67441 -#ifdef CDR_LOG
67442 - CDR_LOG("cdrReadInterrupt() Log: KEY END");
67443 -#endif
67444 -
67445 - cdr.OCUP = 1;
67446 - SetResultSize(1);
67447 - cdr.StatP|= 0x22;
67448 - cdr.StatP&=~0x40;
67449 - cdr.Result[0] = cdr.StatP;
67450 -
67451 - buf = CDR_getBuffer();
67452 - if (buf == NULL) cdr.RErr = -1;
67453 -
67454 - if (cdr.RErr == -1) {
67455 -#ifdef CDR_LOG
67456 - fprintf(emuLog, "cdrReadInterrupt() Log: err\n");
67457 -#endif
67458 - memset(cdr.Transfer, 0, 2340);
67459 - cdr.Stat = DiskError;
67460 - cdr.Result[0]|= 0x01;
67461 - ReadTrack();
67462 - CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
67463 - return;
67464 - }
67465 -
67466 - memcpy(cdr.Transfer, buf, 2340);
67467 - cdr.Stat = DataReady;
67468 -
67469 -#ifdef CDR_LOG
67470 - fprintf(emuLog, "cdrReadInterrupt() Log: cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]);
67471 -#endif
67472 -
67473 - if ((cdr.Muted == 1) && (cdr.Mode & 0x40) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
67474 - if ((cdr.Transfer[4+2] & 0x4) &&
67475 - ((cdr.Mode&0x8) ? (cdr.Transfer[4+1] == cdr.Channel) : 1) &&
67476 - (cdr.Transfer[4+0] == cdr.File)) {
67477 - int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
67478 -
67479 - if (!ret) {
67480 - SPU_playADPCMchannel(&cdr.Xa);
67481 - cdr.FirstSector = 0;
67482 - }
67483 - else cdr.FirstSector = -1;
67484 - }
67485 - }
67486 -
67487 - cdr.SetSector[2]++;
67488 - if (cdr.SetSector[2] == 75) {
67489 - cdr.SetSector[2] = 0;
67490 - cdr.SetSector[1]++;
67491 - if (cdr.SetSector[1] == 60) {
67492 - cdr.SetSector[1] = 0;
67493 - cdr.SetSector[0]++;
67494 - }
67495 - }
67496 -
67497 - cdr.Readed = 0;
67498 -
67499 - if ((cdr.Transfer[4+2] & 0x80) && (cdr.Mode & 0x2)) { // EOF
67500 -#ifdef CDR_LOG
67501 - CDR_LOG("cdrReadInterrupt() Log: Autopausing read\n");
67502 -#endif
67503 -// AddIrqQueue(AUTOPAUSE, 0x800);
67504 - AddIrqQueue(CdlPause, 0x800);
67505 - }
67506 - else {
67507 - ReadTrack();
67508 - CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
67509 - }
67510 - psxHu32ref(0x1070)|= SWAP32((u32)0x4);
67511 - psxRegs.interrupt|= 0x80000000;
67512 -}
67513 -
67514 -/*
67515 -cdrRead0:
67516 - bit 0 - 0 REG1 command send / 1 REG1 data read
67517 - bit 1 - 0 data transfer finish / 1 data transfer ready/in progress
67518 - bit 2 - unknown
67519 - bit 3 - unknown
67520 - bit 4 - unknown
67521 - bit 5 - 1 result ready
67522 - bit 6 - 1 dma ready
67523 - bit 7 - 1 command being processed
67524 -*/
67525 -
67526 -unsigned char cdrRead0(void) {
67527 - if (cdr.ResultReady) cdr.Ctrl|= 0x20;
67528 - else cdr.Ctrl&=~0x20;
67529 -
67530 - if (cdr.OCUP) cdr.Ctrl|= 0x40;
67531 -// else cdr.Ctrl&=~0x40;
67532 -
67533 - // what means the 0x10 and the 0x08 bits? i only saw it used by the bios
67534 - cdr.Ctrl|=0x18;
67535 -
67536 -#ifdef CDR_LOG
67537 - CDR_LOG("cdrRead0() Log: CD0 Read: %x\n", cdr.Ctrl);
67538 -#endif
67539 - return psxHu8(0x1800) = cdr.Ctrl;
67540 -}
67541 -
67542 -/*
67543 -cdrWrite0:
67544 - 0 - to send a command / 1 - to get the result
67545 -*/
67546 -
67547 -void cdrWrite0(unsigned char rt) {
67548 -#ifdef CDR_LOG
67549 - CDR_LOG("cdrWrite0() Log: CD0 write: %x\n", rt);
67550 -#endif
67551 - cdr.Ctrl = rt | (cdr.Ctrl & ~0x3);
67552 -
67553 - if (rt == 0) {
67554 - cdr.ParamP = 0;
67555 - cdr.ParamC = 0;
67556 - cdr.ResultReady = 0;
67557 - }
67558 -}
67559 -
67560 -unsigned char cdrRead1(void) {
67561 - if (cdr.ResultReady) { // && cdr.Ctrl & 0x1) {
67562 - psxHu8(0x1801) = cdr.Result[cdr.ResultP++];
67563 - if (cdr.ResultP == cdr.ResultC) cdr.ResultReady = 0;
67564 - } else psxHu8(0x1801) = 0;
67565 -#ifdef CDR_LOG
67566 - CDR_LOG("cdrRead1() Log: CD1 Read: %x\n", psxHu8(0x1801));
67567 -#endif
67568 - return psxHu8(0x1801);
67569 -}
67570 -
67571 -void cdrWrite1(unsigned char rt) {
67572 - int i;
67573 -
67574 -#ifdef CDR_LOG
67575 - CDR_LOG("cdrWrite1() Log: CD1 write: %x (%s)\n", rt, CmdName[rt]);
67576 -#endif
67577 -// psxHu8(0x1801) = rt;
67578 - cdr.Cmd = rt;
67579 - cdr.OCUP = 0;
67580 -
67581 -#ifdef CDRCMD_DEBUG
67582 - SysPrintf("cdrWrite1() Log: CD1 write: %x (%s)", rt, CmdName[rt]);
67583 - if (cdr.ParamC) {
67584 - SysPrintf(" Param[%d] = {", cdr.ParamC);
67585 - for (i=0;i<cdr.ParamC;i++) SysPrintf(" %x,", cdr.Param[i]);
67586 - SysPrintf("}\n");
67587 - } else SysPrintf("\n");
67588 -#endif
67589 -
67590 - if (cdr.Ctrl & 0x1) return;
67591 -
67592 - switch(cdr.Cmd) {
67593 - case CdlSync:
67594 - cdr.Ctrl|= 0x80;
67595 - cdr.Stat = NoIntr;
67596 - AddIrqQueue(cdr.Cmd, 0x800);
67597 - break;
67598 -
67599 - case CdlNop:
67600 - cdr.Ctrl|= 0x80;
67601 - cdr.Stat = NoIntr;
67602 - AddIrqQueue(cdr.Cmd, 0x800);
67603 - break;
67604 -
67605 - case CdlSetloc:
67606 - StopReading();
67607 - cdr.Seeked = 0;
67608 - for (i=0; i<3; i++) cdr.SetSector[i] = btoi(cdr.Param[i]);
67609 - cdr.SetSector[3] = 0;
67610 -/* if ((cdr.SetSector[0] | cdr.SetSector[1] | cdr.SetSector[2]) == 0) {
67611 - *(u32 *)cdr.SetSector = *(u32 *)cdr.SetSectorSeek;
67612 - }*/
67613 - cdr.Ctrl|= 0x80;
67614 - cdr.Stat = NoIntr;
67615 - AddIrqQueue(cdr.Cmd, 0x800);
67616 - break;
67617 -
67618 - case CdlPlay:
67619 - if (!cdr.SetSector[0] & !cdr.SetSector[1] & !cdr.SetSector[2]) {
67620 - if (CDR_getTN(cdr.ResultTN) != -1) {
67621 - if (cdr.CurTrack > cdr.ResultTN[1]) cdr.CurTrack = cdr.ResultTN[1];
67622 - if (CDR_getTD((unsigned char)(cdr.CurTrack), cdr.ResultTD) != -1) {
67623 - int tmp = cdr.ResultTD[2];
67624 - cdr.ResultTD[2] = cdr.ResultTD[0];
67625 - cdr.ResultTD[0] = tmp;
67626 - if (!Config.Cdda) CDR_play(cdr.ResultTD);
67627 - }
67628 - }
67629 - }
67630 - else if (!Config.Cdda) CDR_play(cdr.SetSector);
67631 - cdr.Play = 1;
67632 - cdr.Ctrl|= 0x80;
67633 - cdr.Stat = NoIntr;
67634 - AddIrqQueue(cdr.Cmd, 0x800);
67635 - break;
67636 -
67637 - case CdlForward:
67638 - if (cdr.CurTrack < 0xaa) cdr.CurTrack++;
67639 - cdr.Ctrl|= 0x80;
67640 - cdr.Stat = NoIntr;
67641 - AddIrqQueue(cdr.Cmd, 0x800);
67642 - break;
67643 -
67644 - case CdlBackward:
67645 - if (cdr.CurTrack > 1) cdr.CurTrack--;
67646 - cdr.Ctrl|= 0x80;
67647 - cdr.Stat = NoIntr;
67648 - AddIrqQueue(cdr.Cmd, 0x800);
67649 - break;
67650 -
67651 - case CdlReadN:
67652 - cdr.Irq = 0;
67653 - StopReading();
67654 - cdr.Ctrl|= 0x80;
67655 - cdr.Stat = NoIntr;
67656 - StartReading(1);
67657 - break;
67658 -
67659 - case CdlStandby:
67660 - StopCdda();
67661 - StopReading();
67662 - cdr.Ctrl|= 0x80;
67663 - cdr.Stat = NoIntr;
67664 - AddIrqQueue(cdr.Cmd, 0x800);
67665 - break;
67666 -
67667 - case CdlStop:
67668 - StopCdda();
67669 - StopReading();
67670 - cdr.Ctrl|= 0x80;
67671 - cdr.Stat = NoIntr;
67672 - AddIrqQueue(cdr.Cmd, 0x800);
67673 - break;
67674 -
67675 - case CdlPause:
67676 - StopCdda();
67677 - StopReading();
67678 - cdr.Ctrl|= 0x80;
67679 - cdr.Stat = NoIntr;
67680 - AddIrqQueue(cdr.Cmd, 0x40000);
67681 - break;
67682 -
67683 - case CdlReset:
67684 - case CdlInit:
67685 - StopCdda();
67686 - StopReading();
67687 - cdr.Ctrl|= 0x80;
67688 - cdr.Stat = NoIntr;
67689 - AddIrqQueue(cdr.Cmd, 0x800);
67690 - break;
67691 -
67692 - case CdlMute:
67693 - cdr.Muted = 0;
67694 - cdr.Ctrl|= 0x80;
67695 - cdr.Stat = NoIntr;
67696 - AddIrqQueue(cdr.Cmd, 0x800);
67697 - break;
67698 -
67699 - case CdlDemute:
67700 - cdr.Muted = 1;
67701 - cdr.Ctrl|= 0x80;
67702 - cdr.Stat = NoIntr;
67703 - AddIrqQueue(cdr.Cmd, 0x800);
67704 - break;
67705 -
67706 - case CdlSetfilter:
67707 - cdr.File = cdr.Param[0];
67708 - cdr.Channel = cdr.Param[1];
67709 - cdr.Ctrl|= 0x80;
67710 - cdr.Stat = NoIntr;
67711 - AddIrqQueue(cdr.Cmd, 0x800);
67712 - break;
67713 -
67714 - case CdlSetmode:
67715 -#ifdef CDR_LOG
67716 - CDR_LOG("cdrWrite1() Log: Setmode %x\n", cdr.Param[0]);
67717 -#endif
67718 - cdr.Mode = cdr.Param[0];
67719 - cdr.Ctrl|= 0x80;
67720 - cdr.Stat = NoIntr;
67721 - AddIrqQueue(cdr.Cmd, 0x800);
67722 - break;
67723 -
67724 - case CdlGetmode:
67725 - cdr.Ctrl|= 0x80;
67726 - cdr.Stat = NoIntr;
67727 - AddIrqQueue(cdr.Cmd, 0x800);
67728 - break;
67729 -
67730 - case CdlGetlocL:
67731 - cdr.Ctrl|= 0x80;
67732 - cdr.Stat = NoIntr;
67733 - AddIrqQueue(cdr.Cmd, 0x800);
67734 - break;
67735 -
67736 - case CdlGetlocP:
67737 - cdr.Ctrl|= 0x80;
67738 - cdr.Stat = NoIntr;
67739 - AddIrqQueue(cdr.Cmd, 0x800);
67740 - break;
67741 -
67742 - case CdlGetTN:
67743 - cdr.Ctrl|= 0x80;
67744 - cdr.Stat = NoIntr;
67745 - AddIrqQueue(cdr.Cmd, 0x800);
67746 - break;
67747 -
67748 - case CdlGetTD:
67749 - cdr.Ctrl|= 0x80;
67750 - cdr.Stat = NoIntr;
67751 - AddIrqQueue(cdr.Cmd, 0x800);
67752 - break;
67753 -
67754 - case CdlSeekL:
67755 -// ((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0];
67756 - cdr.Ctrl|= 0x80;
67757 - cdr.Stat = NoIntr;
67758 - AddIrqQueue(cdr.Cmd, 0x800);
67759 - break;
67760 -
67761 - case CdlSeekP:
67762 -// ((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0];
67763 - cdr.Ctrl|= 0x80;
67764 - cdr.Stat = NoIntr;
67765 - AddIrqQueue(cdr.Cmd, 0x800);
67766 - break;
67767 -
67768 - case CdlTest:
67769 - cdr.Ctrl|= 0x80;
67770 - cdr.Stat = NoIntr;
67771 - AddIrqQueue(cdr.Cmd, 0x800);
67772 - break;
67773 -
67774 - case CdlID:
67775 - cdr.Ctrl|= 0x80;
67776 - cdr.Stat = NoIntr;
67777 - AddIrqQueue(cdr.Cmd, 0x800);
67778 - break;
67779 -
67780 - case CdlReadS:
67781 - cdr.Irq = 0;
67782 - StopReading();
67783 - cdr.Ctrl|= 0x80;
67784 - cdr.Stat = NoIntr;
67785 - StartReading(2);
67786 - break;
67787 -
67788 - case CdlReadToc:
67789 - cdr.Ctrl|= 0x80;
67790 - cdr.Stat = NoIntr;
67791 - AddIrqQueue(cdr.Cmd, 0x800);
67792 - break;
67793 -
67794 - default:
67795 -#ifdef CDR_LOG
67796 - CDR_LOG("cdrWrite1() Log: Unknown command: %x\n", cdr.Cmd);
67797 -#endif
67798 - return;
67799 - }
67800 - if (cdr.Stat != NoIntr) {
67801 - psxHu32ref(0x1070)|= SWAP32((u32)0x4);
67802 - psxRegs.interrupt|= 0x80000000;
67803 - }
67804 -}
67805 -
67806 -unsigned char cdrRead2(void) {
67807 - unsigned char ret;
67808 -
67809 - if (cdr.Readed == 0) {
67810 - ret = 0;
67811 - } else {
67812 - ret = *cdr.pTransfer++;
67813 - }
67814 -
67815 -#ifdef CDR_LOG
67816 - CDR_LOG("cdrRead2() Log: CD2 Read: %x\n", ret);
67817 -#endif
67818 - return ret;
67819 -}
67820 -
67821 -void cdrWrite2(unsigned char rt) {
67822 -#ifdef CDR_LOG
67823 - CDR_LOG("cdrWrite2() Log: CD2 write: %x\n", rt);
67824 -#endif
67825 - if (cdr.Ctrl & 0x1) {
67826 - switch (rt) {
67827 - case 0x07:
67828 - cdr.ParamP = 0;
67829 - cdr.ParamC = 0;
67830 - cdr.ResultReady = 1; //0;
67831 - cdr.Ctrl&= ~3; //cdr.Ctrl = 0;
67832 - break;
67833 -
67834 - default:
67835 - cdr.Reg2 = rt;
67836 - break;
67837 - }
67838 - } else if (!(cdr.Ctrl & 0x1) && cdr.ParamP < 8) {
67839 - cdr.Param[cdr.ParamP++] = rt;
67840 - cdr.ParamC++;
67841 - }
67842 -}
67843 -
67844 -unsigned char cdrRead3(void) {
67845 - if (cdr.Stat) {
67846 - if (cdr.Ctrl & 0x1) psxHu8(0x1803) = cdr.Stat | 0xE0;
67847 - else psxHu8(0x1803) = 0xff;
67848 - } else psxHu8(0x1803) = 0;
67849 -#ifdef CDR_LOG
67850 - CDR_LOG("cdrRead3() Log: CD3 Read: %x\n", psxHu8(0x1803));
67851 -#endif
67852 - return psxHu8(0x1803);
67853 -}
67854 -
67855 -void cdrWrite3(unsigned char rt) {
67856 -#ifdef CDR_LOG
67857 - CDR_LOG("cdrWrite3() Log: CD3 write: %x\n", rt);
67858 -#endif
67859 - if (rt == 0x07 && cdr.Ctrl & 0x1) {
67860 - cdr.Stat = 0;
67861 -
67862 - if (cdr.Irq == 0xff) { cdr.Irq = 0; return; }
67863 - if (cdr.Irq) CDR_INT(cdr.eCycle);
67864 - if (cdr.Reading && !cdr.ResultReady)
67865 - CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
67866 -
67867 - return;
67868 - }
67869 - if (rt == 0x80 && !(cdr.Ctrl & 0x1) && cdr.Readed == 0) {
67870 - cdr.Readed = 1;
67871 - cdr.pTransfer = cdr.Transfer;
67872 -
67873 - switch (cdr.Mode&0x30) {
67874 - case 0x10:
67875 - case 0x00: cdr.pTransfer+=12; break;
67876 - default: break;
67877 - }
67878 - }
67879 -}
67880 -
67881 -void psxDma3(u32 madr, u32 bcr, u32 chcr) {
67882 - u32 cdsize;
67883 - u8 *ptr;
67884 -
67885 -#ifdef CDR_LOG
67886 - CDR_LOG("psxDma3() Log: *** DMA 3 *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
67887 -#endif
67888 -
67889 - switch (chcr) {
67890 - case 0x11000000:
67891 - case 0x11400100:
67892 - if (cdr.Readed == 0) {
67893 -#ifdef CDR_LOG
67894 - CDR_LOG("psxDma3() Log: *** DMA 3 *** NOT READY\n");
67895 -#endif
67896 - break;
67897 - }
67898 -
67899 - cdsize = (bcr & 0xffff) * 4;
67900 -
67901 - ptr = (u8*)PSXM(madr);
67902 - if (ptr == NULL) {
67903 -#ifdef CPU_LOG
67904 - CDR_LOG("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");
67905 -#endif
67906 - break;
67907 - }
67908 - memcpy(ptr, cdr.pTransfer, cdsize);
67909 - psxCpu->Clear(madr, cdsize/4);
67910 - cdr.pTransfer+= cdsize;
67911 -
67912 - break;
67913 - default:
67914 -#ifdef CDR_LOG
67915 - CDR_LOG("psxDma3() Log: Unknown cddma %lx\n", chcr);
67916 -#endif
67917 - break;
67918 - }
67919 -
67920 - HW_DMA3_CHCR &= SWAP32(~0x01000000);
67921 - DMA_INTERRUPT(3);
67922 -}
67923 -
67924 -void cdrReset() {
67925 - memset(&cdr, 0, sizeof(cdr));
67926 - cdr.CurTrack=1;
67927 - cdr.File=1; cdr.Channel=1;
67928 -}
67929 -
67930 -int cdrFreeze(gzFile f, int Mode) {
67931 - uintptr_t tmp;
67932 -
67933 - gzfreeze(&cdr, sizeof(cdr));
67934 -
67935 - if (Mode == 1) tmp = cdr.pTransfer - cdr.Transfer;
67936 - gzfreezel(&tmp);
67937 - if (Mode == 0) cdr.pTransfer = cdr.Transfer + tmp;
67938 -
67939 - return 0;
67940 -}
67941 -
67942 -
67943 diff -rupN original/libpcsxcore/libpcsxcore/cdrom.h new/libpcsxcore/libpcsxcore/cdrom.h
67944 --- original/libpcsxcore/libpcsxcore/cdrom.h 2007-10-08 17:13:28.000000000 -0400
67945 +++ new/libpcsxcore/libpcsxcore/cdrom.h 1969-12-31 20:00:00.000000000 -0400
67946 @@ -1,96 +0,0 @@
67947 -/***************************************************************************
67948 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
67949 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
67950 - * *
67951 - * This program is free software; you can redistribute it and/or modify *
67952 - * it under the terms of the GNU General Public License as published by *
67953 - * the Free Software Foundation; either version 2 of the License, or *
67954 - * (at your option) any later version. *
67955 - * *
67956 - * This program is distributed in the hope that it will be useful, *
67957 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
67958 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
67959 - * GNU General Public License for more details. *
67960 - * *
67961 - * You should have received a copy of the GNU General Public License *
67962 - * along with this program; if not, write to the *
67963 - * Free Software Foundation, Inc., *
67964 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
67965 - ***************************************************************************/
67966 -
67967 -#ifndef __CDROM_H__
67968 -#define __CDROM_H__
67969 -
67970 -#include "psxcommon.h"
67971 -#include "decode_xa.h"
67972 -#include "r3000a.h"
67973 -#include "plugins.h"
67974 -#include "psxmem.h"
67975 -#include "psxhw.h"
67976 -
67977 -typedef struct {
67978 - unsigned char OCUP;
67979 - unsigned char Reg1Mode;
67980 - unsigned char Reg2;
67981 - unsigned char CmdProcess;
67982 - unsigned char Ctrl;
67983 - unsigned char Stat;
67984 -
67985 - unsigned char StatP;
67986 -
67987 - unsigned char Transfer[2352];
67988 - unsigned char *pTransfer;
67989 -
67990 - unsigned char Prev[4];
67991 - unsigned char Param[8];
67992 - unsigned char Result[8];
67993 -
67994 - unsigned char ParamC;
67995 - unsigned char ParamP;
67996 - unsigned char ResultC;
67997 - unsigned char ResultP;
67998 - unsigned char ResultReady;
67999 - unsigned char Cmd;
68000 - unsigned char Readed;
68001 - unsigned long Reading;
68002 -
68003 - unsigned char ResultTN[6];
68004 - unsigned char ResultTD[4];
68005 - unsigned char SetSector[4];
68006 - unsigned char SetSectorSeek[4];
68007 - unsigned char Track;
68008 - int Play;
68009 - int CurTrack;
68010 - int Mode, File, Channel, Muted;
68011 - int Reset;
68012 - int RErr;
68013 - int FirstSector;
68014 -
68015 - xa_decode_t Xa;
68016 -
68017 - int Init;
68018 -
68019 - unsigned char Irq;
68020 - unsigned long eCycle;
68021 -
68022 - int Seeked;
68023 -
68024 - char Unused[4083];
68025 -} cdrStruct;
68026 -
68027 -cdrStruct cdr;
68028 -
68029 -void cdrReset();
68030 -void cdrInterrupt();
68031 -void cdrReadInterrupt();
68032 -unsigned char cdrRead0(void);
68033 -unsigned char cdrRead1(void);
68034 -unsigned char cdrRead2(void);
68035 -unsigned char cdrRead3(void);
68036 -void cdrWrite0(unsigned char rt);
68037 -void cdrWrite1(unsigned char rt);
68038 -void cdrWrite2(unsigned char rt);
68039 -void cdrWrite3(unsigned char rt);
68040 -int cdrFreeze(gzFile f, int Mode);
68041 -
68042 -#endif /* __CDROM_H__ */
68043 diff -rupN original/libpcsxcore/libpcsxcore/cdrom.lo new/libpcsxcore/libpcsxcore/cdrom.lo
68044 --- original/libpcsxcore/libpcsxcore/cdrom.lo 2009-03-28 22:34:43.000000000 -0430
68045 +++ new/libpcsxcore/libpcsxcore/cdrom.lo 1969-12-31 20:00:00.000000000 -0400
68046 @@ -1,12 +0,0 @@
68047 -# cdrom.lo - a libtool object file
68048 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
68049 -#
68050 -# Please DO NOT delete this file!
68051 -# It is necessary for linking the library.
68052 -
68053 -# Name of the PIC object.
68054 -pic_object='.libs/cdrom.o'
68055 -
68056 -# Name of the non-PIC object.
68057 -non_pic_object='cdrom.o'
68058 -
68059 Los ficheros binarios original/libpcsxcore/libpcsxcore/cdrom.o y new/libpcsxcore/libpcsxcore/cdrom.o son distintos
68060 diff -rupN original/libpcsxcore/libpcsxcore/coff.h new/libpcsxcore/libpcsxcore/coff.h
68061 --- original/libpcsxcore/libpcsxcore/coff.h 2007-10-08 17:13:28.000000000 -0400
68062 +++ new/libpcsxcore/libpcsxcore/coff.h 1969-12-31 20:00:00.000000000 -0400
68063 @@ -1,39 +0,0 @@
68064 -/***************************************************************************
68065 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
68066 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
68067 - * *
68068 - * This program is free software; you can redistribute it and/or modify *
68069 - * it under the terms of the GNU General Public License as published by *
68070 - * the Free Software Foundation; either version 2 of the License, or *
68071 - * (at your option) any later version. *
68072 - * *
68073 - * This program is distributed in the hope that it will be useful, *
68074 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
68075 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
68076 - * GNU General Public License for more details. *
68077 - * *
68078 - * You should have received a copy of the GNU General Public License *
68079 - * along with this program; if not, write to the *
68080 - * Free Software Foundation, Inc., *
68081 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
68082 - ***************************************************************************/
68083 -
68084 -#ifndef __COFF_H__
68085 -#define __COFF_H__
68086 -
68087 -/********************** FILE HEADER **********************/
68088 -
68089 -struct external_filehdr {
68090 - unsigned short f_magic; /* magic number */
68091 - unsigned short f_nscns; /* number of sections */
68092 - unsigned long f_timdat; /* time & date stamp */
68093 - unsigned long f_symptr; /* file pointer to symtab */
68094 - unsigned long f_nsyms; /* number of symtab entries */
68095 - unsigned short f_opthdr; /* sizeof(optional hdr) */
68096 - unsigned short f_flags; /* flags */
68097 -};
68098 -
68099 -#define FILHDR struct external_filehdr
68100 -#define FILHSZ sizeof(FILHDR)
68101 -
68102 -#endif /* __COFF_H__ */
68103 diff -rupN original/libpcsxcore/libpcsxcore/debug.h new/libpcsxcore/libpcsxcore/debug.h
68104 --- original/libpcsxcore/libpcsxcore/debug.h 2007-10-08 17:13:28.000000000 -0400
68105 +++ new/libpcsxcore/libpcsxcore/debug.h 1969-12-31 20:00:00.000000000 -0400
68106 @@ -1,60 +0,0 @@
68107 -/***************************************************************************
68108 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
68109 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
68110 - * *
68111 - * This program is free software; you can redistribute it and/or modify *
68112 - * it under the terms of the GNU General Public License as published by *
68113 - * the Free Software Foundation; either version 2 of the License, or *
68114 - * (at your option) any later version. *
68115 - * *
68116 - * This program is distributed in the hope that it will be useful, *
68117 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
68118 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
68119 - * GNU General Public License for more details. *
68120 - * *
68121 - * You should have received a copy of the GNU General Public License *
68122 - * along with this program; if not, write to the *
68123 - * Free Software Foundation, Inc., *
68124 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
68125 - ***************************************************************************/
68126 -
68127 -/*
68128 -* Specficies which logs should be activated.
68129 -* Ryan TODO: These should ALL be definable with configure flags.
68130 -*/
68131 -
68132 -#ifndef __DEBUG_H__
68133 -#define __DEBUG_H__
68134 -
68135 -extern char *disRNameCP0[];
68136 -
68137 -char* disR3000AF(u32 code, u32 pc);
68138 -
68139 -FILE *emuLog;
68140 -
68141 -//#define GTE_DUMP
68142 -
68143 -#ifdef GTE_DUMP
68144 -FILE *gteLog;
68145 -#endif
68146 -
68147 -//#define LOG_STDOUT
68148 -
68149 -//#define PAD_LOG __Log
68150 -//#define GTE_LOG __Log
68151 -//#define CDR_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log
68152 -
68153 -//#define PSXHW_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log
68154 -//#define PSXBIOS_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log
68155 -//#define PSXDMA_LOG __Log
68156 -//#define PSXMEM_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log
68157 -//#define PSXCPU_LOG __Log
68158 -
68159 -//#define CDRCMD_DEBUG
68160 -
68161 -#if defined (PSXCPU_LOG) || defined(PSXDMA_LOG) || defined(CDR_LOG) || defined(PSXHW_LOG) || \
68162 - defined(PSXBIOS_LOG) || defined(PSXMEM_LOG) || defined(GTE_LOG) || defined(PAD_LOG)
68163 -#define EMU_LOG __Log
68164 -#endif
68165 -
68166 -#endif /* __DEBUG_H__ */
68167 diff -rupN original/libpcsxcore/libpcsxcore/decode_xa.c new/libpcsxcore/libpcsxcore/decode_xa.c
68168 --- original/libpcsxcore/libpcsxcore/decode_xa.c 2007-10-08 17:13:28.000000000 -0400
68169 +++ new/libpcsxcore/libpcsxcore/decode_xa.c 1969-12-31 20:00:00.000000000 -0400
68170 @@ -1,368 +0,0 @@
68171 -/***************************************************************************
68172 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
68173 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
68174 - * *
68175 - * This program is free software; you can redistribute it and/or modify *
68176 - * it under the terms of the GNU General Public License as published by *
68177 - * the Free Software Foundation; either version 2 of the License, or *
68178 - * (at your option) any later version. *
68179 - * *
68180 - * This program is distributed in the hope that it will be useful, *
68181 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
68182 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
68183 - * GNU General Public License for more details. *
68184 - * *
68185 - * You should have received a copy of the GNU General Public License *
68186 - * along with this program; if not, write to the *
68187 - * Free Software Foundation, Inc., *
68188 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
68189 - ***************************************************************************/
68190 -
68191 -/*
68192 -* XA audio decoding functions (Kazzuya).
68193 -*/
68194 -
68195 -#include "decode_xa.h"
68196 -
68197 -#define FIXED
68198 -
68199 -#define NOT(_X_) (!(_X_))
68200 -#define XACLAMP(_X_,_MI_,_MA_) {if(_X_<_MI_)_X_=_MI_;if(_X_>_MA_)_X_=_MA_;}
68201 -
68202 -#define SH 4
68203 -#define SHC 10
68204 -
68205 -//============================================
68206 -//=== ADPCM DECODING ROUTINES
68207 -//============================================
68208 -
68209 -#ifndef FIXED
68210 -static double K0[4] = {
68211 - 0.0,
68212 - 0.9375,
68213 - 1.796875,
68214 - 1.53125
68215 -};
68216 -
68217 -static double K1[4] = {
68218 - 0.0,
68219 - 0.0,
68220 - -0.8125,
68221 - -0.859375
68222 -};
68223 -#else
68224 -static int K0[4] = {
68225 - 0.0 * (1<<SHC),
68226 - 0.9375 * (1<<SHC),
68227 - 1.796875 * (1<<SHC),
68228 - 1.53125 * (1<<SHC)
68229 -};
68230 -
68231 -static int K1[4] = {
68232 - 0.0 * (1<<SHC),
68233 - 0.0 * (1<<SHC),
68234 - -0.8125 * (1<<SHC),
68235 - -0.859375 * (1<<SHC)
68236 -};
68237 -#endif
68238 -
68239 -#define BLKSIZ 28 /* block size (32 - 4 nibbles) */
68240 -
68241 -//===========================================
68242 -void ADPCM_InitDecode(ADPCM_Decode_t *decp) {
68243 - decp->y0 = 0;
68244 - decp->y1 = 0;
68245 -}
68246 -
68247 -//===========================================
68248 -#ifndef FIXED
68249 -#define IK0(fid) ((int)((-K0[fid]) * (1<<SHC)))
68250 -#define IK1(fid) ((int)((-K1[fid]) * (1<<SHC)))
68251 -#else
68252 -#define IK0(fid) (-K0[fid])
68253 -#define IK1(fid) (-K1[fid])
68254 -#endif
68255 -
68256 -static __inline void ADPCM_DecodeBlock16( ADPCM_Decode_t *decp, u8 filter_range, const void *vblockp, short *destp, int inc ) {
68257 - int i;
68258 - int range, filterid;
68259 - s32 fy0, fy1;
68260 - const u16 *blockp;
68261 -
68262 - blockp = (const unsigned short *)vblockp;
68263 - filterid = (filter_range >> 4) & 0x0f;
68264 - range = (filter_range >> 0) & 0x0f;
68265 -
68266 - fy0 = decp->y0;
68267 - fy1 = decp->y1;
68268 -
68269 - for (i = BLKSIZ/4; i; --i) {
68270 - s32 y;
68271 - s32 x0, x1, x2, x3;
68272 -
68273 - y = *blockp++;
68274 - x3 = (short)( y & 0xf000) >> range; x3 <<= SH;
68275 - x2 = (short)((y << 4) & 0xf000) >> range; x2 <<= SH;
68276 - x1 = (short)((y << 8) & 0xf000) >> range; x1 <<= SH;
68277 - x0 = (short)((y << 12) & 0xf000) >> range; x0 <<= SH;
68278 -
68279 - x0 -= (IK0(filterid) * fy0 + (IK1(filterid) * fy1)) >> SHC; fy1 = fy0; fy0 = x0;
68280 - x1 -= (IK0(filterid) * fy0 + (IK1(filterid) * fy1)) >> SHC; fy1 = fy0; fy0 = x1;
68281 - x2 -= (IK0(filterid) * fy0 + (IK1(filterid) * fy1)) >> SHC; fy1 = fy0; fy0 = x2;
68282 - x3 -= (IK0(filterid) * fy0 + (IK1(filterid) * fy1)) >> SHC; fy1 = fy0; fy0 = x3;
68283 -
68284 - XACLAMP( x0, -32768<<SH, 32767<<SH ); *destp = x0 >> SH; destp += inc;
68285 - XACLAMP( x1, -32768<<SH, 32767<<SH ); *destp = x1 >> SH; destp += inc;
68286 - XACLAMP( x2, -32768<<SH, 32767<<SH ); *destp = x2 >> SH; destp += inc;
68287 - XACLAMP( x3, -32768<<SH, 32767<<SH ); *destp = x3 >> SH; destp += inc;
68288 - }
68289 - decp->y0 = fy0;
68290 - decp->y1 = fy1;
68291 -}
68292 -
68293 -static int headtable[4] = {0,2,8,10};
68294 -
68295 -//===========================================
68296 -static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) {
68297 - const u8 *sound_groupsp;
68298 - const u8 *sound_datap, *sound_datap2;
68299 - int i, j, k, nbits;
68300 - u16 data[4096], *datap;
68301 - short *destp;
68302 -
68303 - destp = xdp->pcm;
68304 - nbits = xdp->nbits == 4 ? 4 : 2;
68305 -
68306 - if (xdp->stereo) { // stereo
68307 - if ((xdp->nbits == 8) && (xdp->freq == 37800)) { // level A
68308 - for (j=0; j < 18; j++) {
68309 - sound_groupsp = srcp + j * 128; // sound groups header
68310 - sound_datap = sound_groupsp + 16; // sound data just after the header
68311 -
68312 - for (i=0; i < nbits; i++) {
68313 - datap = data;
68314 - sound_datap2 = sound_datap + i;
68315 -
68316 - for (k=0; k < 14; k++, sound_datap2 += 8) {
68317 - *(datap++) = (u16)sound_datap2[0] |
68318 - (u16)(sound_datap2[4] << 8);
68319 - }
68320 -
68321 - ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+0], data,
68322 - destp+0, 2 );
68323 -
68324 - datap = data;
68325 - sound_datap2 = sound_datap + i;
68326 - for (k=0; k < 14; k++, sound_datap2 += 8) {
68327 - *(datap++) = (u16)sound_datap2[0] |
68328 - (u16)(sound_datap2[4] << 8);
68329 - }
68330 - ADPCM_DecodeBlock16( &xdp->right, sound_groupsp[headtable[i]+1], data,
68331 - destp+1, 2 );
68332 -
68333 - destp += 28*2;
68334 - }
68335 - }
68336 - } else { // level B/C
68337 - for (j=0; j < 18; j++) {
68338 - sound_groupsp = srcp + j * 128; // sound groups header
68339 - sound_datap = sound_groupsp + 16; // sound data just after the header
68340 -
68341 - for (i=0; i < nbits; i++) {
68342 - datap = data;
68343 - sound_datap2 = sound_datap + i;
68344 -
68345 - for (k=0; k < 7; k++, sound_datap2 += 16) {
68346 - *(datap++) = (u16)(sound_datap2[ 0] & 0x0f) |
68347 - ((u16)(sound_datap2[ 4] & 0x0f) << 4) |
68348 - ((u16)(sound_datap2[ 8] & 0x0f) << 8) |
68349 - ((u16)(sound_datap2[12] & 0x0f) << 12);
68350 - }
68351 - ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+0], data,
68352 - destp+0, 2 );
68353 -
68354 - datap = data;
68355 - sound_datap2 = sound_datap + i;
68356 - for (k=0; k < 7; k++, sound_datap2 += 16) {
68357 - *(datap++) = (u16)(sound_datap2[ 0] >> 4) |
68358 - ((u16)(sound_datap2[ 4] >> 4) << 4) |
68359 - ((u16)(sound_datap2[ 8] >> 4) << 8) |
68360 - ((u16)(sound_datap2[12] >> 4) << 12);
68361 - }
68362 - ADPCM_DecodeBlock16( &xdp->right, sound_groupsp[headtable[i]+1], data,
68363 - destp+1, 2 );
68364 -
68365 - destp += 28*2;
68366 - }
68367 - }
68368 - }
68369 - } else { // mono
68370 - if ((xdp->nbits == 8) && (xdp->freq == 37800)) { // level A
68371 - for (j=0; j < 18; j++) {
68372 - sound_groupsp = srcp + j * 128; // sound groups header
68373 - sound_datap = sound_groupsp + 16; // sound data just after the header
68374 -
68375 - for (i=0; i < nbits; i++) {
68376 - datap = data;
68377 - sound_datap2 = sound_datap + i;
68378 - for (k=0; k < 14; k++, sound_datap2 += 8) {
68379 - *(datap++) = (u16)sound_datap2[0] |
68380 - (u16)(sound_datap2[4] << 8);
68381 - }
68382 - ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+0], data,
68383 - destp, 1 );
68384 -
68385 - destp += 28;
68386 -
68387 - datap = data;
68388 - sound_datap2 = sound_datap + i;
68389 - for (k=0; k < 14; k++, sound_datap2 += 8) {
68390 - *(datap++) = (u16)sound_datap2[0] |
68391 - (u16)(sound_datap2[4] << 8);
68392 - }
68393 - ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+1], data,
68394 - destp, 1 );
68395 -
68396 - destp += 28;
68397 - }
68398 - }
68399 - } else { // level B/C
68400 - for (j=0; j < 18; j++) {
68401 - sound_groupsp = srcp + j * 128; // sound groups header
68402 - sound_datap = sound_groupsp + 16; // sound data just after the header
68403 -
68404 - for (i=0; i < nbits; i++) {
68405 - datap = data;
68406 - sound_datap2 = sound_datap + i;
68407 - for (k=0; k < 7; k++, sound_datap2 += 16) {
68408 - *(datap++) = (u16)(sound_datap2[ 0] & 0x0f) |
68409 - ((u16)(sound_datap2[ 4] & 0x0f) << 4) |
68410 - ((u16)(sound_datap2[ 8] & 0x0f) << 8) |
68411 - ((u16)(sound_datap2[12] & 0x0f) << 12);
68412 - }
68413 - ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+0], data,
68414 - destp, 1 );
68415 -
68416 - destp += 28;
68417 -
68418 - datap = data;
68419 - sound_datap2 = sound_datap + i;
68420 - for (k=0; k < 7; k++, sound_datap2 += 16) {
68421 - *(datap++) = (u16)(sound_datap2[ 0] >> 4) |
68422 - ((u16)(sound_datap2[ 4] >> 4) << 4) |
68423 - ((u16)(sound_datap2[ 8] >> 4) << 8) |
68424 - ((u16)(sound_datap2[12] >> 4) << 12);
68425 - }
68426 - ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+1], data,
68427 - destp, 1 );
68428 -
68429 - destp += 28;
68430 - }
68431 - }
68432 - }
68433 - }
68434 -}
68435 -
68436 -//============================================
68437 -//=== XA SPECIFIC ROUTINES
68438 -//============================================
68439 -typedef struct {
68440 -u8 filenum;
68441 -u8 channum;
68442 -u8 submode;
68443 -u8 coding;
68444 -
68445 -u8 filenum2;
68446 -u8 channum2;
68447 -u8 submode2;
68448 -u8 coding2;
68449 -} xa_subheader_t;
68450 -
68451 -#define SUB_SUB_EOF (1<<7) // end of file
68452 -#define SUB_SUB_RT (1<<6) // real-time sector
68453 -#define SUB_SUB_FORM (1<<5) // 0 form1 1 form2
68454 -#define SUB_SUB_TRIGGER (1<<4) // used for interrupt
68455 -#define SUB_SUB_DATA (1<<3) // contains data
68456 -#define SUB_SUB_AUDIO (1<<2) // contains audio
68457 -#define SUB_SUB_VIDEO (1<<1) // contains video
68458 -#define SUB_SUB_EOR (1<<0) // end of record
68459 -
68460 -#define AUDIO_CODING_GET_STEREO(_X_) ( (_X_) & 3)
68461 -#define AUDIO_CODING_GET_FREQ(_X_) (((_X_) >> 2) & 3)
68462 -#define AUDIO_CODING_GET_BPS(_X_) (((_X_) >> 4) & 3)
68463 -#define AUDIO_CODING_GET_EMPHASIS(_X_) (((_X_) >> 6) & 1)
68464 -
68465 -#define SUB_UNKNOWN 0
68466 -#define SUB_VIDEO 1
68467 -#define SUB_AUDIO 2
68468 -
68469 -//============================================
68470 -static int parse_xa_audio_sector( xa_decode_t *xdp,
68471 - xa_subheader_t *subheadp,
68472 - unsigned char *sectorp,
68473 - int is_first_sector ) {
68474 - if ( is_first_sector ) {
68475 - switch ( AUDIO_CODING_GET_FREQ(subheadp->coding) ) {
68476 - case 0: xdp->freq = 37800; break;
68477 - case 1: xdp->freq = 18900; break;
68478 - default: xdp->freq = 0; break;
68479 - }
68480 - switch ( AUDIO_CODING_GET_BPS(subheadp->coding) ) {
68481 - case 0: xdp->nbits = 4; break;
68482 - case 1: xdp->nbits = 8; break;
68483 - default: xdp->nbits = 0; break;
68484 - }
68485 - switch ( AUDIO_CODING_GET_STEREO(subheadp->coding) ) {
68486 - case 0: xdp->stereo = 0; break;
68487 - case 1: xdp->stereo = 1; break;
68488 - default: xdp->stereo = 0; break;
68489 - }
68490 -
68491 - if ( xdp->freq == 0 )
68492 - return -1;
68493 -
68494 - ADPCM_InitDecode( &xdp->left );
68495 - ADPCM_InitDecode( &xdp->right );
68496 -
68497 - xdp->nsamples = 18 * 28 * 8;
68498 - if (xdp->stereo == 1) xdp->nsamples /= 2;
68499 - }
68500 - xa_decode_data( xdp, sectorp );
68501 -
68502 - return 0;
68503 -}
68504 -
68505 -//================================================================
68506 -//=== THIS IS WHAT YOU HAVE TO CALL
68507 -//=== xdp - structure were all important data are returned
68508 -//=== sectorp - data in input
68509 -//=== pcmp - data in output
68510 -//=== is_first_sector - 1 if it's the 1st sector of the stream
68511 -//=== - 0 for any other successive sector
68512 -//=== return -1 if error
68513 -//================================================================
68514 -s32 xa_decode_sector( xa_decode_t *xdp,
68515 - unsigned char *sectorp, int is_first_sector ) {
68516 - if (parse_xa_audio_sector(xdp, (xa_subheader_t *)sectorp, sectorp + sizeof(xa_subheader_t), is_first_sector))
68517 - return -1;
68518 -
68519 - return 0;
68520 -}
68521 -
68522 -/* EXAMPLE:
68523 -"nsamples" is the number of 16 bit samples
68524 -every sample is 2 bytes in mono and 4 bytes in stereo
68525 -
68526 -xa_decode_t xa;
68527 -
68528 - sectorp = read_first_sector();
68529 - xa_decode_sector( &xa, sectorp, 1 );
68530 - play_wave( xa.pcm, xa.freq, xa.nsamples );
68531 -
68532 - while ( --n_sectors )
68533 - {
68534 - sectorp = read_next_sector();
68535 - xa_decode_sector( &xa, sectorp, 0 );
68536 - play_wave( xa.pcm, xa.freq, xa.nsamples );
68537 - }
68538 -*/
68539 diff -rupN original/libpcsxcore/libpcsxcore/decode_xa.h new/libpcsxcore/libpcsxcore/decode_xa.h
68540 --- original/libpcsxcore/libpcsxcore/decode_xa.h 2007-10-08 17:13:27.000000000 -0400
68541 +++ new/libpcsxcore/libpcsxcore/decode_xa.h 1969-12-31 20:00:00.000000000 -0400
68542 @@ -1,43 +0,0 @@
68543 -/***************************************************************************
68544 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
68545 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
68546 - * *
68547 - * This program is free software; you can redistribute it and/or modify *
68548 - * it under the terms of the GNU General Public License as published by *
68549 - * the Free Software Foundation; either version 2 of the License, or *
68550 - * (at your option) any later version. *
68551 - * *
68552 - * This program is distributed in the hope that it will be useful, *
68553 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
68554 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
68555 - * GNU General Public License for more details. *
68556 - * *
68557 - * You should have received a copy of the GNU General Public License *
68558 - * along with this program; if not, write to the *
68559 - * Free Software Foundation, Inc., *
68560 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
68561 - ***************************************************************************/
68562 -
68563 -#ifndef __DECODE_XA_H__
68564 -#define __DECODE_XA_H__
68565 -
68566 -#include "psxcommon.h"
68567 -
68568 -typedef struct {
68569 - s32 y0, y1;
68570 -} ADPCM_Decode_t;
68571 -
68572 -typedef struct {
68573 - int freq;
68574 - int nbits;
68575 - int stereo;
68576 - int nsamples;
68577 - ADPCM_Decode_t left, right;
68578 - short pcm[16384];
68579 -} xa_decode_t;
68580 -
68581 -s32 xa_decode_sector( xa_decode_t *xdp,
68582 - unsigned char *sectorp,
68583 - int is_first_sector );
68584 -
68585 -#endif
68586 diff -rupN original/libpcsxcore/libpcsxcore/decode_xa.lo new/libpcsxcore/libpcsxcore/decode_xa.lo
68587 --- original/libpcsxcore/libpcsxcore/decode_xa.lo 2009-03-28 22:34:55.000000000 -0430
68588 +++ new/libpcsxcore/libpcsxcore/decode_xa.lo 1969-12-31 20:00:00.000000000 -0400
68589 @@ -1,12 +0,0 @@
68590 -# decode_xa.lo - a libtool object file
68591 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
68592 -#
68593 -# Please DO NOT delete this file!
68594 -# It is necessary for linking the library.
68595 -
68596 -# Name of the PIC object.
68597 -pic_object='.libs/decode_xa.o'
68598 -
68599 -# Name of the non-PIC object.
68600 -non_pic_object='decode_xa.o'
68601 -
68602 Los ficheros binarios original/libpcsxcore/libpcsxcore/decode_xa.o y new/libpcsxcore/libpcsxcore/decode_xa.o son distintos
68603 diff -rupN original/libpcsxcore/libpcsxcore/disr3000a.c new/libpcsxcore/libpcsxcore/disr3000a.c
68604 --- original/libpcsxcore/libpcsxcore/disr3000a.c 2007-10-08 17:13:28.000000000 -0400
68605 +++ new/libpcsxcore/libpcsxcore/disr3000a.c 1969-12-31 20:00:00.000000000 -0400
68606 @@ -1,324 +0,0 @@
68607 -/***************************************************************************
68608 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
68609 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
68610 - * *
68611 - * This program is free software; you can redistribute it and/or modify *
68612 - * it under the terms of the GNU General Public License as published by *
68613 - * the Free Software Foundation; either version 2 of the License, or *
68614 - * (at your option) any later version. *
68615 - * *
68616 - * This program is distributed in the hope that it will be useful, *
68617 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
68618 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
68619 - * GNU General Public License for more details. *
68620 - * *
68621 - * You should have received a copy of the GNU General Public License *
68622 - * along with this program; if not, write to the *
68623 - * Free Software Foundation, Inc., *
68624 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
68625 - ***************************************************************************/
68626 -
68627 -/*
68628 -* R3000A disassembler.
68629 -*/
68630 -
68631 -#include "psxcommon.h"
68632 -
68633 -char ostr[256];
68634 -
68635 -// Names of registers
68636 -static char *disRNameGPR[] = {
68637 - "r0", "at", "v0", "v1", "a0", "a1","a2", "a3",
68638 - "t0", "t1", "t2", "t3", "t4", "t5","t6", "t7",
68639 - "s0", "s1", "s2", "s3", "s4", "s5","s6", "s7",
68640 - "t8", "t9", "k0", "k1", "gp", "sp","fp", "ra"};
68641 -
68642 -char *disRNameCP0[] = {
68643 - "Index" , "Random" , "EntryLo0", "EntryLo1", "Context" , "PageMask" , "Wired" , "*Check me*",
68644 - "BadVAddr" , "Count" , "EntryHi" , "Compare" , "Status" , "Cause" , "ExceptPC" , "PRevID" ,
68645 - "Config" , "LLAddr" , "WatchLo" , "WatchHi" , "XContext", "*RES*" , "*RES*" , "*RES*" ,
68646 - "*RES*" , "*RES* " , "PErr" , "CacheErr", "TagLo" , "TagHi" , "ErrorEPC" , "*RES*" };
68647 -
68648 -
68649 -// Type deffinition of our functions
68650 -
68651 -typedef char* (*TdisR3000AF)(u32 code, u32 pc);
68652 -
68653 -// These macros are used to assemble the disassembler functions
68654 -#define MakeDisFg(fn, b) char* fn(u32 code, u32 pc) { b; return ostr; }
68655 -#define MakeDisF(fn, b) \
68656 - static char* fn(u32 code, u32 pc) { \
68657 - sprintf (ostr, "%8.8lx %8.8lx:", pc, code); \
68658 - b; /*ostr[(strlen(ostr) - 1)] = 0;*/ return ostr; \
68659 - }
68660 -
68661 -
68662 -#include "r3000a.h"
68663 -
68664 -#undef _Funct_
68665 -#undef _Rd_
68666 -#undef _Rt_
68667 -#undef _Rs_
68668 -#undef _Sa_
68669 -#undef _Im_
68670 -#undef _Target_
68671 -
68672 -#define _Funct_ ((code ) & 0x3F) // The funct part of the instruction register
68673 -#define _Rd_ ((code >> 11) & 0x1F) // The rd part of the instruction register
68674 -#define _Rt_ ((code >> 16) & 0x1F) // The rt part of the instruction register
68675 -#define _Rs_ ((code >> 21) & 0x1F) // The rs part of the instruction register
68676 -#define _Sa_ ((code >> 6) & 0x1F) // The sa part of the instruction register
68677 -#define _Im_ ( code & 0xFFFF) // The immediate part of the instruction register
68678 -
68679 -#define _Target_ ((pc & 0xf0000000) + ((code & 0x03ffffff) * 4))
68680 -#define _Branch_ (pc + 4 + ((short)_Im_ * 4))
68681 -#define _OfB_ _Im_, _nRs_
68682 -
68683 -#define dName(i) sprintf(ostr, "%s %-7s,", ostr, i)
68684 -#define dGPR(i) sprintf(ostr, "%s %8.8lx (%s),", ostr, psxRegs.GPR.r[i], disRNameGPR[i])
68685 -#define dCP0(i) sprintf(ostr, "%s %8.8lx (%s),", ostr, psxRegs.CP0.r[i], disRNameCP0[i])
68686 -#define dHI() sprintf(ostr, "%s %8.8lx (%s),", ostr, psxRegs.GPR.n.hi, "hi")
68687 -#define dLO() sprintf(ostr, "%s %8.8lx (%s),", ostr, psxRegs.GPR.n.lo, "lo")
68688 -#define dImm() sprintf(ostr, "%s %4.4lx (%ld),", ostr, _Im_, _Im_)
68689 -#define dTarget() sprintf(ostr, "%s %8.8lx,", ostr, _Target_)
68690 -#define dSa() sprintf(ostr, "%s %2.2lx (%ld),", ostr, _Sa_, _Sa_)
68691 -#define dOfB() sprintf(ostr, "%s %4.4lx (%8.8lx (%s)),", ostr, _Im_, psxRegs.GPR.r[_Rs_], disRNameGPR[_Rs_])
68692 -#define dOffset() sprintf(ostr, "%s %8.8lx,", ostr, _Branch_)
68693 -#define dCode() sprintf(ostr, "%s %8.8lx,", ostr, (code >> 6) & 0xffffff)
68694 -
68695 -/*********************************************************
68696 -* Arithmetic with immediate operand *
68697 -* Format: OP rt, rs, immediate *
68698 -*********************************************************/
68699 -MakeDisF(disADDI, dName("ADDI"); dGPR(_Rt_); dGPR(_Rs_); dImm();)
68700 -MakeDisF(disADDIU, dName("ADDIU"); dGPR(_Rt_); dGPR(_Rs_); dImm();)
68701 -MakeDisF(disANDI, dName("ANDI"); dGPR(_Rt_); dGPR(_Rs_); dImm();)
68702 -MakeDisF(disORI, dName("ORI"); dGPR(_Rt_); dGPR(_Rs_); dImm();)
68703 -MakeDisF(disSLTI, dName("SLTI"); dGPR(_Rt_); dGPR(_Rs_); dImm();)
68704 -MakeDisF(disSLTIU, dName("SLTIU"); dGPR(_Rt_); dGPR(_Rs_); dImm();)
68705 -MakeDisF(disXORI, dName("XORI"); dGPR(_Rt_); dGPR(_Rs_); dImm();)
68706 -
68707 -/*********************************************************
68708 -* Register arithmetic *
68709 -* Format: OP rd, rs, rt *
68710 -*********************************************************/
68711 -MakeDisF(disADD, dName("ADD"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68712 -MakeDisF(disADDU, dName("ADDU"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68713 -MakeDisF(disAND, dName("AND"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68714 -MakeDisF(disNOR, dName("NOR"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68715 -MakeDisF(disOR, dName("OR"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68716 -MakeDisF(disSLT, dName("SLT"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68717 -MakeDisF(disSLTU, dName("SLTU"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68718 -MakeDisF(disSUB, dName("SUB"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68719 -MakeDisF(disSUBU, dName("SUBU"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68720 -MakeDisF(disXOR, dName("XOR"); dGPR(_Rd_); dGPR(_Rs_); dGPR(_Rt_);)
68721 -
68722 -/*********************************************************
68723 -* Register arithmetic & Register trap logic *
68724 -* Format: OP rs, rt *
68725 -*********************************************************/
68726 -MakeDisF(disDIV, dName("DIV"); dGPR(_Rs_); dGPR(_Rt_);)
68727 -MakeDisF(disDIVU, dName("DIVU"); dGPR(_Rs_); dGPR(_Rt_);)
68728 -MakeDisF(disMULT, dName("MULT"); dGPR(_Rs_); dGPR(_Rt_);)
68729 -MakeDisF(disMULTU, dName("MULTU"); dGPR(_Rs_); dGPR(_Rt_);)
68730 -
68731 -/*********************************************************
68732 -* Register branch logic *
68733 -* Format: OP rs, offset *
68734 -*********************************************************/
68735 -MakeDisF(disBGEZ, dName("BGEZ"); dGPR(_Rs_); dOffset();)
68736 -MakeDisF(disBGEZAL, dName("BGEZAL"); dGPR(_Rs_); dOffset();)
68737 -MakeDisF(disBGTZ, dName("BGTZ"); dGPR(_Rs_); dOffset();)
68738 -MakeDisF(disBLEZ, dName("BLEZ"); dGPR(_Rs_); dOffset();)
68739 -MakeDisF(disBLTZ, dName("BLTZ"); dGPR(_Rs_); dOffset();)
68740 -MakeDisF(disBLTZAL, dName("BLTZAL"); dGPR(_Rs_); dOffset();)
68741 -
68742 -/*********************************************************
68743 -* Shift arithmetic with constant shift *
68744 -* Format: OP rd, rt, sa *
68745 -*********************************************************/
68746 -MakeDisF(disSLL, if (code) { dName("SLL"); dGPR(_Rd_); dGPR(_Rt_); dSa(); } else { dName("NOP"); })
68747 -MakeDisF(disSRA, dName("SRA"); dGPR(_Rd_); dGPR(_Rt_); dSa();)
68748 -MakeDisF(disSRL, dName("SRL"); dGPR(_Rd_); dGPR(_Rt_); dSa();)
68749 -
68750 -/*********************************************************
68751 -* Shift arithmetic with variant register shift *
68752 -* Format: OP rd, rt, rs *
68753 -*********************************************************/
68754 -MakeDisF(disSLLV, dName("SLLV"); dGPR(_Rd_); dGPR(_Rt_); dGPR(_Rs_);)
68755 -MakeDisF(disSRAV, dName("SRAV"); dGPR(_Rd_); dGPR(_Rt_); dGPR(_Rs_);)
68756 -MakeDisF(disSRLV, dName("SRLV"); dGPR(_Rd_); dGPR(_Rt_); dGPR(_Rs_);)
68757 -
68758 -/*********************************************************
68759 -* Load higher 16 bits of the first word in GPR with imm *
68760 -* Format: OP rt, immediate *
68761 -*********************************************************/
68762 -MakeDisF(disLUI, dName("LUI"); dGPR(_Rt_); dImm();)
68763 -
68764 -/*********************************************************
68765 -* Move from HI/LO to GPR *
68766 -* Format: OP rd *
68767 -*********************************************************/
68768 -MakeDisF(disMFHI, dName("MFHI"); dGPR(_Rd_); dHI();)
68769 -MakeDisF(disMFLO, dName("MFLO"); dGPR(_Rd_); dLO();)
68770 -
68771 -/*********************************************************
68772 -* Move from GPR to HI/LO *
68773 -* Format: OP rd *
68774 -*********************************************************/
68775 -MakeDisF(disMTHI, dName("MTHI"); dHI(); dGPR(_Rs_);)
68776 -MakeDisF(disMTLO, dName("MTLO"); dLO(); dGPR(_Rs_);)
68777 -
68778 -/*********************************************************
68779 -* Special purpose instructions *
68780 -* Format: OP *
68781 -*********************************************************/
68782 -MakeDisF(disBREAK, dName("BREAK"))
68783 -MakeDisF(disRFE, dName("RFE"))
68784 -MakeDisF(disSYSCALL, dName("SYSCALL"))
68785 -MakeDisF(disHLE, dName("HLE"))
68786 -
68787 -
68788 -MakeDisF(disRTPS, dName("RTPS"))
68789 -MakeDisF(disOP , dName("OP"))
68790 -MakeDisF(disNCLIP, dName("NCLIP"))
68791 -MakeDisF(disDPCS, dName("DPCS"))
68792 -MakeDisF(disINTPL, dName("INTPL"))
68793 -MakeDisF(disMVMVA, dName("MVMVA"))
68794 -MakeDisF(disNCDS , dName("NCDS"))
68795 -MakeDisF(disCDP , dName("CDP"))
68796 -MakeDisF(disNCDT , dName("NCDT"))
68797 -MakeDisF(disNCCS , dName("NCCS"))
68798 -MakeDisF(disCC , dName("CC"))
68799 -MakeDisF(disNCS , dName("NCS"))
68800 -MakeDisF(disNCT , dName("NCT"))
68801 -MakeDisF(disSQR , dName("SQR"))
68802 -MakeDisF(disDCPL , dName("DCPL"))
68803 -MakeDisF(disDPCT , dName("DPCT"))
68804 -MakeDisF(disAVSZ3, dName("AVSZ3"))
68805 -MakeDisF(disAVSZ4, dName("AVSZ4"))
68806 -MakeDisF(disRTPT , dName("RTPT"))
68807 -MakeDisF(disGPF , dName("GPF"))
68808 -MakeDisF(disGPL , dName("GPL"))
68809 -MakeDisF(disNCCT , dName("NCCT"))
68810 -
68811 -MakeDisF(disMFC2, dName("MFC2"); dGPR(_Rt_);)
68812 -MakeDisF(disCFC2, dName("CFC2"); dGPR(_Rt_);)
68813 -MakeDisF(disMTC2, dName("MTC2"); dGPR(_Rt_);)
68814 -MakeDisF(disCTC2, dName("CTC2"); dGPR(_Rt_);)
68815 -
68816 -/*********************************************************
68817 -* Register branch logic *
68818 -* Format: OP rs, rt, offset *
68819 -*********************************************************/
68820 -MakeDisF(disBEQ, dName("BEQ"); dGPR(_Rs_); dGPR(_Rt_); dOffset();)
68821 -MakeDisF(disBNE, dName("BNE"); dGPR(_Rs_); dGPR(_Rt_); dOffset();)
68822 -
68823 -/*********************************************************
68824 -* Jump to target *
68825 -* Format: OP target *
68826 -*********************************************************/
68827 -MakeDisF(disJ, dName("J"); dTarget();)
68828 -MakeDisF(disJAL, dName("JAL"); dTarget(); dGPR(31);)
68829 -
68830 -/*********************************************************
68831 -* Register jump *
68832 -* Format: OP rs, rd *
68833 -*********************************************************/
68834 -MakeDisF(disJR, dName("JR"); dGPR(_Rs_);)
68835 -MakeDisF(disJALR, dName("JALR"); dGPR(_Rs_); dGPR(_Rd_))
68836 -
68837 -/*********************************************************
68838 -* Load and store for GPR *
68839 -* Format: OP rt, offset(base) *
68840 -*********************************************************/
68841 -MakeDisF(disLB, dName("LB"); dGPR(_Rt_); dOfB();)
68842 -MakeDisF(disLBU, dName("LBU"); dGPR(_Rt_); dOfB();)
68843 -MakeDisF(disLH, dName("LH"); dGPR(_Rt_); dOfB();)
68844 -MakeDisF(disLHU, dName("LHU"); dGPR(_Rt_); dOfB();)
68845 -MakeDisF(disLW, dName("LW"); dGPR(_Rt_); dOfB();)
68846 -MakeDisF(disLWL, dName("LWL"); dGPR(_Rt_); dOfB();)
68847 -MakeDisF(disLWR, dName("LWR"); dGPR(_Rt_); dOfB();)
68848 -MakeDisF(disLWC2, dName("LWC2"); dGPR(_Rt_); dOfB();)
68849 -MakeDisF(disSB, dName("SB"); dGPR(_Rt_); dOfB();)
68850 -MakeDisF(disSH, dName("SH"); dGPR(_Rt_); dOfB();)
68851 -MakeDisF(disSW, dName("SW"); dGPR(_Rt_); dOfB();)
68852 -MakeDisF(disSWL, dName("SWL"); dGPR(_Rt_); dOfB();)
68853 -MakeDisF(disSWR, dName("SWR"); dGPR(_Rt_); dOfB();)
68854 -MakeDisF(disSWC2, dName("SWC2"); dGPR(_Rt_); dOfB();)
68855 -
68856 -/*********************************************************
68857 -* Moves between GPR and COPx *
68858 -* Format: OP rt, fs *
68859 -*********************************************************/
68860 -MakeDisF(disMFC0, dName("MFC0"); dGPR(_Rt_); dCP0(_Rd_);)
68861 -MakeDisF(disMTC0, dName("MTC0"); dCP0(_Rd_); dGPR(_Rt_);)
68862 -MakeDisF(disCFC0, dName("CFC0"); dGPR(_Rt_); dCP0(_Rd_);)
68863 -MakeDisF(disCTC0, dName("CTC0"); dCP0(_Rd_); dGPR(_Rt_);)
68864 -
68865 -/*********************************************************
68866 -* Unknow instruction (would generate an exception) *
68867 -* Format: ? *
68868 -*********************************************************/
68869 -MakeDisF(disNULL, dName("*** Bad OP ***");)
68870 -
68871 -
68872 -TdisR3000AF disR3000A_SPECIAL[] = { // Subset of disSPECIAL
68873 - disSLL , disNULL , disSRL , disSRA , disSLLV , disNULL , disSRLV , disSRAV ,
68874 - disJR , disJALR , disNULL, disNULL, disSYSCALL, disBREAK , disNULL , disNULL ,
68875 - disMFHI, disMTHI , disMFLO, disMTLO, disNULL , disNULL , disNULL , disNULL ,
68876 - disMULT, disMULTU, disDIV , disDIVU, disNULL , disNULL , disNULL , disNULL ,
68877 - disADD , disADDU , disSUB , disSUBU, disAND , disOR , disXOR , disNOR ,
68878 - disNULL, disNULL , disSLT , disSLTU, disNULL , disNULL , disNULL , disNULL ,
68879 - disNULL, disNULL , disNULL, disNULL, disNULL , disNULL , disNULL , disNULL ,
68880 - disNULL, disNULL , disNULL, disNULL, disNULL , disNULL , disNULL , disNULL};
68881 -
68882 -MakeDisF(disSPECIAL, disR3000A_SPECIAL[_Funct_](code, pc))
68883 -
68884 -TdisR3000AF disR3000A_BCOND[] = { // Subset of disBCOND
68885 - disBLTZ , disBGEZ , disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
68886 - disNULL , disNULL , disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
68887 - disBLTZAL, disBGEZAL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
68888 - disNULL , disNULL , disNULL, disNULL, disNULL, disNULL, disNULL, disNULL};
68889 -
68890 -MakeDisF(disBCOND, disR3000A_BCOND[_Rt_](code, pc))
68891 -
68892 -TdisR3000AF disR3000A_COP0[] = { // Subset of disCOP0
68893 - disMFC0, disNULL, disCFC0, disNULL, disMTC0, disNULL, disCTC0, disNULL,
68894 - disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
68895 - disRFE , disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
68896 - disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL};
68897 -
68898 -MakeDisF(disCOP0, disR3000A_COP0[_Rs_](code, pc))
68899 -
68900 -TdisR3000AF disR3000A_BASIC[] = { // Subset of disBASIC (based on rs)
68901 - disMFC2, disNULL, disCFC2, disNULL, disMTC2, disNULL, disCTC2, disNULL,
68902 - disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
68903 - disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
68904 - disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL};
68905 -
68906 -MakeDisF(disBASIC, disR3000A_BASIC[_Rs_](code, pc))
68907 -
68908 -TdisR3000AF disR3000A_COP2[] = { // Subset of disR3000F_COP2 (based on funct)
68909 - disBASIC, disRTPS , disNULL , disNULL , disNULL, disNULL , disNCLIP, disNULL,
68910 - disNULL , disNULL , disNULL , disNULL , disOP , disNULL , disNULL , disNULL,
68911 - disDPCS , disINTPL, disMVMVA, disNCDS , disCDP , disNULL , disNCDT , disNULL,
68912 - disNULL , disNULL , disNULL , disNCCS , disCC , disNULL , disNCS , disNULL,
68913 - disNCT , disNULL , disNULL , disNULL , disNULL, disNULL , disNULL , disNULL,
68914 - disSQR , disDCPL , disDPCT , disNULL , disNULL, disAVSZ3, disAVSZ4, disNULL,
68915 - disRTPT , disNULL , disNULL , disNULL , disNULL, disNULL , disNULL , disNULL,
68916 - disNULL , disNULL , disNULL , disNULL , disNULL, disGPF , disGPL , disNCCT };
68917 -
68918 -MakeDisF(disCOP2, disR3000A_COP2[_Funct_](code, pc))
68919 -
68920 -TdisR3000AF disR3000A[] = {
68921 - disSPECIAL , disBCOND , disJ , disJAL , disBEQ , disBNE , disBLEZ , disBGTZ ,
68922 - disADDI , disADDIU , disSLTI , disSLTIU, disANDI, disORI , disXORI , disLUI ,
68923 - disCOP0 , disNULL , disCOP2 , disNULL , disNULL, disNULL, disNULL , disNULL ,
68924 - disNULL , disNULL , disNULL , disNULL , disNULL, disNULL, disNULL , disNULL ,
68925 - disLB , disLH , disLWL , disLW , disLBU , disLHU , disLWR , disNULL ,
68926 - disSB , disSH , disSWL , disSW , disNULL, disNULL, disSWR , disNULL ,
68927 - disNULL , disNULL , disLWC2 , disNULL , disNULL, disNULL, disNULL , disNULL ,
68928 - disNULL , disNULL , disSWC2 , disHLE , disNULL, disNULL, disNULL , disNULL };
68929 -
68930 -MakeDisFg(disR3000AF, disR3000A[code >> 26](code, pc))
68931 diff -rupN original/libpcsxcore/libpcsxcore/disr3000a.lo new/libpcsxcore/libpcsxcore/disr3000a.lo
68932 --- original/libpcsxcore/libpcsxcore/disr3000a.lo 2009-03-28 22:34:46.000000000 -0430
68933 +++ new/libpcsxcore/libpcsxcore/disr3000a.lo 1969-12-31 20:00:00.000000000 -0400
68934 @@ -1,12 +0,0 @@
68935 -# disr3000a.lo - a libtool object file
68936 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
68937 -#
68938 -# Please DO NOT delete this file!
68939 -# It is necessary for linking the library.
68940 -
68941 -# Name of the PIC object.
68942 -pic_object='.libs/disr3000a.o'
68943 -
68944 -# Name of the non-PIC object.
68945 -non_pic_object='disr3000a.o'
68946 -
68947 Los ficheros binarios original/libpcsxcore/libpcsxcore/disr3000a.o y new/libpcsxcore/libpcsxcore/disr3000a.o son distintos
68948 diff -rupN original/libpcsxcore/libpcsxcore/gte.c new/libpcsxcore/libpcsxcore/gte.c
68949 --- original/libpcsxcore/libpcsxcore/gte.c 2007-10-08 17:13:27.000000000 -0400
68950 +++ new/libpcsxcore/libpcsxcore/gte.c 1969-12-31 20:00:00.000000000 -0400
68951 @@ -1,3118 +0,0 @@
68952 -/***************************************************************************
68953 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
68954 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
68955 - * *
68956 - * This program is free software; you can redistribute it and/or modify *
68957 - * it under the terms of the GNU General Public License as published by *
68958 - * the Free Software Foundation; either version 2 of the License, or *
68959 - * (at your option) any later version. *
68960 - * *
68961 - * This program is distributed in the hope that it will be useful, *
68962 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
68963 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
68964 - * GNU General Public License for more details. *
68965 - * *
68966 - * You should have received a copy of the GNU General Public License *
68967 - * along with this program; if not, write to the *
68968 - * Free Software Foundation, Inc., *
68969 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
68970 - ***************************************************************************/
68971 -
68972 -/*
68973 -* GTE functions.
68974 -*/
68975 -
68976 -#include "gte.h"
68977 -
68978 -#ifdef GTE_DUMP
68979 -#define G_OP(name,delay) fprintf(gteLog, "* : %08X : %02d : %s\n", psxRegs.code, delay, name);
68980 -#define G_SD(reg) fprintf(gteLog, "+D%02d : %08X\n", reg, psxRegs.CP2D.r[reg]);
68981 -#define G_SC(reg) fprintf(gteLog, "+C%02d : %08X\n", reg, psxRegs.CP2C.r[reg]);
68982 -#define G_GD(reg) fprintf(gteLog, "-D%02d : %08X\n", reg, psxRegs.CP2D.r[reg]);
68983 -#define G_GC(reg) fprintf(gteLog, "-C%02d : %08X\n", reg, psxRegs.CP2C.r[reg]);
68984 -#else
68985 -#define G_OP(name,delay)
68986 -#define G_SD(reg)
68987 -#define G_SC(reg)
68988 -#define G_GD(reg)
68989 -#define G_GC(reg)
68990 -#endif
68991 -
68992 -#define SUM_FLAG if(gteFLAG & 0x7F87E000) gteFLAG |= 0x80000000;
68993 -
68994 -#if defined(__BIGENDIAN__)
68995 -#define SEL16(n) ((n)^1)
68996 -#define SEL8(n) ((n)^3)
68997 -#else
68998 -#define SEL16(n) (n)
68999 -#define SEL8(n) (n)
69000 -#endif
69001 -
69002 -#define gteVX0 ((s16*)psxRegs.CP2D.r)[SEL16(0)]
69003 -#define gteVY0 ((s16*)psxRegs.CP2D.r)[SEL16(1)]
69004 -#define gteVZ0 ((s16*)psxRegs.CP2D.r)[SEL16(2)]
69005 -#define gteVX1 ((s16*)psxRegs.CP2D.r)[SEL16(4)]
69006 -#define gteVY1 ((s16*)psxRegs.CP2D.r)[SEL16(5)]
69007 -#define gteVZ1 ((s16*)psxRegs.CP2D.r)[SEL16(6)]
69008 -#define gteVX2 ((s16*)psxRegs.CP2D.r)[SEL16(8)]
69009 -#define gteVY2 ((s16*)psxRegs.CP2D.r)[SEL16(9)]
69010 -#define gteVZ2 ((s16*)psxRegs.CP2D.r)[SEL16(10)]
69011 -#define gteRGB psxRegs.CP2D.r[6]
69012 -#define gteOTZ ((s16*)psxRegs.CP2D.r)[SEL16(7*2)]
69013 -#define gteIR0 ((s32*)psxRegs.CP2D.r)[8]
69014 -#define gteIR1 ((s32*)psxRegs.CP2D.r)[9]
69015 -#define gteIR2 ((s32*)psxRegs.CP2D.r)[10]
69016 -#define gteIR3 ((s32*)psxRegs.CP2D.r)[11]
69017 -#define gteSXY0 ((s32*)psxRegs.CP2D.r)[12]
69018 -#define gteSXY1 ((s32*)psxRegs.CP2D.r)[13]
69019 -#define gteSXY2 ((s32*)psxRegs.CP2D.r)[14]
69020 -#define gteSXYP ((s32*)psxRegs.CP2D.r)[15]
69021 -#define gteSX0 ((s16*)psxRegs.CP2D.r)[SEL16(12*2)]
69022 -#define gteSY0 ((s16*)psxRegs.CP2D.r)[SEL16(12*2+1)]
69023 -#define gteSX1 ((s16*)psxRegs.CP2D.r)[SEL16(13*2)]
69024 -#define gteSY1 ((s16*)psxRegs.CP2D.r)[SEL16(13*2+1)]
69025 -#define gteSX2 ((s16*)psxRegs.CP2D.r)[SEL16(14*2)]
69026 -#define gteSY2 ((s16*)psxRegs.CP2D.r)[SEL16(14*2+1)]
69027 -#define gteSXP ((s16*)psxRegs.CP2D.r)[SEL16(15*2)]
69028 -#define gteSYP ((s16*)psxRegs.CP2D.r)[SEL16(15*2+1)]
69029 -#define gteSZx ((u16*)psxRegs.CP2D.r)[SEL16(16*2)]
69030 -#define gteSZ0 ((u16*)psxRegs.CP2D.r)[SEL16(17*2)]
69031 -#define gteSZ1 ((u16*)psxRegs.CP2D.r)[SEL16(18*2)]
69032 -#define gteSZ2 ((u16*)psxRegs.CP2D.r)[SEL16(19*2)]
69033 -#define gteRGB0 psxRegs.CP2D.r[20]
69034 -#define gteRGB1 psxRegs.CP2D.r[21]
69035 -#define gteRGB2 psxRegs.CP2D.r[22]
69036 -#define gteMAC0 psxRegs.CP2D.r[24]
69037 -#define gteMAC1 ((s32*)psxRegs.CP2D.r)[25]
69038 -#define gteMAC2 ((s32*)psxRegs.CP2D.r)[26]
69039 -#define gteMAC3 ((s32*)psxRegs.CP2D.r)[27]
69040 -#define gteIRGB psxRegs.CP2D.r[28]
69041 -#define gteORGB psxRegs.CP2D.r[29]
69042 -#define gteLZCS psxRegs.CP2D.r[30]
69043 -#define gteLZCR psxRegs.CP2D.r[31]
69044 -
69045 -#define gteR ((u8 *)psxRegs.CP2D.r)[SEL8(6*4)]
69046 -#define gteG ((u8 *)psxRegs.CP2D.r)[SEL8(6*4+1)]
69047 -#define gteB ((u8 *)psxRegs.CP2D.r)[SEL8(6*4+2)]
69048 -#define gteCODE ((u8 *)psxRegs.CP2D.r)[SEL8(6*4+3)]
69049 -#define gteC gteCODE
69050 -
69051 -#define gteR0 ((u8 *)psxRegs.CP2D.r)[SEL8(20*4)]
69052 -#define gteG0 ((u8 *)psxRegs.CP2D.r)[SEL8(20*4+1)]
69053 -#define gteB0 ((u8 *)psxRegs.CP2D.r)[SEL8(20*4+2)]
69054 -#define gteCODE0 ((u8 *)psxRegs.CP2D.r)[SEL8(20*4+3)]
69055 -#define gteC0 gteCODE0
69056 -
69057 -#define gteR1 ((u8 *)psxRegs.CP2D.r)[SEL8(21*4)]
69058 -#define gteG1 ((u8 *)psxRegs.CP2D.r)[SEL8(21*4+1)]
69059 -#define gteB1 ((u8 *)psxRegs.CP2D.r)[SEL8(21*4+2)]
69060 -#define gteCODE1 ((u8 *)psxRegs.CP2D.r)[SEL8(21*4+3)]
69061 -#define gteC1 gteCODE1
69062 -
69063 -#define gteR2 ((u8 *)psxRegs.CP2D.r)[SEL8(22*4)]
69064 -#define gteG2 ((u8 *)psxRegs.CP2D.r)[SEL8(22*4+1)]
69065 -#define gteB2 ((u8 *)psxRegs.CP2D.r)[SEL8(22*4+2)]
69066 -#define gteCODE2 ((u8 *)psxRegs.CP2D.r)[SEL8(22*4+3)]
69067 -#define gteC2 gteCODE2
69068 -
69069 -
69070 -
69071 -#define gteR11 ((s16*)psxRegs.CP2C.r)[SEL16(0)]
69072 -#define gteR12 ((s16*)psxRegs.CP2C.r)[SEL16(1)]
69073 -#define gteR13 ((s16*)psxRegs.CP2C.r)[SEL16(2)]
69074 -#define gteR21 ((s16*)psxRegs.CP2C.r)[SEL16(3)]
69075 -#define gteR22 ((s16*)psxRegs.CP2C.r)[SEL16(4)]
69076 -#define gteR23 ((s16*)psxRegs.CP2C.r)[SEL16(5)]
69077 -#define gteR31 ((s16*)psxRegs.CP2C.r)[SEL16(6)]
69078 -#define gteR32 ((s16*)psxRegs.CP2C.r)[SEL16(7)]
69079 -#define gteR33 ((s16*)psxRegs.CP2C.r)[SEL16(8)]
69080 -#define gteTRX ((s32*)psxRegs.CP2C.r)[5]
69081 -#define gteTRY ((s32*)psxRegs.CP2C.r)[6]
69082 -#define gteTRZ ((s32*)psxRegs.CP2C.r)[7]
69083 -#define gteL11 ((s16*)psxRegs.CP2C.r)[SEL16(16)]
69084 -#define gteL12 ((s16*)psxRegs.CP2C.r)[SEL16(17)]
69085 -#define gteL13 ((s16*)psxRegs.CP2C.r)[SEL16(18)]
69086 -#define gteL21 ((s16*)psxRegs.CP2C.r)[SEL16(19)]
69087 -#define gteL22 ((s16*)psxRegs.CP2C.r)[SEL16(20)]
69088 -#define gteL23 ((s16*)psxRegs.CP2C.r)[SEL16(21)]
69089 -#define gteL31 ((s16*)psxRegs.CP2C.r)[SEL16(22)]
69090 -#define gteL32 ((s16*)psxRegs.CP2C.r)[SEL16(23)]
69091 -#define gteL33 ((s16*)psxRegs.CP2C.r)[SEL16(24)]
69092 -#define gteRBK ((s32*)psxRegs.CP2C.r)[13]
69093 -#define gteGBK ((s32*)psxRegs.CP2C.r)[14]
69094 -#define gteBBK ((s32*)psxRegs.CP2C.r)[15]
69095 -#define gteLR1 ((s16*)psxRegs.CP2C.r)[SEL16(32)]
69096 -#define gteLR2 ((s16*)psxRegs.CP2C.r)[SEL16(33)]
69097 -#define gteLR3 ((s16*)psxRegs.CP2C.r)[SEL16(34)]
69098 -#define gteLG1 ((s16*)psxRegs.CP2C.r)[SEL16(35)]
69099 -#define gteLG2 ((s16*)psxRegs.CP2C.r)[SEL16(36)]
69100 -#define gteLG3 ((s16*)psxRegs.CP2C.r)[SEL16(37)]
69101 -#define gteLB1 ((s16*)psxRegs.CP2C.r)[SEL16(38)]
69102 -#define gteLB2 ((s16*)psxRegs.CP2C.r)[SEL16(39)]
69103 -#define gteLB3 ((s16*)psxRegs.CP2C.r)[SEL16(40)]
69104 -#define gteRFC ((s32*)psxRegs.CP2C.r)[21]
69105 -#define gteGFC ((s32*)psxRegs.CP2C.r)[22]
69106 -#define gteBFC ((s32*)psxRegs.CP2C.r)[23]
69107 -#define gteOFX ((s32*)psxRegs.CP2C.r)[24]
69108 -#define gteOFY ((s32*)psxRegs.CP2C.r)[25]
69109 -#define gteH ((u16*)psxRegs.CP2C.r)[SEL16(52)]
69110 -#define gteDQA ((s16*)psxRegs.CP2C.r)[SEL16(54)]
69111 -#define gteDQB ((s32*)psxRegs.CP2C.r)[28]
69112 -#define gteZSF3 ((s16*)psxRegs.CP2C.r)[SEL16(58)]
69113 -#define gteZSF4 ((s16*)psxRegs.CP2C.r)[SEL16(60)]
69114 -#define gteFLAG psxRegs.CP2C.r[31]
69115 -
69116 -__inline u32 MFC2(int reg) {
69117 - switch(reg) {
69118 - case 29:
69119 - gteORGB = (((gteIR1 >> 7) & 0x1f)) |
69120 - (((gteIR2 >> 7) & 0x1f)<<5) |
69121 - (((gteIR3 >> 7) & 0x1f)<<10);
69122 -// gteORGB = (gteIR1 ) |
69123 -// (gteIR2 << 5) |
69124 -// (gteIR3 << 10);
69125 -// gteORGB = ((gteIR1 & 0xf80)>>7) |
69126 -// ((gteIR2 & 0xf80)>>2) |
69127 -// ((gteIR3 & 0xf80)<<3);
69128 - return gteORGB;
69129 -
69130 - default:
69131 - return psxRegs.CP2D.r[reg];
69132 - }
69133 -}
69134 -
69135 -__inline void MTC2(u32 value, int reg) {
69136 - int a;
69137 -
69138 - switch(reg) {
69139 - case 8: case 9: case 10: case 11:
69140 - psxRegs.CP2D.r[reg] = (short)value;
69141 - break;
69142 -
69143 - case 15:
69144 - gteSXY0 = gteSXY1;
69145 - gteSXY1 = gteSXY2;
69146 - gteSXY2 = value;
69147 - gteSXYP = value;
69148 - break;
69149 -
69150 - case 16: case 17: case 18: case 19:
69151 - psxRegs.CP2D.r[reg] = (value & 0xffff);
69152 - break;
69153 -
69154 - case 28:
69155 - psxRegs.CP2D.r[28] = value;
69156 - gteIR1 = ((value ) & 0x1f) << 7;
69157 - gteIR2 = ((value >> 5) & 0x1f) << 7;
69158 - gteIR3 = ((value >> 10) & 0x1f) << 7;
69159 -// gteIR1 = (value ) & 0x1f;
69160 -// gteIR2 = (value >> 5) & 0x1f;
69161 -// gteIR3 = (value >> 10) & 0x1f;
69162 -// gteIR1 = ((value ) & 0x1f) << 4;
69163 -// gteIR2 = ((value >> 5) & 0x1f) << 4;
69164 -// gteIR3 = ((value >> 10) & 0x1f) << 4;
69165 - break;
69166 -
69167 - case 30:
69168 - psxRegs.CP2D.r[30] = value;
69169 -
69170 - a = psxRegs.CP2D.r[30];
69171 - if (a > 0) {
69172 - int i;
69173 - for (i=31; (a & (1 << i)) == 0 && i >= 0; i--);
69174 - psxRegs.CP2D.r[31] = 31 - i;
69175 - } else if (a < 0) {
69176 - int i;
69177 - a^= 0xffffffff;
69178 - for (i=31; (a & (1 << i)) == 0 && i >= 0; i--);
69179 - psxRegs.CP2D.r[31] = 31 - i;
69180 - } else {
69181 - psxRegs.CP2D.r[31] = 32;
69182 - }
69183 - break;
69184 -
69185 - default:
69186 - psxRegs.CP2D.r[reg] = value;
69187 - }
69188 -}
69189 -
69190 -void gteMFC2() {
69191 - if (!_Rt_) return;
69192 - psxRegs.GPR.r[_Rt_] = MFC2(_Rd_);
69193 -}
69194 -
69195 -void gteCFC2() {
69196 - if (!_Rt_) return;
69197 - psxRegs.GPR.r[_Rt_] = psxRegs.CP2C.r[_Rd_];
69198 -}
69199 -
69200 -void gteMTC2() {
69201 - MTC2(psxRegs.GPR.r[_Rt_], _Rd_);
69202 -}
69203 -
69204 -void gteCTC2() {
69205 - psxRegs.CP2C.r[_Rd_] = psxRegs.GPR.r[_Rt_];
69206 -}
69207 -
69208 -#define _oB_ (psxRegs.GPR.r[_Rs_] + _Imm_)
69209 -
69210 -void gteLWC2() {
69211 - MTC2(psxMemRead32(_oB_), _Rt_);
69212 -}
69213 -
69214 -void gteSWC2() {
69215 - psxMemWrite32(_oB_, MFC2(_Rt_));
69216 -}
69217 -
69218 -/////LIMITATIONS AND OTHER STUFF************************************
69219 -
69220 -
69221 -/*
69222 -#define MAGIC (((65536. * 65536. * 16) + (65536.*.5)) * 65536.)
69223 -
69224 -static __inline long float2int(double d)
69225 -{
69226 - double dtemp = MAGIC + d;
69227 - return (*(long *)&dtemp)-0x80000000;
69228 -}*/
69229 -/*
69230 -__inline double EDETEC1(double data)
69231 -{
69232 - if (data<(double)-2147483647) {gteFLAG|=1<<30; return (double)-2147483647;}
69233 - else
69234 - if (data>(double) 2147483647) {gteFLAG|=1<<27; return (double) 2147483647;}
69235 -
69236 - else return data;
69237 -}
69238 -
69239 -__inline double EDETEC2(double data)
69240 -{
69241 - if (data<(double)-2147483647) {gteFLAG|=1<<29; return (double)-2147483647;}
69242 - else
69243 - if (data>(double) 2147483647) {gteFLAG|=1<<26; return (double) 2147483647;}
69244 -
69245 - else return data;
69246 -}
69247 -
69248 -__inline double EDETEC3(double data)
69249 -{
69250 - if (data<(double)-2147483647) {gteFLAG|=1<<28; return (double)-2147483647;}
69251 - else
69252 - if (data>(double) 2147483647) {gteFLAG|=1<<25; return (double) 2147483647;}
69253 -
69254 - else return data;
69255 -}
69256 -
69257 -__inline double EDETEC4(double data)
69258 -{
69259 - if (data<(double)-2147483647) {gteFLAG|=1<<16; return (double)-2147483647;}
69260 - else
69261 - if (data>(double) 2147483647) {gteFLAG|=1<<15; return (double) 2147483647;}
69262 -
69263 - else return data;
69264 -}*/
69265 -/*
69266 -double LimitAU(double fraction,unsigned long bitIndex) {
69267 - if (fraction < 0.0) { fraction = 0.0; gteFLAG |= (1<<bitIndex); }
69268 - else
69269 - if (fraction > 32767.0) { fraction = 32767.0; gteFLAG |= (1<<bitIndex); }
69270 -
69271 - return (fraction);
69272 -}
69273 -
69274 -double LimitAS(double fraction,unsigned long bitIndex) {
69275 - if (fraction <-32768.0) { fraction =-32768.0; gteFLAG |= (1<<bitIndex); }
69276 - else
69277 - if (fraction > 32767.0) { fraction = 32767.0; gteFLAG |= (1<<bitIndex); }
69278 -
69279 - return (fraction);
69280 -}
69281 -
69282 -double LimitB (double fraction,unsigned long bitIndex) {
69283 - if (fraction < 0.0) { fraction = 0.0; gteFLAG |= (1<<bitIndex); }
69284 - else
69285 - if (fraction > 255.0) { fraction = 255.0; gteFLAG |= (1<<bitIndex); }
69286 -
69287 - return (fraction);
69288 -}
69289 -
69290 -double LimitC (double fraction,unsigned long bitIndex) {
69291 - if (fraction < 0.0) { fraction = 0.0; gteFLAG |= (1<<bitIndex); }
69292 - else
69293 - if (fraction > 65535.0) { fraction = 65535.0; gteFLAG |= (1<<bitIndex); }
69294 -
69295 - return (fraction);
69296 -}
69297 -
69298 -double LimitD (double fraction,unsigned long bitIndex) {
69299 - if (fraction < -1024.0) { fraction = -1024.0; gteFLAG |= (1<<bitIndex); }
69300 - else
69301 - if (fraction > 1023.0) { fraction = 1023.0; gteFLAG |= (1<<bitIndex); }
69302 -
69303 - return (fraction);
69304 -}
69305 -
69306 -double LimitE (double fraction,unsigned long bitIndex) {
69307 - if (fraction < 0.0) { fraction = 0.0; gteFLAG |= (1<<bitIndex); }
69308 - else
69309 - if (fraction > 1023.0) { fraction = 1023.0; gteFLAG |= (1<<bitIndex); }
69310 -
69311 - return (fraction);
69312 -}
69313 -
69314 -double LIMIT(double data,double MIN,double MAX,int FLAG)
69315 -{
69316 - if (data<MIN) {gteFLAG|=1<<FLAG; return MIN;}
69317 - else
69318 - if (data>MAX) {gteFLAG|=1<<FLAG; return MAX;}
69319 -
69320 - else return data;
69321 -}
69322 -
69323 -double ALIMIT(double data,double MIN,double MAX)
69324 -{
69325 - if (data<MIN) return MIN;
69326 - else
69327 - if (data>MAX) return MAX;
69328 -
69329 - else return data;
69330 -}
69331 -
69332 -double OLIMIT(double data)
69333 -{
69334 - data=(data);
69335 -
69336 - if (data<(double)-2147483647) {return (double)-2147483647;}
69337 - else
69338 - if (data>(double) 2147483647) {return (double) 2147483647;}
69339 -
69340 - else return data;
69341 -}*/
69342 -
69343 -__inline double NC_OVERFLOW1(double x) {
69344 - if (x<-2147483648.0) {gteFLAG |= 1<<29;}
69345 - else if (x> 2147483647.0) {gteFLAG |= 1<<26;}
69346 -
69347 - return x;
69348 -}
69349 -
69350 -__inline double NC_OVERFLOW2(double x) {
69351 - if (x<-2147483648.0) {gteFLAG |= 1<<28;}
69352 - else if (x> 2147483647.0) {gteFLAG |= 1<<25;}
69353 -
69354 - return x;
69355 -}
69356 -
69357 -__inline double NC_OVERFLOW3(double x) {
69358 - if (x<-2147483648.0) {gteFLAG |= 1<<27;}
69359 - else if (x> 2147483647.0) {gteFLAG |= 1<<24;}
69360 -
69361 - return x;
69362 -}
69363 -
69364 -__inline double NC_OVERFLOW4(double x) {
69365 - if (x<-2147483648.0) {gteFLAG |= 1<<16;}
69366 - else if (x> 2147483647.0) {gteFLAG |= 1<<15;}
69367 -
69368 - return x;
69369 -}
69370 -
69371 -__inline s32 FNC_OVERFLOW1(s64 x) {
69372 - if (x< (s64)0xffffffff80000000) {gteFLAG |= 1<<29;}
69373 - else if (x> 2147483647) {gteFLAG |= 1<<26;}
69374 -
69375 - return (s32)x;
69376 -}
69377 -
69378 -__inline s32 FNC_OVERFLOW2(s64 x) {
69379 - if (x< (s64)0xffffffff80000000) {gteFLAG |= 1<<28;}
69380 - else if (x> 2147483647) {gteFLAG |= 1<<25;}
69381 -
69382 - return (s32)x;
69383 -}
69384 -
69385 -__inline s32 FNC_OVERFLOW3(s64 x) {
69386 - if (x< (s64)0xffffffff80000000) {gteFLAG |= 1<<27;}
69387 - else if (x> 2147483647) {gteFLAG |= 1<<24;}
69388 -
69389 - return (s32)x;
69390 -}
69391 -
69392 -__inline s32 FNC_OVERFLOW4(s64 x) {
69393 - if (x< (s64)0xffffffff80000000) {gteFLAG |= 1<<16;}
69394 - else if (x> 2147483647) {gteFLAG |= 1<<15;}
69395 -
69396 - return (s32)x;
69397 -}
69398 -
69399 -#define _LIMX(negv, posv, flagb) { \
69400 - if (x < (negv)) { x = (negv); gteFLAG |= (1<<flagb); } else \
69401 - if (x > (posv)) { x = (posv); gteFLAG |= (1<<flagb); } return (x); \
69402 -}
69403 -
69404 -__inline double limA1S(double x) { _LIMX(-32768.0, 32767.0, 24); }
69405 -__inline double limA2S(double x) { _LIMX(-32768.0, 32767.0, 23); }
69406 -__inline double limA3S(double x) { _LIMX(-32768.0, 32767.0, 22); }
69407 -__inline double limA1U(double x) { _LIMX(0.0, 32767.0, 24); }
69408 -__inline double limA2U(double x) { _LIMX(0.0, 32767.0, 23); }
69409 -__inline double limA3U(double x) { _LIMX(0.0, 32767.0, 22); }
69410 -__inline double limB1 (double x) { _LIMX(0.0, 255.0, 21); }
69411 -__inline double limB2 (double x) { _LIMX(0.0, 255.0, 20); }
69412 -__inline double limB3 (double x) { _LIMX(0.0, 255.0, 19); }
69413 -__inline double limC (double x) { _LIMX(0.0, 65535.0, 18); }
69414 -__inline double limD1 (double x) { _LIMX(-1024.0, 1023.0, 14); }
69415 -__inline double limD2 (double x) { _LIMX(-1024.0, 1023.0, 13); }
69416 -__inline double limE (double x) { _LIMX(0.0, 4095.0, 12); }
69417 -
69418 -__inline double limG1(double x) {
69419 - if (x > 2147483647.0) { gteFLAG |= (1<<16); } else
69420 - if (x <-2147483648.0) { gteFLAG |= (1<<15); }
69421 -
69422 - if (x > 1023.0) { x = 1023.0; gteFLAG |= (1<<14); } else
69423 - if (x < -1024.0) { x = -1024.0; gteFLAG |= (1<<14); } return (x);
69424 -}
69425 -
69426 -__inline double limG2(double x) {
69427 - if (x > 2147483647.0) { gteFLAG |= (1<<16); } else
69428 - if (x <-2147483648.0) { gteFLAG |= (1<<15); }
69429 -
69430 - if (x > 1023.0) { x = 1023.0; gteFLAG |= (1<<13); } else
69431 - if (x < -1024.0) { x = -1024.0; gteFLAG |= (1<<13); } return (x);
69432 -}
69433 -
69434 -__inline s32 F12limA1S(s64 x) { _LIMX(-32768<<12, 32767<<12, 24); }
69435 -__inline s32 F12limA2S(s64 x) { _LIMX(-32768<<12, 32767<<12, 23); }
69436 -__inline s32 F12limA3S(s64 x) { _LIMX(-32768<<12, 32767<<12, 22); }
69437 -__inline s32 F12limA1U(s64 x) { _LIMX(0, 32767<<12, 24); }
69438 -__inline s32 F12limA2U(s64 x) { _LIMX(0, 32767<<12, 23); }
69439 -__inline s32 F12limA3U(s64 x) { _LIMX(0, 32767<<12, 22); }
69440 -
69441 -__inline s16 FlimA1S(s32 x) { _LIMX(-32768, 32767, 24); }
69442 -__inline s16 FlimA2S(s32 x) { _LIMX(-32768, 32767, 23); }
69443 -__inline s16 FlimA3S(s32 x) { _LIMX(-32768, 32767, 22); }
69444 -__inline s16 FlimA1U(s32 x) { _LIMX(0, 32767, 24); }
69445 -__inline s16 FlimA2U(s32 x) { _LIMX(0, 32767, 23); }
69446 -__inline s16 FlimA3U(s32 x) { _LIMX(0, 32767, 22); }
69447 -__inline u8 FlimB1 (s32 x) { _LIMX(0, 255, 21); }
69448 -__inline u8 FlimB2 (s32 x) { _LIMX(0, 255, 20); }
69449 -__inline u8 FlimB3 (s32 x) { _LIMX(0, 255, 19); }
69450 -__inline u16 FlimC (s32 x) { _LIMX(0, 65535, 18); }
69451 -__inline s32 FlimD1 (s32 x) { _LIMX(-1024, 1023, 14); }
69452 -__inline s32 FlimD2 (s32 x) { _LIMX(-1024, 1023, 13); }
69453 -__inline s32 FlimE (s32 x) { _LIMX(0, 65535, 12); }
69454 -//__inline s32 FlimE (s32 x) { _LIMX(0, 4095, 12); }
69455 -
69456 -__inline s32 FlimG1(s64 x) {
69457 - if (x > 2147483647) { gteFLAG |= (1<<16); } else
69458 - if (x < (s64)0xffffffff80000000) { gteFLAG |= (1<<15); }
69459 -
69460 - if (x > 1023) { x = 1023; gteFLAG |= (1<<14); } else
69461 - if (x < -1024) { x = -1024; gteFLAG |= (1<<14); } return (x);
69462 -}
69463 -
69464 -__inline s32 FlimG2(s64 x) {
69465 - if (x > 2147483647) { gteFLAG |= (1<<16); } else
69466 - if (x < (s64)0xffffffff80000000) { gteFLAG |= (1<<15); }
69467 -
69468 - if (x > 1023) { x = 1023; gteFLAG |= (1<<13); } else
69469 - if (x < -1024) { x = -1024; gteFLAG |= (1<<13); } return (x);
69470 -}
69471 -
69472 -#define MAC2IR() { \
69473 - if (gteMAC1 < (long)(-32768)) { gteIR1=(long)(-32768); gteFLAG|=1<<24;} \
69474 - else \
69475 - if (gteMAC1 > (long)( 32767)) { gteIR1=(long)( 32767); gteFLAG|=1<<24;} \
69476 - else gteIR1=(long)gteMAC1; \
69477 - if (gteMAC2 < (long)(-32768)) { gteIR2=(long)(-32768); gteFLAG|=1<<23;} \
69478 - else \
69479 - if (gteMAC2 > (long)( 32767)) { gteIR2=(long)( 32767); gteFLAG|=1<<23;} \
69480 - else gteIR2=(long)gteMAC2; \
69481 - if (gteMAC3 < (long)(-32768)) { gteIR3=(long)(-32768); gteFLAG|=1<<22;} \
69482 - else \
69483 - if (gteMAC3 > (long)( 32767)) { gteIR3=(long)( 32767); gteFLAG|=1<<22;} \
69484 - else gteIR3=(long)gteMAC3; \
69485 -}
69486 -
69487 -
69488 -#define MAC2IR1() { \
69489 - if (gteMAC1 < (long)0) { gteIR1=(long)0; gteFLAG|=1<<24;} \
69490 - else if (gteMAC1 > (long)(32767)) { gteIR1=(long)(32767); gteFLAG|=1<<24;} \
69491 - else gteIR1=(long)gteMAC1; \
69492 - if (gteMAC2 < (long)0) { gteIR2=(long)0; gteFLAG|=1<<23;} \
69493 - else if (gteMAC2 > (long)(32767)) { gteIR2=(long)(32767); gteFLAG|=1<<23;} \
69494 - else gteIR2=(long)gteMAC2; \
69495 - if (gteMAC3 < (long)0) { gteIR3=(long)0; gteFLAG|=1<<22;} \
69496 - else if (gteMAC3 > (long)(32767)) { gteIR3=(long)(32767); gteFLAG|=1<<22;} \
69497 - else gteIR3=(long)gteMAC3; \
69498 -}
69499 -
69500 -//********END OF LIMITATIONS**********************************/
69501 -
69502 -#define GTE_RTPS1(vn) { \
69503 - gteMAC1 = FNC_OVERFLOW1(((signed long)(gteR11*gteVX##vn + gteR12*gteVY##vn + gteR13*gteVZ##vn)>>12) + gteTRX); \
69504 - gteMAC2 = FNC_OVERFLOW2(((signed long)(gteR21*gteVX##vn + gteR22*gteVY##vn + gteR23*gteVZ##vn)>>12) + gteTRY); \
69505 - gteMAC3 = FNC_OVERFLOW3(((signed long)(gteR31*gteVX##vn + gteR32*gteVY##vn + gteR33*gteVZ##vn)>>12) + gteTRZ); \
69506 -}
69507 -
69508 -/* gteMAC1 = NC_OVERFLOW1(((signed long)(gteR11*gteVX0 + gteR12*gteVY0 + gteR13*gteVZ0)>>12) + gteTRX);
69509 - gteMAC2 = NC_OVERFLOW2(((signed long)(gteR21*gteVX0 + gteR22*gteVY0 + gteR23*gteVZ0)>>12) + gteTRY);
69510 - gteMAC3 = NC_OVERFLOW3(((signed long)(gteR31*gteVX0 + gteR32*gteVY0 + gteR33*gteVZ0)>>12) + gteTRZ);*/
69511 -
69512 -#if 0
69513 -
69514 -#define GTE_RTPS2(vn) { \
69515 - if (gteSZ##vn == 0) { \
69516 - DSZ = 2.0f; gteFLAG |= 1<<17; \
69517 - } else { \
69518 - DSZ = (double)gteH / gteSZ##vn; \
69519 - if (DSZ > 2.0) { DSZ = 2.0f; gteFLAG |= 1<<17; } \
69520 -/* if (DSZ > 2147483647.0) { DSZ = 2.0f; gteFLAG |= 1<<17; }*/ \
69521 - } \
69522 - \
69523 -/* gteSX##vn = limG1(gteOFX/65536.0 + (limA1S(gteMAC1) * DSZ));*/ \
69524 -/* gteSY##vn = limG2(gteOFY/65536.0 + (limA2S(gteMAC2) * DSZ));*/ \
69525 - gteSX##vn = FlimG1(gteOFX/65536.0 + (gteIR1 * DSZ)); \
69526 - gteSY##vn = FlimG2(gteOFY/65536.0 + (gteIR2 * DSZ)); \
69527 -}
69528 -
69529 -#define GTE_RTPS3() { \
69530 - DSZ = gteDQB/16777216.0 + (gteDQA/256.0) * DSZ; \
69531 - gteMAC0 = DSZ * 16777216.0; \
69532 - gteIR0 = limE(DSZ * 4096.0f); \
69533 -printf("zero %x, %x\n", gteMAC0, gteIR0); \
69534 -}
69535 -#endif
69536 -//#if 0
69537 -#define GTE_RTPS2(vn) { \
69538 - if (gteSZ##vn == 0) { \
69539 - FDSZ = 2 << 16; gteFLAG |= 1<<17; \
69540 - } else { \
69541 - FDSZ = ((u64)gteH << 32) / ((u64)gteSZ##vn << 16); \
69542 - if ((u64)FDSZ > (2 << 16)) { FDSZ = 2 << 16; gteFLAG |= 1<<17; } \
69543 - } \
69544 - \
69545 - gteSX##vn = FlimG1((gteOFX + (((s64)((s64)gteIR1 << 16) * FDSZ) >> 16)) >> 16); \
69546 - gteSY##vn = FlimG2((gteOFY + (((s64)((s64)gteIR2 << 16) * FDSZ) >> 16)) >> 16); \
69547 -}
69548 -
69549 -#define GTE_RTPS3() { \
69550 - FDSZ = (s64)((s64)gteDQB + (((s64)((s64)gteDQA << 8) * FDSZ) >> 8)); \
69551 - gteMAC0 = FDSZ; \
69552 - gteIR0 = FlimE(FDSZ >> 12); \
69553 -}
69554 -//#endif
69555 -// gteMAC0 = (gteDQB/16777216.0 + (gteDQA/256.0) * DSZ) * 16777216.0;
69556 -// gteIR0 = limE((gteDQB/16777216.0 + (gteDQA/256.0) * DSZ) * 4096.0);
69557 -// gteMAC0 = ((gteDQB >> 24) + (gteDQA >> 8) * DSZ) * 16777216.0;
69558 -// gteIR0 = FlimE(((gteDQB >> 24) + (gteDQA >> 8) * DSZ) * 4096.0);
69559 -
69560 -
69561 -void gteRTPS() {
69562 -// double SSX0,SSY0,SSZ0;
69563 -// double SZ;
69564 -// double DSZ;
69565 - s64 FDSZ;
69566 -#ifdef GTE_DUMP
69567 - static int sample = 0; sample++;
69568 -#endif
69569 -
69570 -#ifdef GTE_LOG
69571 - GTE_LOG("GTE_RTPS\n");
69572 -#endif
69573 -
69574 -#ifdef GTE_DUMP
69575 - if(sample < 100)
69576 - {
69577 - G_OP("RTPS", 14);
69578 - G_SD(0);
69579 - G_SD(1);
69580 -
69581 - G_SD(16); // Store original fifo
69582 - G_SD(17);
69583 - G_SD(18);
69584 - G_SD(19);
69585 -
69586 - G_SC(0);
69587 - G_SC(1);
69588 - G_SC(2);
69589 - G_SC(3);
69590 - G_SC(4);
69591 - G_SC(5);
69592 - G_SC(6);
69593 - G_SC(7);
69594 -
69595 - G_SC(24);
69596 - G_SC(25);
69597 - G_SC(26);
69598 - G_SC(27);
69599 - G_SC(28);
69600 - }
69601 -#endif
69602 -/* gteFLAG = 0;
69603 -
69604 - SSX0 = NC_OVERFLOW1((double)gteTRX + ((double)(gteVX0*gteR11) + (double)(gteVY0*gteR12) + (double)(gteVZ0*gteR13))/4096.0);
69605 - SSY0 = NC_OVERFLOW2((double)gteTRY + ((double)(gteVX0*gteR21) + (double)(gteVY0*gteR22) + (double)(gteVZ0*gteR23))/4096.0);
69606 - SSZ0 = NC_OVERFLOW3((double)gteTRZ + ((double)(gteVX0*gteR31) + (double)(gteVY0*gteR32) + (double)(gteVZ0*gteR33))/4096.0);
69607 -
69608 - SZ = LIMIT(SSZ0,(double)0,(double)65535,18);
69609 - DSZ = ((double)gteH/SZ);
69610 -
69611 - if ((DSZ>(double)2147483647)) {DSZ=(double)2; gteFLAG|=1<<17;}
69612 -
69613 - gteSZ0 = gteSZ1;
69614 - gteSZ1 = gteSZ2;
69615 - gteSZ2 = gteSZx;
69616 - gteSZx = (unsigned short)float2int(SZ);
69617 -
69618 - psxRegs.CP2D.r[12]= psxRegs.CP2D.r[13];
69619 - psxRegs.CP2D.r[13]= psxRegs.CP2D.r[14];
69620 -
69621 - gteSX2 = (signed short)float2int(LIMIT((double)(gteOFX)/65536.0f + (LimitAS(SSX0,24)*DSZ),(double)-1024,(double)1024,14));
69622 - gteSY2 = (signed short)float2int(LIMIT((double)(gteOFY)/65536.0f + (LimitAS(SSY0,23)*DSZ),(double)-1024,(double)1024,13));
69623 -
69624 - gteMAC1 = (signed long)(SSX0);
69625 - gteMAC2 = (signed long)(SSY0);
69626 - gteMAC3 = (signed long)(SSZ0);
69627 -
69628 - MAC2IR();
69629 -
69630 - gteMAC0 = (signed long)float2int(OLIMIT((((double)gteDQB/(double)16777216) + (((double)gteDQA/(double)256)*DSZ))*16777216));
69631 - gteIR0 = (signed long)float2int(LIMIT(((((double)gteDQB/(double)16777216) + (((double)gteDQA/(double)256)*DSZ))*4096),(double)0,(double)4095,12));
69632 -
69633 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
69634 -
69635 - gteFLAG = 0;
69636 -
69637 - GTE_RTPS1(0);
69638 -
69639 - MAC2IR();
69640 -
69641 - gteSZx = gteSZ0;
69642 - gteSZ0 = gteSZ1;
69643 - gteSZ1 = gteSZ2;
69644 -// gteSZ2 = limC(gteMAC3);
69645 - gteSZ2 = FlimC(gteMAC3);
69646 -
69647 - gteSXY0 = gteSXY1;
69648 - gteSXY1 = gteSXY2;
69649 -
69650 - GTE_RTPS2(2);
69651 - gteSXYP = gteSXY2;
69652 -
69653 - GTE_RTPS3();
69654 -
69655 - SUM_FLAG;
69656 -
69657 -#ifdef GTE_DUMP
69658 - if(sample < 100)
69659 - {
69660 - G_GD(8);
69661 - G_GD(9);
69662 - G_GD(10);
69663 - G_GD(11);
69664 -
69665 - //G_GD(12);
69666 - //G_GD(13);
69667 - G_GD(14);
69668 -
69669 - G_GD(16);
69670 - G_GD(17);
69671 - G_GD(18);
69672 - G_GD(19);
69673 -
69674 - G_GD(24);
69675 - G_GD(25);
69676 - G_GD(26);
69677 - G_GD(27);
69678 -
69679 - G_GC(31);
69680 - }
69681 -#endif
69682 -}
69683 -
69684 -void gteRTPT() {
69685 -// double SSX0,SSY0,SSZ0;
69686 -// double SZ;
69687 -// double DSZ;
69688 - s64 FDSZ;
69689 -#ifdef GTE_DUMP
69690 - static int sample = 0; sample++;
69691 -#endif
69692 -
69693 -#ifdef GTE_LOG
69694 - GTE_LOG("GTE_RTPT\n");
69695 -#endif
69696 -
69697 -#ifdef GTE_DUMP
69698 - if(sample < 100)
69699 - {
69700 - G_OP("RTPT", 22);
69701 - G_SD(0);
69702 - G_SD(1);
69703 - G_SD(2);
69704 - G_SD(3);
69705 - G_SD(4);
69706 - G_SD(5);
69707 -
69708 - G_SD(16); // Store original fifo
69709 - G_SD(17);
69710 - G_SD(18);
69711 - G_SD(19);
69712 -
69713 - G_SC(0);
69714 - G_SC(1);
69715 - G_SC(2);
69716 - G_SC(3);
69717 - G_SC(4);
69718 - G_SC(5);
69719 - G_SC(6);
69720 - G_SC(7);
69721 -
69722 - G_SC(24);
69723 - G_SC(25);
69724 - G_SC(26);
69725 - G_SC(27);
69726 - G_SC(28);
69727 - }
69728 -#endif
69729 -/* gteFLAG = 0;
69730 -
69731 - gteSZ0 = gteSZx;
69732 -
69733 - SSX0 = NC_OVERFLOW1((double)gteTRX + ((double)(gteVX0 * gteR11) + (double)(gteVY0 * gteR12) + (double)(gteVZ0 * gteR13)) / 4096.0);
69734 - SSY0 = NC_OVERFLOW2((double)gteTRY + ((double)(gteVX0 * gteR21) + (double)(gteVY0 * gteR22) + (double)(gteVZ0 * gteR23)) / 4096.0);
69735 - SSZ0 = NC_OVERFLOW3((double)gteTRZ + ((double)(gteVX0 * gteR31) + (double)(gteVY0 * gteR32) + (double)(gteVZ0 * gteR33)) / 4096.0);
69736 -
69737 - SZ = LIMIT(SSZ0, (double)0, (double)65535, 18);
69738 - DSZ = ((double)gteH / SZ);
69739 -
69740 - if ((DSZ>(double)2147483647)) {DSZ=(double)2; gteFLAG|=1<<17;}
69741 -
69742 - gteSZ1 = (unsigned short)float2int(SZ);
69743 - gteSX0 = (signed short)float2int(LIMIT((double)(gteOFX)/65536.0f + (LimitAS(SSX0,24)*DSZ),(double)-1024,(double)1023,14));
69744 - gteSY0 = (signed short)float2int(LIMIT((double)(gteOFY)/65536.0f + (LimitAS(SSY0,23)*DSZ),(double)-1024,(double)1023,13));
69745 -
69746 - SSX0 = NC_OVERFLOW1((double)gteTRX + ((double)(gteVX1*gteR11) + (double)(gteVY1*gteR12) + (double)(gteVZ1*gteR13))/4096.0);
69747 - SSY0 = NC_OVERFLOW2((double)gteTRY + ((double)(gteVX1*gteR21) + (double)(gteVY1*gteR22) + (double)(gteVZ1*gteR23))/4096.0);
69748 - SSZ0 = NC_OVERFLOW3((double)gteTRZ + ((double)(gteVX1*gteR31) + (double)(gteVY1*gteR32) + (double)(gteVZ1*gteR33))/4096.0);
69749 -
69750 - SZ = LIMIT(SSZ0,(double)0,(double)65535,18);
69751 - DSZ = ((double)gteH/SZ);
69752 -
69753 - if ((DSZ>(double)2147483647)) {DSZ=(double)2; gteFLAG|=1<<17;}
69754 -
69755 - gteSZ2 = (unsigned short)float2int(SZ);
69756 - gteSX1 = (signed short)float2int(LIMIT((double)(gteOFX)/65536.0f + (LimitAS(SSX0,24)*DSZ),(double)-1024,(double)1023,14));
69757 - gteSY1 = (signed short)float2int(LIMIT((double)(gteOFY)/65536.0f + (LimitAS(SSY0,23)*DSZ),(double)-1024,(double)1023,13));
69758 -
69759 - SSX0 = NC_OVERFLOW1((double)gteTRX + ((double)(gteVX2*gteR11) + (double)(gteVY2*gteR12) + (double)(gteVZ2*gteR13))/4096.0);
69760 - SSY0 = NC_OVERFLOW2((double)gteTRY + ((double)(gteVX2*gteR21) + (double)(gteVY2*gteR22) + (double)(gteVZ2*gteR23))/4096.0);
69761 - SSZ0 = NC_OVERFLOW3((double)gteTRZ + ((double)(gteVX2*gteR31) + (double)(gteVY2*gteR32) + (double)(gteVZ2*gteR33))/4096.0);
69762 -
69763 - SZ = LIMIT(SSZ0,(double)0,(double)65535,18);
69764 - DSZ = ((double)gteH/SZ);
69765 -
69766 - if ((DSZ>(double)2147483647)) {DSZ=(double)2; gteFLAG|=1<<17;}
69767 -
69768 - gteSZx = (unsigned short)float2int(SZ);
69769 - gteSX2 = (signed short)float2int(LIMIT((double)(gteOFX)/65536.0f + (LimitAS(SSX0,24)*DSZ),(double)-1024,(double)1023,14));
69770 - gteSY2 = (signed short)float2int(LIMIT((double)(gteOFY)/65536.0f + (LimitAS(SSY0,23)*DSZ),(double)-1024,(double)1023,13));
69771 -
69772 - gteMAC1 = (signed long)float2int(SSX0);
69773 - gteMAC2 = (signed long)float2int(SSY0);
69774 - gteMAC3 = (signed long)float2int(SSZ0);
69775 -
69776 - MAC2IR();
69777 -
69778 - gteMAC0 = (signed long)float2int(OLIMIT((((double)gteDQB/(double)16777216) + (((double)gteDQA/(double)256)*DSZ))*16777216));
69779 - gteIR0 = (signed long)float2int(LIMIT(((((double)gteDQB/(double)16777216) + (((double)gteDQA/(double)256)*DSZ))*4096),(double)0,(double)4095,12));
69780 -
69781 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
69782 -
69783 - /* NC: old
69784 - gteFLAG = 0;
69785 -
69786 - gteSZ0 = gteSZx;
69787 -
69788 - gteMAC1 = NC_OVERFLOW1(((signed long)(gteR11*gteVX0 + gteR12*gteVY0 + gteR13*gteVZ0)>>12) + gteTRX);
69789 - gteMAC2 = NC_OVERFLOW2(((signed long)(gteR21*gteVX0 + gteR22*gteVY0 + gteR23*gteVZ0)>>12) + gteTRY);
69790 - gteMAC3 = NC_OVERFLOW3(((signed long)(gteR31*gteVX0 + gteR32*gteVY0 + gteR33*gteVZ0)>>12) + gteTRZ);
69791 -
69792 - DSZ = gteH / limC(gteMAC3);
69793 - if (DSZ > 2147483647.0) { DSZ = 2.0f; gteFLAG |= 1<<17; }
69794 -
69795 - gteSZ1 = limC(gteMAC3);
69796 -
69797 - gteSX0 = limG1(gteOFX/65536.0 + (limA1S(gteMAC1) * DSZ));
69798 - gteSY0 = limG2(gteOFY/65536.0 + (limA2S(gteMAC2) * DSZ));
69799 -
69800 - gteMAC1 = NC_OVERFLOW1(((signed long)(gteR11*gteVX1 + gteR12*gteVY1 + gteR13*gteVZ1)>>12) + gteTRX);
69801 - gteMAC2 = NC_OVERFLOW2(((signed long)(gteR21*gteVX1 + gteR22*gteVY1 + gteR23*gteVZ1)>>12) + gteTRY);
69802 - gteMAC3 = NC_OVERFLOW3(((signed long)(gteR31*gteVX1 + gteR32*gteVY1 + gteR33*gteVZ1)>>12) + gteTRZ);
69803 -
69804 - DSZ = gteH / limC(gteMAC3);
69805 - if (DSZ > 2147483647.0) { DSZ = 2.0f; gteFLAG |= 1<<17; }
69806 -
69807 - gteSZ2 = limC(gteMAC3);
69808 -
69809 - gteSX1 = limG1(gteOFX/65536.0 + (limA1S(gteMAC1) * DSZ ));
69810 - gteSY1 = limG2(gteOFY/65536.0 + (limA2S(gteMAC2) * DSZ ));
69811 -
69812 - gteMAC1 = NC_OVERFLOW1(((signed long)(gteR11*gteVX2 + gteR12*gteVY2 + gteR13*gteVZ2)>>12) + gteTRX);
69813 - gteMAC2 = NC_OVERFLOW2(((signed long)(gteR21*gteVX2 + gteR22*gteVY2 + gteR23*gteVZ2)>>12) + gteTRY);
69814 - gteMAC3 = NC_OVERFLOW3(((signed long)(gteR31*gteVX2 + gteR32*gteVY2 + gteR33*gteVZ2)>>12) + gteTRZ);
69815 -
69816 - DSZ = gteH / limC(gteMAC3); if (DSZ > 2147483647.0f) { DSZ = 2.0f; gteFLAG |= 1<<17; }
69817 -
69818 - gteSZx = gteSZ2;
69819 -
69820 - gteSX2 = limG1(gteOFX/65536.0 + (limA1S(gteMAC1) * DSZ ));
69821 - gteSY2 = limG2(gteOFY/65536.0 + (limA2S(gteMAC2) * DSZ ));
69822 -
69823 - MAC2IR();
69824 -
69825 - gteMAC0 = (gteDQB/16777216.0 + (gteDQA/256.0) * DSZ ) * 16777216.0;
69826 - gteIR0 = limE((gteDQB/16777216.0 + (gteDQA/256.0) * DSZ ) * 4096.0f);
69827 - */
69828 -
69829 - gteFLAG = 0;
69830 -
69831 - gteSZx = gteSZ2;
69832 -
69833 - GTE_RTPS1(0);
69834 -
69835 -// gteSZ0 = limC(gteMAC3);
69836 - gteSZ0 = FlimC(gteMAC3);
69837 -
69838 - gteIR1 = FlimA1S(gteMAC1);
69839 - gteIR2 = FlimA2S(gteMAC2);
69840 - GTE_RTPS2(0);
69841 -
69842 - GTE_RTPS1(1);
69843 -
69844 -// gteSZ1 = limC(gteMAC3);
69845 - gteSZ1 = FlimC(gteMAC3);
69846 -
69847 - gteIR1 = FlimA1S(gteMAC1);
69848 - gteIR2 = FlimA2S(gteMAC2);
69849 - GTE_RTPS2(1);
69850 -
69851 - GTE_RTPS1(2);
69852 -
69853 - MAC2IR();
69854 -
69855 -// gteSZ2 = limC(gteMAC3);
69856 - gteSZ2 = FlimC(gteMAC3);
69857 -
69858 - GTE_RTPS2(2);
69859 - gteSXYP = gteSXY2;
69860 -
69861 - GTE_RTPS3();
69862 -
69863 - SUM_FLAG;
69864 -
69865 -#ifdef GTE_DUMP
69866 - if(sample < 100)
69867 - {
69868 - G_GD(8);
69869 - G_GD(9);
69870 - G_GD(10);
69871 - G_GD(11);
69872 -
69873 - G_GD(12);
69874 - G_GD(13);
69875 - G_GD(14);
69876 -
69877 - G_GD(16);
69878 - G_GD(17);
69879 - G_GD(18);
69880 - G_GD(19);
69881 -
69882 - G_GD(24);
69883 - G_GD(25);
69884 - G_GD(26);
69885 - G_GD(27);
69886 -
69887 - G_GC(31);
69888 - }
69889 -#endif
69890 -}
69891 -
69892 -#define gte_C11 gteLR1
69893 -#define gte_C12 gteLR2
69894 -#define gte_C13 gteLR3
69895 -#define gte_C21 gteLG1
69896 -#define gte_C22 gteLG2
69897 -#define gte_C23 gteLG3
69898 -#define gte_C31 gteLB1
69899 -#define gte_C32 gteLB2
69900 -#define gte_C33 gteLB3
69901 -
69902 -#define _MVMVA_FUNC(_v0, _v1, _v2, mx) { \
69903 - SSX = (_v0) * mx##11 + (_v1) * mx##12 + (_v2) * mx##13; \
69904 - SSY = (_v0) * mx##21 + (_v1) * mx##22 + (_v2) * mx##23; \
69905 - SSZ = (_v0) * mx##31 + (_v1) * mx##32 + (_v2) * mx##33; \
69906 -}
69907 -
69908 -void gteMVMVA() {
69909 -// double SSX, SSY, SSZ;
69910 - s64 SSX, SSY, SSZ;
69911 -
69912 -#ifdef GTE_LOG
69913 - GTE_LOG("GTE_MVMVA %lx\n", psxRegs.code & 0x1ffffff);
69914 -#endif
69915 -
69916 - switch (psxRegs.code & 0x78000) {
69917 - case 0x00000: // V0 * R
69918 - _MVMVA_FUNC(gteVX0, gteVY0, gteVZ0, gteR); break;
69919 - case 0x08000: // V1 * R
69920 - _MVMVA_FUNC(gteVX1, gteVY1, gteVZ1, gteR); break;
69921 - case 0x10000: // V2 * R
69922 - _MVMVA_FUNC(gteVX2, gteVY2, gteVZ2, gteR); break;
69923 - case 0x18000: // IR * R
69924 - _MVMVA_FUNC((short)gteIR1, (short)gteIR2, (short)gteIR3, gteR);
69925 - break;
69926 - case 0x20000: // V0 * L
69927 - _MVMVA_FUNC(gteVX0, gteVY0, gteVZ0, gteL); break;
69928 - case 0x28000: // V1 * L
69929 - _MVMVA_FUNC(gteVX1, gteVY1, gteVZ1, gteL); break;
69930 - case 0x30000: // V2 * L
69931 - _MVMVA_FUNC(gteVX2, gteVY2, gteVZ2, gteL); break;
69932 - case 0x38000: // IR * L
69933 - _MVMVA_FUNC((short)gteIR1, (short)gteIR2, (short)gteIR3, gteL); break;
69934 - case 0x40000: // V0 * C
69935 - _MVMVA_FUNC(gteVX0, gteVY0, gteVZ0, gte_C); break;
69936 - case 0x48000: // V1 * C
69937 - _MVMVA_FUNC(gteVX1, gteVY1, gteVZ1, gte_C); break;
69938 - case 0x50000: // V2 * C
69939 - _MVMVA_FUNC(gteVX2, gteVY2, gteVZ2, gte_C); break;
69940 - case 0x58000: // IR * C
69941 - _MVMVA_FUNC((short)gteIR1, (short)gteIR2, (short)gteIR3, gte_C); break;
69942 - default:
69943 - SSX = SSY = SSZ = 0;
69944 - }
69945 -
69946 - if (psxRegs.code & 0x80000) {
69947 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
69948 - SSX>>= 12; SSY>>= 12; SSZ>>= 12;
69949 - }
69950 -
69951 - switch (psxRegs.code & 0x6000) {
69952 - case 0x0000: // Add TR
69953 - SSX+= gteTRX;
69954 - SSY+= gteTRY;
69955 - SSZ+= gteTRZ;
69956 - break;
69957 - case 0x2000: // Add BK
69958 - SSX+= gteRBK;
69959 - SSY+= gteGBK;
69960 - SSZ+= gteBBK;
69961 - break;
69962 - case 0x4000: // Add FC
69963 - SSX+= gteRFC;
69964 - SSY+= gteGFC;
69965 - SSZ+= gteBFC;
69966 - break;
69967 - }
69968 -
69969 - gteFLAG = 0;
69970 - //gteMAC1 = (long)SSX;
69971 - //gteMAC2 = (long)SSY;
69972 - //gteMAC3 = (long)SSZ;//okay the follow lines are correct??
69973 -/* gteMAC1 = NC_OVERFLOW1(SSX);
69974 - gteMAC2 = NC_OVERFLOW2(SSY);
69975 - gteMAC3 = NC_OVERFLOW3(SSZ);*/
69976 - gteMAC1 = FNC_OVERFLOW1(SSX);
69977 - gteMAC2 = FNC_OVERFLOW2(SSY);
69978 - gteMAC3 = FNC_OVERFLOW3(SSZ);
69979 - if (psxRegs.code & 0x400)
69980 - MAC2IR1()
69981 - else MAC2IR()
69982 -
69983 - SUM_FLAG;
69984 -}
69985 -
69986 -void gteNCLIP() {
69987 -#ifdef GTE_DUMP
69988 - static int sample = 0; sample++;
69989 -#endif
69990 -
69991 -#ifdef GTE_LOG
69992 - GTE_LOG("GTE_NCLIP\n");
69993 -#endif
69994 -
69995 - //gteLog
69996 -#ifdef GTE_DUMP
69997 - if(sample < 100)
69998 - {
69999 - G_OP("NCLIP", 8);
70000 - G_SD(12);
70001 - G_SD(13);
70002 - G_SD(14);
70003 - }
70004 -#endif
70005 -
70006 -/* gteFLAG = 0;
70007 -
70008 - gteMAC0 = (signed long)float2int(EDETEC4(
70009 - ((double)gteSX0*((double)gteSY1-(double)gteSY2))+
70010 - ((double)gteSX1*((double)gteSY2-(double)gteSY0))+
70011 - ((double)gteSX2*((double)gteSY0-(double)gteSY1))));
70012 -
70013 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70014 - gteFLAG = 0;
70015 -
70016 -
70017 - gteMAC0 = gteSX0 * (gteSY1 - gteSY2) +
70018 - gteSX1 * (gteSY2 - gteSY0) +
70019 - gteSX2 * (gteSY0 - gteSY1);
70020 -
70021 - //gteMAC0 = (gteSX0 - gteSX1) * (gteSY0 - gteSY2) - (gteSX0 - gteSX2) * (gteSY0 - gteSY1);
70022 -
70023 - SUM_FLAG;
70024 -
70025 -#ifdef GTE_DUMP
70026 - if(sample < 100)
70027 - {
70028 - G_GD(24);
70029 - G_GC(31);
70030 - }
70031 -#endif
70032 -}
70033 -
70034 -void gteAVSZ3() {
70035 -// unsigned long SS;
70036 -// double SZ1,SZ2,SZ3;
70037 -// double ZSF3;
70038 -#ifdef GTE_DUMP
70039 - static int sample = 0; sample++;
70040 -#endif
70041 -
70042 -#ifdef GTE_LOG
70043 - GTE_LOG("GTE_AVSZ3\n");
70044 -#endif
70045 -
70046 -#ifdef GTE_DUMP
70047 - if(sample < 100)
70048 - {
70049 - G_OP("AVSZ3", 5);
70050 - G_SD(16);
70051 - G_SD(17);
70052 - G_SD(18);
70053 - G_SD(19);
70054 - G_SC(29);
70055 - G_SC(30);
70056 - }
70057 -#endif
70058 -
70059 -/* gteFLAG = 0;
70060 -
70061 - SS = psxRegs.CP2D.r[17] & 0xffff; SZ1 = (double)SS;
70062 - SS = psxRegs.CP2D.r[18] & 0xffff; SZ2 = (double)SS;
70063 - SS = psxRegs.CP2D.r[19] & 0xffff; SZ3 = (double)SS;
70064 - SS = psxRegs.CP2C.r[29] & 0xffff; ZSF3 = (double)SS/(double)4096;
70065 -
70066 - psxRegs.CP2D.r[24] = (signed long)float2int(EDETEC4(((SZ1+SZ2+SZ3)*ZSF3)));
70067 - psxRegs.CP2D.r[7] = (unsigned short)float2int(LimitC(((SZ1+SZ2+SZ3)*ZSF3),18));
70068 -
70069 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70070 -
70071 -
70072 - gteFLAG = 0;
70073 -
70074 - /* NC: OLD
70075 - gteMAC0 = ((gteSZ1 + gteSZ2 + gteSZx) * (gteZSF3/4096.0f));
70076 -
70077 - gteOTZ = limC((double)gteMAC0);
70078 - */
70079 -/* gteMAC0 = ((gteSZ1 + gteSZ2 + gteSZx) * (gteZSF3));
70080 -
70081 - gteOTZ = limC((double)(gteMAC0 >> 12));*/
70082 - gteMAC0 = ((gteSZ0 + gteSZ1 + gteSZ2) * (gteZSF3)) >> 12;
70083 -
70084 - gteOTZ = FlimC(gteMAC0);
70085 -// gteOTZ = limC((double)gteMAC0);
70086 -
70087 - SUM_FLAG
70088 -
70089 -#ifdef GTE_DUMP
70090 - if(sample < 100)
70091 - {
70092 - G_GD(7);
70093 - G_GD(24);
70094 - G_GC(31);
70095 - }
70096 -#endif
70097 -}
70098 -
70099 -void gteAVSZ4() {
70100 -// unsigned long SS;
70101 -// double SZ0,SZ1,SZ2,SZ3;
70102 -// double ZSF4;
70103 -#ifdef GTE_DUMP
70104 - static int sample = 0; sample++;
70105 -#endif
70106 -
70107 -#ifdef GTE_LOG
70108 - GTE_LOG("GTE_AVSZ4\n");
70109 -#endif
70110 -
70111 -#ifdef GTE_DUMP
70112 - if(sample < 100)
70113 - {
70114 - G_OP("AVSZ4", 6);
70115 - G_SD(16);
70116 - G_SD(17);
70117 - G_SD(18);
70118 - G_SD(19);
70119 - G_SC(29);
70120 - G_SC(30);
70121 - }
70122 -#endif
70123 -
70124 -/* gteFLAG = 0;
70125 -
70126 - SS = psxRegs.CP2D.r[16] & 0xffff; SZ0 = (double)SS;
70127 - SS = psxRegs.CP2D.r[17] & 0xffff; SZ1 = (double)SS;
70128 - SS = psxRegs.CP2D.r[18] & 0xffff; SZ2 = (double)SS;
70129 - SS = psxRegs.CP2D.r[19] & 0xffff; SZ3 = (double)SS;
70130 - SS = psxRegs.CP2C.r[30] & 0xffff; ZSF4 = (double)SS/(double)4096;
70131 -
70132 - psxRegs.CP2D.r[24] = (signed long)float2int(EDETEC4(((SZ0+SZ1+SZ2+SZ3)*ZSF4)));
70133 - psxRegs.CP2D.r[7] = (unsigned short)float2int(LimitC(((SZ0+SZ1+SZ2+SZ3)*ZSF4),18));
70134 -
70135 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70136 - gteFLAG = 0;
70137 -
70138 - /* NC: OLD
70139 - gteMAC0 = ((gteSZ0 + gteSZ1 + gteSZ2 + gteSZx) * (gteZSF4/4096.0f));
70140 -
70141 - gteOTZ = limC((double)gteMAC0);
70142 - */
70143 -/* gteMAC0 = ((gteSZ0 + gteSZ1 + gteSZ2 + gteSZx) * (gteZSF4));
70144 -
70145 - gteOTZ = limC((double)(gteMAC0 >> 12));
70146 -*/
70147 - gteMAC0 = ((gteSZx + gteSZ0 + gteSZ1 + gteSZ2) * (gteZSF4))>> 12;
70148 -
70149 - gteOTZ = FlimC(gteMAC0);
70150 -// gteOTZ = limC((double)gteMAC0);
70151 -
70152 - SUM_FLAG
70153 -
70154 -#ifdef GTE_DUMP
70155 - if(sample < 100)
70156 - {
70157 - G_GD(7);
70158 - G_GD(24);
70159 - G_GC(31);
70160 - }
70161 -#endif
70162 -}
70163 -
70164 -void gteSQR() {
70165 - //double SSX0,SSY0,SSZ0;
70166 -#ifdef GTE_DUMP
70167 - static int sample = 0; sample++;
70168 -#endif
70169 -
70170 -#ifdef GTE_LOG
70171 - GTE_LOG("GTE_SQR %lx\n", psxRegs.code & 0x1ffffff);
70172 -#endif
70173 -
70174 -#ifdef GTE_DUMP
70175 - if(sample < 100)
70176 - {
70177 - G_OP("SQR", 5);
70178 - G_SD(9);
70179 - G_SD(10);
70180 - G_SD(11);
70181 - }
70182 -#endif
70183 -
70184 -/* gteFLAG = 0;
70185 -
70186 - SSX0 = (double)gteIR1 * gteIR1;
70187 - SSY0 = (double)gteIR2 * gteIR2;
70188 - SSZ0 = (double)gteIR3 * gteIR3;
70189 -
70190 - if (psxRegs.code & 0x80000) {
70191 - SSX0 /= 4096.0; SSY0 /= 4096.0; SSZ0 /= 4096.0;
70192 - }
70193 -
70194 - gteMAC1 = (long)SSX0;
70195 - gteMAC2 = (long)SSY0;
70196 - gteMAC3 = (long)SSZ0;
70197 -
70198 - MAC2IR1();
70199 -
70200 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70201 - gteFLAG = 0;
70202 -
70203 -/* if (psxRegs.code & 0x80000) {
70204 - gteMAC1 = NC_OVERFLOW1((gteIR1 * gteIR1) / 4096.0f);
70205 - gteMAC2 = NC_OVERFLOW2((gteIR2 * gteIR2) / 4096.0f);
70206 - gteMAC3 = NC_OVERFLOW3((gteIR3 * gteIR3) / 4096.0f);
70207 - } else {
70208 - gteMAC1 = NC_OVERFLOW1(gteIR1 * gteIR1);
70209 - gteMAC2 = NC_OVERFLOW2(gteIR2 * gteIR2);
70210 - gteMAC3 = NC_OVERFLOW3(gteIR3 * gteIR3);
70211 - }*/
70212 - if (psxRegs.code & 0x80000) {
70213 - gteMAC1 = FNC_OVERFLOW1((gteIR1 * gteIR1) >> 12);
70214 - gteMAC2 = FNC_OVERFLOW2((gteIR2 * gteIR2) >> 12);
70215 - gteMAC3 = FNC_OVERFLOW3((gteIR3 * gteIR3) >> 12);
70216 - } else {
70217 - gteMAC1 = FNC_OVERFLOW1(gteIR1 * gteIR1);
70218 - gteMAC2 = FNC_OVERFLOW2(gteIR2 * gteIR2);
70219 - gteMAC3 = FNC_OVERFLOW3(gteIR3 * gteIR3);
70220 - }
70221 - MAC2IR1();
70222 -
70223 - SUM_FLAG
70224 -
70225 -#ifdef GTE_DUMP
70226 - if(sample < 100)
70227 - {
70228 - G_GD(9);
70229 - G_GD(10);
70230 - G_GD(11);
70231 - G_GD(25);
70232 - G_GD(26);
70233 - G_GD(27);
70234 - G_GC(31);
70235 - }
70236 -#endif
70237 -}
70238 -/*
70239 -#define GTE_NCCS(vn) { \
70240 - RR0 = ((double)gteL11 * gteVX##vn + (double)gteL12 * gteVY##vn + (double)gteL13 * gteVZ##vn)/4096.0; \
70241 - GG0 = ((double)gteL21 * gteVX##vn + (double)gteL22 * gteVY##vn + (double)gteL23 * gteVZ##vn)/4096.0; \
70242 - BB0 = ((double)gteL31 * gteVX##vn + (double)gteL32 * gteVY##vn + (double)gteL33 * gteVZ##vn)/4096.0; \
70243 - t1 = LimitAU(RR0,24); \
70244 - t2 = LimitAU(GG0,23); \
70245 - t3 = LimitAU(BB0,22); \
70246 - \
70247 - RR0 = (double)gteRBK + ((double)gteLR1 * t1 + (double)gteLR2 * t2 + (double)gteLR3 * t3)/4096.0; \
70248 - GG0 = (double)gteGBK + ((double)gteLG1 * t1 + (double)gteLG2 * t2 + (double)gteLG3 * t3)/4096.0; \
70249 - BB0 = (double)gteBBK + ((double)gteLB1 * t1 + (double)gteLB2 * t2 + (double)gteLB3 * t3)/4096.0; \
70250 - t1 = LimitAU(RR0,24); \
70251 - t2 = LimitAU(GG0,23); \
70252 - t3 = LimitAU(BB0,22); \
70253 - \
70254 - RR0 = ((double)gteR * t1)/256.0; \
70255 - GG0 = ((double)gteG * t2)/256.0; \
70256 - BB0 = ((double)gteB * t3)/256.0; \
70257 - \
70258 - gteIR1 = (long)LimitAU(RR0,24); \
70259 - gteIR2 = (long)LimitAU(GG0,23); \
70260 - gteIR3 = (long)LimitAU(BB0,22); \
70261 - \
70262 - gteCODE0 = gteCODE1; gteCODE1 = gteCODE2; gteCODE2 = gteCODE; \
70263 - gteR0 = gteR1; gteR1 = gteR2; gteR2 = (unsigned char)LimitB(RR0/16.0,21); \
70264 - gteG0 = gteG1; gteG1 = gteG2; gteG2 = (unsigned char)LimitB(GG0/16.0,20); \
70265 - gteB0 = gteB1; gteB1 = gteB2; gteB2 = (unsigned char)LimitB(BB0/16.0,19); \
70266 - \
70267 - gteMAC1 = (long)RR0; \
70268 - gteMAC2 = (long)GG0; \
70269 - gteMAC3 = (long)BB0; \
70270 -}
70271 -*/
70272 -/*
70273 -__forceinline double ncLIM1(double x)
70274 -{
70275 - if(x > 8796093022207.0)
70276 - {
70277 - return 8796093022207.0;
70278 - }
70279 -}
70280 -*/
70281 -
70282 -
70283 -
70284 -/* NC: OLD
70285 -#define GTE_NCCS(vn)\
70286 -gte_LL1 = limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn)/16777216.0f);\
70287 -gte_LL2 = limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn)/16777216.0f);\
70288 -gte_LL3 = limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn)/16777216.0f);\
70289 -gte_RRLT= limA1U(gteRBK/4096.0f + (gteLR1/4096.0f*gte_LL1 + gteLR2/4096.0f*gte_LL2 + gteLR3/4096.0f*gte_LL3));\
70290 -gte_GGLT= limA2U(gteGBK/4096.0f + (gteLG1/4096.0f*gte_LL1 + gteLG2/4096.0f*gte_LL2 + gteLG3/4096.0f*gte_LL3));\
70291 -gte_BBLT= limA3U(gteBBK/4096.0f + (gteLB1/4096.0f*gte_LL1 + gteLB2/4096.0f*gte_LL2 + gteLB3/4096.0f*gte_LL3));\
70292 -gte_RR0 = gteR*gte_RRLT;\
70293 -gte_GG0 = gteG*gte_GGLT;\
70294 -gte_BB0 = gteB*gte_BBLT;\
70295 -gteIR1 = (long)limA1U(gte_RR0);\
70296 -gteIR2 = (long)limA2U(gte_GG0);\
70297 -gteIR3 = (long)limA3U(gte_BB0);\
70298 -gteCODE0 = gteCODE1; gteCODE1 = gteCODE2; gteCODE2 = gteCODE;\
70299 -gteR0 = gteR1; gteR1 = gteR2; gteR2 = (unsigned char)limB1(gte_RR0);\
70300 -gteG0 = gteG1; gteG1 = gteG2; gteG2 = (unsigned char)limB2(gte_GG0);\
70301 -gteB0 = gteB1; gteB1 = gteB2; gteB2 = (unsigned char)limB3(gte_BB0);\
70302 -gteMAC1 = (long)gte_RR0;\
70303 -gteMAC2 = (long)gte_GG0;\
70304 -gteMAC3 = (long)gte_BB0;\
70305 -*/
70306 -/*
70307 -#define GTE_NCCS(vn)\
70308 -gte_LL1 = limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn)/16777216.0f);\
70309 -gte_LL2 = limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn)/16777216.0f);\
70310 -gte_LL3 = limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn)/16777216.0f);\
70311 -gte_RRLT= limA1U(gteRBK/4096.0f + (gteLR1/4096.0f*gte_LL1 + gteLR2/4096.0f*gte_LL2 + gteLR3/4096.0f*gte_LL3));\
70312 -gte_GGLT= limA2U(gteGBK/4096.0f + (gteLG1/4096.0f*gte_LL1 + gteLG2/4096.0f*gte_LL2 + gteLG3/4096.0f*gte_LL3));\
70313 -gte_BBLT= limA3U(gteBBK/4096.0f + (gteLB1/4096.0f*gte_LL1 + gteLB2/4096.0f*gte_LL2 + gteLB3/4096.0f*gte_LL3));\
70314 -gteMAC1 = (long)(gteR*gte_RRLT*16);\
70315 -gteMAC2 = (long)(gteG*gte_GGLT*16);\
70316 -gteMAC3 = (long)(gteB*gte_BBLT*16);\
70317 -gteIR1 = (long)limA1U(gteMAC1);\
70318 -gteIR2 = (long)limA2U(gteMAC2);\
70319 -gteIR3 = (long)limA3U(gteMAC3);\
70320 -gte_RR0 = gteMAC1>>4;\
70321 -gte_GG0 = gteMAC2>>4;\
70322 -gte_BB0 = gteMAC3>>4;\
70323 -gteCODE0 = gteCODE1; gteCODE1 = gteCODE2; gteCODE2 = gteCODE;\
70324 -gteR0 = gteR1; gteR1 = gteR2; gteR2 = (unsigned char)limB1(gte_RR0);\
70325 -gteG0 = gteG1; gteG1 = gteG2; gteG2 = (unsigned char)limB2(gte_GG0);\
70326 -gteB0 = gteB1; gteB1 = gteB2; gteB2 = (unsigned char)limB3(gte_BB0);*/
70327 -
70328 -
70329 -/*
70330 - gte_LL1 = limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn)/16777216.0f); \
70331 - gte_LL2 = limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn)/16777216.0f); \
70332 - gte_LL3 = limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn)/16777216.0f); \
70333 - gte_RRLT= limA1U(gteRBK/4096.0f + (gteLR1/4096.0f*gte_LL1 + gteLR2/4096.0f*gte_LL2 + gteLR3/4096.0f*gte_LL3)); \
70334 - gte_GGLT= limA2U(gteGBK/4096.0f + (gteLG1/4096.0f*gte_LL1 + gteLG2/4096.0f*gte_LL2 + gteLG3/4096.0f*gte_LL3)); \
70335 - gte_BBLT= limA3U(gteBBK/4096.0f + (gteLB1/4096.0f*gte_LL1 + gteLB2/4096.0f*gte_LL2 + gteLB3/4096.0f*gte_LL3)); \
70336 - \
70337 - gteMAC1 = (long)(gteR*gte_RRLT*16); \
70338 - gteMAC2 = (long)(gteG*gte_GGLT*16); \
70339 - gteMAC3 = (long)(gteB*gte_BBLT*16); \
70340 -*/
70341 -#define GTE_NCCS(vn) \
70342 - gte_LL1 = F12limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn) >> 12); \
70343 - gte_LL2 = F12limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn) >> 12); \
70344 - gte_LL3 = F12limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn) >> 12); \
70345 - gte_RRLT= F12limA1U(gteRBK + ((gteLR1*gte_LL1 + gteLR2*gte_LL2 + gteLR3*gte_LL3) >> 12)); \
70346 - gte_GGLT= F12limA2U(gteGBK + ((gteLG1*gte_LL1 + gteLG2*gte_LL2 + gteLG3*gte_LL3) >> 12)); \
70347 - gte_BBLT= F12limA3U(gteBBK + ((gteLB1*gte_LL1 + gteLB2*gte_LL2 + gteLB3*gte_LL3) >> 12)); \
70348 - \
70349 - gteMAC1 = (long)(((s64)((u32)gteR<<12)*gte_RRLT) >> 20);\
70350 - gteMAC2 = (long)(((s64)((u32)gteG<<12)*gte_GGLT) >> 20);\
70351 - gteMAC3 = (long)(((s64)((u32)gteB<<12)*gte_BBLT) >> 20);
70352 -
70353 -
70354 -void gteNCCS() {
70355 -// double RR0,GG0,BB0;
70356 -// double t1, t2, t3;
70357 -// double gte_LL1, gte_LL2, gte_LL3;
70358 -// double gte_RRLT, gte_GGLT, gte_BBLT;
70359 - s32 gte_LL1, gte_LL2, gte_LL3;
70360 - s32 gte_RRLT, gte_GGLT, gte_BBLT;
70361 -
70362 -#ifdef GTE_DUMP
70363 - static int sample = 0; sample++;
70364 -#endif
70365 -
70366 -#ifdef GTE_LOG
70367 - GTE_LOG("GTE_NCCS\n");
70368 -#endif
70369 -
70370 -/*
70371 - gteFLAG = 0;
70372 -
70373 - GTE_NCCS(0);
70374 -
70375 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70376 -
70377 -#ifdef GTE_DUMP
70378 - if(sample < 100)
70379 - {
70380 - G_OP("NCCS", 17);
70381 - G_SD(0);
70382 - G_SD(1);
70383 - G_SD(6);
70384 - G_SC(8);
70385 - G_SC(9);
70386 - G_SC(10);
70387 - G_SC(11);
70388 - G_SC(12);
70389 - G_SC(13);
70390 - G_SC(14);
70391 - G_SC(15);
70392 - G_SC(16);
70393 - G_SC(17);
70394 - G_SC(18);
70395 - G_SC(19);
70396 - G_SC(20);
70397 - }
70398 -#endif
70399 -
70400 - gteFLAG = 0;
70401 -
70402 - GTE_NCCS(0);
70403 -
70404 - gteRGB0 = gteRGB1;
70405 - gteRGB1 = gteRGB2;
70406 - gteR2 = FlimB1(gteMAC1>>4);
70407 - gteG2 = FlimB2(gteMAC2>>4);
70408 - gteB2 = FlimB3(gteMAC3>>4); gteCODE2 = gteCODE;
70409 -
70410 - MAC2IR1();
70411 -
70412 - SUM_FLAG
70413 -
70414 -#ifdef GTE_DUMP
70415 - if(sample < 100)
70416 - {
70417 - G_GD(9);
70418 - G_GD(10);
70419 - G_GD(11);
70420 -
70421 - //G_GD(20);
70422 - //G_GD(21);
70423 - G_GD(22);
70424 -
70425 - //G_GD(24); Doc must be wrong. PSX does not touch it.
70426 - G_GD(25);
70427 - G_GD(26);
70428 - G_GD(27);
70429 -
70430 - G_GC(31);
70431 - }
70432 -#endif
70433 -}
70434 -
70435 -void gteNCCT() {
70436 -// double RR0,GG0,BB0;
70437 -// double t1, t2, t3;
70438 -// double gte_LL1, gte_LL2, gte_LL3;
70439 -// double gte_RRLT, gte_GGLT, gte_BBLT;
70440 - s32 gte_LL1, gte_LL2, gte_LL3;
70441 - s32 gte_RRLT, gte_GGLT, gte_BBLT;
70442 -
70443 -#ifdef GTE_DUMP
70444 - static int sample = 0; sample++;
70445 -#endif
70446 -
70447 -#ifdef GTE_LOG
70448 - GTE_LOG("GTE_NCCT\n");
70449 -#endif
70450 -
70451 -
70452 - /*gteFLAG = 0;
70453 -
70454 - GTE_NCCS(0);
70455 - GTE_NCCS(1);
70456 - GTE_NCCS(2);
70457 -
70458 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70459 -
70460 -#ifdef GTE_DUMP
70461 - if(sample < 100)
70462 - {
70463 - G_OP("NCCT", 39);
70464 - G_SD(0);
70465 - G_SD(1);
70466 - G_SD(2);
70467 - G_SD(3);
70468 - G_SD(4);
70469 - G_SD(5);
70470 - G_SD(6);
70471 -
70472 - G_SC(8);
70473 - G_SC(9);
70474 - G_SC(10);
70475 - G_SC(11);
70476 - G_SC(12);
70477 - G_SC(13);
70478 - G_SC(14);
70479 - G_SC(15);
70480 - G_SC(16);
70481 - G_SC(17);
70482 - G_SC(18);
70483 - G_SC(19);
70484 - G_SC(20);
70485 - }
70486 -#endif
70487 -
70488 - gteFLAG = 0;
70489 -
70490 - GTE_NCCS(0);
70491 -
70492 - gteR0 = FlimB1(gteMAC1>>4);
70493 - gteG0 = FlimB2(gteMAC2>>4);
70494 - gteB0 = FlimB3(gteMAC3>>4); gteCODE0 = gteCODE;
70495 -
70496 - GTE_NCCS(1);
70497 -
70498 - gteR1 = FlimB1(gteMAC1>>4);
70499 - gteG1 = FlimB2(gteMAC2>>4);
70500 - gteB1 = FlimB3(gteMAC3>>4); gteCODE1 = gteCODE;
70501 -
70502 - GTE_NCCS(2);
70503 -
70504 - gteR2 = FlimB1(gteMAC1>>4);
70505 - gteG2 = FlimB2(gteMAC2>>4);
70506 - gteB2 = FlimB3(gteMAC3>>4); gteCODE2 = gteCODE;
70507 -
70508 - MAC2IR1();
70509 -
70510 - SUM_FLAG
70511 -
70512 -#ifdef GTE_DUMP
70513 - if(sample < 100)
70514 - {
70515 - G_GD(9);
70516 - G_GD(10);
70517 - G_GD(11);
70518 -
70519 - G_GD(20);
70520 - G_GD(21);
70521 - G_GD(22);
70522 -
70523 - //G_GD(24); Doc must be wrong. PSX does not touch it.
70524 - G_GD(25);
70525 - G_GD(26);
70526 - G_GD(27);
70527 -
70528 - G_GC(31);
70529 - }
70530 -#endif
70531 -}
70532 -/*
70533 -#define GTE_NCDS(vn) \
70534 -gte_LL1 = limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn)/16777216.0f);\
70535 -gte_LL2 = limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn)/16777216.0f);\
70536 -gte_LL3 = limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn)/16777216.0f);\
70537 -gte_RRLT= limA1U(gteRBK/4096.0f + (gteLR1/4096.0f*gte_LL1 + gteLR2/4096.0f*gte_LL2 + gteLR3/4096.0f*gte_LL3));\
70538 -gte_GGLT= limA2U(gteGBK/4096.0f + (gteLG1/4096.0f*gte_LL1 + gteLG2/4096.0f*gte_LL2 + gteLG3/4096.0f*gte_LL3));\
70539 -gte_BBLT= limA3U(gteBBK/4096.0f + (gteLB1/4096.0f*gte_LL1 + gteLB2/4096.0f*gte_LL2 + gteLB3/4096.0f*gte_LL3));\
70540 -gte_RR0 = (gteR*gte_RRLT) + (gteIR0/4096.0f * limA1S(gteRFC/16.0f - (gteR*gte_RRLT)));\
70541 -gte_GG0 = (gteG*gte_GGLT) + (gteIR0/4096.0f * limA2S(gteGFC/16.0f - (gteG*gte_GGLT)));\
70542 -gte_BB0 = (gteB*gte_BBLT) + (gteIR0/4096.0f * limA3S(gteBFC/16.0f - (gteB*gte_BBLT)));\
70543 -gteMAC1= (long)(gte_RR0 * 16.0f); gteIR1 = (long)limA1U(gte_RR0*16.0f);\
70544 -gteMAC2= (long)(gte_GG0 * 16.0f); gteIR2 = (long)limA2U(gte_GG0*16.0f);\
70545 -gteMAC3= (long)(gte_BB0 * 16.0f); gteIR3 = (long)limA3U(gte_BB0*16.0f);\
70546 -gteRGB0 = gteRGB1; \
70547 -gteRGB1 = gteRGB2; \
70548 -gteR2 = limB1(gte_RR0); \
70549 -gteG2 = limB2(gte_GG0); \
70550 -gteB2 = limB3(gte_BB0); gteCODE2 = gteCODE;
70551 -*/
70552 -/*
70553 -#define GTE_NCDS(vn) \
70554 -gte_LL1 = limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn)/16777216.0f);\
70555 -gte_LL2 = limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn)/16777216.0f);\
70556 -gte_LL3 = limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn)/16777216.0f);\
70557 -gte_RRLT= limA1U(gteRBK/4096.0f + (gteLR1/4096.0f*gte_LL1 + gteLR2/4096.0f*gte_LL2 + gteLR3/4096.0f*gte_LL3));\
70558 -gte_GGLT= limA2U(gteGBK/4096.0f + (gteLG1/4096.0f*gte_LL1 + gteLG2/4096.0f*gte_LL2 + gteLG3/4096.0f*gte_LL3));\
70559 -gte_BBLT= limA3U(gteBBK/4096.0f + (gteLB1/4096.0f*gte_LL1 + gteLB2/4096.0f*gte_LL2 + gteLB3/4096.0f*gte_LL3));\
70560 - \
70561 - gte_RR0 = (gteR*gte_RRLT) + (gteIR0/4096.0f * limA1S(gteRFC/16.0f - (gteR*gte_RRLT)));\
70562 - gte_GG0 = (gteG*gte_GGLT) + (gteIR0/4096.0f * limA2S(gteGFC/16.0f - (gteG*gte_GGLT)));\
70563 - gte_BB0 = (gteB*gte_BBLT) + (gteIR0/4096.0f * limA3S(gteBFC/16.0f - (gteB*gte_BBLT)));\
70564 - gteMAC1 = (long)(gte_RR0 << 4); \
70565 - gteMAC2 = (long)(gte_GG0 << 4); \
70566 - gteMAC3 = (long)(gte_BB0 << 4);
70567 -*/
70568 -#define GTE_NCDS(vn) \
70569 - gte_LL1 = F12limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn) >> 12); \
70570 - gte_LL2 = F12limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn) >> 12); \
70571 - gte_LL3 = F12limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn) >> 12); \
70572 - gte_RRLT= F12limA1U(gteRBK + ((gteLR1*gte_LL1 + gteLR2*gte_LL2 + gteLR3*gte_LL3) >> 12)); \
70573 - gte_GGLT= F12limA2U(gteGBK + ((gteLG1*gte_LL1 + gteLG2*gte_LL2 + gteLG3*gte_LL3) >> 12)); \
70574 - gte_BBLT= F12limA3U(gteBBK + ((gteLB1*gte_LL1 + gteLB2*gte_LL2 + gteLB3*gte_LL3) >> 12)); \
70575 - \
70576 - gte_RR0 = (long)(((s64)((u32)gteR<<12)*gte_RRLT) >> 12);\
70577 - gte_GG0 = (long)(((s64)((u32)gteG<<12)*gte_GGLT) >> 12);\
70578 - gte_BB0 = (long)(((s64)((u32)gteB<<12)*gte_BBLT) >> 12);\
70579 - gteMAC1 = (long)((gte_RR0 + (((s64)gteIR0 * F12limA1S((s64)(gteRFC << 8) - gte_RR0)) >> 12)) >> 8);\
70580 - gteMAC2 = (long)((gte_GG0 + (((s64)gteIR0 * F12limA2S((s64)(gteGFC << 8) - gte_GG0)) >> 12)) >> 8);\
70581 - gteMAC3 = (long)((gte_BB0 + (((s64)gteIR0 * F12limA3S((s64)(gteBFC << 8) - gte_BB0)) >> 12)) >> 8);
70582 -
70583 -void gteNCDS() {
70584 -/* double tRLT,tRRLT;
70585 - double tGLT,tGGLT;
70586 - double tBLT,tBBLT;
70587 - double tRR0,tL1,tLL1;
70588 - double tGG0,tL2,tLL2;
70589 - double tBB0,tL3,tLL3;
70590 - unsigned long C,R,G,B; */
70591 -// double gte_LL1, gte_LL2, gte_LL3;
70592 -// double gte_RRLT, gte_GGLT, gte_BBLT;
70593 - s32 gte_LL1, gte_LL2, gte_LL3;
70594 - s32 gte_RRLT, gte_GGLT, gte_BBLT;
70595 - s32 gte_RR0, gte_GG0, gte_BB0;
70596 -
70597 -#ifdef GTE_DUMP
70598 - static int sample = 0; sample++;
70599 -#endif
70600 -
70601 -#ifdef GTE_LOG
70602 - GTE_LOG("GTE_NCDS\n");
70603 -#endif
70604 -
70605 -/* gteFLAG = 0;
70606 -
70607 - R = ((gteRGB)&0xff);
70608 - G = ((gteRGB>> 8)&0xff);
70609 - B = ((gteRGB>>16)&0xff);
70610 - C = ((gteRGB>>24)&0xff);
70611 -
70612 - tLL1 = (gteL11/4096.0 * gteVX0/4096.0) + (gteL12/4096.0 * gteVY0/4096.0) + (gteL13/4096.0 * gteVZ0/4096.0);
70613 - tLL2 = (gteL21/4096.0 * gteVX0/4096.0) + (gteL22/4096.0 * gteVY0/4096.0) + (gteL23/4096.0 * gteVZ0/4096.0);
70614 - tLL3 = (gteL31/4096.0 * gteVX0/4096.0) + (gteL32/4096.0 * gteVY0/4096.0) + (gteL33/4096.0 * gteVZ0/4096.0);
70615 -
70616 - tL1 = LimitAU(tLL1,24);
70617 - tL2 = LimitAU(tLL2,23);
70618 - tL3 = LimitAU(tLL3,22);
70619 -
70620 - tRRLT = gteRBK/4096.0 + (gteLR1/4096.0 * tL1) + (gteLR2/4096.0 * tL2) + (gteLR3/4096.0 * tL3);
70621 - tGGLT = gteGBK/4096.0 + (gteLG1/4096.0 * tL1) + (gteLG2/4096.0 * tL2) + (gteLG3/4096.0 * tL3);
70622 - tBBLT = gteBBK/4096.0 + (gteLB1/4096.0 * tL1) + (gteLB2/4096.0 * tL2) + (gteLB3/4096.0 * tL3);
70623 -
70624 - tRLT = LimitAU(tRRLT,24);
70625 - tGLT = LimitAU(tGGLT,23);
70626 - tBLT = LimitAU(tBBLT,22);
70627 -
70628 - tRR0 = (R * tRLT) + (gteIR0/4096.0 * LimitAS(gteRFC/16.0 - (R * tRLT),24));
70629 - tGG0 = (G * tGLT) + (gteIR0/4096.0 * LimitAS(gteGFC/16.0 - (G * tGLT),23));
70630 - tBB0 = (B * tBLT) + (gteIR0/4096.0 * LimitAS(gteBFC/16.0 - (B * tBLT),22));
70631 -
70632 - gteMAC1 = (long)(tRR0 * 16.0); gteIR1 = (long)LimitAU((tRR0*16.0),24);
70633 - gteMAC2 = (long)(tGG0 * 16.0); gteIR2 = (long)LimitAU((tGG0*16.0),23);
70634 - gteMAC3 = (long)(tBB0 * 16.0); gteIR3 = (long)LimitAU((tBB0*16.0),22);
70635 -
70636 - R = (unsigned long)LimitB(tRR0,21); if (R>255) R=255; else if (R<0) R=0;
70637 - G = (unsigned long)LimitB(tGG0,20); if (G>255) G=255; else if (G<0) G=0;
70638 - B = (unsigned long)LimitB(tBB0,19); if (B>255) B=255; else if (B<0) B=0;
70639 -
70640 - gteRGB0 = gteRGB1;
70641 - gteRGB1 = gteRGB2;
70642 - gteRGB2 = R|(G<<8)|(B<<16)|(C<<24);
70643 -
70644 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70645 -
70646 -#ifdef GTE_DUMP
70647 - if(sample < 100)
70648 - {
70649 - G_OP("NCDS", 19);
70650 - G_SD(0);
70651 - G_SD(1);
70652 - G_SD(6);
70653 - G_SD(8);
70654 -
70655 - G_SC(8);
70656 - G_SC(9);
70657 - G_SC(10);
70658 - G_SC(11);
70659 - G_SC(12);
70660 - G_SC(13);
70661 - G_SC(14);
70662 - G_SC(15);
70663 - G_SC(16);
70664 - G_SC(17);
70665 - G_SC(18);
70666 - G_SC(19);
70667 - G_SC(20);
70668 - G_SC(21);
70669 - G_SC(22);
70670 - G_SC(23);
70671 - }
70672 -#endif
70673 -
70674 - gteFLAG = 0;
70675 - GTE_NCDS(0);
70676 -
70677 - gteRGB0 = gteRGB1;
70678 - gteRGB1 = gteRGB2;
70679 - gteR2 = FlimB1(gteMAC1 >> 4);
70680 - gteG2 = FlimB2(gteMAC2 >> 4);
70681 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
70682 -
70683 - MAC2IR1();
70684 -
70685 - SUM_FLAG;
70686 -
70687 -#ifdef GTE_DUMP
70688 - if(sample < 100)
70689 - {
70690 - G_GD(9);
70691 - G_GD(10);
70692 - G_GD(11);
70693 -
70694 - //G_GD(20);
70695 - //G_GD(21);
70696 - G_GD(22);
70697 -
70698 - G_GD(25);
70699 - G_GD(26);
70700 - G_GD(27);
70701 -
70702 - G_GC(31);
70703 - }
70704 -#endif
70705 -}
70706 -
70707 -void gteNCDT() {
70708 - /*double tRLT,tRRLT;
70709 - double tGLT,tGGLT;
70710 - double tBLT,tBBLT;
70711 - double tRR0,tL1,tLL1;
70712 - double tGG0,tL2,tLL2;
70713 - double tBB0,tL3,tLL3;
70714 - unsigned long C,R,G,B;*/
70715 -// double gte_LL1, gte_LL2, gte_LL3;
70716 -// double gte_RRLT, gte_GGLT, gte_BBLT;
70717 - s32 gte_LL1, gte_LL2, gte_LL3;
70718 - s32 gte_RRLT, gte_GGLT, gte_BBLT;
70719 - s32 gte_RR0, gte_GG0, gte_BB0;
70720 -
70721 -#ifdef GTE_DUMP
70722 - static int sample = 0; sample++;
70723 -#endif
70724 -
70725 -#ifdef GTE_LOG
70726 - GTE_LOG("GTE_NCDT\n");
70727 -#endif
70728 -
70729 -/* gteFLAG = 0;
70730 -
70731 - R = ((gteRGB)&0xff);
70732 - G = ((gteRGB>> 8)&0xff);
70733 - B = ((gteRGB>>16)&0xff);
70734 - C = ((gteRGB>>24)&0xff);
70735 -
70736 - tLL1 = (gteL11/4096.0 * gteVX0/4096.0) + (gteL12/4096.0 * gteVY0/4096.0) + (gteL13/4096.0 * gteVZ0/4096.0);
70737 - tLL2 = (gteL21/4096.0 * gteVX0/4096.0) + (gteL22/4096.0 * gteVY0/4096.0) + (gteL23/4096.0 * gteVZ0/4096.0);
70738 - tLL3 = (gteL31/4096.0 * gteVX0/4096.0) + (gteL32/4096.0 * gteVY0/4096.0) + (gteL33/4096.0 * gteVZ0/4096.0);
70739 -
70740 - tL1 = LimitAU(tLL1,24);
70741 - tL2 = LimitAU(tLL2,23);
70742 - tL3 = LimitAU(tLL3,22);
70743 -
70744 - tRRLT = gteRBK/4096.0 + (gteLR1/4096.0 * tL1) + (gteLR2/4096.0 * tL2) + (gteLR3/4096.0 * tL3);
70745 - tGGLT = gteGBK/4096.0 + (gteLG1/4096.0 * tL1) + (gteLG2/4096.0 * tL2) + (gteLG3/4096.0 * tL3);
70746 - tBBLT = gteBBK/4096.0 + (gteLB1/4096.0 * tL1) + (gteLB2/4096.0 * tL2) + (gteLB3/4096.0 * tL3);
70747 -
70748 - tRLT = LimitAU(tRRLT,24);
70749 - tGLT = LimitAU(tGGLT,23);
70750 - tBLT = LimitAU(tBBLT,22);
70751 -
70752 - tRR0 = (R * tRLT) + (gteIR0/4096.0 * LimitAS(gteRFC/16.0 - (R * tRLT),24));
70753 - tGG0 = (G * tGLT) + (gteIR0/4096.0 * LimitAS(gteGFC/16.0 - (G * tGLT),23));
70754 - tBB0 = (B * tBLT) + (gteIR0/4096.0 * LimitAS(gteBFC/16.0 - (B * tBLT),22));
70755 -
70756 - gteMAC1 = (long)(tRR0 * 16.0); gteIR1 = (long)LimitAU((tRR0*16.0),24);
70757 - gteMAC2 = (long)(tGG0 * 16.0); gteIR2 = (long)LimitAU((tGG0*16.0),23);
70758 - gteMAC3 = (long)(tBB0 * 16.0); gteIR3 = (long)LimitAU((tBB0*16.0),22);
70759 -
70760 - R = (unsigned long)LimitB(tRR0,21); if (R>255) R=255; else if (R<0) R=0;
70761 - G = (unsigned long)LimitB(tGG0,20); if (G>255) G=255; else if (G<0) G=0;
70762 - B = (unsigned long)LimitB(tBB0,19); if (B>255) B=255; else if (B<0) B=0;
70763 -
70764 - gteRGB0 = gteRGB1;
70765 - gteRGB1 = gteRGB2;
70766 - gteRGB2 = R|(G<<8)|(B<<16)|(C<<24);
70767 -
70768 - R = ((gteRGB)&0xff);
70769 - G = ((gteRGB>> 8)&0xff);
70770 - B = ((gteRGB>>16)&0xff);
70771 - C = ((gteRGB>>24)&0xff);
70772 -
70773 - tLL1 = (gteL11/4096.0 * gteVX1/4096.0) + (gteL12/4096.0 * gteVY1/4096.0) + (gteL13/4096.0 * gteVZ1/4096.0);
70774 - tLL2 = (gteL21/4096.0 * gteVX1/4096.0) + (gteL22/4096.0 * gteVY1/4096.0) + (gteL23/4096.0 * gteVZ1/4096.0);
70775 - tLL3 = (gteL31/4096.0 * gteVX1/4096.0) + (gteL32/4096.0 * gteVY1/4096.0) + (gteL33/4096.0 * gteVZ1/4096.0);
70776 -
70777 - tL1 = LimitAU(tLL1,24);
70778 - tL2 = LimitAU(tLL2,23);
70779 - tL3 = LimitAU(tLL3,22);
70780 -
70781 - tRRLT = gteRBK/4096.0 + (gteLR1/4096.0 * tL1) + (gteLR2/4096.0 * tL2) + (gteLR3/4096.0 * tL3);
70782 - tGGLT = gteGBK/4096.0 + (gteLG1/4096.0 * tL1) + (gteLG2/4096.0 * tL2) + (gteLG3/4096.0 * tL3);
70783 - tBBLT = gteBBK/4096.0 + (gteLB1/4096.0 * tL1) + (gteLB2/4096.0 * tL2) + (gteLB3/4096.0 * tL3);
70784 -
70785 - tRLT = LimitAU(tRRLT,24);
70786 - tGLT = LimitAU(tGGLT,23);
70787 - tBLT = LimitAU(tBBLT,22);
70788 -
70789 - tRR0 = (R * tRLT) + (gteIR0/4096.0 * LimitAS(gteRFC/16.0 - (R * tRLT),24));
70790 - tGG0 = (G * tGLT) + (gteIR0/4096.0 * LimitAS(gteGFC/16.0 - (G * tGLT),23));
70791 - tBB0 = (B * tBLT) + (gteIR0/4096.0 * LimitAS(gteBFC/16.0 - (B * tBLT),22));
70792 -
70793 - gteMAC1 = (long)(tRR0 * 16.0); gteIR1 = (long)LimitAU((tRR0*16.0),24);
70794 - gteMAC2 = (long)(tGG0 * 16.0); gteIR2 = (long)LimitAU((tGG0*16.0),23);
70795 - gteMAC3 = (long)(tBB0 * 16.0); gteIR3 = (long)LimitAU((tBB0*16.0),22);
70796 -
70797 - R = (unsigned long)LimitB(tRR0,21); if (R>255) R=255; else if (R<0) R=0;
70798 - G = (unsigned long)LimitB(tGG0,20); if (G>255) G=255; else if (G<0) G=0;
70799 - B = (unsigned long)LimitB(tBB0,19); if (B>255) B=255; else if (B<0) B=0;
70800 -
70801 - gteRGB0 = gteRGB1;
70802 - gteRGB1 = gteRGB2;
70803 - gteRGB2 = R|(G<<8)|(B<<16)|(C<<24);
70804 -
70805 - R = ((gteRGB)&0xff);
70806 - G = ((gteRGB>> 8)&0xff);
70807 - B = ((gteRGB>>16)&0xff);
70808 - C = ((gteRGB>>24)&0xff);
70809 -
70810 - tLL1 = (gteL11/4096.0 * gteVX2/4096.0) + (gteL12/4096.0 * gteVY2/4096.0) + (gteL13/4096.0 * gteVZ2/4096.0);
70811 - tLL2 = (gteL21/4096.0 * gteVX2/4096.0) + (gteL22/4096.0 * gteVY2/4096.0) + (gteL23/4096.0 * gteVZ2/4096.0);
70812 - tLL3 = (gteL31/4096.0 * gteVX2/4096.0) + (gteL32/4096.0 * gteVY2/4096.0) + (gteL33/4096.0 * gteVZ2/4096.0);
70813 -
70814 - tL1 = LimitAU(tLL1,24);
70815 - tL2 = LimitAU(tLL2,23);
70816 - tL3 = LimitAU(tLL3,22);
70817 -
70818 - tRRLT = gteRBK/4096.0 + (gteLR1/4096.0 * tL1) + (gteLR2/4096.0 * tL2) + (gteLR3/4096.0 * tL3);
70819 - tGGLT = gteGBK/4096.0 + (gteLG1/4096.0 * tL1) + (gteLG2/4096.0 * tL2) + (gteLG3/4096.0 * tL3);
70820 - tBBLT = gteBBK/4096.0 + (gteLB1/4096.0 * tL1) + (gteLB2/4096.0 * tL2) + (gteLB3/4096.0 * tL3);
70821 -
70822 - tRLT = LimitAU(tRRLT,24);
70823 - tGLT = LimitAU(tGGLT,23);
70824 - tBLT = LimitAU(tBBLT,22);
70825 -
70826 - tRR0 = (R * tRLT) + (gteIR0/4096.0 * LimitAS(gteRFC/16.0 - (R * tRLT),24));
70827 - tGG0 = (G * tGLT) + (gteIR0/4096.0 * LimitAS(gteGFC/16.0 - (G * tGLT),23));
70828 - tBB0 = (B * tBLT) + (gteIR0/4096.0 * LimitAS(gteBFC/16.0 - (B * tBLT),22));
70829 -
70830 - gteMAC1 = (long)(tRR0 * 16.0); gteIR1 = (long)LimitAU((tRR0*16.0),24);
70831 - gteMAC2 = (long)(tGG0 * 16.0); gteIR2 = (long)LimitAU((tGG0*16.0),23);
70832 - gteMAC3 = (long)(tBB0 * 16.0); gteIR3 = (long)LimitAU((tBB0*16.0),22);
70833 -
70834 - R = (unsigned long)LimitB(tRR0,21); if (R>255) R=255; else if (R<0) R=0;
70835 - G = (unsigned long)LimitB(tGG0,20); if (G>255) G=255; else if (G<0) G=0;
70836 - B = (unsigned long)LimitB(tBB0,19); if (B>255) B=255; else if (B<0) B=0;
70837 -
70838 - gteRGB0 = gteRGB1;
70839 - gteRGB1 = gteRGB2;
70840 - gteRGB2 = R|(G<<8)|(B<<16)|(C<<24);
70841 -
70842 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70843 -
70844 -#ifdef GTE_DUMP
70845 - if(sample < 100)
70846 - {
70847 - G_OP("NCDT", 44);
70848 - G_SD(0);
70849 - G_SD(1);
70850 - G_SD(2);
70851 - G_SD(3);
70852 - G_SD(4);
70853 - G_SD(5);
70854 - G_SD(6);
70855 - G_SD(8);
70856 -
70857 - G_SC(8);
70858 - G_SC(9);
70859 - G_SC(10);
70860 - G_SC(11);
70861 - G_SC(12);
70862 - G_SC(13);
70863 - G_SC(14);
70864 - G_SC(15);
70865 - G_SC(16);
70866 - G_SC(17);
70867 - G_SC(18);
70868 - G_SC(19);
70869 - G_SC(20);
70870 - G_SC(21);
70871 - G_SC(22);
70872 - G_SC(23);
70873 - }
70874 -#endif
70875 -
70876 - gteFLAG = 0;
70877 - GTE_NCDS(0);
70878 -
70879 - gteR0 = FlimB1(gteMAC1 >> 4);
70880 - gteG0 = FlimB2(gteMAC2 >> 4);
70881 - gteB0 = FlimB3(gteMAC3 >> 4); gteCODE0 = gteCODE;
70882 -
70883 - GTE_NCDS(1);
70884 -
70885 - gteR1 = FlimB1(gteMAC1 >> 4);
70886 - gteG1 = FlimB2(gteMAC2 >> 4);
70887 - gteB1 = FlimB3(gteMAC3 >> 4); gteCODE1 = gteCODE;
70888 -
70889 - GTE_NCDS(2);
70890 -
70891 - gteR2 = FlimB1(gteMAC1 >> 4);
70892 - gteG2 = FlimB2(gteMAC2 >> 4);
70893 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
70894 -
70895 - MAC2IR1();
70896 -
70897 - SUM_FLAG;
70898 -
70899 -#ifdef GTE_DUMP
70900 - if(sample < 100)
70901 - {
70902 - G_GD(9);
70903 - G_GD(10);
70904 - G_GD(11);
70905 -
70906 - G_GD(20);
70907 - G_GD(21);
70908 - G_GD(22);
70909 -
70910 - G_GD(25);
70911 - G_GD(26);
70912 - G_GD(27);
70913 -
70914 - G_GC(31);
70915 - }
70916 -#endif
70917 -}
70918 -
70919 -#define gteD1 (*(short *)&gteR11)
70920 -#define gteD2 (*(short *)&gteR22)
70921 -#define gteD3 (*(short *)&gteR33)
70922 -
70923 -void gteOP() {
70924 -// double SSX0=0,SSY0=0,SSZ0=0;
70925 -#ifdef GTE_DUMP
70926 - static int sample = 0; sample++;
70927 -#endif
70928 -
70929 -#ifdef GTE_LOG
70930 - GTE_LOG("GTE_OP %lx\n", psxRegs.code & 0x1ffffff);
70931 -#endif
70932 -
70933 -#ifdef GTE_DUMP
70934 - if(sample < 100)
70935 - {
70936 - G_OP("OP", 6);
70937 - G_SD(9);
70938 - G_SD(10);
70939 - G_SD(11);
70940 -
70941 - G_SC(0);
70942 - G_SC(2);
70943 - G_SC(4);
70944 - }
70945 -#endif
70946 -/* gteFLAG=0;
70947 -
70948 - switch (psxRegs.code & 0x1ffffff) {
70949 - case 0x178000C://op12
70950 - SSX0 = EDETEC1((gteR22*(short)gteIR3 - gteR33*(short)gteIR2)/(double)4096);
70951 - SSY0 = EDETEC2((gteR33*(short)gteIR1 - gteR11*(short)gteIR3)/(double)4096);
70952 - SSZ0 = EDETEC3((gteR11*(short)gteIR2 - gteR22*(short)gteIR1)/(double)4096);
70953 - break;
70954 - case 0x170000C:
70955 - SSX0 = EDETEC1((gteR22*(short)gteIR3 - gteR33*(short)gteIR2));
70956 - SSY0 = EDETEC2((gteR33*(short)gteIR1 - gteR11*(short)gteIR3));
70957 - SSZ0 = EDETEC3((gteR11*(short)gteIR2 - gteR22*(short)gteIR1));
70958 - break;
70959 - }
70960 -
70961 - gteMAC1 = (long)float2int(SSX0);
70962 - gteMAC2 = (long)float2int(SSY0);
70963 - gteMAC3 = (long)float2int(SSZ0);
70964 -
70965 - MAC2IR();
70966 -
70967 - if (gteIR1<0) gteIR1=0;
70968 - if (gteIR2<0) gteIR2=0;
70969 - if (gteIR3<0) gteIR3=0;
70970 -
70971 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
70972 - gteFLAG = 0;
70973 -
70974 -/* if (psxRegs.code & 0x80000) {
70975 -
70976 - gteMAC1 = NC_OVERFLOW1((gteD2 * gteIR3 - gteD3 * gteIR2) / 4096.0f);
70977 - gteMAC2 = NC_OVERFLOW2((gteD3 * gteIR1 - gteD1 * gteIR3) / 4096.0f);
70978 - gteMAC3 = NC_OVERFLOW3((gteD1 * gteIR2 - gteD2 * gteIR1) / 4096.0f);
70979 - } else {
70980 -
70981 - gteMAC1 = NC_OVERFLOW1(gteD2 * gteIR3 - gteD3 * gteIR2);
70982 - gteMAC2 = NC_OVERFLOW2(gteD3 * gteIR1 - gteD1 * gteIR3);
70983 - gteMAC3 = NC_OVERFLOW3(gteD1 * gteIR2 - gteD2 * gteIR1);
70984 - }*/
70985 - if (psxRegs.code & 0x80000) {
70986 - gteMAC1 = FNC_OVERFLOW1((gteD2 * gteIR3 - gteD3 * gteIR2) >> 12);
70987 - gteMAC2 = FNC_OVERFLOW2((gteD3 * gteIR1 - gteD1 * gteIR3) >> 12);
70988 - gteMAC3 = FNC_OVERFLOW3((gteD1 * gteIR2 - gteD2 * gteIR1) >> 12);
70989 - } else {
70990 - gteMAC1 = FNC_OVERFLOW1(gteD2 * gteIR3 - gteD3 * gteIR2);
70991 - gteMAC2 = FNC_OVERFLOW2(gteD3 * gteIR1 - gteD1 * gteIR3);
70992 - gteMAC3 = FNC_OVERFLOW3(gteD1 * gteIR2 - gteD2 * gteIR1);
70993 - }
70994 -
70995 - /* NC: old
70996 - MAC2IR1();
70997 - */
70998 - MAC2IR();
70999 -
71000 - SUM_FLAG
71001 -
71002 -#ifdef GTE_DUMP
71003 - if(sample < 100)
71004 - {
71005 - G_GD(9);
71006 - G_GD(10);
71007 - G_GD(11);
71008 -
71009 - G_GD(25);
71010 - G_GD(26);
71011 - G_GD(27);
71012 -
71013 - G_GC(31);
71014 - }
71015 -#endif
71016 -}
71017 -
71018 -void gteDCPL() {
71019 -// unsigned long C,R,G,B;
71020 -#ifdef GTE_DUMP
71021 - static int sample = 0; sample++;
71022 -#endif
71023 -#ifdef GTE_LOG
71024 - GTE_LOG("GTE_DCPL\n");
71025 -#endif
71026 -
71027 -#ifdef GTE_DUMP
71028 - if(sample < 100)
71029 - {
71030 - G_OP("DCPL", 8);
71031 - G_SD(6);
71032 - G_SD(8);
71033 - G_SD(9);
71034 - G_SD(10);
71035 - G_SD(11);
71036 -
71037 - G_SC(21);
71038 - G_SC(22);
71039 - G_SC(23);
71040 - }
71041 -#endif
71042 -/* R = ((gteRGB)&0xff);
71043 - G = ((gteRGB>> 8)&0xff);
71044 - B = ((gteRGB>>16)&0xff);
71045 - C = ((gteRGB>>24)&0xff);
71046 -
71047 - gteMAC1 = (signed long)((double)(R*gteIR1) + (double)(gteIR0*LimitAS(gteRFC-(double)(R*gteIR1),24))/4096.0);
71048 - gteMAC2 = (signed long)((double)(G*gteIR2) + (double)(gteIR0*LimitAS(gteGFC-(double)(G*gteIR2),23))/4096.0);
71049 - gteMAC3 = (signed long)((double)(B*gteIR3) + (double)(gteIR0*LimitAS(gteBFC-(double)(B*gteIR3),22))/4096.0);
71050 -
71051 - MAC2IR()
71052 -
71053 - R = (unsigned long)LimitB(gteMAC1,21); if (R>255) R=255; else if (R<0) R=0;
71054 - G = (unsigned long)LimitB(gteMAC2,20); if (G>255) G=255; else if (G<0) G=0;
71055 - B = (unsigned long)LimitB(gteMAC3,19); if (B>255) B=255; else if (B<0) B=0;
71056 -
71057 - gteRGB0 = gteRGB1;
71058 - gteRGB1 = gteRGB2;
71059 - gteRGB2 = R|(G<<8)|(B<<16)|(C<<24);
71060 -
71061 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
71062 -
71063 -/* gteFLAG = 0;
71064 -
71065 - gteMAC1 = NC_OVERFLOW1((gteR * gteIR1) / 256.0f + (gteIR0 * limA1S(gteRFC - ((gteR * gteIR1) / 256.0f))) / 4096.0f);
71066 - gteMAC2 = NC_OVERFLOW2((gteG * gteIR1) / 256.0f + (gteIR0 * limA2S(gteGFC - ((gteG * gteIR1) / 256.0f))) / 4096.0f);
71067 - gteMAC3 = NC_OVERFLOW3((gteB * gteIR1) / 256.0f + (gteIR0 * limA3S(gteBFC - ((gteB * gteIR1) / 256.0f))) / 4096.0f);
71068 - */
71069 -/* gteMAC1 = ( (signed long)(gteR)*gteIR1 + (gteIR0*(signed short)limA1S(gteRFC - ((gteR*gteIR1)>>12) )) ) >>6;
71070 - gteMAC2 = ( (signed long)(gteG)*gteIR2 + (gteIR0*(signed short)limA2S(gteGFC - ((gteG*gteIR2)>>12) )) ) >>6;
71071 - gteMAC3 = ( (signed long)(gteB)*gteIR3 + (gteIR0*(signed short)limA3S(gteBFC - ((gteB*gteIR3)>>12) )) ) >>6;*/
71072 -
71073 -/* gteMAC1 = ( (signed long)(gteR)*gteIR1 + (gteIR0*(signed short)limA1S(gteRFC - ((gteR*gteIR1)>>12) )) ) >>8;
71074 - gteMAC2 = ( (signed long)(gteG)*gteIR2 + (gteIR0*(signed short)limA2S(gteGFC - ((gteG*gteIR2)>>12) )) ) >>8;
71075 - gteMAC3 = ( (signed long)(gteB)*gteIR3 + (gteIR0*(signed short)limA3S(gteBFC - ((gteB*gteIR3)>>12) )) ) >>8;*/
71076 - gteMAC1 = ( (signed long)(gteR)*gteIR1 + (gteIR0*(signed short)FlimA1S(gteRFC - ((gteR*gteIR1)>>12) )) ) >>8;
71077 - gteMAC2 = ( (signed long)(gteG)*gteIR2 + (gteIR0*(signed short)FlimA2S(gteGFC - ((gteG*gteIR2)>>12) )) ) >>8;
71078 - gteMAC3 = ( (signed long)(gteB)*gteIR3 + (gteIR0*(signed short)FlimA3S(gteBFC - ((gteB*gteIR3)>>12) )) ) >>8;
71079 -
71080 - gteFLAG=0;
71081 - MAC2IR();
71082 -
71083 - gteRGB0 = gteRGB1;
71084 - gteRGB1 = gteRGB2;
71085 -
71086 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71087 - gteG2 = limB2(gteMAC2 / 16.0f);
71088 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71089 - gteR2 = FlimB1(gteMAC1 >> 4);
71090 - gteG2 = FlimB2(gteMAC2 >> 4);
71091 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71092 -
71093 - SUM_FLAG
71094 -
71095 -#ifdef GTE_DUMP
71096 - if(sample < 100)
71097 - {
71098 - G_GD(9);
71099 - G_GD(10);
71100 - G_GD(11);
71101 -
71102 - //G_GD(20);
71103 - //G_GD(21);
71104 - G_GD(22);
71105 -
71106 - G_GD(25);
71107 - G_GD(26);
71108 - G_GD(27);
71109 -
71110 - G_GC(31);
71111 - }
71112 -#endif
71113 -}
71114 -
71115 -void gteGPF() {
71116 -// double ipx, ipy, ipz;
71117 -// s32 ipx, ipy, ipz;
71118 -
71119 -#ifdef GTE_DUMP
71120 - static int sample = 0; sample++;
71121 -#endif
71122 -#ifdef GTE_LOG
71123 - GTE_LOG("GTE_GPF %lx\n", psxRegs.code & 0x1ffffff);
71124 -#endif
71125 -#ifdef GTE_DUMP
71126 - if(sample < 100)
71127 - {
71128 - G_OP("GPF", 5);
71129 - G_SD(6);
71130 - G_SD(8);
71131 - G_SD(9);
71132 - G_SD(10);
71133 - G_SD(11);
71134 - }
71135 -#endif
71136 -/* gteFLAG = 0;
71137 -
71138 - ipx = (double)((short)gteIR0) * ((short)gteIR1);
71139 - ipy = (double)((short)gteIR0) * ((short)gteIR2);
71140 - ipz = (double)((short)gteIR0) * ((short)gteIR3);
71141 -
71142 - // same as mvmva
71143 - if (psxRegs.code & 0x80000) {
71144 - ipx /= 4096.0; ipy /= 4096.0; ipz /= 4096.0;
71145 - }
71146 -
71147 - gteMAC1 = (long)ipx;
71148 - gteMAC2 = (long)ipy;
71149 - gteMAC3 = (long)ipz;
71150 -
71151 - gteIR1 = (long)LimitAS(ipx,24);
71152 - gteIR2 = (long)LimitAS(ipy,23);
71153 - gteIR3 = (long)LimitAS(ipz,22);
71154 -
71155 - gteRGB0 = gteRGB1;
71156 - gteRGB1 = gteRGB2;
71157 - gteC2 = gteCODE;
71158 - gteR2 = (unsigned char)LimitB(ipx,21);
71159 - gteG2 = (unsigned char)LimitB(ipy,20);
71160 - gteB2 = (unsigned char)LimitB(ipz,19);*/
71161 -
71162 - gteFLAG = 0;
71163 -
71164 -/* if (psxRegs.code & 0x80000) {
71165 - gteMAC1 = NC_OVERFLOW1((gteIR0 * gteIR1) / 4096.0f);
71166 - gteMAC2 = NC_OVERFLOW2((gteIR0 * gteIR2) / 4096.0f);
71167 - gteMAC3 = NC_OVERFLOW3((gteIR0 * gteIR3) / 4096.0f);
71168 - } else {
71169 - gteMAC1 = NC_OVERFLOW1(gteIR0 * gteIR1);
71170 - gteMAC2 = NC_OVERFLOW2(gteIR0 * gteIR2);
71171 - gteMAC3 = NC_OVERFLOW3(gteIR0 * gteIR3);
71172 - }*/
71173 - if (psxRegs.code & 0x80000) {
71174 - gteMAC1 = FNC_OVERFLOW1((gteIR0 * gteIR1) >> 12);
71175 - gteMAC2 = FNC_OVERFLOW2((gteIR0 * gteIR2) >> 12);
71176 - gteMAC3 = FNC_OVERFLOW3((gteIR0 * gteIR3) >> 12);
71177 - } else {
71178 - gteMAC1 = FNC_OVERFLOW1(gteIR0 * gteIR1);
71179 - gteMAC2 = FNC_OVERFLOW2(gteIR0 * gteIR2);
71180 - gteMAC3 = FNC_OVERFLOW3(gteIR0 * gteIR3);
71181 - }
71182 - MAC2IR();
71183 -
71184 - gteRGB0 = gteRGB1;
71185 - gteRGB1 = gteRGB2;
71186 -
71187 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71188 - gteG2 = limB2(gteMAC2 / 16.0f);
71189 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71190 - gteR2 = FlimB1(gteMAC1 >> 4);
71191 - gteG2 = FlimB2(gteMAC2 >> 4);
71192 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71193 -
71194 - SUM_FLAG
71195 -
71196 -#ifdef GTE_DUMP
71197 - if(sample < 100)
71198 - {
71199 - G_GD(9);
71200 - G_GD(10);
71201 - G_GD(11);
71202 -
71203 - //G_GD(20);
71204 - //G_GD(21);
71205 - G_GD(22);
71206 -
71207 - G_GD(25);
71208 - G_GD(26);
71209 - G_GD(27);
71210 -
71211 - G_GC(31);
71212 - }
71213 -#endif
71214 -}
71215 -
71216 -void gteGPL() {
71217 - // double IPX=0,IPY=0,IPZ=0;
71218 -// unsigned long C,R,G,B;
71219 -#ifdef GTE_DUMP
71220 - static int sample = 0; sample++;
71221 -#endif
71222 -#ifdef GTE_LOG
71223 - GTE_LOG("GTE_GPL %lx\n", psxRegs.code & 0x1ffffff);
71224 -#endif
71225 -
71226 -#ifdef GTE_DUMP
71227 - if(sample < 100)
71228 - {
71229 - G_OP("GPL", 5);
71230 - G_SD(6);
71231 - G_SD(8);
71232 - G_SD(9);
71233 - G_SD(10);
71234 - G_SD(11);
71235 -
71236 - G_SD(25);
71237 - G_SD(26);
71238 - G_SD(27);
71239 - }
71240 -#endif
71241 -
71242 -/* gteFLAG=0;
71243 - switch(psxRegs.code & 0x1ffffff) {
71244 - case 0x1A8003E:
71245 - IPX = EDETEC1((double)gteMAC1 + ((double)gteIR0*(double)gteIR1)/4096.0f);
71246 - IPY = EDETEC2((double)gteMAC2 + ((double)gteIR0*(double)gteIR2)/4096.0f);
71247 - IPZ = EDETEC3((double)gteMAC3 + ((double)gteIR0*(double)gteIR3)/4096.0f);
71248 - break;
71249 -
71250 - case 0x1A0003E:
71251 - IPX = EDETEC1((double)gteMAC1 + ((double)gteIR0*(double)gteIR1));
71252 - IPY = EDETEC2((double)gteMAC2 + ((double)gteIR0*(double)gteIR2));
71253 - IPZ = EDETEC3((double)gteMAC3 + ((double)gteIR0*(double)gteIR3));
71254 - break;
71255 - }
71256 - gteIR1 = (short)float2int(LimitAS(IPX,24));
71257 - gteIR2 = (short)float2int(LimitAS(IPY,23));
71258 - gteIR3 = (short)float2int(LimitAS(IPZ,22));
71259 -
71260 - gteMAC1 = (int)float2int(IPX);
71261 - gteMAC2 = (int)float2int(IPY);
71262 - gteMAC3 = (int)float2int(IPZ);
71263 -
71264 - C = gteRGB & 0xff000000;
71265 - R = float2int(ALIMIT(IPX,0,255));
71266 - G = float2int(ALIMIT(IPY,0,255));
71267 - B = float2int(ALIMIT(IPZ,0,255));
71268 -
71269 - gteRGB0 = gteRGB1;
71270 - gteRGB1 = gteRGB2;
71271 - gteRGB2 = C|R|(G<<8)|(B<<16);*/
71272 - gteFLAG = 0;
71273 -
71274 -/* if (psxRegs.code & 0x80000) {
71275 - gteMAC1 = NC_OVERFLOW1(gteMAC1 + (gteIR0 * gteIR1) / 4096.0f);
71276 - gteMAC2 = NC_OVERFLOW2(gteMAC2 + (gteIR0 * gteIR2) / 4096.0f);
71277 - gteMAC3 = NC_OVERFLOW3(gteMAC3 + (gteIR0 * gteIR3) / 4096.0f);
71278 - } else {
71279 - gteMAC1 = NC_OVERFLOW1(gteMAC1 + (gteIR0 * gteIR1));
71280 - gteMAC2 = NC_OVERFLOW2(gteMAC2 + (gteIR0 * gteIR2));
71281 - gteMAC3 = NC_OVERFLOW3(gteMAC3 + (gteIR0 * gteIR3));
71282 - }*/
71283 - if (psxRegs.code & 0x80000) {
71284 - gteMAC1 = FNC_OVERFLOW1(gteMAC1 + ((gteIR0 * gteIR1) >> 12));
71285 - gteMAC2 = FNC_OVERFLOW2(gteMAC2 + ((gteIR0 * gteIR2) >> 12));
71286 - gteMAC3 = FNC_OVERFLOW3(gteMAC3 + ((gteIR0 * gteIR3) >> 12));
71287 - } else {
71288 - gteMAC1 = FNC_OVERFLOW1(gteMAC1 + (gteIR0 * gteIR1));
71289 - gteMAC2 = FNC_OVERFLOW2(gteMAC2 + (gteIR0 * gteIR2));
71290 - gteMAC3 = FNC_OVERFLOW3(gteMAC3 + (gteIR0 * gteIR3));
71291 - }
71292 - MAC2IR();
71293 -
71294 - gteRGB0 = gteRGB1;
71295 - gteRGB1 = gteRGB2;
71296 -
71297 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71298 - gteG2 = limB2(gteMAC2 / 16.0f);
71299 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71300 - gteR2 = FlimB1(gteMAC1 >> 4);
71301 - gteG2 = FlimB2(gteMAC2 >> 4);
71302 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71303 -
71304 - SUM_FLAG
71305 -
71306 -#ifdef GTE_DUMP
71307 - if(sample < 100)
71308 - {
71309 - G_GD(9);
71310 - G_GD(10);
71311 - G_GD(11);
71312 -
71313 - //G_GD(20);
71314 - //G_GD(21);
71315 - G_GD(22);
71316 -
71317 - G_GD(25);
71318 - G_GD(26);
71319 - G_GD(27);
71320 -
71321 - G_GC(31);
71322 - }
71323 -#endif
71324 -}
71325 -
71326 -/*
71327 -#define GTE_DPCS() { \
71328 - RR0 = (double)R + (gteIR0*LimitAS((double)(gteRFC - R),24))/4096.0; \
71329 - GG0 = (double)G + (gteIR0*LimitAS((double)(gteGFC - G),23))/4096.0; \
71330 - BB0 = (double)B + (gteIR0*LimitAS((double)(gteBFC - B),22))/4096.0; \
71331 - \
71332 - gteIR1 = (long)LimitAS(RR0,24); \
71333 - gteIR2 = (long)LimitAS(GG0,23); \
71334 - gteIR3 = (long)LimitAS(BB0,22); \
71335 - \
71336 - gteRGB0 = gteRGB1; \
71337 - gteRGB1 = gteRGB2; \
71338 - gteC2 = C; \
71339 - gteR2 = (unsigned char)LimitB(RR0/16.0,21); \
71340 - gteG2 = (unsigned char)LimitB(GG0/16.0,20); \
71341 - gteB2 = (unsigned char)LimitB(BB0/16.0,19); \
71342 - \
71343 - gteMAC1 = (long)RR0; \
71344 - gteMAC2 = (long)GG0; \
71345 - gteMAC3 = (long)BB0; \
71346 -}
71347 -*/
71348 -void gteDPCS() {
71349 -// unsigned long C,R,G,B;
71350 -// double RR0,GG0,BB0;
71351 -#ifdef GTE_DUMP
71352 - static int sample = 0; sample++;
71353 -#endif
71354 -#ifdef GTE_LOG
71355 - GTE_LOG("GTE_DPCS\n");
71356 -#endif
71357 -
71358 -#ifdef GTE_DUMP
71359 - if(sample < 100)
71360 - {
71361 - G_OP("DPCS", 8);
71362 - G_SD(6);
71363 - G_SD(8);
71364 -
71365 - G_SC(21);
71366 - G_SC(22);
71367 - G_SC(23);
71368 - }
71369 -#endif
71370 -
71371 -/* gteFLAG = 0;
71372 -
71373 - C = gteCODE;
71374 - R = gteR * 16.0;
71375 - G = gteG * 16.0;
71376 - B = gteB * 16.0;
71377 -
71378 - GTE_DPCS();
71379 -
71380 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
71381 -/* gteFLAG = 0;
71382 -
71383 - gteMAC1 = NC_OVERFLOW1((gteR * 16.0f) + (gteIR0 * limA1S(gteRFC - (gteR * 16.0f))) / 4096.0f);
71384 - gteMAC2 = NC_OVERFLOW2((gteG * 16.0f) + (gteIR0 * limA2S(gteGFC - (gteG * 16.0f))) / 4096.0f);
71385 - gteMAC3 = NC_OVERFLOW3((gteB * 16.0f) + (gteIR0 * limA3S(gteBFC - (gteB * 16.0f))) / 4096.0f);
71386 - */
71387 -/* gteMAC1 = (gteR<<4) + ( (gteIR0*(signed short)limA1S(gteRFC-(gteR<<4)) ) >>12);
71388 - gteMAC2 = (gteG<<4) + ( (gteIR0*(signed short)limA2S(gteGFC-(gteG<<4)) ) >>12);
71389 - gteMAC3 = (gteB<<4) + ( (gteIR0*(signed short)limA3S(gteBFC-(gteB<<4)) ) >>12);*/
71390 - gteMAC1 = (gteR<<4) + ( (gteIR0*(signed short)FlimA1S(gteRFC-(gteR<<4)) ) >>12);
71391 - gteMAC2 = (gteG<<4) + ( (gteIR0*(signed short)FlimA2S(gteGFC-(gteG<<4)) ) >>12);
71392 - gteMAC3 = (gteB<<4) + ( (gteIR0*(signed short)FlimA3S(gteBFC-(gteB<<4)) ) >>12);
71393 -
71394 - gteFLAG = 0;
71395 - MAC2IR();
71396 -
71397 - gteRGB0 = gteRGB1;
71398 - gteRGB1 = gteRGB2;
71399 -
71400 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71401 - gteG2 = limB2(gteMAC2 / 16.0f);
71402 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71403 - gteR2 = FlimB1(gteMAC1 >> 4);
71404 - gteG2 = FlimB2(gteMAC2 >> 4);
71405 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71406 -
71407 - SUM_FLAG
71408 -
71409 -#ifdef GTE_DUMP
71410 - if(sample < 100)
71411 - {
71412 - G_GD(9);
71413 - G_GD(10);
71414 - G_GD(11);
71415 -
71416 - //G_GD(20);
71417 - //G_GD(21);
71418 - G_GD(22);
71419 -
71420 - G_GD(25);
71421 - G_GD(26);
71422 - G_GD(27);
71423 -
71424 - G_GC(31);
71425 - }
71426 -#endif
71427 -}
71428 -
71429 -void gteDPCT() {
71430 -// unsigned long C,R,G,B;
71431 -// double RR0,GG0,BB0;
71432 -#ifdef GTE_DUMP
71433 - static int sample = 0; sample++;
71434 -#endif
71435 -#ifdef GTE_LOG
71436 - GTE_LOG("GTE_DPCT\n");
71437 -#endif
71438 -
71439 -#ifdef GTE_DUMP
71440 - if(sample < 100)
71441 - {
71442 - G_OP("DPCT", 17);
71443 - G_SD(8);
71444 -
71445 - G_SD(20);
71446 - G_SD(21);
71447 - G_SD(22);
71448 -
71449 - G_SC(21);
71450 - G_SC(22);
71451 - G_SC(23);
71452 - }
71453 -#endif
71454 -/* gteFLAG = 0;
71455 -
71456 - C = gteCODE0;
71457 - R = gteR0 * 16.0;
71458 - G = gteG0 * 16.0;
71459 - B = gteB0 * 16.0;
71460 -
71461 - GTE_DPCS();
71462 -
71463 - C = gteCODE0;
71464 - R = gteR0 * 16.0;
71465 - G = gteG0 * 16.0;
71466 - B = gteB0 * 16.0;
71467 -
71468 - GTE_DPCS();
71469 -
71470 - C = gteCODE0;
71471 - R = gteR0 * 16.0;
71472 - G = gteG0 * 16.0;
71473 - B = gteB0 * 16.0;
71474 -
71475 - GTE_DPCS();
71476 -
71477 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
71478 -/* gteFLAG = 0;
71479 -
71480 - gteMAC1 = NC_OVERFLOW1((gteR0 * 16.0f) + gteIR0 * limA1S(gteRFC - (gteR0 * 16.0f)));
71481 - gteMAC2 = NC_OVERFLOW2((gteG0 * 16.0f) + gteIR0 * limA2S(gteGFC - (gteG0 * 16.0f)));
71482 - gteMAC3 = NC_OVERFLOW3((gteB0 * 16.0f) + gteIR0 * limA3S(gteBFC - (gteB0 * 16.0f)));
71483 - */
71484 -/* gteMAC1 = (gteR0<<4) + ( (gteIR0*(signed short)limA1S(gteRFC-(gteR0<<4)) ) >>12);
71485 - gteMAC2 = (gteG0<<4) + ( (gteIR0*(signed short)limA2S(gteGFC-(gteG0<<4)) ) >>12);
71486 - gteMAC3 = (gteB0<<4) + ( (gteIR0*(signed short)limA3S(gteBFC-(gteB0<<4)) ) >>12);*/
71487 - gteMAC1 = (gteR0<<4) + ( (gteIR0*(signed short)FlimA1S(gteRFC-(gteR0<<4)) ) >>12);
71488 - gteMAC2 = (gteG0<<4) + ( (gteIR0*(signed short)FlimA2S(gteGFC-(gteG0<<4)) ) >>12);
71489 - gteMAC3 = (gteB0<<4) + ( (gteIR0*(signed short)FlimA3S(gteBFC-(gteB0<<4)) ) >>12);
71490 -// MAC2IR();
71491 -
71492 - gteRGB0 = gteRGB1;
71493 - gteRGB1 = gteRGB2;
71494 -
71495 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71496 - gteG2 = limB2(gteMAC2 / 16.0f);
71497 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71498 - gteR2 = FlimB1(gteMAC1 >> 4);
71499 - gteG2 = FlimB2(gteMAC2 >> 4);
71500 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71501 -
71502 -/* gteMAC1 = (gteR0<<4) + ( (gteIR0*(signed short)limA1S(gteRFC-(gteR0<<4)) ) >>12);
71503 - gteMAC2 = (gteG0<<4) + ( (gteIR0*(signed short)limA2S(gteGFC-(gteG0<<4)) ) >>12);
71504 - gteMAC3 = (gteB0<<4) + ( (gteIR0*(signed short)limA3S(gteBFC-(gteB0<<4)) ) >>12);*/
71505 - gteMAC1 = (gteR0<<4) + ( (gteIR0*(signed short)FlimA1S(gteRFC-(gteR0<<4)) ) >>12);
71506 - gteMAC2 = (gteG0<<4) + ( (gteIR0*(signed short)FlimA2S(gteGFC-(gteG0<<4)) ) >>12);
71507 - gteMAC3 = (gteB0<<4) + ( (gteIR0*(signed short)FlimA3S(gteBFC-(gteB0<<4)) ) >>12);
71508 -// MAC2IR();
71509 - gteRGB0 = gteRGB1;
71510 - gteRGB1 = gteRGB2;
71511 -
71512 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71513 - gteG2 = limB2(gteMAC2 / 16.0f);
71514 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71515 - gteR2 = FlimB1(gteMAC1 >> 4);
71516 - gteG2 = FlimB2(gteMAC2 >> 4);
71517 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71518 -
71519 -/* gteMAC1 = (gteR0<<4) + ( (gteIR0*(signed short)limA1S(gteRFC-(gteR0<<4)) ) >>12);
71520 - gteMAC2 = (gteG0<<4) + ( (gteIR0*(signed short)limA2S(gteGFC-(gteG0<<4)) ) >>12);
71521 - gteMAC3 = (gteB0<<4) + ( (gteIR0*(signed short)limA3S(gteBFC-(gteB0<<4)) ) >>12);*/
71522 - gteMAC1 = (gteR0<<4) + ( (gteIR0*(signed short)FlimA1S(gteRFC-(gteR0<<4)) ) >>12);
71523 - gteMAC2 = (gteG0<<4) + ( (gteIR0*(signed short)FlimA2S(gteGFC-(gteG0<<4)) ) >>12);
71524 - gteMAC3 = (gteB0<<4) + ( (gteIR0*(signed short)FlimA3S(gteBFC-(gteB0<<4)) ) >>12);
71525 - gteFLAG = 0;
71526 - MAC2IR();
71527 - gteRGB0 = gteRGB1;
71528 - gteRGB1 = gteRGB2;
71529 -
71530 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71531 - gteG2 = limB2(gteMAC2 / 16.0f);
71532 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71533 - gteR2 = FlimB1(gteMAC1 >> 4);
71534 - gteG2 = FlimB2(gteMAC2 >> 4);
71535 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71536 -
71537 - SUM_FLAG
71538 -
71539 -#ifdef GTE_DUMP
71540 - if(sample < 100)
71541 - {
71542 - G_GD(9);
71543 - G_GD(10);
71544 - G_GD(11);
71545 -
71546 - G_GD(20);
71547 - G_GD(21);
71548 - G_GD(22);
71549 -
71550 - G_GD(25);
71551 - G_GD(26);
71552 - G_GD(27);
71553 -
71554 - G_GC(31);
71555 - }
71556 -#endif
71557 -}
71558 -
71559 -/*
71560 -#define GTE_NCS(vn) { \
71561 - RR0 = ((double)gteVX##vn * gteL11 + (double)gteVY##vn * (double)gteL12 + (double)gteVZ##vn * gteL13) / 4096.0; \
71562 - GG0 = ((double)gteVX##vn * gteL21 + (double)gteVY##vn * (double)gteL22 + (double)gteVZ##vn * gteL23) / 4096.0; \
71563 - BB0 = ((double)gteVX##vn * gteL31 + (double)gteVY##vn * (double)gteL32 + (double)gteVZ##vn * gteL33) / 4096.0; \
71564 - t1 = LimitAU(RR0, 24); \
71565 - t2 = LimitAU(GG0, 23); \
71566 - t3 = LimitAU(BB0, 22); \
71567 - \
71568 - RR0 = (double)gteRBK + ((double)gteLR1 * t1 + (double)gteLR2 * t2 + (double)gteLR3 * t3) / 4096.0; \
71569 - GG0 = (double)gteGBK + ((double)gteLG1 * t1 + (double)gteLG2 * t2 + (double)gteLG3 * t3) / 4096.0; \
71570 - BB0 = (double)gteBBK + ((double)gteLB1 * t1 + (double)gteLB2 * t2 + (double)gteLB3 * t3) / 4096.0; \
71571 - t1 = LimitAU(RR0, 24); \
71572 - t2 = LimitAU(GG0, 23); \
71573 - t3 = LimitAU(BB0, 22); \
71574 - \
71575 - gteRGB0 = gteRGB1; gteRGB1 = gteRGB2; \
71576 - gteR2 = (unsigned char)LimitB(RR0/16.0, 21); \
71577 - gteG2 = (unsigned char)LimitB(GG0/16.0, 20); \
71578 - gteB2 = (unsigned char)LimitB(BB0/16.0, 19); \
71579 - gteCODE2=gteCODE0; \
71580 -}*/
71581 -
71582 -#define LOW(a) (((a) < 0) ? 0 : (a))
71583 -/*
71584 -#define GTE_NCS(vn) \
71585 -RR0 = LOW((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn)/4096.0f); \
71586 -GG0 = LOW((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn)/4096.0f); \
71587 -BB0 = LOW((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn)/4096.0f); \
71588 -gteMAC1 = gteRBK + (gteLR1*RR0 + gteLR2*GG0 + gteLR3*BB0)/4096.0f; \
71589 -gteMAC2 = gteGBK + (gteLG1*RR0 + gteLG2*GG0 + gteLG3*BB0)/4096.0f; \
71590 -gteMAC3 = gteBBK + (gteLB1*RR0 + gteLB2*GG0 + gteLB3*BB0)/4096.0f; \
71591 -gteRGB0 = gteRGB1; \
71592 -gteRGB1 = gteRGB2; \
71593 -gteR2 = FlimB1(gteMAC1 >> 4); \
71594 -gteG2 = FlimB2(gteMAC2 >> 4); \
71595 -gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;*/
71596 -/*gteR2 = limB1(gteMAC1 / 16.0f); \
71597 -gteG2 = limB2(gteMAC2 / 16.0f); \
71598 -gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71599 -
71600 -#define GTE_NCS(vn) \
71601 - gte_LL1 = F12limA1U((gteL11*gteVX##vn + gteL12*gteVY##vn + gteL13*gteVZ##vn) >> 12); \
71602 - gte_LL2 = F12limA2U((gteL21*gteVX##vn + gteL22*gteVY##vn + gteL23*gteVZ##vn) >> 12); \
71603 - gte_LL3 = F12limA3U((gteL31*gteVX##vn + gteL32*gteVY##vn + gteL33*gteVZ##vn) >> 12); \
71604 - gteMAC1 = F12limA1U(gteRBK + ((gteLR1*gte_LL1 + gteLR2*gte_LL2 + gteLR3*gte_LL3) >> 12)); \
71605 - gteMAC2 = F12limA2U(gteGBK + ((gteLG1*gte_LL1 + gteLG2*gte_LL2 + gteLG3*gte_LL3) >> 12)); \
71606 - gteMAC3 = F12limA3U(gteBBK + ((gteLB1*gte_LL1 + gteLB2*gte_LL2 + gteLB3*gte_LL3) >> 12));
71607 -
71608 -void gteNCS() {
71609 -// double RR0,GG0,BB0;
71610 - s32 gte_LL1,gte_LL2,gte_LL3;
71611 -// s32 RR0,GG0,BB0;
71612 -// double t1, t2, t3;
71613 -#ifdef GTE_DUMP
71614 - static int sample = 0; sample++;
71615 -#endif
71616 -
71617 -#ifdef GTE_LOG
71618 - GTE_LOG("GTE_NCS\n");
71619 -#endif
71620 -
71621 -#ifdef GTE_DUMP
71622 - if(sample < 100)
71623 - {
71624 - G_OP("NCS", 14);
71625 - G_SD(0);
71626 - G_SD(1);
71627 - G_SD(6);
71628 -
71629 - G_SC(8);
71630 - G_SC(9);
71631 - G_SC(10);
71632 - G_SC(11);
71633 - G_SC(12);
71634 - G_SC(13);
71635 - G_SC(14);
71636 - G_SC(15);
71637 - G_SC(16);
71638 - G_SC(17);
71639 - G_SC(18);
71640 - G_SC(19);
71641 - G_SC(20);
71642 - }
71643 -#endif
71644 -/* gteFLAG = 0;
71645 -
71646 - GTE_NCS(0);
71647 -
71648 - gteMAC1=(long)RR0;
71649 - gteMAC2=(long)GG0;
71650 - gteMAC3=(long)BB0;
71651 -
71652 - gteIR1=(long)t1;
71653 - gteIR2=(long)t2;
71654 - gteIR3=(long)t3;
71655 -
71656 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
71657 - gteFLAG = 0;
71658 -
71659 - GTE_NCS(0);
71660 -
71661 - gteRGB0 = gteRGB1;
71662 - gteRGB1 = gteRGB2;
71663 - gteR2 = FlimB1(gteMAC1 >> 4);
71664 - gteG2 = FlimB2(gteMAC2 >> 4);
71665 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71666 -
71667 - MAC2IR1();
71668 -
71669 - SUM_FLAG
71670 -
71671 -#ifdef GTE_DUMP
71672 - if(sample < 100)
71673 - {
71674 - G_GD(9);
71675 - G_GD(10);
71676 - G_GD(11);
71677 -
71678 - //G_GD(20);
71679 - //G_GD(21);
71680 - G_GD(22);
71681 -
71682 - G_GD(25);
71683 - G_GD(26);
71684 - G_GD(27);
71685 -
71686 - G_GC(31);
71687 - }
71688 -#endif
71689 -}
71690 -
71691 -void gteNCT() {
71692 -// double RR0,GG0,BB0;
71693 - s32 gte_LL1,gte_LL2,gte_LL3;
71694 -// s32 RR0,GG0,BB0;
71695 -// double t1, t2, t3;
71696 -#ifdef GTE_DUMP
71697 - static int sample = 0; sample++;
71698 -#endif
71699 -
71700 -#ifdef GTE_LOG
71701 - GTE_LOG("GTE_NCT\n");
71702 -#endif
71703 -
71704 -#ifdef GTE_DUMP
71705 - if(sample < 100)
71706 - {
71707 - G_OP("NCT", 30);
71708 - G_SD(0);
71709 - G_SD(1);
71710 - G_SD(2);
71711 - G_SD(3);
71712 - G_SD(4);
71713 - G_SD(5);
71714 - G_SD(6);
71715 -
71716 - G_SC(8);
71717 - G_SC(9);
71718 - G_SC(10);
71719 - G_SC(11);
71720 - G_SC(12);
71721 - G_SC(13);
71722 - G_SC(14);
71723 - G_SC(15);
71724 - G_SC(16);
71725 - G_SC(17);
71726 - G_SC(18);
71727 - G_SC(19);
71728 - G_SC(20);
71729 - }
71730 -#endif
71731 -/*
71732 - gteFLAG = 0;
71733 -
71734 -//V0
71735 - GTE_NCS(0);
71736 -//V1
71737 - GTE_NCS(1);
71738 -//V2
71739 - GTE_NCS(2);
71740 -
71741 - gteMAC1=(long)RR0;
71742 - gteMAC2=(long)GG0;
71743 - gteMAC3=(long)BB0;
71744 -
71745 - gteIR1=(long)t1;
71746 - gteIR2=(long)t2;
71747 - gteIR3=(long)t3;
71748 -
71749 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
71750 - gteFLAG = 0;
71751 -
71752 - GTE_NCS(0);
71753 -
71754 - gteR0 = FlimB1(gteMAC1 >> 4);
71755 - gteG0 = FlimB2(gteMAC2 >> 4);
71756 - gteB0 = FlimB3(gteMAC3 >> 4); gteCODE0 = gteCODE;
71757 -
71758 - GTE_NCS(1);
71759 - gteR1 = FlimB1(gteMAC1 >> 4);
71760 - gteG1 = FlimB2(gteMAC2 >> 4);
71761 - gteB1 = FlimB3(gteMAC3 >> 4); gteCODE1 = gteCODE;
71762 -
71763 - GTE_NCS(2);
71764 - gteR2 = FlimB1(gteMAC1 >> 4);
71765 - gteG2 = FlimB2(gteMAC2 >> 4);
71766 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71767 -
71768 - MAC2IR1();
71769 -
71770 - SUM_FLAG
71771 -
71772 -#ifdef GTE_DUMP
71773 - if(sample < 100)
71774 - {
71775 - G_GD(9);
71776 - G_GD(10);
71777 - G_GD(11);
71778 -
71779 - G_GD(20);
71780 - G_GD(21);
71781 - G_GD(22);
71782 -
71783 - G_GD(25);
71784 - G_GD(26);
71785 - G_GD(27);
71786 -
71787 - G_GC(31);
71788 - }
71789 -#endif
71790 -}
71791 -
71792 -void gteCC() {
71793 -// double RR0,GG0,BB0;
71794 - s32 RR0,GG0,BB0;
71795 -// double t1,t2,t3;
71796 -#ifdef GTE_DUMP
71797 - static int sample = 0; sample++;
71798 -#endif
71799 -#ifdef GTE_LOG
71800 - GTE_LOG("GTE_CC\n");
71801 -#endif
71802 -
71803 -#ifdef GTE_DUMP
71804 - if(sample < 100)
71805 - {
71806 - G_OP("CC", 11);
71807 - G_SD(6);
71808 - G_SD(9);
71809 - G_SD(10);
71810 - G_SD(11);
71811 -
71812 - G_SC(13);
71813 - G_SC(14);
71814 - G_SC(15);
71815 - G_SC(16);
71816 - G_SC(17);
71817 - G_SC(18);
71818 - G_SC(19);
71819 - }
71820 -#endif
71821 -/* gteFLAG = 0;
71822 -
71823 - RR0 = (double)gteRBK + ((double)gteLR1 * gteIR1 + (double)gteLR2 * gteIR2 + (double)gteLR3 * gteIR3) / 4096.0;
71824 - GG0 = (double)gteGBK + ((double)gteLG1 * gteIR1 + (double)gteLG2 * gteIR2 + (double)gteLG3 * gteIR3) / 4096.0;
71825 - BB0 = (double)gteBBK + ((double)gteLB1 * gteIR1 + (double)gteLB2 * gteIR2 + (double)gteLB3 * gteIR3) / 4096.0;
71826 - t1 = LimitAU(RR0, 24);
71827 - t2 = LimitAU(GG0, 23);
71828 - t3 = LimitAU(BB0, 22);
71829 -
71830 - RR0=((double)gteR * t1)/256.0;
71831 - GG0=((double)gteG * t2)/256.0;
71832 - BB0=((double)gteB * t3)/256.0;
71833 - gteIR1 = (long)LimitAU(RR0,24);
71834 - gteIR2 = (long)LimitAU(GG0,23);
71835 - gteIR3 = (long)LimitAU(BB0,22);
71836 -
71837 - gteCODE0=gteCODE1; gteCODE1=gteCODE2;
71838 - gteC2 = gteCODE0;
71839 - gteR2 = (unsigned char)LimitB(RR0/16.0, 21);
71840 - gteG2 = (unsigned char)LimitB(GG0/16.0, 20);
71841 - gteB2 = (unsigned char)LimitB(BB0/16.0, 19);
71842 -
71843 - if (gteFLAG & 0x7f87e000) gteFLAG|=0x80000000;*/
71844 - gteFLAG = 0;
71845 -
71846 -/* RR0 = NC_OVERFLOW1(gteRBK + (gteLR1*gteIR1 + gteLR2*gteIR2 + gteLR3*gteIR3) / 4096.0f);
71847 - GG0 = NC_OVERFLOW2(gteGBK + (gteLG1*gteIR1 + gteLG2*gteIR2 + gteLG3*gteIR3) / 4096.0f);
71848 - BB0 = NC_OVERFLOW3(gteBBK + (gteLB1*gteIR1 + gteLB2*gteIR2 + gteLB3*gteIR3) / 4096.0f);
71849 -
71850 - gteMAC1 = gteR * RR0 / 256.0f;
71851 - gteMAC2 = gteG * GG0 / 256.0f;
71852 - gteMAC3 = gteB * BB0 / 256.0f;*/
71853 - RR0 = FNC_OVERFLOW1(gteRBK + ((gteLR1*gteIR1 + gteLR2*gteIR2 + gteLR3*gteIR3) >> 12));
71854 - GG0 = FNC_OVERFLOW2(gteGBK + ((gteLG1*gteIR1 + gteLG2*gteIR2 + gteLG3*gteIR3) >> 12));
71855 - BB0 = FNC_OVERFLOW3(gteBBK + ((gteLB1*gteIR1 + gteLB2*gteIR2 + gteLB3*gteIR3) >> 12));
71856 -
71857 - gteMAC1 = (gteR * RR0) >> 8;
71858 - gteMAC2 = (gteG * GG0) >> 8;
71859 - gteMAC3 = (gteB * BB0) >> 8;
71860 -
71861 - MAC2IR1();
71862 -
71863 - gteRGB0 = gteRGB1;
71864 - gteRGB1 = gteRGB2;
71865 -
71866 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71867 - gteG2 = limB2(gteMAC2 / 16.0f);
71868 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71869 - gteR2 = FlimB1(gteMAC1 >> 4);
71870 - gteG2 = FlimB2(gteMAC2 >> 4);
71871 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71872 -
71873 - SUM_FLAG
71874 -
71875 -#ifdef GTE_DUMP
71876 - if(sample < 100)
71877 - {
71878 - G_GD(9);
71879 - G_GD(10);
71880 - G_GD(11);
71881 -
71882 - //G_GD(20);
71883 - //G_GD(21);
71884 - G_GD(22);
71885 -
71886 - G_GD(25);
71887 - G_GD(26);
71888 - G_GD(27);
71889 -
71890 - G_GC(31);
71891 - }
71892 -#endif
71893 -}
71894 -
71895 -void gteINTPL() { //test opcode
71896 -#ifdef GTE_DUMP
71897 - static int sample = 0; sample++;
71898 -#endif
71899 -#ifdef GTE_LOG
71900 - GTE_LOG("GTE_INTP\n");
71901 -#endif
71902 -
71903 -#ifdef GTE_DUMP
71904 - if(sample < 100)
71905 - {
71906 - G_OP("INTPL", 8);
71907 - G_SD(6);
71908 - G_SD(8);
71909 - G_SD(9);
71910 - G_SD(10);
71911 - G_SD(11);
71912 -
71913 - G_SC(21);
71914 - G_SC(22);
71915 - G_SC(23);
71916 - }
71917 -#endif
71918 - /* NC: old
71919 - gteFLAG=0;
71920 - gteMAC1 = gteIR1 + gteIR0*limA1S(gteRFC-gteIR1);
71921 - gteMAC2 = gteIR2 + gteIR0*limA2S(gteGFC-gteIR2);
71922 - gteMAC3 = gteIR3 + gteIR0*limA3S(gteBFC-gteIR3);
71923 - //gteFLAG = 0;
71924 - MAC2IR();
71925 - gteRGB0 = gteRGB1;
71926 - gteRGB1 = gteRGB2;
71927 -
71928 - gteR2 = limB1(gteMAC1 / 16.0f);
71929 - gteG2 = limB2(gteMAC2 / 16.0f);
71930 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;
71931 - */
71932 -
71933 -/* gteFLAG=0;
71934 - gteMAC1 = gteIR1 + gteIR0*(gteRFC-gteIR1)/4096.0;
71935 - gteMAC2 = gteIR2 + gteIR0*(gteGFC-gteIR2)/4096.0;
71936 - gteMAC3 = gteIR3 + gteIR0*(gteBFC-gteIR3)/4096.0;
71937 -
71938 - //gteMAC3 = (int)((((psxRegs).CP2D).n).ir3+(((psxRegs).CP2D).n).ir0 * ((((psxRegs).CP2C).n).bfc-(((psxRegs).CP2D).n).ir3)/4096.0);
71939 -
71940 - if(gteMAC3 > gteIR1 && gteMAC3 > gteBFC)
71941 - {
71942 - gteMAC3 = gteMAC3;
71943 - }
71944 - //gteFLAG = 0;*/
71945 - //NEW CODE
71946 -/* gteMAC1 = gteIR1 + ((gteIR0*(signed short)limA1S(gteRFC-gteIR1))>>12);
71947 - gteMAC2 = gteIR2 + ((gteIR0*(signed short)limA2S(gteGFC-gteIR2))>>12);
71948 - gteMAC3 = gteIR3 + ((gteIR0*(signed short)limA3S(gteBFC-gteIR3))>>12);*/
71949 - gteMAC1 = gteIR1 + ((gteIR0*(signed short)FlimA1S(gteRFC-gteIR1))>>12);
71950 - gteMAC2 = gteIR2 + ((gteIR0*(signed short)FlimA2S(gteGFC-gteIR2))>>12);
71951 - gteMAC3 = gteIR3 + ((gteIR0*(signed short)FlimA3S(gteBFC-gteIR3))>>12);
71952 - gteFLAG = 0;
71953 -
71954 - MAC2IR();
71955 - gteRGB0 = gteRGB1;
71956 - gteRGB1 = gteRGB2;
71957 -
71958 -/* gteR2 = limB1(gteMAC1 / 16.0f);
71959 - gteG2 = limB2(gteMAC2 / 16.0f);
71960 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
71961 - gteR2 = FlimB1(gteMAC1 >> 4);
71962 - gteG2 = FlimB2(gteMAC2 >> 4);
71963 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
71964 -
71965 - SUM_FLAG
71966 -
71967 -#ifdef GTE_DUMP
71968 - if(sample < 100)
71969 - {
71970 - G_GD(9);
71971 - G_GD(10);
71972 - G_GD(11);
71973 -
71974 - //G_GD(20);
71975 - //G_GD(21);
71976 - G_GD(22);
71977 -
71978 - G_GD(25);
71979 - G_GD(26);
71980 - G_GD(27);
71981 -
71982 - G_GC(31);
71983 - }
71984 -#endif
71985 -}
71986 -
71987 -void gteCDP() { //test opcode
71988 - double RR0,GG0,BB0;
71989 -// s32 RR0,GG0,BB0;
71990 -#ifdef GTE_DUMP
71991 - static int sample = 0; sample++;
71992 -#endif
71993 -
71994 -#ifdef GTE_LOG
71995 - GTE_LOG("GTE_CDP\n");
71996 -#endif
71997 -
71998 -#ifdef GTE_DUMP
71999 - if(sample < 100)
72000 - {
72001 - G_OP("CDP", 13);
72002 - G_SD(6);
72003 - G_SD(8);
72004 - G_SD(9);
72005 - G_SD(10);
72006 - G_SD(11);
72007 -
72008 - G_SC(13);
72009 - G_SC(14);
72010 - G_SC(15);
72011 - G_SC(16);
72012 - G_SC(17);
72013 - G_SC(18);
72014 - G_SC(19);
72015 - G_SC(20);
72016 - G_SC(21);
72017 - G_SC(22);
72018 - G_SC(23);
72019 - }
72020 -#endif
72021 -
72022 - gteFLAG = 0;
72023 -
72024 - RR0 = NC_OVERFLOW1(gteRBK + (gteLR1*gteIR1 +gteLR2*gteIR2 + gteLR3*gteIR3));
72025 - GG0 = NC_OVERFLOW2(gteGBK + (gteLG1*gteIR1 +gteLG2*gteIR2 + gteLG3*gteIR3));
72026 - BB0 = NC_OVERFLOW3(gteBBK + (gteLB1*gteIR1 +gteLB2*gteIR2 + gteLB3*gteIR3));
72027 - gteMAC1 = gteR*RR0 + gteIR0*limA1S(gteRFC-gteR*RR0);
72028 - gteMAC2 = gteG*GG0 + gteIR0*limA2S(gteGFC-gteG*GG0);
72029 - gteMAC3 = gteB*BB0 + gteIR0*limA3S(gteBFC-gteB*BB0);
72030 -
72031 -/* RR0 = FNC_OVERFLOW1(gteRBK + (gteLR1*gteIR1 +gteLR2*gteIR2 + gteLR3*gteIR3));
72032 - GG0 = FNC_OVERFLOW2(gteGBK + (gteLG1*gteIR1 +gteLG2*gteIR2 + gteLG3*gteIR3));
72033 - BB0 = FNC_OVERFLOW3(gteBBK + (gteLB1*gteIR1 +gteLB2*gteIR2 + gteLB3*gteIR3));
72034 - gteMAC1 = gteR*RR0 + gteIR0*FlimA1S(gteRFC-gteR*RR0);
72035 - gteMAC2 = gteG*GG0 + gteIR0*FlimA2S(gteGFC-gteG*GG0);
72036 - gteMAC3 = gteB*BB0 + gteIR0*FlimA3S(gteBFC-gteB*BB0);*/
72037 -
72038 - MAC2IR1();
72039 - gteRGB0 = gteRGB1;
72040 - gteRGB1 = gteRGB2;
72041 -
72042 -/* gteR2 = limB1(gteMAC1 / 16.0f);
72043 - gteG2 = limB2(gteMAC2 / 16.0f);
72044 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
72045 - gteR2 = FlimB1(gteMAC1 >> 4);
72046 - gteG2 = FlimB2(gteMAC2 >> 4);
72047 - gteB2 = FlimB3(gteMAC3 >> 4); gteCODE2 = gteCODE;
72048 -
72049 - SUM_FLAG
72050 -
72051 -#ifdef GTE_DUMP
72052 - if(sample < 100)
72053 - {
72054 - G_GD(9);
72055 - G_GD(10);
72056 - G_GD(11);
72057 -
72058 - //G_GD(20);
72059 - //G_GD(21);
72060 - G_GD(22);
72061 -
72062 - G_GD(25);
72063 - G_GD(26);
72064 - G_GD(27);
72065 -
72066 - G_GC(31);
72067 - }
72068 -#endif
72069 -}
72070 diff -rupN original/libpcsxcore/libpcsxcore/gte.h new/libpcsxcore/libpcsxcore/gte.h
72071 --- original/libpcsxcore/libpcsxcore/gte.h 2007-10-08 17:13:28.000000000 -0400
72072 +++ new/libpcsxcore/libpcsxcore/gte.h 1969-12-31 20:00:00.000000000 -0400
72073 @@ -1,57 +0,0 @@
72074 -/***************************************************************************
72075 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
72076 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
72077 - * *
72078 - * This program is free software; you can redistribute it and/or modify *
72079 - * it under the terms of the GNU General Public License as published by *
72080 - * the Free Software Foundation; either version 2 of the License, or *
72081 - * (at your option) any later version. *
72082 - * *
72083 - * This program is distributed in the hope that it will be useful, *
72084 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
72085 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
72086 - * GNU General Public License for more details. *
72087 - * *
72088 - * You should have received a copy of the GNU General Public License *
72089 - * along with this program; if not, write to the *
72090 - * Free Software Foundation, Inc., *
72091 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
72092 - ***************************************************************************/
72093 -
72094 -#ifndef __GTE_H__
72095 -#define __GTE_H__
72096 -
72097 -#include "psxcommon.h"
72098 -#include "r3000a.h"
72099 -
72100 -void gteMFC2();
72101 -void gteCFC2();
72102 -void gteMTC2();
72103 -void gteCTC2();
72104 -void gteLWC2();
72105 -void gteSWC2();
72106 -
72107 -void gteRTPS();
72108 -void gteOP();
72109 -void gteNCLIP();
72110 -void gteDPCS();
72111 -void gteINTPL();
72112 -void gteMVMVA();
72113 -void gteNCDS();
72114 -void gteNCDT();
72115 -void gteCDP();
72116 -void gteNCCS();
72117 -void gteCC();
72118 -void gteNCS();
72119 -void gteNCT();
72120 -void gteSQR();
72121 -void gteDCPL();
72122 -void gteDPCT();
72123 -void gteAVSZ3();
72124 -void gteAVSZ4();
72125 -void gteRTPT();
72126 -void gteGPF();
72127 -void gteGPL();
72128 -void gteNCCT();
72129 -
72130 -#endif /* __GTE_H__ */
72131 diff -rupN original/libpcsxcore/libpcsxcore/gte.lo new/libpcsxcore/libpcsxcore/gte.lo
72132 --- original/libpcsxcore/libpcsxcore/gte.lo 2009-03-28 22:35:04.000000000 -0430
72133 +++ new/libpcsxcore/libpcsxcore/gte.lo 1969-12-31 20:00:00.000000000 -0400
72134 @@ -1,12 +0,0 @@
72135 -# gte.lo - a libtool object file
72136 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
72137 -#
72138 -# Please DO NOT delete this file!
72139 -# It is necessary for linking the library.
72140 -
72141 -# Name of the PIC object.
72142 -pic_object='.libs/gte.o'
72143 -
72144 -# Name of the non-PIC object.
72145 -non_pic_object='gte.o'
72146 -
72147 Los ficheros binarios original/libpcsxcore/libpcsxcore/gte.o y new/libpcsxcore/libpcsxcore/gte.o son distintos
72148 diff -rupN original/libpcsxcore/libpcsxcore/iR3000A.lo new/libpcsxcore/libpcsxcore/iR3000A.lo
72149 --- original/libpcsxcore/libpcsxcore/iR3000A.lo 2009-03-28 22:35:08.000000000 -0430
72150 +++ new/libpcsxcore/libpcsxcore/iR3000A.lo 1969-12-31 20:00:00.000000000 -0400
72151 @@ -1,12 +0,0 @@
72152 -# iR3000A.lo - a libtool object file
72153 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
72154 -#
72155 -# Please DO NOT delete this file!
72156 -# It is necessary for linking the library.
72157 -
72158 -# Name of the PIC object.
72159 -pic_object='.libs/iR3000A.o'
72160 -
72161 -# Name of the non-PIC object.
72162 -non_pic_object='iR3000A.o'
72163 -
72164 Los ficheros binarios original/libpcsxcore/libpcsxcore/iR3000A.o y new/libpcsxcore/libpcsxcore/iR3000A.o son distintos
72165 diff -rupN original/libpcsxcore/libpcsxcore/ix86/CVS/Entries new/libpcsxcore/libpcsxcore/ix86/CVS/Entries
72166 --- original/libpcsxcore/libpcsxcore/ix86/CVS/Entries 2009-03-28 22:23:20.000000000 -0430
72167 +++ new/libpcsxcore/libpcsxcore/ix86/CVS/Entries 1969-12-31 20:00:00.000000000 -0400
72168 @@ -1,5 +0,0 @@
72169 -/iGte.h/1.2/Mon Feb 23 10:17:22 2009//
72170 -/iR3000A.c/1.3/Mon Feb 23 10:17:22 2009//
72171 -/ix86.c/1.2/Sat Dec 29 22:18:00 2007//
72172 -/ix86.h/1.2/Sat Dec 29 22:18:00 2007//
72173 -D
72174 diff -rupN original/libpcsxcore/libpcsxcore/ix86/CVS/Repository new/libpcsxcore/libpcsxcore/ix86/CVS/Repository
72175 --- original/libpcsxcore/libpcsxcore/ix86/CVS/Repository 2009-03-28 22:23:08.000000000 -0430
72176 +++ new/libpcsxcore/libpcsxcore/ix86/CVS/Repository 1969-12-31 20:00:00.000000000 -0400
72177 @@ -1 +0,0 @@
72178 -pcsx-df/libpcsxcore/ix86
72179 diff -rupN original/libpcsxcore/libpcsxcore/ix86/CVS/Root new/libpcsxcore/libpcsxcore/ix86/CVS/Root
72180 --- original/libpcsxcore/libpcsxcore/ix86/CVS/Root 2009-03-28 22:23:08.000000000 -0430
72181 +++ new/libpcsxcore/libpcsxcore/ix86/CVS/Root 1969-12-31 20:00:00.000000000 -0400
72182 @@ -1 +0,0 @@
72183 -:pserver:anonymous@pcsx-df.cvs.sourceforge.net:/cvsroot/pcsx-df
72184 diff -rupN original/libpcsxcore/libpcsxcore/ix86/iGte.h new/libpcsxcore/libpcsxcore/ix86/iGte.h
72185 --- original/libpcsxcore/libpcsxcore/ix86/iGte.h 2009-02-23 05:47:22.000000000 -0430
72186 +++ new/libpcsxcore/libpcsxcore/ix86/iGte.h 1969-12-31 20:00:00.000000000 -0400
72187 @@ -1,663 +0,0 @@
72188 -/***************************************************************************
72189 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
72190 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
72191 - * *
72192 - * This program is free software; you can redistribute it and/or modify *
72193 - * it under the terms of the GNU General Public License as published by *
72194 - * the Free Software Foundation; either version 2 of the License, or *
72195 - * (at your option) any later version. *
72196 - * *
72197 - * This program is distributed in the hope that it will be useful, *
72198 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
72199 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
72200 - * GNU General Public License for more details. *
72201 - * *
72202 - * You should have received a copy of the GNU General Public License *
72203 - * along with this program; if not, write to the *
72204 - * Free Software Foundation, Inc., *
72205 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
72206 - ***************************************************************************/
72207 -
72208 -#ifndef __IGTE_H__
72209 -#define __IGTE_H__
72210 -
72211 -#include "../r3000a.h"
72212 -#include "../psxmem.h"
72213 -
72214 -#define CP2_FUNC(f) \
72215 -void gte##f(); \
72216 -static void rec##f() { \
72217 - iFlushRegs(); \
72218 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code); \
72219 - CALLFunc ((u32)gte##f); \
72220 -/* branch = 2; */\
72221 -}
72222 -
72223 -#define CP2_FUNCNC(f) \
72224 -void gte##f(); \
72225 -static void rec##f() { \
72226 - iFlushRegs(); \
72227 - CALLFunc ((u32)gte##f); \
72228 -/* branch = 2; */\
72229 -}
72230 -
72231 -/*CP2_FUNC(MFC2);
72232 -CP2_FUNC(MTC2);
72233 -CP2_FUNC(CFC2);
72234 -CP2_FUNC(CTC2);
72235 -CP2_FUNC(LWC2);
72236 -CP2_FUNC(SWC2);*/
72237 -
72238 -void gteMFC2();
72239 -static void recMFC2() {
72240 -// Rt = Cop2D->Rd
72241 - if (!_Rt_) return;
72242 -
72243 - iRegs[_Rt_].state = ST_UNK;
72244 -
72245 - switch (_Rd_) {
72246 - case 29:
72247 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
72248 - CALLFunc ((u32)gteMFC2);
72249 - break;
72250 -
72251 - default:
72252 - MOV32MtoR(EAX, (u32)&psxRegs.CP2D.r[_Rd_]);
72253 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
72254 - break;
72255 - }
72256 -}
72257 -
72258 -void gteMTC2();
72259 -static void recMTC2() {
72260 -// Cop2D->Rd = Rt
72261 - int fixt = 0;
72262 -
72263 -// iFlushRegs();
72264 -
72265 - switch (_Rd_) {
72266 - case 8: case 9: case 10: case 11:
72267 - fixt = 1; break;
72268 -
72269 - case 16: case 17: case 18: case 19:
72270 - fixt = 2; break;
72271 -
72272 - case 15:
72273 - case 28:
72274 - case 30:
72275 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
72276 - CALLFunc ((u32)gteMTC2);
72277 - break;
72278 - }
72279 -
72280 - if (IsConst(_Rt_)) {
72281 - if (fixt == 1) MOV32ItoM((u32)&psxRegs.CP2D.r[_Rd_], (s16)iRegs[_Rt_].k);
72282 - else if (fixt == 2) MOV32ItoM((u32)&psxRegs.CP2D.r[_Rd_], iRegs[_Rt_].k & 0xffff);
72283 - else MOV32ItoM((u32)&psxRegs.CP2D.r[_Rd_], iRegs[_Rt_].k);
72284 - } else {
72285 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
72286 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
72287 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
72288 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rd_], EAX);
72289 - }
72290 -}
72291 -
72292 -void gteLWC2();
72293 -static void recLWC2() {
72294 -// Cop2D->Rt = mem[Rs + Im] (unsigned)
72295 - int fixt = 0;
72296 -
72297 - switch (_Rt_) {
72298 - case 8: case 9: case 10: case 11:
72299 - fixt = 1; break;
72300 -
72301 - case 16: case 17: case 18: case 19:
72302 - fixt = 2; break;
72303 -
72304 - case 15:
72305 - case 28:
72306 - case 30:
72307 - iFlushRegs();
72308 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
72309 - CALLFunc ((u32)gteLWC2);
72310 - return;
72311 - }
72312 -
72313 - if (IsConst(_Rs_)) {
72314 - u32 addr = iRegs[_Rs_].k + _Imm_;
72315 - int t = addr >> 16;
72316 -
72317 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
72318 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1fffff]);
72319 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
72320 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
72321 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rt_], EAX);
72322 - return;
72323 - }
72324 - if (t == 0x1f80 && addr < 0x1f801000) {
72325 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xfff]);
72326 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
72327 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
72328 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rt_], EAX);
72329 - return;
72330 - }
72331 - }
72332 -
72333 - iPushOfB();
72334 - CALLFunc((u32)psxMemRead32);
72335 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
72336 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
72337 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rt_], EAX);
72338 -// ADD32ItoR(ESP, 4);
72339 - resp+= 4;
72340 -}
72341 -
72342 -void gteSWC2();
72343 -static void recSWC2() {
72344 -// mem[Rs + Im] = Rt
72345 -
72346 - switch (_Rt_) {
72347 - case 29:
72348 - iFlushRegs();
72349 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
72350 - CALLFunc ((u32)gteSWC2);
72351 - return;
72352 - }
72353 -
72354 - if (IsConst(_Rs_)) {
72355 - u32 addr = iRegs[_Rs_].k + _Imm_;
72356 - int t = addr >> 16;
72357 -
72358 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
72359 - MOV32MtoR(EAX, (u32)&psxRegs.CP2D.r[_Rt_]);
72360 - MOV32RtoM((u32)&psxM[addr & 0x1fffff], EAX);
72361 - return;
72362 - }
72363 - if (t == 0x1f80 && addr < 0x1f801000) {
72364 - MOV32MtoR(EAX, (u32)&psxRegs.CP2D.r[_Rt_]);
72365 - MOV32RtoM((u32)&psxH[addr & 0xfff], EAX);
72366 - return;
72367 - }
72368 - }
72369 -
72370 - PUSH32M ((u32)&psxRegs.CP2D.r[_Rt_]);
72371 - iPushOfB();
72372 - CALLFunc((u32)psxMemWrite32);
72373 -// ADD32ItoR(ESP, 8);
72374 - resp+= 8;
72375 -}
72376 -
72377 -static void recCFC2() {
72378 -// Rt = Cop2C->Rd
72379 - if (!_Rt_) return;
72380 -
72381 - iRegs[_Rt_].state = ST_UNK;
72382 - MOV32MtoR(EAX, (u32)&psxRegs.CP2C.r[_Rd_]);
72383 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
72384 -}
72385 -
72386 -static void recCTC2() {
72387 -// Cop2C->Rd = Rt
72388 -
72389 - if (IsConst(_Rt_)) {
72390 - MOV32ItoM((u32)&psxRegs.CP2C.r[_Rd_], iRegs[_Rt_].k);
72391 - } else {
72392 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
72393 - MOV32RtoM((u32)&psxRegs.CP2C.r[_Rd_], EAX);
72394 - }
72395 -}
72396 -
72397 -CP2_FUNCNC(RTPS);
72398 -CP2_FUNC(OP);
72399 -CP2_FUNCNC(NCLIP);
72400 -CP2_FUNCNC(DPCS);
72401 -CP2_FUNCNC(INTPL);
72402 -CP2_FUNC(MVMVA);
72403 -CP2_FUNCNC(NCDS);
72404 -CP2_FUNCNC(NCDT);
72405 -CP2_FUNCNC(CDP);
72406 -CP2_FUNCNC(NCCS);
72407 -CP2_FUNCNC(CC);
72408 -CP2_FUNCNC(NCS);
72409 -CP2_FUNCNC(NCT);
72410 -CP2_FUNC(SQR);
72411 -CP2_FUNCNC(DCPL);
72412 -CP2_FUNCNC(DPCT);
72413 -CP2_FUNCNC(AVSZ3);
72414 -CP2_FUNCNC(AVSZ4);
72415 -CP2_FUNCNC(RTPT);
72416 -CP2_FUNC(GPF);
72417 -CP2_FUNC(GPL);
72418 -CP2_FUNCNC(NCCT);
72419 -
72420 -#if 0
72421 -
72422 -#define gteVX0 ((s16*)psxRegs.CP2D.r)[0]
72423 -#define gteVY0 ((s16*)psxRegs.CP2D.r)[1]
72424 -#define gteVZ0 ((s16*)psxRegs.CP2D.r)[2]
72425 -#define gteVX1 ((s16*)psxRegs.CP2D.r)[4]
72426 -#define gteVY1 ((s16*)psxRegs.CP2D.r)[5]
72427 -#define gteVZ1 ((s16*)psxRegs.CP2D.r)[6]
72428 -#define gteVX2 ((s16*)psxRegs.CP2D.r)[8]
72429 -#define gteVY2 ((s16*)psxRegs.CP2D.r)[9]
72430 -#define gteVZ2 ((s16*)psxRegs.CP2D.r)[10]
72431 -#define gteRGB psxRegs.CP2D.r[6]
72432 -#define gteOTZ ((s16*)psxRegs.CP2D.r)[7*2]
72433 -#define gteIR0 ((s32*)psxRegs.CP2D.r)[8]
72434 -#define gteIR1 ((s32*)psxRegs.CP2D.r)[9]
72435 -#define gteIR2 ((s32*)psxRegs.CP2D.r)[10]
72436 -#define gteIR3 ((s32*)psxRegs.CP2D.r)[11]
72437 -#define gteSX0 ((s16*)psxRegs.CP2D.r)[12*2]
72438 -#define gteSY0 ((s16*)psxRegs.CP2D.r)[12*2+1]
72439 -#define gteSX1 ((s16*)psxRegs.CP2D.r)[13*2]
72440 -#define gteSY1 ((s16*)psxRegs.CP2D.r)[13*2+1]
72441 -#define gteSX2 ((s16*)psxRegs.CP2D.r)[14*2]
72442 -#define gteSY2 ((s16*)psxRegs.CP2D.r)[14*2+1]
72443 -#define gteSXP ((s16*)psxRegs.CP2D.r)[15*2]
72444 -#define gteSYP ((s16*)psxRegs.CP2D.r)[15*2+1]
72445 -#define gteSZx ((u16*)psxRegs.CP2D.r)[16*2]
72446 -#define gteSZ0 ((u16*)psxRegs.CP2D.r)[17*2]
72447 -#define gteSZ1 ((u16*)psxRegs.CP2D.r)[18*2]
72448 -#define gteSZ2 ((u16*)psxRegs.CP2D.r)[19*2]
72449 -#define gteRGB0 psxRegs.CP2D.r[20]
72450 -#define gteRGB1 psxRegs.CP2D.r[21]
72451 -#define gteRGB2 psxRegs.CP2D.r[22]
72452 -#define gteMAC0 psxRegs.CP2D.r[24]
72453 -#define gteMAC1 ((s32*)psxRegs.CP2D.r)[25]
72454 -#define gteMAC2 ((s32*)psxRegs.CP2D.r)[26]
72455 -#define gteMAC3 ((s32*)psxRegs.CP2D.r)[27]
72456 -#define gteIRGB psxRegs.CP2D.r[28]
72457 -#define gteORGB psxRegs.CP2D.r[29]
72458 -#define gteLZCS psxRegs.CP2D.r[30]
72459 -#define gteLZCR psxRegs.CP2D.r[31]
72460 -
72461 -#define gteR ((u8 *)psxRegs.CP2D.r)[6*4]
72462 -#define gteG ((u8 *)psxRegs.CP2D.r)[6*4+1]
72463 -#define gteB ((u8 *)psxRegs.CP2D.r)[6*4+2]
72464 -#define gteCODE ((u8 *)psxRegs.CP2D.r)[6*4+3]
72465 -#define gteC gteCODE
72466 -
72467 -#define gteR0 ((u8 *)psxRegs.CP2D.r)[20*4]
72468 -#define gteG0 ((u8 *)psxRegs.CP2D.r)[20*4+1]
72469 -#define gteB0 ((u8 *)psxRegs.CP2D.r)[20*4+2]
72470 -#define gteCODE0 ((u8 *)psxRegs.CP2D.r)[20*4+3]
72471 -#define gteC0 gteCODE0
72472 -
72473 -#define gteR1 ((u8 *)psxRegs.CP2D.r)[21*4]
72474 -#define gteG1 ((u8 *)psxRegs.CP2D.r)[21*4+1]
72475 -#define gteB1 ((u8 *)psxRegs.CP2D.r)[21*4+2]
72476 -#define gteCODE1 ((u8 *)psxRegs.CP2D.r)[21*4+3]
72477 -#define gteC1 gteCODE1
72478 -
72479 -#define gteR2 ((u8 *)psxRegs.CP2D.r)[22*4]
72480 -#define gteG2 ((u8 *)psxRegs.CP2D.r)[22*4+1]
72481 -#define gteB2 ((u8 *)psxRegs.CP2D.r)[22*4+2]
72482 -#define gteCODE2 ((u8 *)psxRegs.CP2D.r)[22*4+3]
72483 -#define gteC2 gteCODE2
72484 -
72485 -
72486 -
72487 -#define gteR11 ((s16*)psxRegs.CP2C.r)[0]
72488 -#define gteR12 ((s16*)psxRegs.CP2C.r)[1]
72489 -#define gteR13 ((s16*)psxRegs.CP2C.r)[2]
72490 -#define gteR21 ((s16*)psxRegs.CP2C.r)[3]
72491 -#define gteR22 ((s16*)psxRegs.CP2C.r)[4]
72492 -#define gteR23 ((s16*)psxRegs.CP2C.r)[5]
72493 -#define gteR31 ((s16*)psxRegs.CP2C.r)[6]
72494 -#define gteR32 ((s16*)psxRegs.CP2C.r)[7]
72495 -#define gteR33 ((s16*)psxRegs.CP2C.r)[8]
72496 -#define gteTRX ((s32*)psxRegs.CP2C.r)[5]
72497 -#define gteTRY ((s32*)psxRegs.CP2C.r)[6]
72498 -#define gteTRZ ((s32*)psxRegs.CP2C.r)[7]
72499 -#define gteL11 ((s16*)psxRegs.CP2C.r)[16]
72500 -#define gteL12 ((s16*)psxRegs.CP2C.r)[17]
72501 -#define gteL13 ((s16*)psxRegs.CP2C.r)[18]
72502 -#define gteL21 ((s16*)psxRegs.CP2C.r)[19]
72503 -#define gteL22 ((s16*)psxRegs.CP2C.r)[20]
72504 -#define gteL23 ((s16*)psxRegs.CP2C.r)[21]
72505 -#define gteL31 ((s16*)psxRegs.CP2C.r)[22]
72506 -#define gteL32 ((s16*)psxRegs.CP2C.r)[23]
72507 -#define gteL33 ((s16*)psxRegs.CP2C.r)[24]
72508 -#define gteRBK ((s32*)psxRegs.CP2C.r)[13]
72509 -#define gteGBK ((s32*)psxRegs.CP2C.r)[14]
72510 -#define gteBBK ((s32*)psxRegs.CP2C.r)[15]
72511 -#define gteLR1 ((s16*)psxRegs.CP2C.r)[32]
72512 -#define gteLR2 ((s16*)psxRegs.CP2C.r)[33]
72513 -#define gteLR3 ((s16*)psxRegs.CP2C.r)[34]
72514 -#define gteLG1 ((s16*)psxRegs.CP2C.r)[35]
72515 -#define gteLG2 ((s16*)psxRegs.CP2C.r)[36]
72516 -#define gteLG3 ((s16*)psxRegs.CP2C.r)[37]
72517 -#define gteLB1 ((s16*)psxRegs.CP2C.r)[38]
72518 -#define gteLB2 ((s16*)psxRegs.CP2C.r)[39]
72519 -#define gteLB3 ((s16*)psxRegs.CP2C.r)[40]
72520 -#define gteRFC ((s32*)psxRegs.CP2C.r)[21]
72521 -#define gteGFC ((s32*)psxRegs.CP2C.r)[22]
72522 -#define gteBFC ((s32*)psxRegs.CP2C.r)[23]
72523 -#define gteOFX ((s32*)psxRegs.CP2C.r)[24]
72524 -#define gteOFY ((s32*)psxRegs.CP2C.r)[25]
72525 -#define gteH ((u16*)psxRegs.CP2C.r)[52]
72526 -#define gteDQA ((s16*)psxRegs.CP2C.r)[54]
72527 -#define gteDQB ((s32*)psxRegs.CP2C.r)[28]
72528 -#define gteZSF3 ((s16*)psxRegs.CP2C.r)[58]
72529 -#define gteZSF4 ((s16*)psxRegs.CP2C.r)[60]
72530 -#define gteFLAG psxRegs.CP2C.r[31]
72531 -
72532 -//#define SUM_FLAG if(gteFLAG & 0x7F87E000) gteFLAG |= 0x80000000;
72533 -
72534 -#define SUM_FLAG() { \
72535 - TEST32ItoM((u32)&gteFLAG, 0x7F87E000); \
72536 - j8Ptr[0] = JZ8(0); \
72537 - OR32ItoM((u32)&gteFLAG, 0x80000000); \
72538 - \
72539 - x86SetJ8(j8Ptr[0]); \
72540 -}
72541 -
72542 -#define LIM32X8(reg, gteout, negv, posv, flagb) { \
72543 - CMP32ItoR(reg, negv); \
72544 - j8Ptr[0] = JL8(0); \
72545 - CMP32ItoR(reg, posv); \
72546 - j8Ptr[1] = JG8(0); \
72547 - \
72548 - MOV8RtoM((u32)&gteout, reg); \
72549 - j8Ptr[2] = JMP8(0); \
72550 - \
72551 - x86SetJ8(j8Ptr[0]); \
72552 - MOV8ItoM((u32)&gteout, negv); \
72553 - j8Ptr[3] = JMP8(0); \
72554 - \
72555 - x86SetJ8(j8Ptr[1]); \
72556 - MOV8ItoM((u32)&gteout, posv); \
72557 - \
72558 - x86SetJ8(j8Ptr[3]); \
72559 - OR32ItoM((u32)&gteFLAG, 1<<flagb); \
72560 - \
72561 - x86SetJ8(j8Ptr[2]); \
72562 -}
72563 -
72564 -#define _LIM_B1(reg, gteout) LIM32X8(reg, gteout, 0, 255, 21);
72565 -#define _LIM_B2(reg, gteout) LIM32X8(reg, gteout, 0, 255, 20);
72566 -#define _LIM_B3(reg, gteout) LIM32X8(reg, gteout, 0, 255, 19);
72567 -
72568 -#define MAC2IRn(reg, ir, flagb, negv, posv) { \
72569 -/* CMP32ItoR(reg, negv);*/ \
72570 -/* j8Ptr[0] = JL8(0); */\
72571 -/* CMP32ItoR(reg, posv);*/ \
72572 -/* j8Ptr[1] = JG8(0);*/ \
72573 - \
72574 - MOV32RtoM((u32)&ir, reg); \
72575 -/* j8Ptr[2] = JMP8(0);*/ \
72576 - \
72577 -/* x86SetJ8(j8Ptr[0]);*/ \
72578 -/* MOV32ItoM((u32)&ir, negv);*/ \
72579 -/* j8Ptr[3] = JMP8(0);*/ \
72580 - \
72581 -/* x86SetJ8(j8Ptr[1]);*/ \
72582 -/* MOV32ItoM((u32)&ir, posv);*/ \
72583 - \
72584 -/* x86SetJ8(j8Ptr[3]);*/ \
72585 -/* OR32ItoR((u32)&gteFLAG, 1<<flagb);*/ \
72586 - \
72587 -/* x86SetJ8(j8Ptr[2]);*/ \
72588 -}
72589 -
72590 -
72591 -
72592 -#define gte_C11 gteLR1
72593 -#define gte_C12 gteLR2
72594 -#define gte_C13 gteLR3
72595 -#define gte_C21 gteLG1
72596 -#define gte_C22 gteLG2
72597 -#define gte_C23 gteLG3
72598 -#define gte_C31 gteLB1
72599 -#define gte_C32 gteLB2
72600 -#define gte_C33 gteLB3
72601 -
72602 -
72603 -#define _MVMVA_FUNC(vn, mx) { \
72604 - MOVSX32M16toR(EAX, (u32)&mx##vn##1); \
72605 - IMUL32R(EBX); \
72606 -/* j8Ptr[0] = JO8(0);*/ \
72607 - MOV32RtoR(ECX, EAX); \
72608 - \
72609 - MOVSX32M16toR(EAX, (u32)&mx##vn##2); \
72610 - IMUL32R(EDI); \
72611 -/* j8Ptr[1] = JO8(0);*/ \
72612 - ADD32RtoR(ECX, EAX); \
72613 -/* j8Ptr[2] = JO8(0);*/ \
72614 - \
72615 - MOVSX32M16toR(EAX, (u32)&mx##vn##3); \
72616 - IMUL32R(ESI); \
72617 -/* j8Ptr[3] = JO8(0);*/ \
72618 - ADD32RtoR(ECX, EAX); \
72619 -/* j8Ptr[4] = JO8(0);*/ \
72620 -}
72621 -
72622 -/* SSX = (_v0) * mx##11 + (_v1) * mx##12 + (_v2) * mx##13;
72623 - SSY = (_v0) * mx##21 + (_v1) * mx##22 + (_v2) * mx##23;
72624 - SSZ = (_v0) * mx##31 + (_v1) * mx##32 + (_v2) * mx##33; */
72625 -
72626 -#define _MVMVA_ADD(_vx, jn) { \
72627 - ADD32MtoR(ECX, (u32)&_vx); \
72628 -/* j8Ptr[jn] = JO8(0);*/ \
72629 -}
72630 -/* SSX+= gteRFC;
72631 - SSY+= gteGFC;
72632 - SSZ+= gteBFC;*/
72633 -
72634 -#define _MVMVA1(vn) { \
72635 - switch (psxRegs.code & 0x60000) { \
72636 - case 0x00000: /* R */ \
72637 - _MVMVA_FUNC(vn, gteR); break; \
72638 - case 0x20000: /* L */ \
72639 - _MVMVA_FUNC(vn, gteL); break; \
72640 - case 0x40000: /* C */ \
72641 - _MVMVA_FUNC(vn, gte_C); break; \
72642 - default: \
72643 - return; \
72644 - } \
72645 -}
72646 -
72647 -#define _MVMVA_LOAD(_v0, _v1, _v2) { \
72648 - MOVSX32M16toR(EBX, (u32)&_v0); \
72649 - MOVSX32M16toR(EDI, (u32)&_v1); \
72650 - MOVSX32M16toR(ESI, (u32)&_v2); \
72651 -}
72652 -
72653 -static void recMVMVA() {
72654 - int i;
72655 -
72656 -// SysPrintf("GTE_MVMVA %lx\n", psxRegs.code & 0x1ffffff);
72657 -
72658 -/* PUSH32R(ESI);
72659 - PUSH32R(EDI);
72660 - PUSH32R(EBX);
72661 -*/
72662 - XOR32RtoR(EAX, EAX); /* gteFLAG = 0 */
72663 - MOV32RtoM((u32)&gteFLAG, EAX);
72664 -
72665 - switch (psxRegs.code & 0x18000) {
72666 - case 0x00000: /* V0 */
72667 - _MVMVA_LOAD(gteVX0, gteVY0, gteVZ0); break;
72668 - case 0x08000: /* V1 */
72669 - _MVMVA_LOAD(gteVX1, gteVY1, gteVZ1); break;
72670 - case 0x10000: /* V2 */
72671 - _MVMVA_LOAD(gteVX2, gteVY2, gteVZ2); break;
72672 - case 0x18000: /* IR */
72673 - _MVMVA_LOAD(gteIR1, gteIR2, gteIR3); break;
72674 - }
72675 -
72676 -// MAC1
72677 - for (i=5; i<8; i++) j8Ptr[i] = 0;
72678 - _MVMVA1(1);
72679 -
72680 - if (psxRegs.code & 0x80000) {
72681 - SAR32ItoR(ECX, 12);
72682 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
72683 - }
72684 -
72685 - switch (psxRegs.code & 0x6000) {
72686 - case 0x0000: // Add TR
72687 - _MVMVA_ADD(gteTRX, 5); break;
72688 - case 0x2000: // Add BK
72689 - _MVMVA_ADD(gteRBK, 6); break;
72690 - case 0x4000: // Add FC
72691 - _MVMVA_ADD(gteRFC, 7); break;
72692 - }
72693 -/*
72694 - j8Ptr[9] = JMP8(0);
72695 - for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
72696 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);
72697 -
72698 -// TEST32ItoR(EDX, 0x80000000);
72699 - OR32ItoM((u32)&gteFLAG, 1<<29);
72700 - x86SetJ8(j8Ptr[9]);*/
72701 - MOV32RtoM((u32)&gteMAC1, ECX);
72702 -
72703 - if (psxRegs.code & 0x400) {
72704 - MAC2IRn(ECX, gteIR1, 24, 0, 32767);
72705 - } else {
72706 - MAC2IRn(ECX, gteIR1, 24, -32768, 32767);
72707 - }
72708 -
72709 -// MAC2
72710 - _MVMVA1(2);
72711 -
72712 - if (psxRegs.code & 0x80000) {
72713 - SAR32ItoR(ECX, 12);
72714 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
72715 - }
72716 -
72717 - switch (psxRegs.code & 0x6000) {
72718 - case 0x0000: // Add TR
72719 - _MVMVA_ADD(gteTRY, 5); break;
72720 - case 0x2000: // Add BK
72721 - _MVMVA_ADD(gteGBK, 6); break;
72722 - case 0x4000: // Add FC
72723 - _MVMVA_ADD(gteGFC, 7); break;
72724 - }
72725 -
72726 -/* for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
72727 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);*/
72728 - MOV32RtoM((u32)&gteMAC2, ECX);
72729 -
72730 - if (psxRegs.code & 0x400) {
72731 - MAC2IRn(ECX, gteIR2, 23, 0, 32767);
72732 - } else {
72733 - MAC2IRn(ECX, gteIR2, 23, -32768, 32767);
72734 - }
72735 -
72736 -// MAC3
72737 - _MVMVA1(3);
72738 -
72739 - if (psxRegs.code & 0x80000) {
72740 - SAR32ItoR(ECX, 12);
72741 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
72742 - }
72743 -
72744 - switch (psxRegs.code & 0x6000) {
72745 - case 0x0000: // Add TR
72746 - _MVMVA_ADD(gteTRZ, 5); break;
72747 - case 0x2000: // Add BK
72748 - _MVMVA_ADD(gteBBK, 6); break;
72749 - case 0x4000: // Add FC
72750 - _MVMVA_ADD(gteBFC, 7); break;
72751 - }
72752 -
72753 -/* for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
72754 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);*/
72755 - MOV32RtoM((u32)&gteMAC3, ECX);
72756 -
72757 - if (psxRegs.code & 0x400) {
72758 - MAC2IRn(ECX, gteIR3, 22, 0, 32767);
72759 - } else {
72760 - MAC2IRn(ECX, gteIR3, 22, -32768, 32767);
72761 - }
72762 -/* MAC2IR1()
72763 - else MAC2IR()*/
72764 -
72765 -// SUM_FLAG();
72766 -
72767 -/* POP32R(EBX);
72768 - POP32R(EDI);
72769 - POP32R(ESI);*/
72770 -}
72771 -
72772 -#if 0
72773 -
72774 -#define _GPF1(vn) { \
72775 - MOV32MtoR(EAX, (u32)&gteIR##vn); \
72776 - IMUL32R(ECX); \
72777 -/* MOV32RtoR(ECX, EAX); */\
72778 -}
72779 -
72780 -static void recGPF() {
72781 -// SysPrintf("GTE_GPF %lx\n", psxRegs.code & 0x1ffffff);
72782 -
72783 - PUSH32R(EBX);
72784 -
72785 - XOR32RtoR(EBX, EBX); /* gteFLAG = 0 */
72786 -
72787 -/* gteMAC1 = NC_OVERFLOW1(gteIR0 * gteIR1);
72788 - gteMAC2 = NC_OVERFLOW2(gteIR0 * gteIR2);
72789 - gteMAC3 = NC_OVERFLOW3(gteIR0 * gteIR3);*/
72790 - MOV32MtoR(ECX, (u32)&gteIR0);
72791 -// MAC1
72792 - _GPF1(1);
72793 -
72794 - if (psxRegs.code & 0x80000) {
72795 - SAR32ItoR(EAX, 12);
72796 - }
72797 - MAC2IRn(EAX, gteIR1, 24, -32768, 32767);
72798 - PUSH32R(EAX);
72799 -
72800 -// MAC2
72801 - _GPF1(2);
72802 -
72803 - if (psxRegs.code & 0x80000) {
72804 - SAR32ItoR(EAX, 12);
72805 - }
72806 - MAC2IRn(EAX, gteIR2, 23, -32768, 32767);
72807 - PUSH32R(EAX);
72808 -
72809 -// MAC3
72810 - _GPF1(3);
72811 -
72812 - if (psxRegs.code & 0x80000) {
72813 - SAR32ItoR(EAX, 12);
72814 - }
72815 - MAC2IRn(EAX, gteIR3, 22, -32768, 32767);
72816 -// MAC2IR();
72817 -
72818 -// gteRGB0 = gteRGB1;
72819 -// gteRGB1 = gteRGB2;
72820 - MOV32MtoR(EDX, (u32)&gteRGB1);
72821 - MOV32MtoR(ECX, (u32)&gteRGB2);
72822 - MOV32RtoM((u32)&gteRGB0, EDX);
72823 - MOV32RtoM((u32)&gteRGB1, ECX);
72824 -
72825 - POP32R(EDX);
72826 - POP32R(ECX);
72827 - SAR32ItoR(ECX, 4);
72828 - SAR32ItoR(EDX, 4);
72829 - SAR32ItoR(EAX, 4);
72830 -
72831 - _LIM_B1(ECX, gteR2);
72832 - _LIM_B2(EDX, gteG2);
72833 - _LIM_B3(EAX, gteB2);
72834 - MOV8MtoR(EAX, (u32)&gteCODE);
72835 - MOV8RtoM((u32)&gteCODE2, EAX);
72836 -
72837 -/* gteR2 = limB1(gteMAC1 / 16.0f);
72838 - gteG2 = limB2(gteMAC2 / 16.0f);
72839 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
72840 -
72841 - SUM_FLAG();
72842 - MOV32RtoM((u32)&gteFLAG, EBX);
72843 -
72844 -// POP32R(EBX);
72845 -}
72846 -#endif
72847 -#endif
72848 -
72849 -
72850 -#endif /* __IGTE_H__ */
72851 diff -rupN original/libpcsxcore/libpcsxcore/ix86/iR3000A.c new/libpcsxcore/libpcsxcore/ix86/iR3000A.c
72852 --- original/libpcsxcore/libpcsxcore/ix86/iR3000A.c 2009-02-23 05:47:22.000000000 -0430
72853 +++ new/libpcsxcore/libpcsxcore/ix86/iR3000A.c 1969-12-31 20:00:00.000000000 -0400
72854 @@ -1,2868 +0,0 @@
72855 -/***************************************************************************
72856 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
72857 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
72858 - * *
72859 - * This program is free software; you can redistribute it and/or modify *
72860 - * it under the terms of the GNU General Public License as published by *
72861 - * the Free Software Foundation; either version 2 of the License, or *
72862 - * (at your option) any later version. *
72863 - * *
72864 - * This program is distributed in the hope that it will be useful, *
72865 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
72866 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
72867 - * GNU General Public License for more details. *
72868 - * *
72869 - * You should have received a copy of the GNU General Public License *
72870 - * along with this program; if not, write to the *
72871 - * Free Software Foundation, Inc., *
72872 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
72873 - ***************************************************************************/
72874 -
72875 -/*
72876 -* i386 assembly functions for R3000A core.
72877 -*/
72878 -
72879 -#include "ix86.h"
72880 -#include <sys/mman.h>
72881 -
72882 -u32 *psxRecLUT;
72883 -
72884 -#undef PC_REC
72885 -#undef PC_REC8
72886 -#undef PC_REC16
72887 -#undef PC_REC32
72888 -#define PC_REC(x) (psxRecLUT[x >> 16] + (x & 0xffff))
72889 -#define PC_REC8(x) (*(u8 *)PC_REC(x))
72890 -#define PC_REC16(x) (*(u16*)PC_REC(x))
72891 -#define PC_REC32(x) (*(u32*)PC_REC(x))
72892 -
72893 -#define RECMEM_SIZE (8*1024*1024)
72894 -
72895 -static char *recMem; /* the recompiled blocks will be here */
72896 -static char *recRAM; /* and the ptr to the blocks here */
72897 -static char *recROM; /* and here */
72898 -
72899 -static u32 pc; /* recompiler pc */
72900 -static u32 pcold; /* recompiler oldpc */
72901 -static int count; /* recompiler intruction count */
72902 -static int branch; /* set for branch */
72903 -static u32 target; /* branch target */
72904 -static u32 resp;
72905 -
72906 -typedef struct {
72907 - int state;
72908 - u32 k;
72909 - int reg;
72910 -} iRegisters;
72911 -
72912 -static iRegisters iRegs[32];
72913 -static iRegisters iRegsS[32];
72914 -
72915 -#define ST_UNK 0
72916 -#define ST_CONST 1
72917 -#define ST_MAPPED 2
72918 -
72919 -#define IsConst(reg) (iRegs[reg].state == ST_CONST)
72920 -#define IsMapped(reg) (iRegs[reg].state == ST_MAPPED)
72921 -
72922 -static void (*recBSC[64])();
72923 -static void (*recSPC[64])();
72924 -static void (*recREG[32])();
72925 -static void (*recCP0[32])();
72926 -static void (*recCP2[64])();
72927 -static void (*recCP2BSC[32])();
72928 -
72929 -
72930 -static void MapConst(int reg, u32 _const) {
72931 - iRegs[reg].k = _const;
72932 - iRegs[reg].state = ST_CONST;
72933 -}
72934 -
72935 -static void iFlushReg(int reg) {
72936 - if (IsConst(reg)) {
72937 - MOV32ItoM((u32)&psxRegs.GPR.r[reg], iRegs[reg].k);
72938 - }
72939 - iRegs[reg].state = ST_UNK;
72940 -}
72941 -
72942 -static void iFlushRegs() {
72943 - int i;
72944 -
72945 - for (i=1; i<32; i++) {
72946 - iFlushReg(i);
72947 - }
72948 -}
72949 -
72950 -static void iRet() {
72951 - /* store cycle */
72952 - count = (pc - pcold)/4;
72953 - ADD32ItoM((u32)&psxRegs.cycle, count);
72954 - if (resp) ADD32ItoR(ESP, resp);
72955 - RET();
72956 -}
72957 -
72958 -static int iLoadTest() {
72959 - u32 tmp;
72960 -
72961 - // check for load delay
72962 - tmp = psxRegs.code >> 26;
72963 - switch (tmp) {
72964 - case 0x10: // COP0
72965 - switch (_Rs_) {
72966 - case 0x00: // MFC0
72967 - case 0x02: // CFC0
72968 - return 1;
72969 - }
72970 - break;
72971 - case 0x12: // COP2
72972 - switch (_Funct_) {
72973 - case 0x00:
72974 - switch (_Rs_) {
72975 - case 0x00: // MFC2
72976 - case 0x02: // CFC2
72977 - return 1;
72978 - }
72979 - break;
72980 - }
72981 - break;
72982 - case 0x32: // LWC2
72983 - return 1;
72984 - default:
72985 - if (tmp >= 0x20 && tmp <= 0x26) { // LB/LH/LWL/LW/LBU/LHU/LWR
72986 - return 1;
72987 - }
72988 - break;
72989 - }
72990 - return 0;
72991 -}
72992 -
72993 -/* set a pending branch */
72994 -static void SetBranch() {
72995 - branch = 1;
72996 - psxRegs.code = PSXMu32(pc);
72997 - pc+=4;
72998 -
72999 - if (iLoadTest() == 1) {
73000 - iFlushRegs();
73001 - MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
73002 - /* store cycle */
73003 - count = (pc - pcold)/4;
73004 - ADD32ItoM((u32)&psxRegs.cycle, count);
73005 - if (resp) ADD32ItoR(ESP, resp);
73006 -
73007 - PUSH32M((u32)&target);
73008 - PUSH32I(_Rt_);
73009 - CALLFunc((u32)psxDelayTest);
73010 - ADD32ItoR(ESP, 2*4);
73011 -
73012 - RET();
73013 - return;
73014 - }
73015 -
73016 - recBSC[psxRegs.code>>26]();
73017 -
73018 - iFlushRegs();
73019 - MOV32MtoR(EAX, (u32)&target);
73020 - MOV32RtoM((u32)&psxRegs.pc, EAX);
73021 - CALLFunc((u32)psxBranchTest);
73022 -
73023 - iRet();
73024 -}
73025 -
73026 -static void iJump(u32 branchPC) {
73027 - branch = 1;
73028 - psxRegs.code = PSXMu32(pc);
73029 - pc+=4;
73030 -
73031 - if (iLoadTest() == 1) {
73032 - iFlushRegs();
73033 - MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
73034 - /* store cycle */
73035 - count = (pc - pcold)/4;
73036 - ADD32ItoM((u32)&psxRegs.cycle, count);
73037 - if (resp) ADD32ItoR(ESP, resp);
73038 -
73039 - PUSH32I(branchPC);
73040 - PUSH32I(_Rt_);
73041 - CALLFunc((u32)psxDelayTest);
73042 - ADD32ItoR(ESP, 2*4);
73043 -
73044 - RET();
73045 - return;
73046 - }
73047 -
73048 - recBSC[psxRegs.code>>26]();
73049 -
73050 - iFlushRegs();
73051 - MOV32ItoM((u32)&psxRegs.pc, branchPC);
73052 - CALLFunc((u32)psxBranchTest);
73053 - /* store cycle */
73054 - count = (pc - pcold)/4;
73055 - ADD32ItoM((u32)&psxRegs.cycle, count);
73056 - if (resp) ADD32ItoR(ESP, resp);
73057 -
73058 - // maybe just happened an interruption, check so
73059 - CMP32ItoM((u32)&psxRegs.pc, branchPC);
73060 - j8Ptr[0] = JE8(0);
73061 - RET();
73062 -
73063 - x86SetJ8(j8Ptr[0]);
73064 - MOV32MtoR(EAX, PC_REC(branchPC));
73065 - TEST32RtoR(EAX, EAX);
73066 - j8Ptr[1] = JNE8(0);
73067 - RET();
73068 -
73069 - x86SetJ8(j8Ptr[1]);
73070 - RET();
73071 - JMP32R(EAX);
73072 -}
73073 -
73074 -static void iBranch(u32 branchPC, int savectx) {
73075 - u32 respold=0;
73076 -
73077 - if (savectx) {
73078 - respold = resp;
73079 - memcpy(iRegsS, iRegs, sizeof(iRegs));
73080 - }
73081 -
73082 - branch = 1;
73083 - psxRegs.code = PSXMu32(pc);
73084 -
73085 - // the delay test is only made when the branch is taken
73086 - // savectx == 0 will mean that :)
73087 - if (savectx == 0 && iLoadTest() == 1) {
73088 - iFlushRegs();
73089 - MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
73090 - /* store cycle */
73091 - count = ((pc+4) - pcold)/4;
73092 - ADD32ItoM((u32)&psxRegs.cycle, count);
73093 - if (resp) ADD32ItoR(ESP, resp);
73094 -
73095 - PUSH32I(branchPC);
73096 - PUSH32I(_Rt_);
73097 - CALLFunc((u32)psxDelayTest);
73098 - ADD32ItoR(ESP, 2*4);
73099 -
73100 - RET();
73101 - return;
73102 - }
73103 -
73104 - pc+= 4;
73105 - recBSC[psxRegs.code>>26]();
73106 -
73107 - iFlushRegs();
73108 - MOV32ItoM((u32)&psxRegs.pc, branchPC);
73109 - CALLFunc((u32)psxBranchTest);
73110 - /* store cycle */
73111 - count = (pc - pcold)/4;
73112 - ADD32ItoM((u32)&psxRegs.cycle, count);
73113 - if (resp) ADD32ItoR(ESP, resp);
73114 -
73115 - // maybe just happened an interruption, check so
73116 - CMP32ItoM((u32)&psxRegs.pc, branchPC);
73117 - j8Ptr[1] = JE8(0);
73118 - RET();
73119 -
73120 - x86SetJ8(j8Ptr[1]);
73121 - MOV32MtoR(EAX, PC_REC(branchPC));
73122 - TEST32RtoR(EAX, EAX);
73123 - j8Ptr[2] = JNE8(0);
73124 - RET();
73125 -
73126 - x86SetJ8(j8Ptr[2]);
73127 - JMP32R(EAX);
73128 -
73129 - pc-= 4;
73130 - if (savectx) {
73131 - resp = respold;
73132 - memcpy(iRegs, iRegsS, sizeof(iRegs));
73133 - }
73134 -}
73135 -
73136 -
73137 -char *txt0 = "EAX = %x : ECX = %x : EDX = %x\n";
73138 -char *txt1 = "EAX = %x\n";
73139 -char *txt2 = "M32 = %x\n";
73140 -
73141 -void iLogX86() {
73142 - PUSHA32();
73143 -
73144 - PUSH32R (EDX);
73145 - PUSH32R (ECX);
73146 - PUSH32R (EAX);
73147 - PUSH32M ((u32)&txt0);
73148 - CALLFunc ((u32)SysPrintf);
73149 - ADD32ItoR(ESP, 4*4);
73150 -
73151 - POPA32();
73152 -}
73153 -
73154 -void iLogEAX() {
73155 - PUSH32R (EAX);
73156 - PUSH32M ((u32)&txt1);
73157 - CALLFunc ((u32)SysPrintf);
73158 - ADD32ItoR(ESP, 4*2);
73159 -}
73160 -
73161 -void iLogM32(u32 mem) {
73162 - PUSH32M (mem);
73163 - PUSH32M ((u32)&txt2);
73164 - CALLFunc ((u32)SysPrintf);
73165 - ADD32ItoR(ESP, 4*2);
73166 -}
73167 -
73168 -static void iDumpRegs() {
73169 - int i, j;
73170 -
73171 - printf("%lx %lx\n", psxRegs.pc, psxRegs.cycle);
73172 - for (i=0; i<4; i++) {
73173 - for (j=0; j<8; j++)
73174 - printf("%lx ", psxRegs.GPR.r[j*i]);
73175 - printf("\n");
73176 - }
73177 -}
73178 -
73179 -void iDumpBlock(char *ptr) {
73180 - FILE *f;
73181 - u32 i;
73182 -
73183 - SysPrintf("dump1 %x:%x, %x\n", psxRegs.pc, pc, psxRegs.cycle);
73184 -
73185 - for (i = psxRegs.pc; i < pc; i+=4)
73186 - SysPrintf("%s\n", disR3000AF(PSXMu32(i), i));
73187 -
73188 - fflush(stdout);
73189 - f = fopen("dump1", "w");
73190 - fwrite(ptr, 1, (u32)x86Ptr - (u32)ptr, f);
73191 - fclose(f);
73192 - system("ndisasmw -u dump1");
73193 - fflush(stdout);
73194 -}
73195 -
73196 -#define REC_FUNC(f) \
73197 -void psx##f(); \
73198 -static void rec##f() { \
73199 - iFlushRegs(); \
73200 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code); \
73201 - MOV32ItoM((u32)&psxRegs.pc, (u32)pc); \
73202 - CALLFunc((u32)psx##f); \
73203 -/* branch = 2; */\
73204 -}
73205 -
73206 -#define REC_SYS(f) \
73207 -void psx##f(); \
73208 -static void rec##f() { \
73209 - iFlushRegs(); \
73210 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code); \
73211 - MOV32ItoM((u32)&psxRegs.pc, (u32)pc); \
73212 - CALLFunc((u32)psx##f); \
73213 - branch = 2; \
73214 - iRet(); \
73215 -}
73216 -
73217 -#define REC_BRANCH(f) \
73218 -void psx##f(); \
73219 -static void rec##f() { \
73220 - iFlushRegs(); \
73221 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code); \
73222 - MOV32ItoM((u32)&psxRegs.pc, (u32)pc); \
73223 - CALLFunc((u32)psx##f); \
73224 - branch = 2; \
73225 - iRet(); \
73226 -}
73227 -
73228 -static void recRecompile();
73229 -
73230 -static int recInit() {
73231 - int i;
73232 -
73233 - psxRecLUT = (u32*) malloc(0x010000 * 4);
73234 -
73235 - //recMem = (char*) malloc(RECMEM_SIZE);
73236 - recMem = mmap(0, RECMEM_SIZE + 0x1000,
73237 - PROT_EXEC | PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
73238 -
73239 - recRAM = (char*) malloc(0x200000);
73240 - recROM = (char*) malloc(0x080000);
73241 - if (recRAM == NULL || recROM == NULL || recMem == NULL || psxRecLUT == NULL) {
73242 - SysMessage("Error allocating memory"); return -1;
73243 - }
73244 -
73245 - for (i=0; i<0x80; i++) psxRecLUT[i + 0x0000] = (u32)&recRAM[(i & 0x1f) << 16];
73246 - memcpy(psxRecLUT + 0x8000, psxRecLUT, 0x80 * 4);
73247 - memcpy(psxRecLUT + 0xa000, psxRecLUT, 0x80 * 4);
73248 -
73249 - for (i=0; i<0x08; i++) psxRecLUT[i + 0xbfc0] = (u32)&recROM[i << 16];
73250 -
73251 - return 0;
73252 -}
73253 -
73254 -static void recReset() {
73255 - memset(recRAM, 0, 0x200000);
73256 - memset(recROM, 0, 0x080000);
73257 -
73258 - //x86Init();
73259 - x86SetPtr(recMem);
73260 -
73261 - branch = 0;
73262 - memset(iRegs, 0, sizeof(iRegs));
73263 - iRegs[0].state = ST_CONST;
73264 - iRegs[0].k = 0;
73265 -}
73266 -
73267 -static void recShutdown() {
73268 - if (recMem == NULL) return;
73269 - free(psxRecLUT);
73270 - //free(recMem);
73271 - munmap(recMem, RECMEM_SIZE + 0x1000);
73272 - free(recRAM);
73273 - free(recROM);
73274 - x86Shutdown();
73275 -}
73276 -
73277 -static void recError() {
73278 - SysReset();
73279 - ClosePlugins();
73280 - SysMessage("Unrecoverable error while running recompiler\n");
73281 - SysRunGui();
73282 -}
73283 -
73284 -__inline static void execute() {
73285 - void (**recFunc)();
73286 - char *p;
73287 -
73288 - p = (char*)PC_REC(psxRegs.pc);
73289 - if (p != NULL) recFunc = (void (**)()) (u32)p;
73290 - else { recError(); return; }
73291 -
73292 - if (*recFunc == 0) {
73293 - recRecompile();
73294 - }
73295 - (*recFunc)();
73296 -}
73297 -
73298 -static void recExecute() {
73299 - for (;;) execute();
73300 -}
73301 -
73302 -static void recExecuteBlock() {
73303 - execute();
73304 -}
73305 -
73306 -static void recClear(u32 Addr, u32 Size) {
73307 - memset((void*)PC_REC(Addr), 0, Size * 4);
73308 -}
73309 -
73310 -static void recNULL() {
73311 -// SysMessage("recUNK: %8.8x\n", psxRegs.code);
73312 -}
73313 -
73314 -/*********************************************************
73315 -* goes to opcodes tables... *
73316 -* Format: table[something....] *
73317 -*********************************************************/
73318 -
73319 -//REC_SYS(SPECIAL);
73320 -static void recSPECIAL() {
73321 - recSPC[_Funct_]();
73322 -}
73323 -
73324 -static void recREGIMM() {
73325 - recREG[_Rt_]();
73326 -}
73327 -
73328 -static void recCOP0() {
73329 - recCP0[_Rs_]();
73330 -}
73331 -
73332 -//REC_SYS(COP2);
73333 -static void recCOP2() {
73334 - recCP2[_Funct_]();
73335 -}
73336 -
73337 -static void recBASIC() {
73338 - recCP2BSC[_Rs_]();
73339 -}
73340 -
73341 -//end of Tables opcodes...
73342 -
73343 -/*********************************************************
73344 -* Arithmetic with immediate operand *
73345 -* Format: OP rt, rs, immediate *
73346 -*********************************************************/
73347 -
73348 -/*REC_FUNC(ADDI);
73349 -REC_FUNC(ADDIU);
73350 -REC_FUNC(ANDI);
73351 -REC_FUNC(ORI);
73352 -REC_FUNC(XORI);
73353 -REC_FUNC(SLTI);
73354 -REC_FUNC(SLTIU);
73355 -#if 0*/
73356 -static void recADDIU() {
73357 -// Rt = Rs + Im
73358 - if (!_Rt_) return;
73359 -
73360 -// iFlushRegs();
73361 -
73362 - if (_Rs_ == _Rt_) {
73363 - if (IsConst(_Rt_)) {
73364 - iRegs[_Rt_].k+= _Imm_;
73365 - } else {
73366 - if (_Imm_ == 1) {
73367 - INC32M((u32)&psxRegs.GPR.r[_Rt_]);
73368 - } else if (_Imm_ == -1) {
73369 - DEC32M((u32)&psxRegs.GPR.r[_Rt_]);
73370 - } else if (_Imm_) {
73371 - ADD32ItoM((u32)&psxRegs.GPR.r[_Rt_], _Imm_);
73372 - }
73373 - }
73374 - } else {
73375 - if (IsConst(_Rs_)) {
73376 - MapConst(_Rt_, iRegs[_Rs_].k + _Imm_);
73377 - } else {
73378 - iRegs[_Rt_].state = ST_UNK;
73379 -
73380 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73381 - if (_Imm_ == 1) {
73382 - INC32R(EAX);
73383 - } else if (_Imm_ == -1) {
73384 - DEC32R(EAX);
73385 - } else if (_Imm_) {
73386 - ADD32ItoR(EAX, _Imm_);
73387 - }
73388 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
73389 - }
73390 - }
73391 -}
73392 -
73393 -static void recADDI() {
73394 -// Rt = Rs + Im
73395 - recADDIU();
73396 -}
73397 -
73398 -static void recSLTI() {
73399 -// Rt = Rs < Im (signed)
73400 - if (!_Rt_) return;
73401 -
73402 -// iFlushRegs();
73403 -
73404 - if (IsConst(_Rs_)) {
73405 - MapConst(_Rt_, (s32)iRegs[_Rs_].k < _Imm_);
73406 - } else {
73407 - iRegs[_Rt_].state = ST_UNK;
73408 -
73409 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73410 - CMP32ItoR(EAX, _Imm_);
73411 - SETL8R (EAX);
73412 - AND32ItoR(EAX, 0xff);
73413 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
73414 - }
73415 -}
73416 -
73417 -static void recSLTIU() {
73418 -// Rt = Rs < Im (unsigned)
73419 - if (!_Rt_) return;
73420 -
73421 -// iFlushRegs();
73422 -
73423 - if (IsConst(_Rs_)) {
73424 - MapConst(_Rt_, iRegs[_Rs_].k < _ImmU_);
73425 - } else {
73426 - iRegs[_Rt_].state = ST_UNK;
73427 -
73428 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73429 - CMP32ItoR(EAX, _Imm_);
73430 - SETB8R (EAX);
73431 - AND32ItoR(EAX, 0xff);
73432 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
73433 - }
73434 -}
73435 -
73436 -static void recANDI() {
73437 -// Rt = Rs And Im
73438 - if (!_Rt_) return;
73439 -
73440 -// iFlushRegs();
73441 -
73442 - if (_Rs_ == _Rt_) {
73443 - if (IsConst(_Rt_)) {
73444 - iRegs[_Rt_].k&= _ImmU_;
73445 - } else {
73446 - AND32ItoM((u32)&psxRegs.GPR.r[_Rt_], _ImmU_);
73447 - }
73448 - } else {
73449 - if (IsConst(_Rs_)) {
73450 - MapConst(_Rt_, iRegs[_Rs_].k & _ImmU_);
73451 - } else {
73452 - iRegs[_Rt_].state = ST_UNK;
73453 -
73454 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73455 - AND32ItoR(EAX, _ImmU_);
73456 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
73457 - }
73458 - }
73459 -}
73460 -
73461 -static void recORI() {
73462 -// Rt = Rs Or Im
73463 - if (!_Rt_) return;
73464 -
73465 -// iFlushRegs();
73466 -
73467 - if (_Rs_ == _Rt_) {
73468 - if (IsConst(_Rt_)) {
73469 - iRegs[_Rt_].k|= _ImmU_;
73470 - } else {
73471 - OR32ItoM((u32)&psxRegs.GPR.r[_Rt_], _ImmU_);
73472 - }
73473 - } else {
73474 - if (IsConst(_Rs_)) {
73475 - MapConst(_Rt_, iRegs[_Rs_].k | _ImmU_);
73476 - } else {
73477 - iRegs[_Rt_].state = ST_UNK;
73478 -
73479 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73480 - if (_ImmU_) OR32ItoR (EAX, _ImmU_);
73481 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
73482 - }
73483 - }
73484 -}
73485 -
73486 -static void recXORI() {
73487 -// Rt = Rs Xor Im
73488 - if (!_Rt_) return;
73489 -
73490 -// iFlushRegs();
73491 -
73492 - if (_Rs_ == _Rt_) {
73493 - if (IsConst(_Rt_)) {
73494 - iRegs[_Rt_].k^= _ImmU_;
73495 - } else {
73496 - XOR32ItoM((u32)&psxRegs.GPR.r[_Rt_], _ImmU_);
73497 - }
73498 - } else {
73499 - if (IsConst(_Rs_)) {
73500 - MapConst(_Rt_, iRegs[_Rs_].k ^ _ImmU_);
73501 - } else {
73502 - iRegs[_Rt_].state = ST_UNK;
73503 -
73504 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73505 - XOR32ItoR(EAX, _ImmU_);
73506 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
73507 - }
73508 - }
73509 -}
73510 -//#endif
73511 -//end of * Arithmetic with immediate operand
73512 -
73513 -/*********************************************************
73514 -* Load higher 16 bits of the first word in GPR with imm *
73515 -* Format: OP rt, immediate *
73516 -*********************************************************/
73517 -/*REC_FUNC(LUI);
73518 -#if 0*/
73519 -static void recLUI() {
73520 -// Rt = Imm << 16
73521 - if (!_Rt_) return;
73522 -
73523 - MapConst(_Rt_, psxRegs.code << 16);
73524 -}
73525 -//#endif
73526 -//End of Load Higher .....
73527 -
73528 -
73529 -/*********************************************************
73530 -* Register arithmetic *
73531 -* Format: OP rd, rs, rt *
73532 -*********************************************************/
73533 -
73534 -/*REC_FUNC(ADD);
73535 -REC_FUNC(ADDU);
73536 -REC_FUNC(SUB);
73537 -REC_FUNC(SUBU);
73538 -REC_FUNC(AND);
73539 -REC_FUNC(OR);
73540 -REC_FUNC(XOR);
73541 -REC_FUNC(NOR);
73542 -REC_FUNC(SLT);
73543 -REC_FUNC(SLTU);
73544 -
73545 -#if 0*/
73546 -static void recADDU() {
73547 -// Rd = Rs + Rt
73548 - if (!_Rd_) return;
73549 -
73550 -// iFlushRegs();
73551 -
73552 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73553 - MapConst(_Rd_, iRegs[_Rs_].k + iRegs[_Rt_].k);
73554 - } else if (IsConst(_Rs_)) {
73555 - iRegs[_Rd_].state = ST_UNK;
73556 -
73557 - if (_Rt_ == _Rd_) {
73558 - if (iRegs[_Rs_].k == 1) {
73559 - INC32M((u32)&psxRegs.GPR.r[_Rd_]);
73560 - } else if (iRegs[_Rs_].k == -1) {
73561 - DEC32M((u32)&psxRegs.GPR.r[_Rd_]);
73562 - } else if (iRegs[_Rs_].k) {
73563 - ADD32ItoM((u32)&psxRegs.GPR.r[_Rd_], iRegs[_Rs_].k);
73564 - }
73565 - } else {
73566 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73567 - if (iRegs[_Rs_].k == 1) {
73568 - INC32R(EAX);
73569 - } else if (iRegs[_Rs_].k == 0xffffffff) {
73570 - DEC32R(EAX);
73571 - } else if (iRegs[_Rs_].k) {
73572 - ADD32ItoR(EAX, iRegs[_Rs_].k);
73573 - }
73574 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73575 - }
73576 - } else if (IsConst(_Rt_)) {
73577 - iRegs[_Rd_].state = ST_UNK;
73578 -
73579 - if (_Rs_ == _Rd_) {
73580 - if (iRegs[_Rt_].k == 1) {
73581 - INC32M((u32)&psxRegs.GPR.r[_Rd_]);
73582 - } else if (iRegs[_Rt_].k == -1) {
73583 - DEC32M((u32)&psxRegs.GPR.r[_Rd_]);
73584 - } else if (iRegs[_Rt_].k) {
73585 - ADD32ItoM((u32)&psxRegs.GPR.r[_Rd_], iRegs[_Rt_].k);
73586 - }
73587 - } else {
73588 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73589 - if (iRegs[_Rt_].k == 1) {
73590 - INC32R(EAX);
73591 - } else if (iRegs[_Rt_].k == 0xffffffff) {
73592 - DEC32R(EAX);
73593 - } else if (iRegs[_Rt_].k) {
73594 - ADD32ItoR(EAX, iRegs[_Rt_].k);
73595 - }
73596 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73597 - }
73598 - } else {
73599 - iRegs[_Rd_].state = ST_UNK;
73600 -
73601 - if (_Rs_ == _Rd_) { // Rd+= Rt
73602 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73603 - ADD32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73604 - } else if (_Rt_ == _Rd_) { // Rd+= Rs
73605 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73606 - ADD32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73607 - } else { // Rd = Rs + Rt
73608 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73609 - ADD32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73610 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73611 - }
73612 - }
73613 -}
73614 -
73615 -static void recADD() {
73616 -// Rd = Rs + Rt
73617 - recADDU();
73618 -}
73619 -
73620 -static void recSUBU() {
73621 -// Rd = Rs - Rt
73622 - if (!_Rd_) return;
73623 -
73624 -// iFlushRegs();
73625 -
73626 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73627 - MapConst(_Rd_, iRegs[_Rs_].k - iRegs[_Rt_].k);
73628 - } else if (IsConst(_Rs_)) {
73629 - iRegs[_Rd_].state = ST_UNK;
73630 -
73631 - MOV32ItoR(EAX, iRegs[_Rs_].k);
73632 - SUB32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73633 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73634 - } else if (IsConst(_Rt_)) {
73635 - iRegs[_Rd_].state = ST_UNK;
73636 -
73637 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73638 - SUB32ItoR(EAX, iRegs[_Rt_].k);
73639 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73640 - } else {
73641 - iRegs[_Rd_].state = ST_UNK;
73642 -
73643 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73644 - SUB32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73645 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73646 - }
73647 -}
73648 -
73649 -static void recSUB() {
73650 -// Rd = Rs - Rt
73651 - recSUBU();
73652 -}
73653 -
73654 -static void recAND() {
73655 -// Rd = Rs And Rt
73656 - if (!_Rd_) return;
73657 -
73658 -// iFlushRegs();
73659 -
73660 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73661 - MapConst(_Rd_, iRegs[_Rs_].k & iRegs[_Rt_].k);
73662 - } else if (IsConst(_Rs_)) {
73663 - iRegs[_Rd_].state = ST_UNK;
73664 -
73665 - if (_Rd_ == _Rt_) { // Rd&= Rs
73666 - AND32ItoM((u32)&psxRegs.GPR.r[_Rd_], iRegs[_Rs_].k);
73667 - } else {
73668 - MOV32ItoR(EAX, iRegs[_Rs_].k);
73669 - AND32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73670 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73671 - }
73672 - } else if (IsConst(_Rt_)) {
73673 - iRegs[_Rd_].state = ST_UNK;
73674 -
73675 - if (_Rd_ == _Rs_) { // Rd&= kRt
73676 - AND32ItoM((u32)&psxRegs.GPR.r[_Rd_], iRegs[_Rt_].k);
73677 - } else { // Rd = Rs & kRt
73678 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73679 - AND32ItoR(EAX, iRegs[_Rt_].k);
73680 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73681 - }
73682 - } else {
73683 - iRegs[_Rd_].state = ST_UNK;
73684 -
73685 - if (_Rs_ == _Rd_) { // Rd&= Rt
73686 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73687 - AND32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73688 - } else if (_Rt_ == _Rd_) { // Rd&= Rs
73689 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73690 - AND32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73691 - } else { // Rd = Rs & Rt
73692 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73693 - AND32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73694 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73695 - }
73696 - }
73697 -}
73698 -
73699 -static void recOR() {
73700 -// Rd = Rs Or Rt
73701 - if (!_Rd_) return;
73702 -
73703 -// iFlushRegs();
73704 -
73705 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73706 - MapConst(_Rd_, iRegs[_Rs_].k | iRegs[_Rt_].k);
73707 - } else if (IsConst(_Rs_)) {
73708 - iRegs[_Rd_].state = ST_UNK;
73709 -
73710 - MOV32ItoR(EAX, iRegs[_Rs_].k);
73711 - OR32MtoR (EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73712 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73713 - } else if (IsConst(_Rt_)) {
73714 - iRegs[_Rd_].state = ST_UNK;
73715 -
73716 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73717 - OR32ItoR (EAX, iRegs[_Rt_].k);
73718 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73719 - } else {
73720 - iRegs[_Rd_].state = ST_UNK;
73721 -
73722 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73723 - OR32MtoR (EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73724 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73725 - }
73726 -}
73727 -
73728 -static void recXOR() {
73729 -// Rd = Rs Xor Rt
73730 - if (!_Rd_) return;
73731 -
73732 -// iFlushRegs();
73733 -
73734 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73735 - MapConst(_Rd_, iRegs[_Rs_].k ^ iRegs[_Rt_].k);
73736 - } else if (IsConst(_Rs_)) {
73737 - iRegs[_Rd_].state = ST_UNK;
73738 -
73739 - MOV32ItoR(EAX, iRegs[_Rs_].k);
73740 - XOR32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73741 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73742 - } else if (IsConst(_Rt_)) {
73743 - iRegs[_Rd_].state = ST_UNK;
73744 -
73745 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73746 - XOR32ItoR(EAX, iRegs[_Rt_].k);
73747 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73748 - } else {
73749 - iRegs[_Rd_].state = ST_UNK;
73750 -
73751 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73752 - XOR32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73753 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73754 - }
73755 -}
73756 -
73757 -static void recNOR() {
73758 -// Rd = Rs Nor Rt
73759 - if (!_Rd_) return;
73760 -
73761 -// iFlushRegs();
73762 -
73763 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73764 - MapConst(_Rd_, ~(iRegs[_Rs_].k | iRegs[_Rt_].k));
73765 - } else if (IsConst(_Rs_)) {
73766 - iRegs[_Rd_].state = ST_UNK;
73767 -
73768 - MOV32ItoR(EAX, iRegs[_Rs_].k);
73769 - OR32MtoR (EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73770 - NOT32R (EAX);
73771 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73772 - } else if (IsConst(_Rt_)) {
73773 - iRegs[_Rd_].state = ST_UNK;
73774 -
73775 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73776 - OR32ItoR (EAX, iRegs[_Rt_].k);
73777 - NOT32R (EAX);
73778 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73779 - } else {
73780 - iRegs[_Rd_].state = ST_UNK;
73781 -
73782 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73783 - OR32MtoR (EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73784 - NOT32R (EAX);
73785 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73786 - }
73787 -}
73788 -
73789 -static void recSLT() {
73790 -// Rd = Rs < Rt (signed)
73791 - if (!_Rd_) return;
73792 -
73793 -// iFlushRegs();
73794 -
73795 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73796 - MapConst(_Rd_, (s32)iRegs[_Rs_].k < (s32)iRegs[_Rt_].k);
73797 - } else if (IsConst(_Rs_)) {
73798 - iRegs[_Rd_].state = ST_UNK;
73799 -
73800 - MOV32ItoR(EAX, iRegs[_Rs_].k);
73801 - CMP32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73802 - SETL8R (EAX);
73803 - AND32ItoR(EAX, 0xff);
73804 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73805 - } else if (IsConst(_Rt_)) {
73806 - iRegs[_Rd_].state = ST_UNK;
73807 -
73808 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73809 - CMP32ItoR(EAX, iRegs[_Rt_].k);
73810 - SETL8R (EAX);
73811 - AND32ItoR(EAX, 0xff);
73812 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73813 - } else {
73814 - iRegs[_Rd_].state = ST_UNK;
73815 -
73816 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73817 - CMP32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73818 - SETL8R (EAX);
73819 - AND32ItoR(EAX, 0xff);
73820 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73821 - }
73822 -}
73823 -
73824 -static void recSLTU() {
73825 -// Rd = Rs < Rt (unsigned)
73826 - if (!_Rd_) return;
73827 -
73828 -// iFlushRegs();
73829 -
73830 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
73831 - MapConst(_Rd_, iRegs[_Rs_].k < iRegs[_Rt_].k);
73832 - } else if (IsConst(_Rs_)) {
73833 - iRegs[_Rd_].state = ST_UNK;
73834 -
73835 - MOV32ItoR(EAX, iRegs[_Rs_].k);
73836 - CMP32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73837 - SBB32RtoR(EAX, EAX);
73838 - NEG32R (EAX);
73839 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73840 - } else if (IsConst(_Rt_)) {
73841 - iRegs[_Rd_].state = ST_UNK;
73842 -
73843 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73844 - CMP32ItoR(EAX, iRegs[_Rt_].k);
73845 - SBB32RtoR(EAX, EAX);
73846 - NEG32R (EAX);
73847 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73848 - } else {
73849 - iRegs[_Rd_].state = ST_UNK;
73850 -
73851 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73852 - CMP32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
73853 - SBB32RtoR(EAX, EAX);
73854 - NEG32R (EAX);
73855 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
73856 - }
73857 -}
73858 -//#endif
73859 -//End of * Register arithmetic
73860 -
73861 -/*********************************************************
73862 -* Register mult/div & Register trap logic *
73863 -* Format: OP rs, rt *
73864 -*********************************************************/
73865 -
73866 -/*REC_FUNC(MULT);
73867 -REC_FUNC(MULTU);
73868 -REC_FUNC(DIV);
73869 -REC_FUNC(DIVU);
73870 -#if 0*/
73871 -static void recMULT() {
73872 -// Lo/Hi = Rs * Rt (signed)
73873 -
73874 -// iFlushRegs();
73875 -
73876 - if ((IsConst(_Rs_) && iRegs[_Rs_].k == 0) ||
73877 - (IsConst(_Rt_) && iRegs[_Rt_].k == 0)) {
73878 - XOR32RtoR(EAX, EAX);
73879 - MOV32RtoM((u32)&psxRegs.GPR.n.lo, EAX);
73880 - MOV32RtoM((u32)&psxRegs.GPR.n.hi, EAX);
73881 - return;
73882 - }
73883 -
73884 - if (IsConst(_Rs_)) {
73885 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("multrsk %x\n", iRegs[_Rs_].k);
73886 - } else {
73887 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73888 - }
73889 - if (IsConst(_Rt_)) {
73890 - MOV32ItoR(EDX, iRegs[_Rt_].k);// printf("multrtk %x\n", iRegs[_Rt_].k);
73891 - IMUL32R (EDX);
73892 - } else {
73893 - IMUL32M ((u32)&psxRegs.GPR.r[_Rt_]);
73894 - }
73895 - MOV32RtoM((u32)&psxRegs.GPR.n.lo, EAX);
73896 - MOV32RtoM((u32)&psxRegs.GPR.n.hi, EDX);
73897 -}
73898 -
73899 -static void recMULTU() {
73900 -// Lo/Hi = Rs * Rt (unsigned)
73901 -
73902 -// iFlushRegs();
73903 -
73904 - if ((IsConst(_Rs_) && iRegs[_Rs_].k == 0) ||
73905 - (IsConst(_Rt_) && iRegs[_Rt_].k == 0)) {
73906 - XOR32RtoR(EAX, EAX);
73907 - MOV32RtoM((u32)&psxRegs.GPR.n.lo, EAX);
73908 - MOV32RtoM((u32)&psxRegs.GPR.n.hi, EAX);
73909 - return;
73910 - }
73911 -
73912 - if (IsConst(_Rs_)) {
73913 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("multursk %x\n", iRegs[_Rs_].k);
73914 - } else {
73915 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73916 - }
73917 - if (IsConst(_Rt_)) {
73918 - MOV32ItoR(EDX, iRegs[_Rt_].k);// printf("multurtk %x\n", iRegs[_Rt_].k);
73919 - MUL32R (EDX);
73920 - } else {
73921 - MUL32M ((u32)&psxRegs.GPR.r[_Rt_]);
73922 - }
73923 - MOV32RtoM((u32)&psxRegs.GPR.n.lo, EAX);
73924 - MOV32RtoM((u32)&psxRegs.GPR.n.hi, EDX);
73925 -}
73926 -
73927 -static void recDIV() {
73928 -// Lo/Hi = Rs / Rt (signed)
73929 -
73930 -// iFlushRegs();
73931 -
73932 - if (IsConst(_Rt_)) {
73933 - if (iRegs[_Rt_].k == 0) return;
73934 - MOV32ItoR(ECX, iRegs[_Rt_].k);// printf("divrtk %x\n", iRegs[_Rt_].k);
73935 - } else {
73936 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
73937 - CMP32ItoR(ECX, 0);
73938 - j8Ptr[0] = JE8(0);
73939 - }
73940 - if (IsConst(_Rs_)) {
73941 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("divrsk %x\n", iRegs[_Rs_].k);
73942 - } else {
73943 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73944 - }
73945 - CDQ();
73946 - IDIV32R (ECX);
73947 - MOV32RtoM((u32)&psxRegs.GPR.n.lo, EAX);
73948 - MOV32RtoM((u32)&psxRegs.GPR.n.hi, EDX);
73949 - if (!IsConst(_Rt_)) {
73950 - x86SetJ8(j8Ptr[0]);
73951 - }
73952 -}
73953 -
73954 -static void recDIVU() {
73955 -// Lo/Hi = Rs / Rt (unsigned)
73956 -
73957 -// iFlushRegs();
73958 -
73959 - if (IsConst(_Rt_)) {
73960 - if (iRegs[_Rt_].k == 0) return;
73961 - MOV32ItoR(ECX, iRegs[_Rt_].k);// printf("divurtk %x\n", iRegs[_Rt_].k);
73962 - } else {
73963 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
73964 - CMP32ItoR(ECX, 0);
73965 - j8Ptr[0] = JE8(0);
73966 - }
73967 - if (IsConst(_Rs_)) {
73968 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("divursk %x\n", iRegs[_Rs_].k);
73969 - } else {
73970 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
73971 - }
73972 - XOR32RtoR(EDX, EDX);
73973 - DIV32R (ECX);
73974 - MOV32RtoM((u32)&psxRegs.GPR.n.lo, EAX);
73975 - MOV32RtoM((u32)&psxRegs.GPR.n.hi, EDX);
73976 - if (!IsConst(_Rt_)) {
73977 - x86SetJ8(j8Ptr[0]);
73978 - }
73979 -}
73980 -//#endif
73981 -//End of * Register mult/div & Register trap logic
73982 -
73983 -/*REC_FUNC(LB);
73984 -REC_FUNC(LBU);
73985 -REC_FUNC(LH);
73986 -REC_FUNC(LHU);
73987 -REC_FUNC(LW);
73988 -
73989 -REC_FUNC(SB);
73990 -REC_FUNC(SH);
73991 -REC_FUNC(SW);*/
73992 -
73993 -//REC_FUNC(LWL);
73994 -//REC_FUNC(LWR);
73995 -//REC_FUNC(SWL);
73996 -//REC_FUNC(SWR);
73997 -
73998 -/* Push OfB for Stores/Loads */
73999 -static void iPushOfB() {
74000 - if (IsConst(_Rs_)) {
74001 - PUSH32I (iRegs[_Rs_].k + _Imm_);
74002 - } else {
74003 - if (_Imm_) {
74004 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
74005 - ADD32ItoR(EAX, _Imm_);
74006 - PUSH32R (EAX);
74007 - } else {
74008 - PUSH32M ((u32)&psxRegs.GPR.r[_Rs_]);
74009 - }
74010 - }
74011 -}
74012 -
74013 -//#if 0
74014 -static void recLB() {
74015 -// Rt = mem[Rs + Im] (signed)
74016 -
74017 -// iFlushRegs();
74018 -
74019 - if (IsConst(_Rs_)) {
74020 - u32 addr = iRegs[_Rs_].k + _Imm_;
74021 - int t = addr >> 16;
74022 -
74023 - if ((t & 0xfff0) == 0xbfc0) {
74024 - if (!_Rt_) return;
74025 - // since bios is readonly it won't change
74026 - MapConst(_Rt_, psxRs8(addr));
74027 - return;
74028 - }
74029 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74030 - if (!_Rt_) return;
74031 - iRegs[_Rt_].state = ST_UNK;
74032 -
74033 - MOVSX32M8toR(EAX, (u32)&psxM[addr & 0x1fffff]);
74034 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74035 - return;
74036 - }
74037 - if (t == 0x1f80 && addr < 0x1f801000) {
74038 - if (!_Rt_) return;
74039 - iRegs[_Rt_].state = ST_UNK;
74040 -
74041 - MOVSX32M8toR(EAX, (u32)&psxH[addr & 0xfff]);
74042 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74043 - return;
74044 - }
74045 -// SysPrintf("unhandled r8 %x\n", addr);
74046 - }
74047 -
74048 - iPushOfB();
74049 - CALLFunc((u32)psxMemRead8);
74050 - if (_Rt_) {
74051 - iRegs[_Rt_].state = ST_UNK;
74052 - MOVSX32R8toR(EAX, EAX);
74053 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74054 - }
74055 -// ADD32ItoR(ESP, 4);
74056 - resp+= 4;
74057 -}
74058 -
74059 -static void recLBU() {
74060 -// Rt = mem[Rs + Im] (unsigned)
74061 -
74062 -// iFlushRegs();
74063 -
74064 - if (IsConst(_Rs_)) {
74065 - u32 addr = iRegs[_Rs_].k + _Imm_;
74066 - int t = addr >> 16;
74067 -
74068 - if ((t & 0xfff0) == 0xbfc0) {
74069 - if (!_Rt_) return;
74070 - // since bios is readonly it won't change
74071 - MapConst(_Rt_, psxRu8(addr));
74072 - return;
74073 - }
74074 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74075 - if (!_Rt_) return;
74076 - iRegs[_Rt_].state = ST_UNK;
74077 -
74078 - MOVZX32M8toR(EAX, (u32)&psxM[addr & 0x1fffff]);
74079 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74080 - return;
74081 - }
74082 - if (t == 0x1f80 && addr < 0x1f801000) {
74083 - if (!_Rt_) return;
74084 - iRegs[_Rt_].state = ST_UNK;
74085 -
74086 - MOVZX32M8toR(EAX, (u32)&psxH[addr & 0xfff]);
74087 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74088 - return;
74089 - }
74090 -// SysPrintf("unhandled r8u %x\n", addr);
74091 - }
74092 -
74093 - iPushOfB();
74094 - CALLFunc((u32)psxMemRead8);
74095 - if (_Rt_) {
74096 - iRegs[_Rt_].state = ST_UNK;
74097 - MOVZX32R8toR(EAX, EAX);
74098 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74099 - }
74100 -// ADD32ItoR(ESP, 4);
74101 - resp+= 4;
74102 -}
74103 -
74104 -static void recLH() {
74105 -// Rt = mem[Rs + Im] (signed)
74106 -
74107 -// iFlushRegs();
74108 -
74109 - if (IsConst(_Rs_)) {
74110 - u32 addr = iRegs[_Rs_].k + _Imm_;
74111 - int t = addr >> 16;
74112 -
74113 - if ((t & 0xfff0) == 0xbfc0) {
74114 - if (!_Rt_) return;
74115 - // since bios is readonly it won't change
74116 - MapConst(_Rt_, psxRs16(addr));
74117 - return;
74118 - }
74119 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74120 - if (!_Rt_) return;
74121 - iRegs[_Rt_].state = ST_UNK;
74122 -
74123 - MOVSX32M16toR(EAX, (u32)&psxM[addr & 0x1fffff]);
74124 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74125 - return;
74126 - }
74127 - if (t == 0x1f80 && addr < 0x1f801000) {
74128 - if (!_Rt_) return;
74129 - iRegs[_Rt_].state = ST_UNK;
74130 -
74131 - MOVSX32M16toR(EAX, (u32)&psxH[addr & 0xfff]);
74132 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74133 - return;
74134 - }
74135 -// SysPrintf("unhandled r16 %x\n", addr);
74136 - }
74137 -
74138 - iPushOfB();
74139 - CALLFunc((u32)psxMemRead16);
74140 - if (_Rt_) {
74141 - iRegs[_Rt_].state = ST_UNK;
74142 - MOVSX32R16toR(EAX, EAX);
74143 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74144 - }
74145 -// ADD32ItoR(ESP, 4);
74146 - resp+= 4;
74147 -}
74148 -
74149 -static void recLHU() {
74150 -// Rt = mem[Rs + Im] (unsigned)
74151 -
74152 -// iFlushRegs();
74153 -
74154 - if (IsConst(_Rs_)) {
74155 - u32 addr = iRegs[_Rs_].k + _Imm_;
74156 - int t = addr >> 16;
74157 -
74158 - if ((t & 0xfff0) == 0xbfc0) {
74159 - if (!_Rt_) return;
74160 - // since bios is readonly it won't change
74161 - MapConst(_Rt_, psxRu16(addr));
74162 - return;
74163 - }
74164 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74165 - if (!_Rt_) return;
74166 - iRegs[_Rt_].state = ST_UNK;
74167 -
74168 - MOVZX32M16toR(EAX, (u32)&psxM[addr & 0x1fffff]);
74169 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74170 - return;
74171 - }
74172 - if (t == 0x1f80 && addr < 0x1f801000) {
74173 - if (!_Rt_) return;
74174 - iRegs[_Rt_].state = ST_UNK;
74175 -
74176 - MOVZX32M16toR(EAX, (u32)&psxH[addr & 0xfff]);
74177 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74178 - return;
74179 - }
74180 - if (t == 0x1f80) {
74181 - if (addr >= 0x1f801c00 && addr < 0x1f801e00) {
74182 - if (!_Rt_) return;
74183 - iRegs[_Rt_].state = ST_UNK;
74184 -
74185 - PUSH32I (addr);
74186 - CALL32M ((u32)&SPU_readRegister);
74187 - MOVZX32R16toR(EAX, EAX);
74188 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74189 -#ifndef __WIN32__
74190 - resp+= 4;
74191 -#endif
74192 - return;
74193 - }
74194 - switch (addr) {
74195 - case 0x1f801100: case 0x1f801110: case 0x1f801120:
74196 - if (!_Rt_) return;
74197 - iRegs[_Rt_].state = ST_UNK;
74198 -
74199 - PUSH32I((addr >> 4) & 0x3);
74200 - CALLFunc((u32)psxRcntRcount);
74201 - MOVZX32R16toR(EAX, EAX);
74202 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74203 - resp+= 4;
74204 - return;
74205 -
74206 - case 0x1f801104: case 0x1f801114: case 0x1f801124:
74207 - if (!_Rt_) return;
74208 - iRegs[_Rt_].state = ST_UNK;
74209 -
74210 - MOVZX32M16toR(EAX, (u32)&psxCounters[(addr >> 4) & 0x3].mode);
74211 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74212 - return;
74213 -
74214 - case 0x1f801108: case 0x1f801118: case 0x1f801128:
74215 - if (!_Rt_) return;
74216 - iRegs[_Rt_].state = ST_UNK;
74217 -
74218 - MOVZX32M16toR(EAX, (u32)&psxCounters[(addr >> 4) & 0x3].target);
74219 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74220 - return;
74221 - }
74222 - }
74223 -// SysPrintf("unhandled r16u %x\n", addr);
74224 - }
74225 -
74226 - iPushOfB();
74227 - CALLFunc((u32)psxMemRead16);
74228 - if (_Rt_) {
74229 - iRegs[_Rt_].state = ST_UNK;
74230 - MOVZX32R16toR(EAX, EAX);
74231 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74232 - }
74233 -// ADD32ItoR(ESP, 4);
74234 - resp+= 4;
74235 -}
74236 -
74237 -static void recLW() {
74238 -// Rt = mem[Rs + Im] (unsigned)
74239 -
74240 -// iFlushRegs();
74241 -
74242 - if (IsConst(_Rs_)) {
74243 - u32 addr = iRegs[_Rs_].k + _Imm_;
74244 - int t = addr >> 16;
74245 -
74246 - if ((t & 0xfff0) == 0xbfc0) {
74247 - if (!_Rt_) return;
74248 - // since bios is readonly it won't change
74249 - MapConst(_Rt_, psxRu32(addr));
74250 - return;
74251 - }
74252 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74253 - if (!_Rt_) return;
74254 - iRegs[_Rt_].state = ST_UNK;
74255 -
74256 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1fffff]);
74257 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74258 - return;
74259 - }
74260 - if (t == 0x1f80 && addr < 0x1f801000) {
74261 - if (!_Rt_) return;
74262 - iRegs[_Rt_].state = ST_UNK;
74263 -
74264 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xfff]);
74265 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74266 - return;
74267 - }
74268 - if (t == 0x1f80) {
74269 - switch (addr) {
74270 - case 0x1f801080: case 0x1f801084: case 0x1f801088:
74271 - case 0x1f801090: case 0x1f801094: case 0x1f801098:
74272 - case 0x1f8010a0: case 0x1f8010a4: case 0x1f8010a8:
74273 - case 0x1f8010b0: case 0x1f8010b4: case 0x1f8010b8:
74274 - case 0x1f8010c0: case 0x1f8010c4: case 0x1f8010c8:
74275 - case 0x1f8010d0: case 0x1f8010d4: case 0x1f8010d8:
74276 - case 0x1f8010e0: case 0x1f8010e4: case 0x1f8010e8:
74277 - case 0x1f801070: case 0x1f801074:
74278 - case 0x1f8010f0: case 0x1f8010f4:
74279 - if (!_Rt_) return;
74280 - iRegs[_Rt_].state = ST_UNK;
74281 -
74282 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffff]);
74283 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74284 - return;
74285 -
74286 - case 0x1f801810:
74287 - if (!_Rt_) return;
74288 - iRegs[_Rt_].state = ST_UNK;
74289 -
74290 - CALL32M((u32)&GPU_readData);
74291 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74292 - return;
74293 -
74294 - case 0x1f801814:
74295 - if (!_Rt_) return;
74296 - iRegs[_Rt_].state = ST_UNK;
74297 -
74298 - CALL32M((u32)&GPU_readStatus);
74299 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74300 - return;
74301 - }
74302 - }
74303 -// SysPrintf("unhandled r32 %x\n", addr);
74304 - }
74305 -
74306 - iPushOfB();
74307 - CALLFunc((u32)psxMemRead32);
74308 - if (_Rt_) {
74309 - iRegs[_Rt_].state = ST_UNK;
74310 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74311 - }
74312 -// ADD32ItoR(ESP, 4);
74313 - resp+= 4;
74314 -}
74315 -
74316 -extern u32 LWL_MASK[4];
74317 -extern u32 LWL_SHIFT[4];
74318 -
74319 -void iLWLk(u32 shift) {
74320 - if (IsConst(_Rt_)) {
74321 - MOV32ItoR(ECX, iRegs[_Rt_].k);
74322 - } else {
74323 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
74324 - }
74325 - AND32ItoR(ECX, LWL_MASK[shift]);
74326 - SHL32ItoR(EAX, LWL_SHIFT[shift]);
74327 - OR32RtoR (EAX, ECX);
74328 -}
74329 -
74330 -void recLWL() {
74331 -// Rt = Rt Merge mem[Rs + Im]
74332 -
74333 - if (IsConst(_Rs_)) {
74334 - u32 addr = iRegs[_Rs_].k + _Imm_;
74335 - int t = addr >> 16;
74336 -
74337 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74338 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
74339 - iLWLk(addr & 3);
74340 -
74341 - iRegs[_Rt_].state = ST_UNK;
74342 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74343 - return;
74344 - }
74345 - if (t == 0x1f80 && addr < 0x1f801000) {
74346 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
74347 - iLWLk(addr & 3);
74348 -
74349 - iRegs[_Rt_].state = ST_UNK;
74350 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74351 - return;
74352 - }
74353 - }
74354 -
74355 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
74356 - else {
74357 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
74358 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
74359 - }
74360 - PUSH32R (EAX);
74361 - AND32ItoR(EAX, ~3);
74362 - PUSH32R (EAX);
74363 - CALLFunc((u32)psxMemRead32);
74364 -
74365 - if (_Rt_) {
74366 - ADD32ItoR(ESP, 4);
74367 - POP32R (EDX);
74368 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
74369 -
74370 - MOV32ItoR(ECX, (u32)LWL_SHIFT);
74371 - MOV32RmStoR(ECX, ECX, EDX, 2);
74372 - SHL32CLtoR(EAX); // mem(EAX) << LWL_SHIFT[shift]
74373 -
74374 - MOV32ItoR(ECX, (u32)LWL_MASK);
74375 - MOV32RmStoR(ECX, ECX, EDX, 2);
74376 - if (IsConst(_Rt_)) {
74377 - MOV32ItoR(EDX, iRegs[_Rt_].k);
74378 - } else {
74379 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
74380 - }
74381 - AND32RtoR(EDX, ECX); // _rRt_ & LWL_MASK[shift]
74382 -
74383 - OR32RtoR(EAX, EDX);
74384 -
74385 - iRegs[_Rt_].state = ST_UNK;
74386 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74387 - } else {
74388 -// ADD32ItoR(ESP, 8);
74389 - resp+= 8;
74390 - }
74391 -}
74392 -
74393 -static void recLWBlock(int count) {
74394 - u32 *code = PSXM(pc);
74395 - int i, respsave;
74396 -// Rt = mem[Rs + Im] (unsigned)
74397 -
74398 -// iFlushRegs();
74399 -
74400 - if (IsConst(_Rs_)) {
74401 - u32 addr = iRegs[_Rs_].k + _Imm_;
74402 - int t = addr >> 16;
74403 -
74404 - if ((t & 0xfff0) == 0xbfc0) {
74405 - // since bios is readonly it won't change
74406 - for (i=0; i<count; i++, code++, addr+=4) {
74407 - if (_fRt_(*code)) {
74408 - MapConst(_fRt_(*code), psxRu32(addr));
74409 - }
74410 - }
74411 - return;
74412 - }
74413 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74414 - for (i=0; i<count; i++, code++, addr+=4) {
74415 - if (!_fRt_(*code)) return;
74416 - iRegs[_fRt_(*code)].state = ST_UNK;
74417 -
74418 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1fffff]);
74419 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EAX);
74420 - }
74421 - return;
74422 - }
74423 - if (t == 0x1f80 && addr < 0x1f801000) {
74424 - for (i=0; i<count; i++, code++, addr+=4) {
74425 - if (!_fRt_(*code)) return;
74426 - iRegs[_fRt_(*code)].state = ST_UNK;
74427 -
74428 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xfff]);
74429 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EAX);
74430 - }
74431 - return;
74432 - }
74433 - }
74434 -
74435 - SysPrintf("recLWBlock %d: %d\n", count, IsConst(_Rs_));
74436 - iPushOfB();
74437 - CALLFunc((u32)psxMemPointer);
74438 -// ADD32ItoR(ESP, 4);
74439 - resp+= 4;
74440 -
74441 - respsave = resp; resp = 0;
74442 - TEST32RtoR(EAX, EAX);
74443 - j32Ptr[4] = JZ32(0);
74444 - XOR32RtoR(ECX, ECX);
74445 - for (i=0; i<count; i++, code++) {
74446 - if (_fRt_(*code)) {
74447 - iRegs[_fRt_(*code)].state = ST_UNK;
74448 -
74449 - MOV32RmStoR(EDX, EAX, ECX, 2);
74450 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EDX);
74451 - }
74452 - if (i != (count-1)) INC32R(ECX);
74453 - }
74454 - j32Ptr[5] = JMP32(0);
74455 - x86SetJ32(j32Ptr[4]);
74456 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
74457 - psxRegs.code = *code;
74458 - recLW();
74459 - }
74460 - ADD32ItoR(ESP, resp);
74461 - x86SetJ32(j32Ptr[5]);
74462 - resp = respsave;
74463 -}
74464 -
74465 -extern u32 LWR_MASK[4];
74466 -extern u32 LWR_SHIFT[4];
74467 -
74468 -void iLWRk(u32 shift) {
74469 - if (IsConst(_Rt_)) {
74470 - MOV32ItoR(ECX, iRegs[_Rt_].k);
74471 - } else {
74472 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
74473 - }
74474 - AND32ItoR(ECX, LWR_MASK[shift]);
74475 - SHR32ItoR(EAX, LWR_SHIFT[shift]);
74476 - OR32RtoR (EAX, ECX);
74477 -}
74478 -
74479 -void recLWR() {
74480 -// Rt = Rt Merge mem[Rs + Im]
74481 -
74482 - if (IsConst(_Rs_)) {
74483 - u32 addr = iRegs[_Rs_].k + _Imm_;
74484 - int t = addr >> 16;
74485 -
74486 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74487 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
74488 - iLWRk(addr & 3);
74489 -
74490 - iRegs[_Rt_].state = ST_UNK;
74491 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74492 - return;
74493 - }
74494 - if (t == 0x1f80 && addr < 0x1f801000) {
74495 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
74496 - iLWRk(addr & 3);
74497 -
74498 - iRegs[_Rt_].state = ST_UNK;
74499 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74500 - return;
74501 - }
74502 - }
74503 -
74504 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
74505 - else {
74506 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
74507 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
74508 - }
74509 - PUSH32R (EAX);
74510 - AND32ItoR(EAX, ~3);
74511 - PUSH32R (EAX);
74512 - CALLFunc((u32)psxMemRead32);
74513 -
74514 - if (_Rt_) {
74515 - ADD32ItoR(ESP, 4);
74516 - POP32R (EDX);
74517 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
74518 -
74519 - MOV32ItoR(ECX, (u32)LWR_SHIFT);
74520 - MOV32RmStoR(ECX, ECX, EDX, 2);
74521 - SHR32CLtoR(EAX); // mem(EAX) >> LWR_SHIFT[shift]
74522 -
74523 - MOV32ItoR(ECX, (u32)LWR_MASK);
74524 - MOV32RmStoR(ECX, ECX, EDX, 2);
74525 -
74526 - if (IsConst(_Rt_)) {
74527 - MOV32ItoR(EDX, iRegs[_Rt_].k);
74528 - } else {
74529 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
74530 - }
74531 - AND32RtoR(EDX, ECX); // _rRt_ & LWR_MASK[shift]
74532 -
74533 - OR32RtoR(EAX, EDX);
74534 -
74535 - iRegs[_Rt_].state = ST_UNK;
74536 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
74537 - } else {
74538 -// ADD32ItoR(ESP, 8);
74539 - resp+= 8;
74540 - }
74541 -}
74542 -
74543 -static void recSB() {
74544 -// mem[Rs + Im] = Rt
74545 -
74546 -// iFlushRegs();
74547 -
74548 - if (IsConst(_Rs_)) {
74549 - u32 addr = iRegs[_Rs_].k + _Imm_;
74550 - int t = addr >> 16;
74551 -
74552 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74553 - if (IsConst(_Rt_)) {
74554 - MOV8ItoM((u32)&psxM[addr & 0x1fffff], (u8)iRegs[_Rt_].k);
74555 - } else {
74556 - MOV8MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74557 - MOV8RtoM((u32)&psxM[addr & 0x1fffff], EAX);
74558 - }
74559 - return;
74560 - }
74561 - if (t == 0x1f80 && addr < 0x1f801000) {
74562 - if (IsConst(_Rt_)) {
74563 - MOV8ItoM((u32)&psxH[addr & 0xfff], (u8)iRegs[_Rt_].k);
74564 - } else {
74565 - MOV8MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74566 - MOV8RtoM((u32)&psxH[addr & 0xfff], EAX);
74567 - }
74568 - return;
74569 - }
74570 -// SysPrintf("unhandled w8 %x\n", addr);
74571 - }
74572 -
74573 - if (IsConst(_Rt_)) {
74574 - PUSH32I (iRegs[_Rt_].k);
74575 - } else {
74576 - PUSH32M ((u32)&psxRegs.GPR.r[_Rt_]);
74577 - }
74578 - iPushOfB();
74579 - CALLFunc((u32)psxMemWrite8);
74580 -// ADD32ItoR(ESP, 8);
74581 - resp+= 8;
74582 -}
74583 -
74584 -static void recSH() {
74585 -// mem[Rs + Im] = Rt
74586 -
74587 -// iFlushRegs();
74588 -
74589 - if (IsConst(_Rs_)) {
74590 - u32 addr = iRegs[_Rs_].k + _Imm_;
74591 - int t = addr >> 16;
74592 -
74593 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74594 - if (IsConst(_Rt_)) {
74595 - MOV16ItoM((u32)&psxM[addr & 0x1fffff], (u16)iRegs[_Rt_].k);
74596 - } else {
74597 - MOV16MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74598 - MOV16RtoM((u32)&psxM[addr & 0x1fffff], EAX);
74599 - }
74600 - return;
74601 - }
74602 - if (t == 0x1f80 && addr < 0x1f801000) {
74603 - if (IsConst(_Rt_)) {
74604 - MOV16ItoM((u32)&psxH[addr & 0xfff], (u16)iRegs[_Rt_].k);
74605 - } else {
74606 - MOV16MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74607 - MOV16RtoM((u32)&psxH[addr & 0xfff], EAX);
74608 - }
74609 - return;
74610 - }
74611 - if (t == 0x1f80) {
74612 - if (addr >= 0x1f801c00 && addr < 0x1f801e00) {
74613 - if (IsConst(_Rt_)) {
74614 - PUSH32I(iRegs[_Rt_].k);
74615 - } else {
74616 - PUSH32M((u32)&psxRegs.GPR.r[_Rt_]);
74617 - }
74618 - PUSH32I (addr);
74619 - CALL32M ((u32)&SPU_writeRegister);
74620 -#ifndef __WIN32__
74621 - resp+= 8;
74622 -#endif
74623 - return;
74624 - }
74625 - }
74626 -// SysPrintf("unhandled w16 %x\n", addr);
74627 - }
74628 -
74629 - if (IsConst(_Rt_)) {
74630 - PUSH32I (iRegs[_Rt_].k);
74631 - } else {
74632 - PUSH32M ((u32)&psxRegs.GPR.r[_Rt_]);
74633 - }
74634 - iPushOfB();
74635 - CALLFunc((u32)psxMemWrite16);
74636 -// ADD32ItoR(ESP, 8);
74637 - resp+= 8;
74638 -}
74639 -
74640 -static void recSW() {
74641 -// mem[Rs + Im] = Rt
74642 -
74643 -// iFlushRegs();
74644 -
74645 - if (IsConst(_Rs_)) {
74646 - u32 addr = iRegs[_Rs_].k + _Imm_;
74647 - int t = addr >> 16;
74648 -
74649 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74650 - if (IsConst(_Rt_)) {
74651 - MOV32ItoM((u32)&psxM[addr & 0x1fffff], iRegs[_Rt_].k);
74652 - } else {
74653 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74654 - MOV32RtoM((u32)&psxM[addr & 0x1fffff], EAX);
74655 - }
74656 - return;
74657 - }
74658 - if (t == 0x1f80 && addr < 0x1f801000) {
74659 - if (IsConst(_Rt_)) {
74660 - MOV32ItoM((u32)&psxH[addr & 0xfff], iRegs[_Rt_].k);
74661 - } else {
74662 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74663 - MOV32RtoM((u32)&psxH[addr & 0xfff], EAX);
74664 - }
74665 - return;
74666 - }
74667 - if (t == 0x1f80) {
74668 - switch (addr) {
74669 - case 0x1f801080: case 0x1f801084:
74670 - case 0x1f801090: case 0x1f801094:
74671 - case 0x1f8010a0: case 0x1f8010a4:
74672 - case 0x1f8010b0: case 0x1f8010b4:
74673 - case 0x1f8010c0: case 0x1f8010c4:
74674 - case 0x1f8010d0: case 0x1f8010d4:
74675 - case 0x1f8010e0: case 0x1f8010e4:
74676 - case 0x1f801074:
74677 - case 0x1f8010f0:
74678 - if (IsConst(_Rt_)) {
74679 - MOV32ItoM((u32)&psxH[addr & 0xffff], iRegs[_Rt_].k);
74680 - } else {
74681 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74682 - MOV32RtoM((u32)&psxH[addr & 0xffff], EAX);
74683 - }
74684 - return;
74685 -
74686 - case 0x1f801810:
74687 - if (IsConst(_Rt_)) {
74688 - PUSH32I(iRegs[_Rt_].k);
74689 - } else {
74690 - PUSH32M((u32)&psxRegs.GPR.r[_Rt_]);
74691 - }
74692 - CALL32M((u32)&GPU_writeData);
74693 -#ifndef __WIN32__
74694 - resp+= 4;
74695 -#endif
74696 - return;
74697 -
74698 - case 0x1f801814:
74699 - if (IsConst(_Rt_)) {
74700 - PUSH32I(iRegs[_Rt_].k);
74701 - } else {
74702 - PUSH32M((u32)&psxRegs.GPR.r[_Rt_]);
74703 - }
74704 - CALL32M((u32)&GPU_writeStatus);
74705 -#ifndef __WIN32__
74706 - resp+= 4;
74707 -#endif
74708 - }
74709 - }
74710 -// SysPrintf("unhandled w32 %x\n", addr);
74711 - }
74712 -
74713 - if (IsConst(_Rt_)) {
74714 - PUSH32I (iRegs[_Rt_].k);
74715 - } else {
74716 - PUSH32M ((u32)&psxRegs.GPR.r[_Rt_]);
74717 - }
74718 - iPushOfB();
74719 - CALLFunc((u32)psxMemWrite32);
74720 -// ADD32ItoR(ESP, 8);
74721 - resp+= 8;
74722 -}
74723 -//#endif
74724 -
74725 -static void recSWBlock(int count) {
74726 - u32 *code;
74727 - int i, respsave;
74728 -// mem[Rs + Im] = Rt
74729 -
74730 -// iFlushRegs();
74731 -
74732 - if (IsConst(_Rs_)) {
74733 - u32 addr = iRegs[_Rs_].k + _Imm_;
74734 - int t = addr >> 16;
74735 - code = PSXM(pc);
74736 -
74737 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74738 - for (i=0; i<count; i++, code++, addr+=4) {
74739 - if (IsConst(_fRt_(*code))) {
74740 - MOV32ItoM((u32)&psxM[addr & 0x1fffff], iRegs[_fRt_(*code)].k);
74741 - } else {
74742 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_fRt_(*code)]);
74743 - MOV32RtoM((u32)&psxM[addr & 0x1fffff], EAX);
74744 - }
74745 - }
74746 - return;
74747 - }
74748 - if (t == 0x1f80 && addr < 0x1f801000) {
74749 - for (i=0; i<count; i++, code++, addr+=4) {
74750 - if (!_fRt_(*code)) return;
74751 - iRegs[_fRt_(*code)].state = ST_UNK;
74752 -
74753 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xfff]);
74754 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EAX);
74755 - }
74756 - return;
74757 - }
74758 - }
74759 -
74760 - SysPrintf("recSWBlock %d: %d\n", count, IsConst(_Rs_));
74761 - iPushOfB();
74762 - CALLFunc((u32)psxMemPointer);
74763 -// ADD32ItoR(ESP, 4);
74764 - resp+= 4;
74765 -
74766 - respsave = resp; resp = 0;
74767 - TEST32RtoR(EAX, EAX);
74768 - j32Ptr[4] = JZ32(0);
74769 - XOR32RtoR(ECX, ECX);
74770 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
74771 - if (IsConst(_fRt_(*code))) {
74772 - MOV32ItoR(EDX, iRegs[_fRt_(*code)].k);
74773 - } else {
74774 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_fRt_(*code)]);
74775 - }
74776 - MOV32RtoRmS(EAX, ECX, 2, EDX);
74777 - if (i != (count-1)) INC32R(ECX);
74778 - }
74779 - j32Ptr[5] = JMP32(0);
74780 - x86SetJ32(j32Ptr[4]);
74781 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
74782 - psxRegs.code = *code;
74783 - recSW();
74784 - }
74785 - ADD32ItoR(ESP, resp);
74786 - x86SetJ32(j32Ptr[5]);
74787 - resp = respsave;
74788 -}
74789 -
74790 -extern u32 SWL_MASK[4];
74791 -extern u32 SWL_SHIFT[4];
74792 -
74793 -void iSWLk(u32 shift) {
74794 - if (IsConst(_Rt_)) {
74795 - MOV32ItoR(ECX, iRegs[_Rt_].k);
74796 - } else {
74797 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
74798 - }
74799 - SHR32ItoR(ECX, SWL_SHIFT[shift]);
74800 - AND32ItoR(EAX, SWL_MASK[shift]);
74801 - OR32RtoR (EAX, ECX);
74802 -}
74803 -
74804 -void recSWL() {
74805 -// mem[Rs + Im] = Rt Merge mem[Rs + Im]
74806 -
74807 - if (IsConst(_Rs_)) {
74808 - u32 addr = iRegs[_Rs_].k + _Imm_;
74809 - int t = addr >> 16;
74810 -
74811 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74812 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
74813 - iSWLk(addr & 3);
74814 - MOV32RtoM((u32)&psxM[addr & 0x1ffffc], EAX);
74815 - return;
74816 - }
74817 - if (t == 0x1f80 && addr < 0x1f801000) {
74818 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
74819 - iSWLk(addr & 3);
74820 - MOV32RtoM((u32)&psxH[addr & 0xffc], EAX);
74821 - return;
74822 - }
74823 - }
74824 -
74825 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
74826 - else {
74827 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
74828 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
74829 - }
74830 - PUSH32R (EAX);
74831 - AND32ItoR(EAX, ~3);
74832 - PUSH32R (EAX);
74833 -
74834 - CALLFunc((u32)psxMemRead32);
74835 -
74836 - ADD32ItoR(ESP, 4);
74837 - POP32R (EDX);
74838 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
74839 -
74840 - MOV32ItoR(ECX, (u32)SWL_MASK);
74841 - MOV32RmStoR(ECX, ECX, EDX, 2);
74842 - AND32RtoR(EAX, ECX); // mem & SWL_MASK[shift]
74843 -
74844 - MOV32ItoR(ECX, (u32)SWL_SHIFT);
74845 - MOV32RmStoR(ECX, ECX, EDX, 2);
74846 - if (IsConst(_Rt_)) {
74847 - MOV32ItoR(EDX, iRegs[_Rt_].k);
74848 - } else {
74849 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
74850 - }
74851 - SHR32CLtoR(EDX); // _rRt_ >> SWL_SHIFT[shift]
74852 -
74853 - OR32RtoR (EAX, EDX);
74854 - PUSH32R (EAX);
74855 -
74856 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
74857 - else {
74858 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
74859 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
74860 - }
74861 - AND32ItoR(EAX, ~3);
74862 - PUSH32R (EAX);
74863 -
74864 - CALLFunc((u32)psxMemWrite32);
74865 -// ADD32ItoR(ESP, 8);
74866 - resp+= 8;
74867 -}
74868 -
74869 -extern u32 SWR_MASK[4];
74870 -extern u32 SWR_SHIFT[4];
74871 -
74872 -void iSWRk(u32 shift) {
74873 - if (IsConst(_Rt_)) {
74874 - MOV32ItoR(ECX, iRegs[_Rt_].k);
74875 - } else {
74876 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
74877 - }
74878 - SHL32ItoR(ECX, SWR_SHIFT[shift]);
74879 - AND32ItoR(EAX, SWR_MASK[shift]);
74880 - OR32RtoR (EAX, ECX);
74881 -}
74882 -
74883 -void recSWR() {
74884 -// mem[Rs + Im] = Rt Merge mem[Rs + Im]
74885 -
74886 - if (IsConst(_Rs_)) {
74887 - u32 addr = iRegs[_Rs_].k + _Imm_;
74888 - int t = addr >> 16;
74889 -
74890 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
74891 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
74892 - iSWRk(addr & 3);
74893 - MOV32RtoM((u32)&psxM[addr & 0x1ffffc], EAX);
74894 - return;
74895 - }
74896 - if (t == 0x1f80 && addr < 0x1f801000) {
74897 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
74898 - iSWRk(addr & 3);
74899 - MOV32RtoM((u32)&psxH[addr & 0xffc], EAX);
74900 - return;
74901 - }
74902 - }
74903 -
74904 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
74905 - else {
74906 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
74907 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
74908 - }
74909 - PUSH32R (EAX);
74910 - AND32ItoR(EAX, ~3);
74911 - PUSH32R (EAX);
74912 -
74913 - CALLFunc((u32)psxMemRead32);
74914 -
74915 - ADD32ItoR(ESP, 4);
74916 - POP32R (EDX);
74917 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
74918 -
74919 - MOV32ItoR(ECX, (u32)SWR_MASK);
74920 - MOV32RmStoR(ECX, ECX, EDX, 2);
74921 - AND32RtoR(EAX, ECX); // mem & SWR_MASK[shift]
74922 -
74923 - MOV32ItoR(ECX, (u32)SWR_SHIFT);
74924 - MOV32RmStoR(ECX, ECX, EDX, 2);
74925 - if (IsConst(_Rt_)) {
74926 - MOV32ItoR(EDX, iRegs[_Rt_].k);
74927 - } else {
74928 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
74929 - }
74930 - SHL32CLtoR(EDX); // _rRt_ << SWR_SHIFT[shift]
74931 -
74932 - OR32RtoR (EAX, EDX);
74933 - PUSH32R (EAX);
74934 -
74935 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
74936 - else {
74937 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
74938 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
74939 - }
74940 - AND32ItoR(EAX, ~3);
74941 - PUSH32R (EAX);
74942 -
74943 - CALLFunc((u32)psxMemWrite32);
74944 -// ADD32ItoR(ESP, 8);
74945 - resp+= 8;
74946 -}
74947 -
74948 -/*REC_FUNC(SLL);
74949 -REC_FUNC(SRL);
74950 -REC_FUNC(SRA);
74951 -#if 0*/
74952 -static void recSLL() {
74953 -// Rd = Rt << Sa
74954 - if (!_Rd_) return;
74955 -
74956 -// iFlushRegs();
74957 -
74958 - if (IsConst(_Rt_)) {
74959 - MapConst(_Rd_, iRegs[_Rt_].k << _Sa_);
74960 - } else {
74961 - iRegs[_Rd_].state = ST_UNK;
74962 -
74963 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74964 - if (_Sa_) SHL32ItoR(EAX, _Sa_);
74965 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
74966 - }
74967 -}
74968 -
74969 -static void recSRL() {
74970 -// Rd = Rt >> Sa
74971 - if (!_Rd_) return;
74972 -
74973 -// iFlushRegs();
74974 -
74975 - if (IsConst(_Rt_)) {
74976 - MapConst(_Rd_, iRegs[_Rt_].k >> _Sa_);
74977 - } else {
74978 - iRegs[_Rd_].state = ST_UNK;
74979 -
74980 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74981 - if (_Sa_) SHR32ItoR(EAX, _Sa_);
74982 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
74983 - }
74984 -}
74985 -
74986 -static void recSRA() {
74987 -// Rd = Rt >> Sa
74988 - if (!_Rd_) return;
74989 -
74990 -// iFlushRegs();
74991 -
74992 - if (IsConst(_Rt_)) {
74993 - MapConst(_Rd_, (s32)iRegs[_Rt_].k >> _Sa_);
74994 - } else {
74995 - iRegs[_Rd_].state = ST_UNK;
74996 -
74997 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
74998 - if (_Sa_) SAR32ItoR(EAX, _Sa_);
74999 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75000 - }
75001 -}
75002 -//#endif
75003 -
75004 -/*REC_FUNC(SLLV);
75005 -REC_FUNC(SRLV);
75006 -REC_FUNC(SRAV);
75007 -#if 0*/
75008 -static void recSLLV() {
75009 -// Rd = Rt << Rs
75010 - if (!_Rd_) return;
75011 -
75012 -// iFlushRegs();
75013 -
75014 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
75015 - MapConst(_Rd_, iRegs[_Rt_].k << iRegs[_Rs_].k);
75016 - } else if (IsConst(_Rs_)) {
75017 - iRegs[_Rd_].state = ST_UNK;
75018 -
75019 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75020 - MOV32ItoR(ECX, iRegs[_Rs_].k);
75021 - SHL32CLtoR(EAX);
75022 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75023 - } else if (IsConst(_Rt_)) {
75024 - iRegs[_Rd_].state = ST_UNK;
75025 -
75026 - MOV32ItoR(EAX, iRegs[_Rt_].k);
75027 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rs_]);
75028 - SHL32CLtoR(EAX);
75029 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75030 - } else {
75031 - iRegs[_Rd_].state = ST_UNK;
75032 -
75033 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75034 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rs_]);
75035 - SHL32CLtoR(EAX);
75036 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75037 - }
75038 -}
75039 -
75040 -static void recSRLV() {
75041 -// Rd = Rt >> Rs
75042 - if (!_Rd_) return;
75043 -
75044 -// iFlushRegs();
75045 -
75046 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
75047 - MapConst(_Rd_, iRegs[_Rt_].k >> iRegs[_Rs_].k);
75048 - } else if (IsConst(_Rs_)) {
75049 - iRegs[_Rd_].state = ST_UNK;
75050 -
75051 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75052 - MOV32ItoR(ECX, iRegs[_Rs_].k);
75053 - SHR32CLtoR(EAX);
75054 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75055 - } else if (IsConst(_Rt_)) {
75056 - iRegs[_Rd_].state = ST_UNK;
75057 -
75058 - MOV32ItoR(EAX, iRegs[_Rt_].k);
75059 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rs_]);
75060 - SHR32CLtoR(EAX);
75061 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75062 - } else {
75063 - iRegs[_Rd_].state = ST_UNK;
75064 -
75065 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75066 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rs_]);
75067 - SHR32CLtoR(EAX);
75068 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75069 - }
75070 -}
75071 -
75072 -static void recSRAV() {
75073 -// Rd = Rt >> Rs
75074 - if (!_Rd_) return;
75075 -
75076 -// iFlushRegs();
75077 -
75078 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
75079 - MapConst(_Rd_, (s32)iRegs[_Rt_].k >> iRegs[_Rs_].k);
75080 - } else if (IsConst(_Rs_)) {
75081 - iRegs[_Rd_].state = ST_UNK;
75082 -
75083 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75084 - MOV32ItoR(ECX, iRegs[_Rs_].k);
75085 - SAR32CLtoR(EAX);
75086 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75087 - } else if (IsConst(_Rt_)) {
75088 - iRegs[_Rd_].state = ST_UNK;
75089 -
75090 - MOV32ItoR(EAX, iRegs[_Rt_].k);
75091 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rs_]);
75092 - SAR32CLtoR(EAX);
75093 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75094 - } else {
75095 - iRegs[_Rd_].state = ST_UNK;
75096 -
75097 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75098 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rs_]);
75099 - SAR32CLtoR(EAX);
75100 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75101 - }
75102 -}
75103 -//#endif
75104 -
75105 -/*REC_SYS(SYSCALL);
75106 -REC_SYS(BREAK);
75107 -
75108 -#if 0*/
75109 -int dump;
75110 -static void recSYSCALL() {
75111 -// dump=1;
75112 - iFlushRegs();
75113 -
75114 - MOV32ItoR(EAX, pc - 4);
75115 - MOV32RtoM((u32)&psxRegs.pc, EAX);
75116 - PUSH32I (branch == 1 ? 1 : 0);
75117 - PUSH32I (0x20);
75118 - CALLFunc ((u32)psxException);
75119 - ADD32ItoR(ESP, 8);
75120 -
75121 - branch = 2;
75122 - iRet();
75123 -}
75124 -
75125 -static void recBREAK() {
75126 -}
75127 -//#endif
75128 -
75129 -/*REC_FUNC(MFHI);
75130 -REC_FUNC(MTHI);
75131 -REC_FUNC(MFLO);
75132 -REC_FUNC(MTLO);
75133 -#if 0*/
75134 -static void recMFHI() {
75135 -// Rd = Hi
75136 - if (!_Rd_) return;
75137 -
75138 - iRegs[_Rd_].state = ST_UNK;
75139 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.n.hi);
75140 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75141 -}
75142 -
75143 -static void recMTHI() {
75144 -// Hi = Rs
75145 -
75146 - if (IsConst(_Rs_)) {
75147 - MOV32ItoM((u32)&psxRegs.GPR.n.hi, iRegs[_Rs_].k);
75148 - } else {
75149 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
75150 - MOV32RtoM((u32)&psxRegs.GPR.n.hi, EAX);
75151 - }
75152 -}
75153 -
75154 -static void recMFLO() {
75155 -// Rd = Lo
75156 - if (!_Rd_) return;
75157 -
75158 - iRegs[_Rd_].state = ST_UNK;
75159 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.n.lo);
75160 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rd_], EAX);
75161 -}
75162 -
75163 -static void recMTLO() {
75164 -// Lo = Rs
75165 -
75166 - if (IsConst(_Rs_)) {
75167 - MOV32ItoM((u32)&psxRegs.GPR.n.lo, iRegs[_Rs_].k);
75168 - } else {
75169 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
75170 - MOV32RtoM((u32)&psxRegs.GPR.n.lo, EAX);
75171 - }
75172 -}
75173 -//#endif
75174 -
75175 -/*REC_BRANCH(J);
75176 -REC_BRANCH(JR);
75177 -REC_BRANCH(JAL);
75178 -REC_BRANCH(JALR);
75179 -REC_BRANCH(BLTZ);
75180 -REC_BRANCH(BGTZ);
75181 -REC_BRANCH(BLTZAL);
75182 -REC_BRANCH(BGEZAL);
75183 -REC_BRANCH(BNE);
75184 -REC_BRANCH(BEQ);
75185 -REC_BRANCH(BLEZ);
75186 -REC_BRANCH(BGEZ);*/
75187 -
75188 -//#if 0
75189 -static void recBLTZ() {
75190 -// Branch if Rs < 0
75191 - u32 bpc = _Imm_ * 4 + pc;
75192 -
75193 -// iFlushRegs();
75194 -
75195 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75196 - return;
75197 - }
75198 -
75199 - if (IsConst(_Rs_)) {
75200 - if ((s32)iRegs[_Rs_].k < 0) {
75201 - iJump(bpc); return;
75202 - } else {
75203 - iJump(pc+4); return;
75204 - }
75205 - }
75206 -
75207 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], 0);
75208 - j32Ptr[4] = JL32(0);
75209 -
75210 - iBranch(pc+4, 1);
75211 -
75212 - x86SetJ32(j32Ptr[4]);
75213 -
75214 - iBranch(bpc, 0);
75215 - pc+=4;
75216 -}
75217 -
75218 -static void recBGTZ() {
75219 -// Branch if Rs > 0
75220 - u32 bpc = _Imm_ * 4 + pc;
75221 -
75222 -// iFlushRegs();
75223 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75224 - return;
75225 - }
75226 -
75227 - if (IsConst(_Rs_)) {
75228 - if ((s32)iRegs[_Rs_].k > 0) {
75229 - iJump(bpc); return;
75230 - } else {
75231 - iJump(pc+4); return;
75232 - }
75233 - }
75234 -
75235 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], 0);
75236 - j32Ptr[4] = JG32(0);
75237 -
75238 - iBranch(pc+4, 1);
75239 -
75240 - x86SetJ32(j32Ptr[4]);
75241 -
75242 - iBranch(bpc, 0);
75243 - pc+=4;
75244 -}
75245 -
75246 -static void recBLTZAL() {
75247 -// Branch if Rs < 0
75248 - u32 bpc = _Imm_ * 4 + pc;
75249 -
75250 -// iFlushRegs();
75251 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75252 - return;
75253 - }
75254 -
75255 - if (IsConst(_Rs_)) {
75256 - if ((s32)iRegs[_Rs_].k < 0) {
75257 - MOV32ItoM((u32)&psxRegs.GPR.r[31], pc + 4);
75258 - iJump(bpc); return;
75259 - } else {
75260 - iJump(pc+4); return;
75261 - }
75262 - }
75263 -
75264 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], 0);
75265 - j32Ptr[4] = JL32(0);
75266 -
75267 - iBranch(pc+4, 1);
75268 -
75269 - x86SetJ32(j32Ptr[4]);
75270 -
75271 - MOV32ItoM((u32)&psxRegs.GPR.r[31], pc + 4);
75272 - iBranch(bpc, 0);
75273 - pc+=4;
75274 -}
75275 -
75276 -static void recBGEZAL() {
75277 -// Branch if Rs >= 0
75278 - u32 bpc = _Imm_ * 4 + pc;
75279 -
75280 -// iFlushRegs();
75281 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75282 - return;
75283 - }
75284 -
75285 - if (IsConst(_Rs_)) {
75286 - if ((s32)iRegs[_Rs_].k >= 0) {
75287 - MOV32ItoM((u32)&psxRegs.GPR.r[31], pc + 4);
75288 - iJump(bpc); return;
75289 - } else {
75290 - iJump(pc+4); return;
75291 - }
75292 - }
75293 -
75294 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], 0);
75295 - j32Ptr[4] = JGE32(0);
75296 -
75297 - iBranch(pc+4, 1);
75298 -
75299 - x86SetJ32(j32Ptr[4]);
75300 -
75301 - MOV32ItoM((u32)&psxRegs.GPR.r[31], pc + 4);
75302 - iBranch(bpc, 0);
75303 - pc+=4;
75304 -}
75305 -
75306 -static void recJ() {
75307 -// j target
75308 -
75309 - iJump(_Target_ * 4 + (pc & 0xf0000000));
75310 -}
75311 -
75312 -static void recJAL() {
75313 -// jal target
75314 -
75315 - MapConst(31, pc + 4);
75316 -
75317 - iJump(_Target_ * 4 + (pc & 0xf0000000));
75318 -}
75319 -
75320 -static void recJR() {
75321 -// jr Rs
75322 -
75323 - if (IsConst(_Rs_)) {
75324 - MOV32ItoM((u32)&target, iRegs[_Rs_].k);
75325 - } else {
75326 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
75327 - MOV32RtoM((u32)&target, EAX);
75328 - }
75329 -
75330 - SetBranch();
75331 -}
75332 -
75333 -static void recJALR() {
75334 -// jalr Rs
75335 -
75336 - if (IsConst(_Rs_)) {
75337 - MOV32ItoM((u32)&target, iRegs[_Rs_].k);
75338 - } else {
75339 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
75340 - MOV32RtoM((u32)&target, EAX);
75341 - }
75342 -
75343 - if (_Rd_) {
75344 - MapConst(_Rd_, pc + 4);
75345 - }
75346 -
75347 - SetBranch();
75348 -}
75349 -
75350 -static void recBEQ() {
75351 -// Branch if Rs == Rt
75352 - u32 bpc = _Imm_ * 4 + pc;
75353 -
75354 -// iFlushRegs();
75355 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75356 - return;
75357 - }
75358 -
75359 - if (_Rs_ == _Rt_) {
75360 - iJump(bpc);
75361 - } else {
75362 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
75363 - if (iRegs[_Rs_].k == iRegs[_Rt_].k) {
75364 - iJump(bpc); return;
75365 - } else {
75366 - iJump(pc+4); return;
75367 - }
75368 - } else if (IsConst(_Rs_)) {
75369 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rt_], iRegs[_Rs_].k);
75370 - } else if (IsConst(_Rt_)) {
75371 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], iRegs[_Rt_].k);
75372 - } else {
75373 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
75374 - CMP32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75375 - }
75376 -
75377 - j32Ptr[4] = JE32(0);
75378 -
75379 - iBranch(pc+4, 1);
75380 -
75381 - x86SetJ32(j32Ptr[4]);
75382 -
75383 - iBranch(bpc, 0);
75384 - pc+=4;
75385 - }
75386 -}
75387 -
75388 -static void recBNE() {
75389 -// Branch if Rs != Rt
75390 - u32 bpc = _Imm_ * 4 + pc;
75391 -
75392 -// iFlushRegs();
75393 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75394 - return;
75395 - }
75396 -
75397 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
75398 - if (iRegs[_Rs_].k != iRegs[_Rt_].k) {
75399 - iJump(bpc); return;
75400 - } else {
75401 - iJump(pc+4); return;
75402 - }
75403 - } else if (IsConst(_Rs_)) {
75404 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rt_], iRegs[_Rs_].k);
75405 - } else if (IsConst(_Rt_)) {
75406 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], iRegs[_Rt_].k);
75407 - } else {
75408 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
75409 - CMP32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75410 - }
75411 - j32Ptr[4] = JNE32(0);
75412 -
75413 - iBranch(pc+4, 1);
75414 -
75415 - x86SetJ32(j32Ptr[4]);
75416 -
75417 - iBranch(bpc, 0);
75418 - pc+=4;
75419 -}
75420 -
75421 -static void recBLEZ() {
75422 -// Branch if Rs <= 0
75423 - u32 bpc = _Imm_ * 4 + pc;
75424 -
75425 -// iFlushRegs();
75426 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75427 - return;
75428 - }
75429 -
75430 - if (IsConst(_Rs_)) {
75431 - if ((s32)iRegs[_Rs_].k <= 0) {
75432 - iJump(bpc); return;
75433 - } else {
75434 - iJump(pc+4); return;
75435 - }
75436 - }
75437 -
75438 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], 0);
75439 - j32Ptr[4] = JLE32(0);
75440 -
75441 - iBranch(pc+4, 1);
75442 -
75443 - x86SetJ32(j32Ptr[4]);
75444 -
75445 - iBranch(bpc, 0);
75446 - pc+=4;
75447 -}
75448 -
75449 -static void recBGEZ() {
75450 -// Branch if Rs >= 0
75451 - u32 bpc = _Imm_ * 4 + pc;
75452 -
75453 -// iFlushRegs();
75454 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
75455 - return;
75456 - }
75457 -
75458 - if (IsConst(_Rs_)) {
75459 - if ((s32)iRegs[_Rs_].k >= 0) {
75460 - iJump(bpc); return;
75461 - } else {
75462 - iJump(pc+4); return;
75463 - }
75464 - }
75465 -
75466 - CMP32ItoM((u32)&psxRegs.GPR.r[_Rs_], 0);
75467 - j32Ptr[4] = JGE32(0);
75468 -
75469 - iBranch(pc+4, 1);
75470 -
75471 - x86SetJ32(j32Ptr[4]);
75472 -
75473 - iBranch(bpc, 0);
75474 - pc+=4;
75475 -}
75476 -//#endif
75477 -
75478 -/*REC_FUNC(MFC0);
75479 -REC_SYS(MTC0);
75480 -REC_FUNC(CFC0);
75481 -REC_SYS(CTC0);
75482 -REC_FUNC(RFE);
75483 -#if 0*/
75484 -static void recMFC0() {
75485 -// Rt = Cop0->Rd
75486 - if (!_Rt_) return;
75487 -
75488 - iRegs[_Rt_].state = ST_UNK;
75489 - MOV32MtoR(EAX, (u32)&psxRegs.CP0.r[_Rd_]);
75490 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
75491 -}
75492 -
75493 -static void recCFC0() {
75494 -// Rt = Cop0->Rd
75495 -
75496 - recMFC0();
75497 -}
75498 -
75499 -void psxMTC0();
75500 -static void recMTC0() {
75501 -// Cop0->Rd = Rt
75502 -
75503 - if (IsConst(_Rt_)) {
75504 - switch (_Rd_) {
75505 - case 12:
75506 - MOV32ItoM((u32)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k);
75507 - break;
75508 - case 13:
75509 - MOV32ItoM((u32)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k & ~(0xfc00));
75510 - break;
75511 - default:
75512 - MOV32ItoM((u32)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k);
75513 - break;
75514 - }
75515 - } else {
75516 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
75517 - switch (_Rd_) {
75518 - case 13:
75519 - AND32ItoR(EAX, ~(0xfc00));
75520 - break;
75521 - }
75522 - MOV32RtoM((u32)&psxRegs.CP0.r[_Rd_], EAX);
75523 - }
75524 -
75525 - if (_Rd_ == 12 || _Rd_ == 13) {
75526 - iFlushRegs();
75527 - MOV32ItoM((u32)&psxRegs.pc, (u32)pc);
75528 - CALLFunc((u32)psxTestSWInts);
75529 - if (_Rd_ == 12)
75530 - OR32ItoM((u32)&psxRegs.interrupt, 0x80000000);
75531 - if (branch == 0) {
75532 - branch = 2;
75533 - iRet();
75534 - }
75535 - }
75536 -}
75537 -
75538 -static void recCTC0() {
75539 -// Cop0->Rd = Rt
75540 -
75541 - recMTC0();
75542 -}
75543 -
75544 -static void recRFE() {
75545 - MOV32MtoR(EAX, (u32)&psxRegs.CP0.n.Status);
75546 - MOV32RtoR(ECX, EAX);
75547 - AND32ItoR(EAX, 0xfffffff0);
75548 - AND32ItoR(ECX, 0x3c);
75549 - SHR32ItoR(ECX, 2);
75550 - OR32RtoR (EAX, ECX);
75551 - MOV32RtoM((u32)&psxRegs.CP0.n.Status, EAX);
75552 -
75553 - iFlushRegs();
75554 - MOV32ItoM((u32)&psxRegs.pc, (u32)pc);
75555 - CALLFunc((u32)psxTestSWInts);
75556 - if (branch == 0) {
75557 - branch = 2;
75558 - iRet();
75559 - }
75560 -}
75561 -//#endif
75562 -
75563 -#include "iGte.h"
75564 -
75565 -//
75566 -
75567 -static void recHLE() {
75568 - iFlushRegs();
75569 -
75570 - MOV32ItoR(EAX, (u32)psxHLEt[psxRegs.code & 0xffff]);
75571 - CALL32R(EAX);
75572 - branch = 2;
75573 - iRet();
75574 -}
75575 -
75576 -//
75577 -
75578 -static void (*recBSC[64])() = {
75579 - recSPECIAL, recREGIMM, recJ , recJAL , recBEQ , recBNE , recBLEZ, recBGTZ,
75580 - recADDI , recADDIU , recSLTI, recSLTIU, recANDI, recORI , recXORI, recLUI ,
75581 - recCOP0 , recNULL , recCOP2, recNULL , recNULL, recNULL, recNULL, recNULL,
75582 - recNULL , recNULL , recNULL, recNULL , recNULL, recNULL, recNULL, recNULL,
75583 - recLB , recLH , recLWL , recLW , recLBU , recLHU , recLWR , recNULL,
75584 - recSB , recSH , recSWL , recSW , recNULL, recNULL, recSWR , recNULL,
75585 - recNULL , recNULL , recLWC2, recNULL , recNULL, recNULL, recNULL, recNULL,
75586 - recNULL , recNULL , recSWC2, recHLE , recNULL, recNULL, recNULL, recNULL
75587 -};
75588 -
75589 -static void (*recSPC[64])() = {
75590 - recSLL , recNULL, recSRL , recSRA , recSLLV , recNULL , recSRLV, recSRAV,
75591 - recJR , recJALR, recNULL, recNULL, recSYSCALL, recBREAK, recNULL, recNULL,
75592 - recMFHI, recMTHI, recMFLO, recMTLO, recNULL , recNULL , recNULL, recNULL,
75593 - recMULT, recMULTU, recDIV, recDIVU, recNULL , recNULL , recNULL, recNULL,
75594 - recADD , recADDU, recSUB , recSUBU, recAND , recOR , recXOR , recNOR ,
75595 - recNULL, recNULL, recSLT , recSLTU, recNULL , recNULL , recNULL, recNULL,
75596 - recNULL, recNULL, recNULL, recNULL, recNULL , recNULL , recNULL, recNULL,
75597 - recNULL, recNULL, recNULL, recNULL, recNULL , recNULL , recNULL, recNULL
75598 -};
75599 -
75600 -static void (*recREG[32])() = {
75601 - recBLTZ , recBGEZ , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
75602 - recNULL , recNULL , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
75603 - recBLTZAL, recBGEZAL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
75604 - recNULL , recNULL , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
75605 -};
75606 -
75607 -static void (*recCP0[32])() = {
75608 - recMFC0, recNULL, recCFC0, recNULL, recMTC0, recNULL, recCTC0, recNULL,
75609 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
75610 - recRFE , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
75611 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
75612 -};
75613 -
75614 -static void (*recCP2[64])() = {
75615 - recBASIC, recRTPS , recNULL , recNULL, recNULL, recNULL , recNCLIP, recNULL, // 00
75616 - recNULL , recNULL , recNULL , recNULL, recOP , recNULL , recNULL , recNULL, // 08
75617 - recDPCS , recINTPL, recMVMVA, recNCDS, recCDP , recNULL , recNCDT , recNULL, // 10
75618 - recNULL , recNULL , recNULL , recNCCS, recCC , recNULL , recNCS , recNULL, // 18
75619 - recNCT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 20
75620 - recSQR , recDCPL , recDPCT , recNULL, recNULL, recAVSZ3, recAVSZ4, recNULL, // 28
75621 - recRTPT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 30
75622 - recNULL , recNULL , recNULL , recNULL, recNULL, recGPF , recGPL , recNCCT // 38
75623 -};
75624 -
75625 -static void (*recCP2BSC[32])() = {
75626 - recMFC2, recNULL, recCFC2, recNULL, recMTC2, recNULL, recCTC2, recNULL,
75627 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
75628 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
75629 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
75630 -};
75631 -
75632 -
75633 -static void recRecompile() {
75634 - char *p;
75635 - char *ptr;
75636 -
75637 - dump=0;
75638 - resp = 0;
75639 -
75640 - /* if x86Ptr reached the mem limit reset whole mem */
75641 - if (((u32)x86Ptr - (u32)recMem) >= (RECMEM_SIZE - 0x10000))
75642 - recReset();
75643 -
75644 - x86Align(32);
75645 - ptr = x86Ptr;
75646 -
75647 - PC_REC32(psxRegs.pc) = (u32)x86Ptr;
75648 - pc = psxRegs.pc;
75649 - pcold = pc;
75650 -
75651 - for (count=0; count<500;) {
75652 - p = (char *)PSXM(pc);
75653 - if (p == NULL) recError();
75654 - psxRegs.code = *(u32 *)p;
75655 -/*
75656 - if ((psxRegs.code >> 26) == 0x23) { // LW
75657 - int i;
75658 - u32 code;
75659 -
75660 - for (i=1;; i++) {
75661 - p = (char *)PSXM(pc+i*4);
75662 - if (p == NULL) recError();
75663 - code = *(u32 *)p;
75664 -
75665 - if ((code >> 26) != 0x23 ||
75666 - _fRs_(code) != _Rs_ ||
75667 - _fImm_(code) != (_Imm_+i*4))
75668 - break;
75669 - }
75670 - if (i > 1) {
75671 - recLWBlock(i);
75672 - pc = pc + i*4; continue;
75673 - }
75674 - }
75675 -
75676 - if ((psxRegs.code >> 26) == 0x2b) { // SW
75677 - int i;
75678 - u32 code;
75679 -
75680 - for (i=1;; i++) {
75681 - p = (char *)PSXM(pc+i*4);
75682 - if (p == NULL) recError();
75683 - code = *(u32 *)p;
75684 -
75685 - if ((code >> 26) != 0x2b ||
75686 - _fRs_(code) != _Rs_ ||
75687 - _fImm_(code) != (_Imm_+i*4))
75688 - break;
75689 - }
75690 - if (i > 1) {
75691 - recSWBlock(i);
75692 - pc = pc + i*4; continue;
75693 - }
75694 - }*/
75695 -
75696 - pc+=4; count++;
75697 - recBSC[psxRegs.code>>26]();
75698 -
75699 - if (branch) {
75700 - branch = 0;
75701 - if (dump) iDumpBlock(ptr);
75702 - return;
75703 - }
75704 - }
75705 -
75706 - iFlushRegs();
75707 -
75708 - MOV32ItoM((u32)&psxRegs.pc, pc);
75709 -
75710 - iRet();
75711 -}
75712 -
75713 -
75714 -R3000Acpu psxRec = {
75715 - recInit,
75716 - recReset,
75717 - recExecute,
75718 - recExecuteBlock,
75719 - recClear,
75720 - recShutdown
75721 -};
75722 -
75723 diff -rupN original/libpcsxcore/libpcsxcore/ix86/ix86.c new/libpcsxcore/libpcsxcore/ix86/ix86.c
75724 --- original/libpcsxcore/libpcsxcore/ix86/ix86.c 2007-12-29 17:48:00.000000000 -0430
75725 +++ new/libpcsxcore/libpcsxcore/ix86/ix86.c 1969-12-31 20:00:00.000000000 -0400
75726 @@ -1,1839 +0,0 @@
75727 -/***************************************************************************
75728 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
75729 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
75730 - * *
75731 - * This program is free software; you can redistribute it and/or modify *
75732 - * it under the terms of the GNU General Public License as published by *
75733 - * the Free Software Foundation; either version 2 of the License, or *
75734 - * (at your option) any later version. *
75735 - * *
75736 - * This program is distributed in the hope that it will be useful, *
75737 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
75738 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
75739 - * GNU General Public License for more details. *
75740 - * *
75741 - * You should have received a copy of the GNU General Public License *
75742 - * along with this program; if not, write to the *
75743 - * Free Software Foundation, Inc., *
75744 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
75745 - ***************************************************************************/
75746 -
75747 -/*
75748 - * ix86 core v0.5.1
75749 - * Authors: linuzappz <linuzappz@pcsx.net>
75750 - * alexey silinov
75751 - */
75752 -
75753 -#include "ix86.h"
75754 -#if 0
75755 -static s32 iCpuId(s32 cmd, u32 *regs) {
75756 - int flag;
75757 -
75758 - __asm__(
75759 - "pushf\n" \
75760 - "pop %%eax\n" \
75761 - "mov %%eax, %%edx\n" \
75762 - "xor $0x200000, %%eax\n" \
75763 - "push %%eax\n" \
75764 - "popf\n" \
75765 - "pushf\n" \
75766 - "pop %%eax\n" \
75767 - "xor %%edx, %%eax\n" \
75768 - "mov %%eax, %0" \
75769 - : "=r"(flag)
75770 - :
75771 - : "eax", "edx"
75772 - );
75773 - if (!flag) return -1;
75774 -
75775 - /* Ryan: assembler PIC fix http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml
75776 - * Code Listing 6.3
75777 - */
75778 - __asm__(
75779 - "mov %4, %%eax\n"
75780 - "movl %%ebx, %%edi\n"
75781 - "cpuid\n"
75782 - "mov %%eax, %0\n"
75783 - "mov %%edi, %1\n"
75784 - "mov %%ecx, %2\n"
75785 - "mov %%edx, %3\n"
75786 - "movl %%edi, %%ebx\n"
75787 - : "=m" (regs[0]), "=m" (regs[1]),
75788 - "=m" (regs[2]), "=m" (regs[3])
75789 - : "m"(cmd)
75790 - : "eax", "ecx", "edx", "edi"
75791 - );
75792 -
75793 - return 0;
75794 -}
75795 -
75796 -void x86Init() {
75797 - u32 regs[4];
75798 - u32 cmds;
75799 -
75800 - memset(x86ID, 0, sizeof(x86ID));
75801 - x86Family = 0;
75802 - x86Model = 0;
75803 - x86PType = 0;
75804 - x86StepID = 0;
75805 - x86Flags = 0;
75806 - x86EFlags = 0;
75807 -
75808 - if (iCpuId(0, regs) != -1) {
75809 - cmds = regs[0];
75810 - ((u32*)x86ID)[0] = regs[1];
75811 - ((u32*)x86ID)[1] = regs[3];
75812 - ((u32*)x86ID)[2] = regs[2];
75813 - if (cmds >= 0x00000001) {
75814 - if (iCpuId(0x00000001, regs) != -1) {
75815 - x86StepID = regs[0] & 0xf;
75816 - x86Model = (regs[0] >> 4) & 0xf;
75817 - x86Family = (regs[0] >> 8) & 0xf;
75818 - x86PType = (regs[0] >> 12) & 0x3;
75819 - x86Flags = regs[3];
75820 - }
75821 - }
75822 -
75823 - if (iCpuId(0x80000000, regs) != -1) {
75824 - cmds = regs[0];
75825 - if (cmds >= 0x80000001) {
75826 - if (iCpuId(0x80000001, regs) != -1) {
75827 - x86EFlags = regs[3];
75828 - }
75829 - }
75830 - }
75831 - }
75832 -}
75833 -#endif
75834 -
75835 -void x86SetPtr(char *ptr) {
75836 - x86Ptr = ptr;
75837 -}
75838 -
75839 -void x86Shutdown() {
75840 -}
75841 -
75842 -void x86SetJ8(u8 *j8) {
75843 - u32 jump = (x86Ptr - (s8*)j8) - 1;
75844 -
75845 - if (jump > 0x7f) printf("j8 greater than 0x7f!!\n");
75846 - *j8 = (u8)jump;
75847 -}
75848 -
75849 -void x86SetJ32(u32 *j32) {
75850 - *j32 = (x86Ptr - (s8*)j32) - 4;
75851 -}
75852 -
75853 -void x86Align(int bytes) {
75854 - // fordward align
75855 - x86Ptr = (s8*)(((u32)x86Ptr + bytes) & ~(bytes - 1));
75856 -}
75857 -
75858 -#define SIB 4
75859 -#define DISP32 5
75860 -
75861 -/* macros helpers */
75862 -
75863 -#define ModRM(mod, rm, reg) \
75864 - write8((mod << 6) | (rm << 3) | (reg));
75865 -
75866 -#define SibSB(ss, rm, index) \
75867 - write8((ss << 6) | (rm << 3) | (index));
75868 -
75869 -#define SET8R(cc, to) { \
75870 - write8(0x0F); write8(cc); \
75871 - write8((0xC0) | (to)); }
75872 -
75873 -#define J8Rel(cc, to) { \
75874 - write8(cc); write8(to); return x86Ptr - 1; }
75875 -
75876 -#define J32Rel(cc, to) { \
75877 - write8(0x0F); write8(cc); write32(to); return (u32*)(x86Ptr - 4); }
75878 -
75879 -#define CMOV32RtoR(cc, to, from) { \
75880 - write8(0x0F); write8(cc); \
75881 - ModRM(3, to, from); }
75882 -
75883 -#define CMOV32MtoR(cc, to, from) { \
75884 - write8(0x0F); write8(cc); \
75885 - ModRM(0, to, DISP32); \
75886 - write32(from); }
75887 -
75888 -/********************/
75889 -/* IX86 intructions */
75890 -/********************/
75891 -
75892 -// mov instructions
75893 -
75894 -/* mov r32 to r32 */
75895 -void MOV32RtoR(int to, int from) {
75896 - write8(0x89);
75897 - ModRM(3, from, to);
75898 -}
75899 -
75900 -/* mov r32 to m32 */
75901 -void MOV32RtoM(u32 to, int from) {
75902 - write8(0x89);
75903 - ModRM(0, from, DISP32);
75904 - write32(to);
75905 -}
75906 -
75907 -/* mov m32 to r32 */
75908 -void MOV32MtoR(int to, u32 from) {
75909 - write8(0x8B);
75910 - ModRM(0, to, DISP32);
75911 - write32(from);
75912 -}
75913 -
75914 -/* mov [r32] to r32 */
75915 -void MOV32RmtoR(int to, int from) {
75916 - write8(0x8B);
75917 - ModRM(0, to, from);
75918 -}
75919 -
75920 -/* mov [r32][r32*scale] to r32 */
75921 -void MOV32RmStoR(int to, int from, int from2, int scale) {
75922 - write8(0x8B);
75923 - ModRM(0, to, 0x4);
75924 - SibSB(scale, from2, from);
75925 -}
75926 -
75927 -/* mov r32 to [r32] */
75928 -void MOV32RtoRm(int to, int from) {
75929 - write8(0x89);
75930 - ModRM(0, from, to);
75931 -}
75932 -
75933 -/* mov r32 to [r32][r32*scale] */
75934 -void MOV32RtoRmS(int to, int to2, int scale, int from) {
75935 - write8(0x89);
75936 - ModRM(0, from, 0x4);
75937 - SibSB(scale, to2, to);
75938 -}
75939 -
75940 -/* mov imm32 to r32 */
75941 -void MOV32ItoR(int to, u32 from) {
75942 - write8(0xB8 | to);
75943 - write32(from);
75944 -}
75945 -
75946 -/* mov imm32 to m32 */
75947 -void MOV32ItoM(u32 to, u32 from) {
75948 - write8(0xC7);
75949 - ModRM(0, 0, DISP32);
75950 - write32(to);
75951 - write32(from);
75952 -}
75953 -
75954 -/* mov r16 to m16 */
75955 -void MOV16RtoM(u32 to, int from) {
75956 - write8(0x66);
75957 - write8(0x89);
75958 - ModRM(0, from, DISP32);
75959 - write32(to);
75960 -}
75961 -
75962 -/* mov m16 to r16 */
75963 -void MOV16MtoR(int to, u32 from) {
75964 - write8(0x66);
75965 - write8(0x8B);
75966 - ModRM(0, to, DISP32);
75967 - write32(from);
75968 -}
75969 -
75970 -/* mov imm16 to m16 */
75971 -void MOV16ItoM(u32 to, u16 from) {
75972 - write8(0x66);
75973 - write8(0xC7);
75974 - ModRM(0, 0, DISP32);
75975 - write32(to);
75976 - write16(from);
75977 -}
75978 -
75979 -/* mov r8 to m8 */
75980 -void MOV8RtoM(u32 to, int from) {
75981 - write8(0x88);
75982 - ModRM(0, from, DISP32);
75983 - write32(to);
75984 -}
75985 -
75986 -/* mov m8 to r8 */
75987 -void MOV8MtoR(int to, u32 from) {
75988 - write8(0x8A);
75989 - ModRM(0, to, DISP32);
75990 - write32(from);
75991 -}
75992 -
75993 -/* mov imm8 to m8 */
75994 -void MOV8ItoM(u32 to, u8 from) {
75995 - write8(0xC6);
75996 - ModRM(0, 0, DISP32);
75997 - write32(to);
75998 - write8(from);
75999 -}
76000 -
76001 -/* movsx r8 to r32 */
76002 -void MOVSX32R8toR(int to, int from) {
76003 - write16(0xBE0F);
76004 - ModRM(3, to, from);
76005 -}
76006 -
76007 -/* movsx m8 to r32 */
76008 -void MOVSX32M8toR(int to, u32 from) {
76009 - write16(0xBE0F);
76010 - ModRM(0, to, DISP32);
76011 - write32(from);
76012 -}
76013 -
76014 -/* movsx r16 to r32 */
76015 -void MOVSX32R16toR(int to, int from) {
76016 - write16(0xBF0F);
76017 - ModRM(3, to, from);
76018 -}
76019 -
76020 -/* movsx m16 to r32 */
76021 -void MOVSX32M16toR(int to, u32 from) {
76022 - write16(0xBF0F);
76023 - ModRM(0, to, DISP32);
76024 - write32(from);
76025 -}
76026 -
76027 -/* movzx r8 to r32 */
76028 -void MOVZX32R8toR(int to, int from) {
76029 - write16(0xB60F);
76030 - ModRM(3, to, from);
76031 -}
76032 -
76033 -/* movzx m8 to r32 */
76034 -void MOVZX32M8toR(int to, u32 from) {
76035 - write16(0xB60F);
76036 - ModRM(0, to, DISP32);
76037 - write32(from);
76038 -}
76039 -
76040 -/* movzx r16 to r32 */
76041 -void MOVZX32R16toR(int to, int from) {
76042 - write16(0xB70F);
76043 - ModRM(3, to, from);
76044 -}
76045 -
76046 -/* movzx m16 to r32 */
76047 -void MOVZX32M16toR(int to, u32 from) {
76048 - write16(0xB70F);
76049 - ModRM(0, to, DISP32);
76050 - write32(from);
76051 -}
76052 -
76053 -/* cmovne r32 to r32 */
76054 -void CMOVNE32RtoR(int to, int from) {
76055 - CMOV32RtoR(0x45, to, from);
76056 -}
76057 -
76058 -/* cmovne m32 to r32*/
76059 -void CMOVNE32MtoR(int to, u32 from) {
76060 - CMOV32MtoR(0x45, to, from);
76061 -}
76062 -
76063 -/* cmove r32 to r32*/
76064 -void CMOVE32RtoR(int to, int from) {
76065 - CMOV32RtoR(0x44, to, from);
76066 -}
76067 -
76068 -/* cmove m32 to r32*/
76069 -void CMOVE32MtoR(int to, u32 from) {
76070 - CMOV32MtoR(0x44, to, from);
76071 -}
76072 -
76073 -/* cmovg r32 to r32*/
76074 -void CMOVG32RtoR(int to, int from) {
76075 - CMOV32RtoR(0x4F, to, from);
76076 -}
76077 -
76078 -/* cmovg m32 to r32*/
76079 -void CMOVG32MtoR(int to, u32 from) {
76080 - CMOV32MtoR(0x4F, to, from);
76081 -}
76082 -
76083 -/* cmovge r32 to r32*/
76084 -void CMOVGE32RtoR(int to, int from) {
76085 - CMOV32RtoR(0x4D, to, from);
76086 -}
76087 -
76088 -/* cmovge m32 to r32*/
76089 -void CMOVGE32MtoR(int to, u32 from) {
76090 - CMOV32MtoR(0x4D, to, from);
76091 -}
76092 -
76093 -/* cmovl r32 to r32*/
76094 -void CMOVL32RtoR(int to, int from) {
76095 - CMOV32RtoR(0x4C, to, from);
76096 -}
76097 -
76098 -/* cmovl m32 to r32*/
76099 -void CMOVL32MtoR(int to, u32 from) {
76100 - CMOV32MtoR(0x4C, to, from);
76101 -}
76102 -
76103 -/* cmovle r32 to r32*/
76104 -void CMOVLE32RtoR(int to, int from) {
76105 - CMOV32RtoR(0x4E, to, from);
76106 -}
76107 -
76108 -/* cmovle m32 to r32*/
76109 -void CMOVLE32MtoR(int to, u32 from) {
76110 - CMOV32MtoR(0x4E, to, from);
76111 -}
76112 -
76113 -// arithmic instructions
76114 -
76115 -/* add imm32 to r32 */
76116 -void ADD32ItoR(int to, u32 from) {
76117 - if (to == EAX) {
76118 - write8(0x05);
76119 - } else {
76120 - write8(0x81);
76121 - ModRM(3, 0, to);
76122 - }
76123 - write32(from);
76124 -}
76125 -
76126 -/* add imm32 to m32 */
76127 -void ADD32ItoM(u32 to, u32 from) {
76128 - write8(0x81);
76129 - ModRM(0, 0, DISP32);
76130 - write32(to);
76131 - write32(from);
76132 -}
76133 -
76134 -/* add r32 to r32 */
76135 -void ADD32RtoR(int to, int from) {
76136 - write8(0x01);
76137 - ModRM(3, from, to);
76138 -}
76139 -
76140 -/* add r32 to m32 */
76141 -void ADD32RtoM(u32 to, int from) {
76142 - write8(0x01);
76143 - ModRM(0, from, DISP32);
76144 - write32(to);
76145 -}
76146 -
76147 -/* add m32 to r32 */
76148 -void ADD32MtoR(int to, u32 from) {
76149 - write8(0x03);
76150 - ModRM(0, to, DISP32);
76151 - write32(from);
76152 -}
76153 -
76154 -/* adc imm32 to r32 */
76155 -void ADC32ItoR(int to, u32 from) {
76156 - if (to == EAX) {
76157 - write8(0x15);
76158 - } else {
76159 - write8(0x81);
76160 - ModRM(3, 2, to);
76161 - }
76162 - write32(from);
76163 -}
76164 -
76165 -/* adc r32 to r32 */
76166 -void ADC32RtoR(int to, int from) {
76167 - write8(0x11);
76168 - ModRM(3, from, to);
76169 -}
76170 -
76171 -/* adc m32 to r32 */
76172 -void ADC32MtoR(int to, u32 from) {
76173 - write8(0x13);
76174 - ModRM(0, to, DISP32);
76175 - write32(from);
76176 -}
76177 -
76178 -/* inc r32 */
76179 -void INC32R(int to) {
76180 - write8(0x40 + to);
76181 -}
76182 -
76183 -/* inc m32 */
76184 -void INC32M(u32 to) {
76185 - write8(0xFF);
76186 - ModRM(0, 0, DISP32);
76187 - write32(to);
76188 -}
76189 -
76190 -/* sub imm32 to r32 */
76191 -void SUB32ItoR(int to, u32 from) {
76192 - if (to == EAX) {
76193 - write8(0x2D);
76194 - } else {
76195 - write8(0x81);
76196 - ModRM(3, 5, to);
76197 - }
76198 - write32(from);
76199 -}
76200 -
76201 -/* sub r32 to r32 */
76202 -void SUB32RtoR(int to, int from) {
76203 - write8(0x29);
76204 - ModRM(3, from, to);
76205 -}
76206 -
76207 -/* sub m32 to r32 */
76208 -void SUB32MtoR(int to, u32 from) {
76209 - write8(0x2B);
76210 - ModRM(0, to, DISP32);
76211 - write32(from);
76212 -}
76213 -
76214 -/* sbb imm32 to r32 */
76215 -void SBB32ItoR(int to, u32 from) {
76216 - if (to == EAX) {
76217 - write8(0x1D);
76218 - } else {
76219 - write8(0x81);
76220 - ModRM(3, 3, to);
76221 - }
76222 - write32(from);
76223 -}
76224 -
76225 -/* sbb r32 to r32 */
76226 -void SBB32RtoR(int to, int from) {
76227 - write8(0x19);
76228 - ModRM(3, from, to);
76229 -}
76230 -
76231 -/* sbb m32 to r32 */
76232 -void SBB32MtoR(int to, u32 from) {
76233 - write8(0x1B);
76234 - ModRM(0, to, DISP32);
76235 - write32(from);
76236 -}
76237 -
76238 -/* dec r32 */
76239 -void DEC32R(int to) {
76240 - write8(0x48 + to);
76241 -}
76242 -
76243 -/* dec m32 */
76244 -void DEC32M(u32 to) {
76245 - write8(0xFF);
76246 - ModRM(0, 1, DISP32);
76247 - write32(to);
76248 -}
76249 -
76250 -/* mul eax by r32 to edx:eax */
76251 -void MUL32R(int from) {
76252 - write8(0xF7);
76253 - ModRM(3, 4, from);
76254 -}
76255 -
76256 -/* imul eax by r32 to edx:eax */
76257 -void IMUL32R(int from) {
76258 - write8(0xF7);
76259 - ModRM(3, 5, from);
76260 -}
76261 -
76262 -/* mul eax by m32 to edx:eax */
76263 -void MUL32M(u32 from) {
76264 - write8(0xF7);
76265 - ModRM(0, 4, DISP32);
76266 - write32(from);
76267 -}
76268 -
76269 -/* imul eax by m32 to edx:eax */
76270 -void IMUL32M(u32 from) {
76271 - write8(0xF7);
76272 - ModRM(0, 5, DISP32);
76273 - write32(from);
76274 -}
76275 -
76276 -/* imul r32 by r32 to r32 */
76277 -void IMUL32RtoR(int to, int from) {
76278 - write16(0xAF0F);
76279 - ModRM(3, to, from);
76280 -}
76281 -
76282 -/* div eax by r32 to edx:eax */
76283 -void DIV32R(int from) {
76284 - write8(0xF7);
76285 - ModRM(3, 6, from);
76286 -}
76287 -
76288 -/* idiv eax by r32 to edx:eax */
76289 -void IDIV32R(int from) {
76290 - write8(0xF7);
76291 - ModRM(3, 7, from);
76292 -}
76293 -
76294 -/* div eax by m32 to edx:eax */
76295 -void DIV32M(u32 from) {
76296 - write8(0xF7);
76297 - ModRM(0, 6, DISP32);
76298 - write32(from);
76299 -}
76300 -
76301 -/* idiv eax by m32 to edx:eax */
76302 -void IDIV32M(u32 from) {
76303 - write8(0xF7);
76304 - ModRM(0, 7, DISP32);
76305 - write32(from);
76306 -}
76307 -
76308 -// shifting instructions
76309 -
76310 -void RCR32ItoR(int to,int from)
76311 -{
76312 - if (from==1)
76313 - {
76314 - write8(0xd1);
76315 - write8(0xd8 | to);
76316 - }
76317 - else
76318 - {
76319 - write8(0xc1);
76320 - write8(0xd8 | to);
76321 - write8(from);
76322 - }
76323 -}
76324 -
76325 -/* shl imm8 to r32 */
76326 -void SHL32ItoR(int to, u8 from) {
76327 - if (from==1)
76328 - {
76329 - write8(0xd1);
76330 - write8(0xe0 | to);
76331 - return;
76332 - }
76333 - write8(0xC1);
76334 - ModRM(3, 4, to);
76335 - write8(from);
76336 -}
76337 -
76338 -/* shl cl to r32 */
76339 -void SHL32CLtoR(int to) {
76340 - write8(0xD3);
76341 - ModRM(3, 4, to);
76342 -}
76343 -
76344 -/* shr imm8 to r32 */
76345 -void SHR32ItoR(int to, u8 from) {
76346 - if (from==1)
76347 - {
76348 - write8(0xd1);
76349 - write8(0xe8 | to);
76350 - return;
76351 - }
76352 - write8(0xC1);
76353 - ModRM(3, 5, to);
76354 - write8(from);
76355 -}
76356 -
76357 -/* shr cl to r32 */
76358 -void SHR32CLtoR(int to) {
76359 - write8(0xD3);
76360 - ModRM(3, 5, to);
76361 -}
76362 -
76363 -/* sar imm8 to r32 */
76364 -void SAR32ItoR(int to, u8 from) {
76365 - write8(0xC1);
76366 - ModRM(3, 7, to);
76367 - write8(from);
76368 -}
76369 -
76370 -/* sar cl to r32 */
76371 -void SAR32CLtoR(int to) {
76372 - write8(0xD3);
76373 - ModRM(3, 7, to);
76374 -}
76375 -
76376 -
76377 -// logical instructions
76378 -
76379 -/* or imm32 to r32 */
76380 -void OR32ItoR(int to, u32 from) {
76381 - if (to == EAX) {
76382 - write8(0x0D);
76383 - } else {
76384 - write8(0x81);
76385 - ModRM(3, 1, to);
76386 - }
76387 - write32(from);
76388 -}
76389 -
76390 -/* or imm32 to m32 */
76391 -void OR32ItoM(u32 to, u32 from) {
76392 - write8(0x81);
76393 - ModRM(0, 1, DISP32);
76394 - write32(to);
76395 - write32(from);
76396 -}
76397 -
76398 -/* or r32 to r32 */
76399 -void OR32RtoR(int to, int from) {
76400 - write8(0x09);
76401 - ModRM(3, from, to);
76402 -}
76403 -
76404 -/* or r32 to m32 */
76405 -void OR32RtoM(u32 to, int from) {
76406 - write8(0x09);
76407 - ModRM(0, from, DISP32);
76408 - write32(to);
76409 -}
76410 -
76411 -/* or m32 to r32 */
76412 -void OR32MtoR(int to, u32 from) {
76413 - write8(0x0B);
76414 - ModRM(0, to, DISP32);
76415 - write32(from);
76416 -}
76417 -
76418 -/* xor imm32 to r32 */
76419 -void XOR32ItoR(int to, u32 from) {
76420 - if (to == EAX) {
76421 - write8(0x35);
76422 - } else {
76423 - write8(0x81);
76424 - ModRM(3, 6, to);
76425 - }
76426 - write32(from);
76427 -}
76428 -
76429 -/* xor imm32 to m32 */
76430 -void XOR32ItoM(u32 to, u32 from) {
76431 - write8(0x81);
76432 - ModRM(0, 6, DISP32);
76433 - write32(to);
76434 - write32(from);
76435 -}
76436 -
76437 -/* xor r32 to r32 */
76438 -void XOR32RtoR(int to, int from) {
76439 - write8(0x31);
76440 - ModRM(3, from, to);
76441 -}
76442 -
76443 -/* xor r32 to m32 */
76444 -void XOR32RtoM(u32 to, int from) {
76445 - write8(0x31);
76446 - ModRM(0, from, DISP32);
76447 - write32(to);
76448 -}
76449 -
76450 -/* xor m32 to r32 */
76451 -void XOR32MtoR(int to, u32 from) {
76452 - write8(0x33);
76453 - ModRM(0, to, DISP32);
76454 - write32(from);
76455 -}
76456 -
76457 -/* and imm32 to r32 */
76458 -void AND32ItoR(int to, u32 from) {
76459 - if (to == EAX) {
76460 - write8(0x25);
76461 - } else {
76462 - write8(0x81);
76463 - ModRM(3, 0x4, to);
76464 - }
76465 - write32(from);
76466 -}
76467 -
76468 -/* and imm32 to m32 */
76469 -void AND32ItoM(u32 to, u32 from) {
76470 - write8(0x81);
76471 - ModRM(0, 0x4, DISP32);
76472 - write32(to);
76473 - write32(from);
76474 -}
76475 -
76476 -/* and r32 to r32 */
76477 -void AND32RtoR(int to, int from) {
76478 - write8(0x21);
76479 - ModRM(3, from, to);
76480 -}
76481 -
76482 -/* and r32 to m32 */
76483 -void AND32RtoM(u32 to, int from) {
76484 - write8(0x21);
76485 - ModRM(0, from, DISP32);
76486 - write32(to);
76487 -}
76488 -
76489 -/* and m32 to r32 */
76490 -void AND32MtoR(int to, u32 from) {
76491 - write8(0x23);
76492 - ModRM(0, to, DISP32);
76493 - write32(from);
76494 -}
76495 -
76496 -/* not r32 */
76497 -void NOT32R(int from) {
76498 - write8(0xF7);
76499 - ModRM(3, 2, from);
76500 -}
76501 -
76502 -/* neg r32 */
76503 -void NEG32R(int from) {
76504 - write8(0xF7);
76505 - ModRM(3, 3, from);
76506 -}
76507 -
76508 -// jump instructions
76509 -
76510 -/* jmp rel8 */
76511 -u8* JMP8(u8 to) {
76512 - write8(0xEB);
76513 - write8(to);
76514 - return x86Ptr - 1;
76515 -}
76516 -
76517 -/* jmp rel32 */
76518 -u32* JMP32(u32 to) {
76519 - write8(0xE9);
76520 - write32(to);
76521 - return (u32*)(x86Ptr - 4);
76522 -}
76523 -
76524 -/* jmp r32 */
76525 -void JMP32R(int to) {
76526 - write8(0xFF);
76527 - ModRM(3, 4, to);
76528 -}
76529 -
76530 -/* je rel8 */
76531 -u8* JE8(u8 to) {
76532 - J8Rel(0x74, to);
76533 -}
76534 -
76535 -/* jz rel8 */
76536 -u8* JZ8(u8 to) {
76537 - J8Rel(0x74, to);
76538 -}
76539 -
76540 -/* jg rel8 */
76541 -u8* JG8(u8 to) {
76542 - J8Rel(0x7F, to);
76543 -}
76544 -
76545 -/* jge rel8 */
76546 -u8* JGE8(u8 to) {
76547 - J8Rel(0x7D, to);
76548 -}
76549 -
76550 -/* jl rel8 */
76551 -u8* JL8(u8 to) {
76552 - J8Rel(0x7C, to);
76553 -}
76554 -
76555 -/* jle rel8 */
76556 -u8* JLE8(u8 to) {
76557 - J8Rel(0x7E, to);
76558 -}
76559 -
76560 -/* jne rel8 */
76561 -u8* JNE8(u8 to) {
76562 - J8Rel(0x75, to);
76563 -}
76564 -
76565 -/* jnz rel8 */
76566 -u8* JNZ8(u8 to) {
76567 - J8Rel(0x75, to);
76568 -}
76569 -
76570 -/* jng rel8 */
76571 -u8* JNG8(u8 to) {
76572 - J8Rel(0x7E, to);
76573 -}
76574 -
76575 -/* jnge rel8 */
76576 -u8* JNGE8(u8 to) {
76577 - J8Rel(0x7C, to);
76578 -}
76579 -
76580 -/* jnl rel8 */
76581 -u8* JNL8(u8 to) {
76582 - J8Rel(0x7D, to);
76583 -}
76584 -
76585 -/* jnle rel8 */
76586 -u8* JNLE8(u8 to) {
76587 - J8Rel(0x7F, to);
76588 -}
76589 -
76590 -/* jo rel8 */
76591 -u8* JO8(u8 to) {
76592 - J8Rel(0x70, to);
76593 -}
76594 -
76595 -/* jno rel8 */
76596 -u8* JNO8(u8 to) {
76597 - J8Rel(0x71, to);
76598 -}
76599 -
76600 -/* je rel32 */
76601 -u32* JE32(u32 to) {
76602 - J32Rel(0x84, to);
76603 -}
76604 -
76605 -/* jz rel32 */
76606 -u32* JZ32(u32 to) {
76607 - J32Rel(0x84, to);
76608 -}
76609 -
76610 -/* jg rel32 */
76611 -u32* JG32(u32 to) {
76612 - J32Rel(0x8F, to);
76613 -}
76614 -
76615 -/* jge rel32 */
76616 -u32* JGE32(u32 to) {
76617 - J32Rel(0x8D, to);
76618 -}
76619 -
76620 -/* jl rel32 */
76621 -u32* JL32(u32 to) {
76622 - J32Rel(0x8C, to);
76623 -}
76624 -
76625 -/* jle rel32 */
76626 -u32* JLE32(u32 to) {
76627 - J32Rel(0x8E, to);
76628 -}
76629 -
76630 -/* jne rel32 */
76631 -u32* JNE32(u32 to) {
76632 - J32Rel(0x85, to);
76633 -}
76634 -
76635 -/* jnz rel32 */
76636 -u32* JNZ32(u32 to) {
76637 - J32Rel(0x85, to);
76638 -}
76639 -
76640 -/* jng rel32 */
76641 -u32* JNG32(u32 to) {
76642 - J32Rel(0x8E, to);
76643 -}
76644 -
76645 -/* jnge rel32 */
76646 -u32* JNGE32(u32 to) {
76647 - J32Rel(0x8C, to);
76648 -}
76649 -
76650 -/* jnl rel32 */
76651 -u32* JNL32(u32 to) {
76652 - J32Rel(0x8D, to);
76653 -}
76654 -
76655 -/* jnle rel32 */
76656 -u32* JNLE32(u32 to) {
76657 - J32Rel(0x8F, to);
76658 -}
76659 -
76660 -/* jo rel32 */
76661 -u32* JO32(u32 to) {
76662 - J32Rel(0x80, to);
76663 -}
76664 -
76665 -/* jno rel32 */
76666 -u32* JNO32(u32 to) {
76667 - J32Rel(0x81, to);
76668 -}
76669 -
76670 -/* call func */
76671 -void CALLFunc(u32 func) {
76672 - CALL32(func - ((u32)x86Ptr + 5));
76673 -}
76674 -
76675 -/* call rel32 */
76676 -void CALL32(u32 to) {
76677 - write8(0xE8);
76678 - write32(to);
76679 -}
76680 -
76681 -/* call r32 */
76682 -void CALL32R(int to) {
76683 - write8(0xFF);
76684 - ModRM(3, 2, to);
76685 -}
76686 -
76687 -/* call m32 */
76688 -void CALL32M(u32 to) {
76689 - write8(0xFF);
76690 - ModRM(0, 2, DISP32);
76691 - write32(to);
76692 -}
76693 -
76694 -// misc instructions
76695 -
76696 -/* cmp imm32 to r32 */
76697 -void CMP32ItoR(int to, u32 from) {
76698 - if (to == EAX) {
76699 - write8(0x3D);
76700 - } else {
76701 - write8(0x81);
76702 - ModRM(3, 7, to);
76703 - }
76704 - write32(from);
76705 -}
76706 -
76707 -/* cmp imm32 to m32 */
76708 -void CMP32ItoM(u32 to, u32 from) {
76709 - write8(0x81);
76710 - ModRM(0, 7, DISP32);
76711 - write32(to);
76712 - write32(from);
76713 -}
76714 -
76715 -/* cmp r32 to r32 */
76716 -void CMP32RtoR(int to, int from) {
76717 - write8(0x39);
76718 - ModRM(3, from, to);
76719 -}
76720 -
76721 -/* cmp m32 to r32 */
76722 -void CMP32MtoR(int to, u32 from) {
76723 - write8(0x3B);
76724 - ModRM(0, to, DISP32);
76725 - write32(from);
76726 -}
76727 -
76728 -/* test imm32 to r32 */
76729 -void TEST32ItoR(int to, u32 from) {
76730 - if (to == EAX) {
76731 - write8(0xA9);
76732 - } else {
76733 - write8(0xF7);
76734 - ModRM(3, 0, to);
76735 - }
76736 - write32(from);
76737 -}
76738 -
76739 -/* test r32 to r32 */
76740 -void TEST32RtoR(int to, int from) {
76741 - write8(0x85);
76742 - ModRM(3, from, to);
76743 -}
76744 -
76745 -void BT32ItoR(int to,int from)
76746 -{
76747 - write16(0xba0f);
76748 - write8(0xe0 | to);
76749 - write8(from);
76750 -}
76751 -
76752 -/* sets r8 */
76753 -void SETS8R(int to) {
76754 - SET8R(0x98, to);
76755 -}
76756 -/* setl r8 */
76757 -void SETL8R(int to) {
76758 - SET8R(0x9C, to);
76759 -}
76760 -
76761 -/* setb r8 */
76762 -void SETB8R(int to) {
76763 - SET8R(0x92, to);
76764 -}
76765 -
76766 -/* setnz r8 */
76767 -void SETNZ8R(int to) {
76768 - SET8R(0x95,to);
76769 -}
76770 -
76771 -/* cbw */
76772 -void CBW() {
76773 - write16(0x9866);
76774 -}
76775 -
76776 -/* cwd */
76777 -void CWD() {
76778 - write8(0x98);
76779 -}
76780 -
76781 -/* cdq */
76782 -void CDQ() {
76783 - write8(0x99);
76784 -}
76785 -
76786 -/* push r32 */
76787 -void PUSH32R(int from) {
76788 - write8(0x50 | from);
76789 -}
76790 -
76791 -/* push m32 */
76792 -void PUSH32M(u32 from) {
76793 - write8(0xFF);
76794 - ModRM(0, 6, DISP32);
76795 - write32(from);
76796 -}
76797 -
76798 -/* push imm32 */
76799 -void PUSH32I(u32 from) {
76800 - write8(0x68); write32(from);
76801 -}
76802 -
76803 -/* pop r32 */
76804 -void POP32R(int from) {
76805 - write8(0x58 | from);
76806 -}
76807 -
76808 -/* pushad */
76809 -void PUSHA32() {
76810 - write8(0x60);
76811 -}
76812 -
76813 -/* popad */
76814 -void POPA32() {
76815 - write8(0x61);
76816 -}
76817 -
76818 -/* ret */
76819 -void RET() {
76820 - write8(0xC3);
76821 -}
76822 -
76823 -/********************/
76824 -/* FPU instructions */
76825 -/********************/
76826 -
76827 -//Added:basara 14.01.2003
76828 -/* compare m32 to fpu reg stack */
76829 -void FCOMP32(u32 from) {
76830 - write8(0xD8);
76831 - ModRM(0, 0x3, DISP32);
76832 - write32(from);
76833 -}
76834 -
76835 -void FNSTSWtoAX() {
76836 - write16(0xE0DF);
76837 -}
76838 -
76839 -/* fild m32 to fpu reg stack */
76840 -void FILD32(u32 from) {
76841 - write8(0xDB);
76842 - ModRM(0, 0x0, DISP32);
76843 - write32(from);
76844 -}
76845 -
76846 -/* fistp m32 from fpu reg stack */
76847 -void FISTP32(u32 from) {
76848 - write8(0xDB);
76849 - ModRM(0, 0x3, DISP32);
76850 - write32(from);
76851 -}
76852 -
76853 -/* fld m32 to fpu reg stack */
76854 -void FLD32(u32 from) {
76855 - write8(0xD9);
76856 - ModRM(0, 0x0, DISP32);
76857 - write32(from);
76858 -}
76859 -
76860 -/* fstp m32 from fpu reg stack */
76861 -void FSTP32(u32 to) {
76862 - write8(0xD9);
76863 - ModRM(0, 0x3, DISP32);
76864 - write32(to);
76865 -}
76866 -
76867 -//
76868 -
76869 -/* fldcw fpu control word from m16 */
76870 -void FLDCW(u32 from) {
76871 - write8(0xD9);
76872 - ModRM(0, 0x5, DISP32);
76873 - write32(from);
76874 -}
76875 -
76876 -/* fnstcw fpu control word to m16 */
76877 -void FNSTCW(u32 to) {
76878 - write8(0xD9);
76879 - ModRM(0, 0x7, DISP32);
76880 - write32(to);
76881 -}
76882 -
76883 -//
76884 -
76885 -/* fadd m32 to fpu reg stack */
76886 -void FADD32(u32 from) {
76887 - write8(0xD8);
76888 - ModRM(0, 0x0, DISP32);
76889 - write32(from);
76890 -}
76891 -
76892 -/* fsub m32 to fpu reg stack */
76893 -void FSUB32(u32 from) {
76894 - write8(0xD8);
76895 - ModRM(0, 0x4, DISP32);
76896 - write32(from);
76897 -}
76898 -
76899 -/* fmul m32 to fpu reg stack */
76900 -void FMUL32(u32 from) {
76901 - write8(0xD8);
76902 - ModRM(0, 0x1, DISP32);
76903 - write32(from);
76904 -}
76905 -
76906 -/* fdiv m32 to fpu reg stack */
76907 -void FDIV32(u32 from) {
76908 - write8(0xD8);
76909 - ModRM(0, 0x6, DISP32);
76910 - write32(from);
76911 -}
76912 -
76913 -/* fabs fpu reg stack */
76914 -void FABS() {
76915 - write16(0xE1D9);
76916 -}
76917 -
76918 -/* fsqrt fpu reg stack */
76919 -void FSQRT() {
76920 - write16(0xFAD9);
76921 -}
76922 -
76923 -/* fchs fpu reg stack */
76924 -void FCHS() {
76925 - write16(0xE0D9);
76926 -}
76927 -
76928 -/********************/
76929 -/* MMX instructions */
76930 -/********************/
76931 -
76932 -// r64 = mm
76933 -
76934 -/* movq m64 to r64 */
76935 -void MOVQMtoR(int to, u32 from) {
76936 - write16(0x6F0F);
76937 - ModRM(0, to, DISP32);
76938 - write32(from);
76939 -}
76940 -
76941 -/* movq r64 to m64 */
76942 -void MOVQRtoM(u32 to, int from) {
76943 - write16(0x7F0F);
76944 - ModRM(0, from, DISP32);
76945 - write32(to);
76946 -}
76947 -
76948 -/* pand r64 to r64 */
76949 -void PANDRtoR(int to, int from) {
76950 - write16(0xDB0F);
76951 - ModRM(3, to, from);
76952 -}
76953 -
76954 -/* pand r64 to r64 */
76955 -void PANDNRtoR(int to, int from) {
76956 - write16(0xDF0F);
76957 - ModRM(3, to, from);
76958 -}
76959 -
76960 -/* por r64 to r64 */
76961 -void PORRtoR(int to, int from) {
76962 - write16(0xEB0F);
76963 - ModRM(3, to, from);
76964 -}
76965 -
76966 -/* pxor r64 to r64 */
76967 -void PXORRtoR(int to, int from) {
76968 - write16(0xEF0F);
76969 - ModRM(3, to, from);
76970 -}
76971 -
76972 -/* psllq r64 to r64 */
76973 -void PSLLQRtoR(int to, int from) {
76974 - write16(0xF30F);
76975 - ModRM(3, to, from);
76976 -}
76977 -
76978 -/* psllq m64 to r64 */
76979 -void PSLLQMtoR(int to, u32 from) {
76980 - write16(0xF30F);
76981 - ModRM(0, to, DISP32);
76982 - write32(from);
76983 -}
76984 -
76985 -/* psllq imm8 to r64 */
76986 -void PSLLQItoR(int to, u8 from) {
76987 - write16(0x730F);
76988 - ModRM(3, 6, to);
76989 - write8(from);
76990 -}
76991 -
76992 -/* psrlq r64 to r64 */
76993 -void PSRLQRtoR(int to, int from) {
76994 - write16(0xD30F);
76995 - ModRM(3, to, from);
76996 -}
76997 -
76998 -/* psrlq m64 to r64 */
76999 -void PSRLQMtoR(int to, u32 from) {
77000 - write16(0xD30F);
77001 - ModRM(0, to, DISP32);
77002 - write32(from);
77003 -}
77004 -
77005 -/* psrlq imm8 to r64 */
77006 -void PSRLQItoR(int to, u8 from) {
77007 - write16(0x730F);
77008 - ModRM(3, 2, to);
77009 - write8(from);
77010 -}
77011 -
77012 -/* paddusb r64 to r64 */
77013 -void PADDUSBRtoR(int to, int from) {
77014 - write16(0xDC0F);
77015 - ModRM(3, to, from);
77016 -}
77017 -
77018 -/* paddusb m64 to r64 */
77019 -void PADDUSBMtoR(int to, u32 from) {
77020 - write16(0xDC0F);
77021 - ModRM(0, to, DISP32);
77022 - write32(from);
77023 -}
77024 -
77025 -/* paddusw r64 to r64 */
77026 -void PADDUSWRtoR(int to, int from) {
77027 - write16(0xDD0F);
77028 - ModRM(3, to, from);
77029 -}
77030 -
77031 -/* paddusw m64 to r64 */
77032 -void PADDUSWMtoR(int to, u32 from) {
77033 - write16(0xDD0F);
77034 - ModRM(0, to, DISP32);
77035 - write32(from);
77036 -}
77037 -
77038 -/* paddb r64 to r64 */
77039 -void PADDBRtoR(int to, int from) {
77040 - write16(0xFC0F);
77041 - ModRM(3, to, from);
77042 -}
77043 -
77044 -/* paddb m64 to r64 */
77045 -void PADDBMtoR(int to, u32 from) {
77046 - write16(0xFC0F);
77047 - ModRM(0, to, DISP32);
77048 - write32(from);
77049 -}
77050 -
77051 -/* paddw r64 to r64 */
77052 -void PADDWRtoR(int to, int from) {
77053 - write16(0xFD0F);
77054 - ModRM(3, to, from);
77055 -}
77056 -
77057 -/* paddw m64 to r64 */
77058 -void PADDWMtoR(int to, u32 from) {
77059 - write16(0xFD0F);
77060 - ModRM(0, to, DISP32);
77061 - write32(from);
77062 -}
77063 -
77064 -/* paddd r64 to r64 */
77065 -void PADDDRtoR(int to, int from) {
77066 - write16(0xFE0F);
77067 - ModRM(3, to, from);
77068 -}
77069 -
77070 -/* paddd m64 to r64 */
77071 -void PADDDMtoR(int to, u32 from) {
77072 - write16(0xFE0F);
77073 - ModRM(0, to, DISP32);
77074 - write32(from);
77075 -}
77076 -
77077 -/* emms */
77078 -void EMMS() {
77079 - //use femms if we have 3dnow
77080 - write16(0x0e0f);
77081 - return;
77082 -}
77083 -
77084 -/* femms */
77085 -void FEMMS() {
77086 - write16(0x770F);
77087 - return;
77088 -}
77089 -
77090 -//Basara:changed
77091 -void PADDSBRtoR(int to, int from) {
77092 - write16(0xEC0F);
77093 - ModRM(3, to, from);
77094 -}
77095 -
77096 -void PADDSWRtoR(int to, int from) {
77097 - write16(0xED0F);
77098 - ModRM(3, to, from);
77099 -}
77100 -
77101 -void PADDSDRtoR(int to, int from) {
77102 - write16(0xEE0F);
77103 - ModRM(3, to, from);
77104 -}
77105 -
77106 -void PSUBSBRtoR(int to, int from) {
77107 - write16(0xE80F);
77108 - ModRM(3, to, from);
77109 -}
77110 -
77111 -void PSUBSWRtoR(int to, int from) {
77112 - write16(0xE90F);
77113 - ModRM(3, to, from);
77114 -}
77115 -
77116 -void PSUBSDRtoR(int to, int from) {
77117 - write16(0xEA0F);
77118 - ModRM(3, to, from);
77119 -}
77120 -
77121 -void PSUBBRtoR(int to, int from) {
77122 - write16(0xF80F);
77123 - ModRM(3, to, from);
77124 -}
77125 -
77126 -void PSUBWRtoR(int to, int from) {
77127 - write16(0xF90F);
77128 - ModRM(3, to, from);
77129 -}
77130 -
77131 -void PSUBDRtoR(int to, int from) {
77132 - write16(0xFA0F);
77133 - ModRM(3, to, from);
77134 -}
77135 -
77136 -//changed:basara
77137 -//P.s.It's sux.Don't use it offten.
77138 -void MOVQ64ItoR(int reg,u64 i)
77139 -{
77140 - MOVQMtoR(reg,(u32)(x86Ptr)+2+7);
77141 - JMP8(8);
77142 - write64(i);
77143 -}
77144 -
77145 -void PSUBUSBRtoR(int to, int from) {
77146 - write16(0xD80F);
77147 - ModRM(3, to, from);
77148 -}
77149 -
77150 -void PSUBUSWRtoR(int to, int from) {
77151 - write16(0xD90F);
77152 - ModRM(3, to, from);
77153 -}
77154 -
77155 -void PMAXSWRtoR(int to,int from)
77156 -{
77157 - write16(0xEE0F);
77158 - ModRM(3, to, from);
77159 -}
77160 -
77161 -void PMINSWRtoR(int to,int from)
77162 -{
77163 - write16(0xEA0F);
77164 - ModRM(3, to, from);
77165 -}
77166 -
77167 -void PCMPEQBRtoR(int to,int from)
77168 -{
77169 - write16(0x740F);
77170 - ModRM(3, to, from);
77171 -}
77172 -
77173 -void PCMPEQWRtoR(int to,int from)
77174 -{
77175 - write16(0x750F);
77176 - ModRM(3, to, from);
77177 -}
77178 -
77179 -void PCMPEQDRtoR(int to,int from)
77180 -{
77181 - write16(0x760F);
77182 - ModRM(3, to, from);
77183 -}
77184 -
77185 -void PCMPGTBRtoR(int to,int from)
77186 -{
77187 - write16(0x640F);
77188 - ModRM(3, to, from);
77189 -}
77190 -
77191 -void PCMPGTWRtoR(int to,int from)
77192 -{
77193 - write16(0x650F);
77194 - ModRM(3, to, from);
77195 -}
77196 -
77197 -void PCMPGTDRtoR(int to,int from)
77198 -{
77199 - write16(0x660F);
77200 - ModRM(3, to, from);
77201 -}
77202 -
77203 -//Basara:Added 10.01.2003
77204 -void PSRLWItoR(int to,int from)
77205 -{
77206 - write16(0x710f);
77207 - ModRM(2, 2 , to);
77208 - write8(from);
77209 -}
77210 -void PSRLDItoR(int to,int from)
77211 -{
77212 - write16(0x720f);
77213 - ModRM(2, 2 , to);
77214 - write8(from);
77215 -}
77216 -
77217 -void PSLLWItoR(int to,int from)
77218 -{
77219 - write16(0x710f);
77220 - ModRM(3, 6 , to);
77221 - write8(from);
77222 -}
77223 -
77224 -void PSLLDItoR(int to,int from)
77225 -{
77226 - write16(0x720f);
77227 - ModRM(3, 6 , to);
77228 - write8(from);
77229 -}
77230 -
77231 -void PSRAWItoR(int to,int from)
77232 -{
77233 - write16(0x710f);
77234 - ModRM(3, 4 , to);
77235 - write8(from);
77236 -}
77237 -
77238 -void PSRADItoR(int to,int from)
77239 -{
77240 - write16(0x720f);
77241 - ModRM(3, 4 , to);
77242 - write8(from);
77243 -}
77244 -
77245 -/* por m64 to r64 */
77246 -void PORMtoR(int to, u32 from) {
77247 - write16(0xEB0F);
77248 - ModRM(0, to, DISP32);
77249 - write32(from);
77250 -}
77251 -
77252 -/* pxor m64 to r64 */
77253 -void PXORMtoR(int to, u32 from) {
77254 - write16(0xEF0F);
77255 - ModRM(0, to, DISP32);
77256 - write32(from);
77257 -}
77258 -
77259 -/* pand m64 to r64 */
77260 -void PANDMtoR(int to, u32 from) {
77261 - write16(0xDB0F);
77262 - ModRM(0, to, DISP32);
77263 - write32(from);
77264 -}
77265 -
77266 -/* pandn m64 to r64 */
77267 -void PANDNMtoR(int to, u32 from) {
77268 - write16(0xDF0F);
77269 - ModRM(0, to, DISP32);
77270 - write32(from);
77271 -}
77272 -
77273 -/* movd m32 to r64 */
77274 -void MOVDMtoR(int to, u32 from) {
77275 - write16(0x6E0F);
77276 - ModRM(0, to, DISP32);
77277 - write32(from);
77278 -}
77279 -
77280 -/* movq r64 to m32 */
77281 -void MOVDRtoM(u32 to, int from) {
77282 - write16(0x7E0F);
77283 - ModRM(0, from, DISP32);
77284 - write32(to);
77285 -}
77286 -
77287 -/* movd r32 to r64 */
77288 -void MOVD32RtoR(int to, int from) {
77289 - write16(0x6E0F);
77290 - ModRM(3, to,from);
77291 -}
77292 -
77293 -/* movq r64 to r32 */
77294 -void MOVD64RtoR(int to, int from) {
77295 - write16(0x7E0F);
77296 - ModRM(3, from,to);
77297 -}
77298 -
77299 -void MOVQRtoR(int to,int from)
77300 -{
77301 - write16(0x6F0F);
77302 - ModRM(3, to,from);
77303 -}
77304 -
77305 -void PUNPCKHDQRtoR(int to,int from)
77306 -{
77307 - write16(0x6A0F);
77308 - ModRM(3, to,from);
77309 -}
77310 -
77311 -void PUNPCKLDQRtoR(int to,int from)
77312 -{
77313 - write16(0x620F);
77314 - ModRM(3, to,from);
77315 -}
77316 -
77317 -//////////////////////////////////////////////////////////////////////////
77318 -// SSE intructions
77319 -//////////////////////////////////////////////////////////////////////////
77320 -
77321 -void MOVAPSMtoR(int to,int from)
77322 -{
77323 - write16(0x280f);
77324 - ModRM(0, to, DISP32);
77325 - write32(from);
77326 -}
77327 -
77328 -void MOVAPSRtoM(int to,int from)
77329 -{
77330 - write16(0x2b0f);
77331 - ModRM(0, from, DISP32);
77332 - write32(to);
77333 -}
77334 -
77335 -void MOVAPSRtoR(int to,int from)
77336 -{
77337 - write16(0x290f);
77338 - ModRM(3, to,from);
77339 -}
77340 -
77341 -void ORPSMtoR(int to,int from)
77342 -{
77343 - write16(0x560f);
77344 - ModRM(0, to, DISP32);
77345 - write32(from);
77346 -}
77347 -
77348 -void ORPSRtoR(int to,int from)
77349 -{
77350 - write16(0x560f);
77351 - ModRM(3, to,from);
77352 -}
77353 -
77354 -void XORPSMtoR(int to,int from)
77355 -{
77356 - write16(0x570f);
77357 - ModRM(0, to, DISP32);
77358 - write32(from);
77359 -}
77360 -
77361 -void XORPSRtoR(int to,int from)
77362 -{
77363 - write16(0x570f);
77364 - ModRM(3, to,from);
77365 -}
77366 -
77367 -void ANDPSMtoR(int to,int from)
77368 -{
77369 - write16(0x540f);
77370 - ModRM(0, to, DISP32);
77371 - write32(from);
77372 -}
77373 -
77374 -void ANDPSRtoR(int to,int from)
77375 -{
77376 - write16(0x540f);
77377 - ModRM(3, to,from);
77378 -}
77379 -
77380 -/*
77381 - 3DNOW intructions
77382 -*/
77383 -
77384 -void PFCMPEQMtoR(int to,int from)
77385 -{
77386 - write16(0x0f0f);
77387 - ModRM(0, to, DISP32);
77388 - write32(from);
77389 - write8(0xb0);
77390 -}
77391 -
77392 -void PFCMPGTMtoR(int to,int from)
77393 -{
77394 - write16(0x0f0f);
77395 - ModRM(0, to, DISP32);
77396 - write32(from);
77397 - write8(0xa0);
77398 -}
77399 -
77400 -void PFCMPGEMtoR(int to,int from)
77401 -{
77402 - write16(0x0f0f);
77403 - ModRM(0, to, DISP32);
77404 - write32(from);
77405 - write8(0x90);
77406 -}
77407 -
77408 -
77409 -void PFADDMtoR(int to,int from)
77410 -{
77411 - write16(0x0f0f);
77412 - ModRM(0, to, DISP32);
77413 - write32(from);
77414 - write8(0x9e);
77415 -}
77416 -
77417 -void PFADDRtoR(int to,int from)
77418 -{
77419 - write16(0x0f0f);
77420 - ModRM(3, to, from);
77421 - write8(0x9e);
77422 -}
77423 -
77424 -
77425 -void PFSUBMtoR(int to,int from)
77426 -{
77427 - write16(0x0f0f);
77428 - ModRM(0, to, DISP32);
77429 - write32(from);
77430 - write8(0x9a);
77431 -}
77432 -
77433 -void PFSUBRtoR(int to,int from)
77434 -{
77435 - write16(0x0f0f);
77436 - ModRM(3, to, from);
77437 - write8(0x9a);
77438 -}
77439 -
77440 -
77441 -void PFMULMtoR(int to,int from)
77442 -{
77443 - write16(0x0f0f);
77444 - ModRM(0, to, DISP32);
77445 - write32(from);
77446 - write8(0xb4);
77447 -}
77448 -
77449 -void PFMULRtoR(int to,int from)
77450 -{
77451 - write16(0x0f0f);
77452 - ModRM(3, to,from);
77453 - write8(0xb4);
77454 -}
77455 -
77456 -void PFRCPMtoR(int to,int from)
77457 -{
77458 - write16(0x0f0f);
77459 - ModRM(0, to, DISP32);
77460 - write32(from);
77461 - write8(0x96);
77462 -}
77463 -
77464 -void PFRCPRtoR(int to,int from)
77465 -{
77466 - write16(0x0f0f);
77467 - ModRM(3, to,from);
77468 - write8(0x96);
77469 -}
77470 -
77471 -void PFRCPIT1RtoR(int to,int from)
77472 -{
77473 - write16(0x0f0f);
77474 - ModRM(3, to,from);
77475 - write8(0xa6);
77476 -}
77477 -
77478 -void PFRCPIT2RtoR(int to,int from)
77479 -{
77480 - write16(0x0f0f);
77481 - ModRM(3, to,from);
77482 - write8(0xb6);
77483 -}
77484 -
77485 -void PFRSQRTRtoR(int to,int from)
77486 -{
77487 - write16(0x0f0f);
77488 - ModRM(3, to,from);
77489 - write8(0x97);
77490 -}
77491 -
77492 -void PFRSQIT1RtoR(int to,int from)
77493 -{
77494 - write16(0x0f0f);
77495 - ModRM(3, to,from);
77496 - write8(0xa7);
77497 -}
77498 -
77499 -void PF2IDMtoR(int to,int from)
77500 -{
77501 - write16(0x0f0f);
77502 - ModRM(0, to, DISP32);
77503 - write32(from);
77504 - write8(0x1d);
77505 -}
77506 -
77507 -void PF2IDRtoR(int to,int from)
77508 -{
77509 - write16(0x0f0f);
77510 - ModRM(3, to, from);
77511 - write8(0x1d);
77512 -}
77513 -
77514 -void PI2FDMtoR(int to,int from)
77515 -{
77516 - write16(0x0f0f);
77517 - ModRM(0, to, DISP32);
77518 - write32(from);
77519 - write8(0x0d);
77520 -}
77521 -
77522 -void PI2FDRtoR(int to,int from)
77523 -{
77524 - write16(0x0f0f);
77525 - ModRM(3, to, from);
77526 - write8(0x0d);
77527 -}
77528 -
77529 -
77530 -/*
77531 - 3DNOW Extension intructions
77532 -*/
77533 -
77534 -void PFMAXMtoR(int to,int from)
77535 -{
77536 - write16(0x0f0f);
77537 - ModRM(0, to, DISP32);
77538 - write32(from);
77539 - write8(0xa4);
77540 -}
77541 -
77542 -void PFMAXRtoR(int to,int from)
77543 -{
77544 - write16(0x0f0f);
77545 - ModRM(3, to, from);
77546 - write8(0xa4);
77547 -}
77548 -
77549 -void PFMINMtoR(int to,int from)
77550 -{
77551 - write16(0x0f0f);
77552 - ModRM(0, to, DISP32);
77553 - write32(from);
77554 - write8(0x94);
77555 -}
77556 -
77557 -void PFMINRtoR(int to,int from)
77558 -{
77559 - write16(0x0f0f);
77560 - ModRM(3, to, from);
77561 - write8(0x94);
77562 -}
77563 -
77564 -
77565 -
77566 diff -rupN original/libpcsxcore/libpcsxcore/ix86/ix86.h new/libpcsxcore/libpcsxcore/ix86/ix86.h
77567 --- original/libpcsxcore/libpcsxcore/ix86/ix86.h 2007-12-29 17:48:00.000000000 -0430
77568 +++ new/libpcsxcore/libpcsxcore/ix86/ix86.h 1969-12-31 20:00:00.000000000 -0400
77569 @@ -1,703 +0,0 @@
77570 -/***************************************************************************
77571 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
77572 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
77573 - * *
77574 - * This program is free software; you can redistribute it and/or modify *
77575 - * it under the terms of the GNU General Public License as published by *
77576 - * the Free Software Foundation; either version 2 of the License, or *
77577 - * (at your option) any later version. *
77578 - * *
77579 - * This program is distributed in the hope that it will be useful, *
77580 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
77581 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
77582 - * GNU General Public License for more details. *
77583 - * *
77584 - * You should have received a copy of the GNU General Public License *
77585 - * along with this program; if not, write to the *
77586 - * Free Software Foundation, Inc., *
77587 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
77588 - ***************************************************************************/
77589 -
77590 -/*
77591 - * ix86 definitions v0.5.1
77592 - * Authors: linuzappz <linuzappz@pcsx.net>
77593 - * alexey silinov
77594 - */
77595 -
77596 -#ifndef __IX86_H__
77597 -#define __IX86_H__
77598 -
77599 -// include basic types
77600 -#include "../psxcommon.h"
77601 -#include "../r3000a.h"
77602 -#include "../psxhle.h"
77603 -
77604 -
77605 -// x86Flags defines
77606 -#define X86FLAG_FPU 0x00000001
77607 -#define X86FLAG_VME 0x00000002
77608 -#define X86FLAG_DEBUGEXT 0x00000004
77609 -#define X86FLAG_4MPAGE 0x00000008
77610 -#define X86FLAG_TSC 0x00000010
77611 -#define X86FLAG_MSR 0x00000020
77612 -#define X86FLAG_PAE 0x00000040
77613 -#define X86FLAG_MCHKXCP 0x00000080
77614 -#define X86FLAG_CMPXCHG8B 0x00000100
77615 -#define X86FLAG_APIC 0x00000200
77616 -#define X86FLAG_SYSENTER 0x00000800
77617 -#define X86FLAG_MTRR 0x00001000
77618 -#define X86FLAG_GPE 0x00002000
77619 -#define X86FLAG_MCHKARCH 0x00004000
77620 -#define X86FLAG_CMOV 0x00008000
77621 -#define X86FLAG_PAT 0x00010000
77622 -#define X86FLAG_PSE36 0x00020000
77623 -#define X86FLAG_PN 0x00040000
77624 -#define X86FLAG_MMX 0x00800000
77625 -#define X86FLAG_FXSAVE 0x01000000
77626 -#define X86FLAG_SSE 0x02000000
77627 -
77628 -// x86EFlags defines
77629 -
77630 -#define X86EFLAG_MMXEXT 0x00400000
77631 -#define X86EFLAG_3DNOWEXT 0x40000000
77632 -#define X86EFLAG_3DNOW 0x80000000
77633 -
77634 -s8 x86ID[16]; // Vendor ID
77635 -u32 x86Family; // Processor Family
77636 -u32 x86Model; // Processor Model
77637 -u32 x86PType; // Processor Type
77638 -u32 x86StepID; // Stepping ID
77639 -u32 x86Flags; // Feature Flags
77640 -u32 x86EFlags; // Extended Feature Flags
77641 -
77642 -/* general defines */
77643 -#define write8(val) *(u8 *)x86Ptr = val; x86Ptr++;
77644 -#define write16(val) *(u16*)x86Ptr = val; x86Ptr+=2;
77645 -#define write32(val) *(u32*)x86Ptr = val; x86Ptr+=4;
77646 -#define write64(val) *(u64*)x86Ptr = val; x86Ptr+=8;
77647 -
77648 -#define EAX 0
77649 -#define EBX 3
77650 -#define ECX 1
77651 -#define EDX 2
77652 -#define ESI 6
77653 -#define EDI 7
77654 -#define EBP 5
77655 -#define ESP 4
77656 -
77657 -#define MM0 0
77658 -#define MM1 1
77659 -#define MM2 2
77660 -#define MM3 3
77661 -#define MM4 4
77662 -#define MM5 5
77663 -#define MM6 6
77664 -#define MM7 7
77665 -
77666 -#define XMM0 0
77667 -#define XMM1 1
77668 -#define XMM2 2
77669 -#define XMM3 3
77670 -#define XMM4 4
77671 -#define XMM5 5
77672 -#define XMM6 6
77673 -#define XMM7 7
77674 -
77675 -
77676 -s8 *x86Ptr;
77677 -u8 *j8Ptr[32];
77678 -u32 *j32Ptr[32];
77679 -
77680 -//void x86Init();
77681 -void x86SetPtr(char *ptr);
77682 -void x86Shutdown();
77683 -
77684 -void x86SetJ8(u8 *j8);
77685 -void x86SetJ32(u32 *j32);
77686 -void x86Align(int bytes);
77687 -
77688 -
77689 -/********************/
77690 -/* IX86 intructions */
77691 -/********************/
77692 -
77693 -/*
77694 - * scale values:
77695 - * 0 - *1
77696 - * 1 - *2
77697 - * 2 - *4
77698 - * 3 - *8
77699 - */
77700 -
77701 -////////////////////////////////////
77702 -// mov instructions /
77703 -////////////////////////////////////
77704 -
77705 -/* mov r32 to r32 */
77706 -void MOV32RtoR(int to, int from);
77707 -/* mov r32 to m32 */
77708 -void MOV32RtoM(u32 to, int from);
77709 -/* mov m32 to r32 */
77710 -void MOV32MtoR(int to, u32 from);
77711 -/* mov [r32] to r32 */
77712 -void MOV32RmtoR(int to, int from);
77713 -/* mov [r32][r32*scale] to r32 */
77714 -void MOV32RmStoR(int to, int from, int from2, int scale);
77715 -/* mov r32 to [r32] */
77716 -void MOV32RtoRm(int to, int from);
77717 -/* mov r32 to [r32][r32*scale] */
77718 -void MOV32RtoRmS(int to, int to2, int scale, int from);
77719 -/* mov imm32 to r32 */
77720 -void MOV32ItoR(int to, u32 from);
77721 -/* mov imm32 to m32 */
77722 -void MOV32ItoM(u32 to, u32 from);
77723 -
77724 -/* mov r16 to m16 */
77725 -void MOV16RtoM(u32 to, int from);
77726 -/* mov m16 to r16 */
77727 -void MOV16MtoR(int to, u32 from);
77728 -/* mov imm16 to m16 */
77729 -void MOV16ItoM(u32 to, u16 from);
77730 -
77731 -/* mov r8 to m8 */
77732 -void MOV8RtoM(u32 to, int from);
77733 -/* mov m8 to r8 */
77734 -void MOV8MtoR(int to, u32 from);
77735 -/* mov imm8 to m8 */
77736 -void MOV8ItoM(u32 to, u8 from);
77737 -
77738 -/* movsx r8 to r32 */
77739 -void MOVSX32R8toR(int to, int from);
77740 -/* movsx m8 to r32 */
77741 -void MOVSX32M8toR(int to, u32 from);
77742 -/* movsx r16 to r32 */
77743 -void MOVSX32R16toR(int to, int from);
77744 -/* movsx m16 to r32 */
77745 -void MOVSX32M16toR(int to, u32 from);
77746 -
77747 -/* movzx r8 to r32 */
77748 -void MOVZX32R8toR(int to, int from);
77749 -/* movzx m8 to r32 */
77750 -void MOVZX32M8toR(int to, u32 from);
77751 -/* movzx r16 to r32 */
77752 -void MOVZX32R16toR(int to, int from);
77753 -/* movzx m16 to r32 */
77754 -void MOVZX32M16toR(int to, u32 from);
77755 -
77756 -/* cmovne r32 to r32 */
77757 -void CMOVNE32RtoR(int to, int from);
77758 -/* cmovne m32 to r32*/
77759 -void CMOVNE32MtoR(int to, u32 from);
77760 -/* cmove r32 to r32*/
77761 -void CMOVE32RtoR(int to, int from);
77762 -/* cmove m32 to r32*/
77763 -void CMOVE32MtoR(int to, u32 from);
77764 -/* cmovg r32 to r32*/
77765 -void CMOVG32RtoR(int to, int from);
77766 -/* cmovg m32 to r32*/
77767 -void CMOVG32MtoR(int to, u32 from);
77768 -/* cmovge r32 to r32*/
77769 -void CMOVGE32RtoR(int to, int from);
77770 -/* cmovge m32 to r32*/
77771 -void CMOVGE32MtoR(int to, u32 from);
77772 -/* cmovl r32 to r32*/
77773 -void CMOVL32RtoR(int to, int from);
77774 -/* cmovl m32 to r32*/
77775 -void CMOVL32MtoR(int to, u32 from);
77776 -/* cmovle r32 to r32*/
77777 -void CMOVLE32RtoR(int to, int from);
77778 -/* cmovle m32 to r32*/
77779 -void CMOVLE32MtoR(int to, u32 from);
77780 -
77781 -////////////////////////////////////
77782 -// arithmetic instructions /
77783 -////////////////////////////////////
77784 -
77785 -/* add imm32 to r32 */
77786 -void ADD32ItoR(int to, u32 from);
77787 -/* add imm32 to m32 */
77788 -void ADD32ItoM(u32 to, u32 from);
77789 -/* add r32 to r32 */
77790 -void ADD32RtoR(int to, int from);
77791 -/* add r32 to m32 */
77792 -void ADD32RtoM(u32 to, int from);
77793 -/* add m32 to r32 */
77794 -void ADD32MtoR(int to, u32 from);
77795 -
77796 -/* adc imm32 to r32 */
77797 -void ADC32ItoR(int to, u32 from);
77798 -/* adc r32 to r32 */
77799 -void ADC32RtoR(int to, int from);
77800 -/* adc m32 to r32 */
77801 -void ADC32MtoR(int to, u32 from);
77802 -
77803 -/* inc r32 */
77804 -void INC32R(int to);
77805 -/* inc m32 */
77806 -void INC32M(u32 to);
77807 -
77808 -/* sub imm32 to r32 */
77809 -void SUB32ItoR(int to, u32 from);
77810 -/* sub r32 to r32 */
77811 -void SUB32RtoR(int to, int from);
77812 -/* sub m32 to r32 */
77813 -void SUB32MtoR(int to, u32 from);
77814 -
77815 -/* sbb imm32 to r32 */
77816 -void SBB32ItoR(int to, u32 from);
77817 -/* sbb r32 to r32 */
77818 -void SBB32RtoR(int to, int from);
77819 -/* sbb m32 to r32 */
77820 -void SBB32MtoR(int to, u32 from);
77821 -
77822 -/* dec r32 */
77823 -void DEC32R(int to);
77824 -/* dec m32 */
77825 -void DEC32M(u32 to);
77826 -
77827 -/* mul eax by r32 to edx:eax */
77828 -void MUL32R(int from);
77829 -/* mul eax by m32 to edx:eax */
77830 -void MUL32M(u32 from);
77831 -
77832 -/* imul eax by r32 to edx:eax */
77833 -void IMUL32R(int from);
77834 -/* imul eax by m32 to edx:eax */
77835 -void IMUL32M(u32 from);
77836 -/* imul r32 by r32 to r32 */
77837 -void IMUL32RtoR(int to, int from);
77838 -
77839 -/* div eax by r32 to edx:eax */
77840 -void DIV32R(int from);
77841 -/* div eax by m32 to edx:eax */
77842 -void DIV32M(u32 from);
77843 -
77844 -/* idiv eax by r32 to edx:eax */
77845 -void IDIV32R(int from);
77846 -/* idiv eax by m32 to edx:eax */
77847 -void IDIV32M(u32 from);
77848 -
77849 -////////////////////////////////////
77850 -// shifting instructions /
77851 -////////////////////////////////////
77852 -
77853 -/* shl imm8 to r32 */
77854 -void SHL32ItoR(int to, u8 from);
77855 -/* shl cl to r32 */
77856 -void SHL32CLtoR(int to);
77857 -
77858 -/* shr imm8 to r32 */
77859 -void SHR32ItoR(int to, u8 from);
77860 -/* shr cl to r32 */
77861 -void SHR32CLtoR(int to);
77862 -
77863 -/* sar imm8 to r32 */
77864 -void SAR32ItoR(int to, u8 from);
77865 -/* sar cl to r32 */
77866 -void SAR32CLtoR(int to);
77867 -
77868 -/* sal imm8 to r32 */
77869 -#define SAL32ItoR SHL32ItoR
77870 -/* sal cl to r32 */
77871 -#define SAL32CLtoR SHL32CLtoR
77872 -
77873 -// logical instructions
77874 -
77875 -/* or imm32 to r32 */
77876 -void OR32ItoR(int to, u32 from);
77877 -/* or imm32 to m32 */
77878 -void OR32ItoM(u32 to, u32 from);
77879 -/* or r32 to r32 */
77880 -void OR32RtoR(int to, int from);
77881 -/* or r32 to m32 */
77882 -void OR32RtoM(u32 to, int from);
77883 -/* or m32 to r32 */
77884 -void OR32MtoR(int to, u32 from);
77885 -
77886 -/* xor imm32 to r32 */
77887 -void XOR32ItoR(int to, u32 from);
77888 -/* xor imm32 to m32 */
77889 -void XOR32ItoM(u32 to, u32 from);
77890 -/* xor r32 to r32 */
77891 -void XOR32RtoR(int to, int from);
77892 -/* xor r32 to m32 */
77893 -void XOR32RtoM(u32 to, int from);
77894 -/* xor m32 to r32 */
77895 -void XOR32MtoR(int to, u32 from);
77896 -
77897 -/* and imm32 to r32 */
77898 -void AND32ItoR(int to, u32 from);
77899 -/* and imm32 to m32 */
77900 -void AND32ItoM(u32 to, u32 from);
77901 -/* and r32 to r32 */
77902 -void AND32RtoR(int to, int from);
77903 -/* and r32 to m32 */
77904 -void AND32RtoM(u32 to, int from);
77905 -/* and m32 to r32 */
77906 -void AND32MtoR(int to, u32 from);
77907 -
77908 -/* not r32 */
77909 -void NOT32R(int from);
77910 -/* neg r32 */
77911 -void NEG32R(int from);
77912 -
77913 -////////////////////////////////////
77914 -// jump instructions /
77915 -////////////////////////////////////
77916 -
77917 -/* jmp rel8 */
77918 -u8* JMP8(u8 to);
77919 -
77920 -/* jmp rel32 */
77921 -u32* JMP32(u32 to);
77922 -/* jmp r32 */
77923 -void JMP32R(int to);
77924 -
77925 -/* je rel8 */
77926 -u8* JE8(u8 to);
77927 -/* jz rel8 */
77928 -u8* JZ8(u8 to);
77929 -/* jg rel8 */
77930 -u8* JG8(u8 to);
77931 -/* jge rel8 */
77932 -u8* JGE8(u8 to);
77933 -/* jl rel8 */
77934 -u8* JL8(u8 to);
77935 -/* jle rel8 */
77936 -u8* JLE8(u8 to);
77937 -/* jne rel8 */
77938 -u8* JNE8(u8 to);
77939 -/* jnz rel8 */
77940 -u8* JNZ8(u8 to);
77941 -/* jng rel8 */
77942 -u8* JNG8(u8 to);
77943 -/* jnge rel8 */
77944 -u8* JNGE8(u8 to);
77945 -/* jnl rel8 */
77946 -u8* JNL8(u8 to);
77947 -/* jnle rel8 */
77948 -u8* JNLE8(u8 to);
77949 -/* jo rel8 */
77950 -u8* JO8(u8 to);
77951 -/* jno rel8 */
77952 -u8* JNO8(u8 to);
77953 -
77954 -/* je rel32 */
77955 -u32* JE32(u32 to);
77956 -/* jz rel32 */
77957 -u32* JZ32(u32 to);
77958 -/* jg rel32 */
77959 -u32* JG32(u32 to);
77960 -/* jge rel32 */
77961 -u32* JGE32(u32 to);
77962 -/* jl rel32 */
77963 -u32* JL32(u32 to);
77964 -/* jle rel32 */
77965 -u32* JLE32(u32 to);
77966 -/* jne rel32 */
77967 -u32* JNE32(u32 to);
77968 -/* jnz rel32 */
77969 -u32* JNZ32(u32 to);
77970 -/* jng rel32 */
77971 -u32* JNG32(u32 to);
77972 -/* jnge rel32 */
77973 -u32* JNGE32(u32 to);
77974 -/* jnl rel32 */
77975 -u32* JNL32(u32 to);
77976 -/* jnle rel32 */
77977 -u32* JNLE32(u32 to);
77978 -/* jo rel32 */
77979 -u32* JO32(u32 to);
77980 -/* jno rel32 */
77981 -u32* JNO32(u32 to);
77982 -
77983 -/* call func */
77984 -void CALLFunc(u32 func); // based on CALL32
77985 -/* call rel32 */
77986 -void CALL32(u32 to);
77987 -/* call r32 */
77988 -void CALL32R(int to);
77989 -/* call m32 */
77990 -void CALL32M(u32 to);
77991 -
77992 -////////////////////////////////////
77993 -// misc instructions /
77994 -////////////////////////////////////
77995 -
77996 -/* cmp imm32 to r32 */
77997 -void CMP32ItoR(int to, u32 from);
77998 -/* cmp imm32 to m32 */
77999 -void CMP32ItoM(u32 to, u32 from);
78000 -/* cmp r32 to r32 */
78001 -void CMP32RtoR(int to, int from);
78002 -/* cmp m32 to r32 */
78003 -void CMP32MtoR(int to, u32 from);
78004 -
78005 -/* test imm32 to r32 */
78006 -void TEST32ItoR(int to, u32 from);
78007 -/* test r32 to r32 */
78008 -void TEST32RtoR(int to, int from);
78009 -/* sets r8 */
78010 -void SETS8R(int to);
78011 -/* setl r8 */
78012 -void SETL8R(int to);
78013 -/* setb r8 */
78014 -void SETB8R(int to);
78015 -
78016 -/* cbw */
78017 -void CBW();
78018 -/* cwd */
78019 -void CWD();
78020 -/* cdq */
78021 -void CDQ();
78022 -
78023 -/* push r32 */
78024 -void PUSH32R(int from);
78025 -/* push m32 */
78026 -void PUSH32M(u32 from);
78027 -/* push imm32 */
78028 -void PUSH32I(u32 from);
78029 -
78030 -/* pop r32 */
78031 -void POP32R(int from);
78032 -
78033 -/* pushad */
78034 -void PUSHA32();
78035 -/* popad */
78036 -void POPA32();
78037 -
78038 -/* ret */
78039 -void RET();
78040 -
78041 -/********************/
78042 -/* FPU instructions */
78043 -/********************/
78044 -
78045 -/* fild m32 to fpu reg stack */
78046 -void FILD32(u32 from);
78047 -/* fistp m32 from fpu reg stack */
78048 -void FISTP32(u32 from);
78049 -/* fld m32 to fpu reg stack */
78050 -void FLD32(u32 from);
78051 -/* fstp m32 from fpu reg stack */
78052 -void FSTP32(u32 to);
78053 -
78054 -/* fldcw fpu control word from m16 */
78055 -void FLDCW(u32 from);
78056 -/* fstcw fpu control word to m16 */
78057 -void FNSTCW(u32 to);
78058 -
78059 -/* fadd m32 to fpu reg stack */
78060 -void FADD32(u32 from);
78061 -/* fsub m32 to fpu reg stack */
78062 -void FSUB32(u32 from);
78063 -/* fmul m32 to fpu reg stack */
78064 -void FMUL32(u32 from);
78065 -/* fdiv m32 to fpu reg stack */
78066 -void FDIV32(u32 from);
78067 -/* fabs fpu reg stack */
78068 -void FABS();
78069 -/* fsqrt fpu reg stack */
78070 -void FSQRT();
78071 -/* fchs fpu reg stack */
78072 -void FCHS();
78073 -
78074 -/********************/
78075 -/* MMX instructions */
78076 -/********************/
78077 -
78078 -// r64 = mm
78079 -
78080 -/* movq m64 to r64 */
78081 -void MOVQMtoR(int to, u32 from);
78082 -/* movq r64 to m64 */
78083 -void MOVQRtoM(u32 to, int from);
78084 -
78085 -/* pand r64 to r64 */
78086 -void PANDRtoR(int to, int from);
78087 -/* pand m64 to r64 */
78088 -void PANDMtoR(int to, u32 from);
78089 -
78090 -/* pandn r64 to r64 */
78091 -void PANDNRtoR(int to, int from);
78092 -
78093 -/* pandn r64 to r64 */
78094 -void PANDNMtoR(int to, u32 from);
78095 -
78096 -/* por r64 to r64 */
78097 -void PORRtoR(int to, int from);
78098 -/* por m64 to r64 */
78099 -void PORMtoR(int to, u32 from);
78100 -
78101 -/* pxor r64 to r64 */
78102 -void PXORRtoR(int to, int from);
78103 -/* pxor m64 to r64 */
78104 -void PXORMtoR(int to, u32 from);
78105 -
78106 -/* psllq r64 to r64 */
78107 -void PSLLQRtoR(int to, int from);
78108 -/* psllq m64 to r64 */
78109 -void PSLLQMtoR(int to, u32 from);
78110 -/* psllq imm8 to r64 */
78111 -void PSLLQItoR(int to, u8 from);
78112 -
78113 -/* psrlq r64 to r64 */
78114 -void PSRLQRtoR(int to, int from);
78115 -/* psrlq m64 to r64 */
78116 -void PSRLQMtoR(int to, u32 from);
78117 -/* psrlq imm8 to r64 */
78118 -void PSRLQItoR(int to, u8 from);
78119 -
78120 -/* paddusb r64 to r64 */
78121 -void PADDUSBRtoR(int to, int from);
78122 -/* paddusb m64 to r64 */
78123 -void PADDUSBMtoR(int to, u32 from);
78124 -/* paddusw r64 to r64 */
78125 -void PADDUSWRtoR(int to, int from);
78126 -/* paddusw m64 to r64 */
78127 -void PADDUSWMtoR(int to, u32 from);
78128 -
78129 -/* paddb r64 to r64 */
78130 -void PADDBRtoR(int to, int from);
78131 -/* paddb m64 to r64 */
78132 -void PADDBMtoR(int to, u32 from);
78133 -/* paddw r64 to r64 */
78134 -void PADDWRtoR(int to, int from);
78135 -/* paddw m64 to r64 */
78136 -void PADDWMtoR(int to, u32 from);
78137 -/* paddd r64 to r64 */
78138 -void PADDDRtoR(int to, int from);
78139 -/* paddd m64 to r64 */
78140 -void PADDDMtoR(int to, u32 from);
78141 -
78142 -/* emms */
78143 -void EMMS();
78144 -void FEMMS();
78145 -void BT32ItoR(int to,int from);
78146 -void RCR32ItoR(int to,int from);
78147 -
78148 -//Basara:changed
78149 -void PADDSBRtoR(int to, int from);
78150 -void PADDSWRtoR(int to, int from);
78151 -void PADDSDRtoR(int to, int from);
78152 -void PSUBSBRtoR(int to, int from);
78153 -void PSUBSWRtoR(int to, int from);
78154 -void PSUBSDRtoR(int to, int from);
78155 -
78156 -void PSUBBRtoR(int to, int from);
78157 -void PSUBWRtoR(int to, int from);
78158 -void PSUBDRtoR(int to, int from);
78159 -
78160 -void MOVQ64ItoR(int reg,u64 i); //Prototype.Todo add all consts to end of block.not after jr $+8
78161 -
78162 -void PMAXSWRtoR(int to,int from);
78163 -void PMINSWRtoR(int to,int from);
78164 -
78165 -void PCMPEQBRtoR(int to,int from);
78166 -void PCMPEQWRtoR(int to,int from);
78167 -void PCMPEQDRtoR(int to,int from);
78168 -
78169 -void PCMPGTBRtoR(int to,int from);
78170 -void PCMPGTWRtoR(int to,int from);
78171 -void PCMPGTDRtoR(int to,int from);
78172 -
78173 -void PSRLWItoR(int to,int from);
78174 -void PSRLDItoR(int to,int from);
78175 -void PSLLWItoR(int to,int from);
78176 -void PSLLDItoR(int to,int from);
78177 -void PSRAWItoR(int to,int from);
78178 -void PSRADItoR(int to,int from);
78179 -
78180 -//Added:basara 11.01.2003
78181 -void FCOMP32(u32 from);
78182 -void FNSTSWtoAX();
78183 -void SETNZ8R(int to);
78184 -
78185 -//Added:basara 14.01.2003
78186 -void PFCMPEQMtoR(int to,int from);
78187 -void PFCMPGTMtoR(int to,int from);
78188 -void PFCMPGEMtoR(int to,int from);
78189 -
78190 -void PFADDMtoR(int to,int from);
78191 -void PFADDRtoR(int to,int from);
78192 -
78193 -void PFSUBMtoR(int to,int from);
78194 -void PFSUBRtoR(int to,int from);
78195 -
78196 -void PFMULMtoR(int to,int from);
78197 -void PFMULRtoR(int to,int from);
78198 -
78199 -void PFRCPMtoR(int to,int from);
78200 -void PFRCPRtoR(int to,int from);
78201 -void PFRCPIT1RtoR(int to,int from);
78202 -void PFRCPIT2RtoR(int to,int from);
78203 -
78204 -void PFRSQRTRtoR(int to,int from);
78205 -void PFRSQIT1RtoR(int to,int from);
78206 -
78207 -
78208 -void PF2IDMtoR(int to,int from);
78209 -void PF2IDRtoR(int to,int from);
78210 -void PI2FDMtoR(int to,int from);
78211 -void PI2FDRtoR(int to,int from);
78212 -
78213 -void PFMAXMtoR(int to,int from);
78214 -void PFMAXRtoR(int to,int from);
78215 -void PFMINMtoR(int to,int from);
78216 -void PFMINRtoR(int to,int from);
78217 -
78218 -
78219 -void MOVDMtoR(int to, u32 from);
78220 -void MOVDRtoM(u32 to, int from);
78221 -void MOVD32RtoR(int to, int from);
78222 -void MOVD64RtoR(int to, int from);
78223 -
78224 -void MOVQRtoR(int to,int from);
78225 -
78226 -//if to==from MMLO=MMHI
78227 -void PUNPCKHDQRtoR(int to,int from);
78228 -
78229 -//if to==from MMHI=MMLO
78230 -void PUNPCKLDQRtoR(int to,int from);
78231 -
78232 -
78233 -
78234 -/*
78235 - SSE intructions
78236 -*/
78237 -void MOVAPSMtoR(int to,int from);
78238 -void MOVAPSRtoM(int to,int from);
78239 -void MOVAPSRtoR(int to,int from);
78240 -
78241 -void ORPSMtoR(int to,int from);
78242 -void ORPSRtoR(int to,int from);
78243 -
78244 -void XORPSMtoR(int to,int from);
78245 -void XORPSRtoR(int to,int from);
78246 -
78247 -void ANDPSMtoR(int to,int from);
78248 -void ANDPSRtoR(int to,int from);
78249 -
78250 -
78251 -#endif /* __IX86_H__ */
78252 -
78253 -
78254 -
78255 -
78256 -
78257 -
78258 -
78259 -
78260 -
78261 -
78262 -
78263 -
78264 -
78265 -
78266 -
78267 -
78268 -
78269 -
78270 -
78271 -
78272 -
78273 diff -rupN original/libpcsxcore/libpcsxcore/ix86.lo new/libpcsxcore/libpcsxcore/ix86.lo
78274 --- original/libpcsxcore/libpcsxcore/ix86.lo 2009-03-28 22:35:12.000000000 -0430
78275 +++ new/libpcsxcore/libpcsxcore/ix86.lo 1969-12-31 20:00:00.000000000 -0400
78276 @@ -1,12 +0,0 @@
78277 -# ix86.lo - a libtool object file
78278 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
78279 -#
78280 -# Please DO NOT delete this file!
78281 -# It is necessary for linking the library.
78282 -
78283 -# Name of the PIC object.
78284 -pic_object='.libs/ix86.o'
78285 -
78286 -# Name of the non-PIC object.
78287 -non_pic_object='ix86.o'
78288 -
78289 Los ficheros binarios original/libpcsxcore/libpcsxcore/ix86.o y new/libpcsxcore/libpcsxcore/ix86.o son distintos
78290 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/CVS/Entries new/libpcsxcore/libpcsxcore/ix86_64/CVS/Entries
78291 --- original/libpcsxcore/libpcsxcore/ix86_64/CVS/Entries 2009-03-28 22:23:37.000000000 -0430
78292 +++ new/libpcsxcore/libpcsxcore/ix86_64/CVS/Entries 1969-12-31 20:00:00.000000000 -0400
78293 @@ -1,11 +0,0 @@
78294 -/README/1.1.1.1/Mon Oct 8 21:13:28 2007//
78295 -/iGte.h/1.2/Mon Feb 23 10:17:23 2009//
78296 -/iR3000A-64.c/1.3/Mon Feb 23 10:17:23 2009//
78297 -/ix86-64.c/1.2/Sat Dec 29 22:18:01 2007//
78298 -/ix86-64.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
78299 -/ix86_3dnow.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
78300 -/ix86_cpudetect.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
78301 -/ix86_fpu.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
78302 -/ix86_mmx.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
78303 -/ix86_sse.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
78304 -D
78305 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/CVS/Repository new/libpcsxcore/libpcsxcore/ix86_64/CVS/Repository
78306 --- original/libpcsxcore/libpcsxcore/ix86_64/CVS/Repository 2009-03-28 22:23:20.000000000 -0430
78307 +++ new/libpcsxcore/libpcsxcore/ix86_64/CVS/Repository 1969-12-31 20:00:00.000000000 -0400
78308 @@ -1 +0,0 @@
78309 -pcsx-df/libpcsxcore/ix86_64
78310 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/CVS/Root new/libpcsxcore/libpcsxcore/ix86_64/CVS/Root
78311 --- original/libpcsxcore/libpcsxcore/ix86_64/CVS/Root 2009-03-28 22:23:20.000000000 -0430
78312 +++ new/libpcsxcore/libpcsxcore/ix86_64/CVS/Root 1969-12-31 20:00:00.000000000 -0400
78313 @@ -1 +0,0 @@
78314 -:pserver:anonymous@pcsx-df.cvs.sourceforge.net:/cvsroot/pcsx-df
78315 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/README new/libpcsxcore/libpcsxcore/ix86_64/README
78316 --- original/libpcsxcore/libpcsxcore/ix86_64/README 2007-10-08 17:13:28.000000000 -0400
78317 +++ new/libpcsxcore/libpcsxcore/ix86_64/README 1969-12-31 20:00:00.000000000 -0400
78318 @@ -1,4 +0,0 @@
78319 -This is the AMD64 dynamic recompiler.
78320 -Made from opcodes from PCSX2 0.9.3 and the x86 recompiler modified to fit. ie. currently no AMD64/SSE specific code advantages.
78321 -
78322 -Note that this recompiler currently requires all variables, data heaps, function pointers, etc to be within a 4 Gig range of each other. While this is currently the case through luck and dirty hacks, a proper fix should be implemented.
78323 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/iGte.h new/libpcsxcore/libpcsxcore/ix86_64/iGte.h
78324 --- original/libpcsxcore/libpcsxcore/ix86_64/iGte.h 2009-02-23 05:47:23.000000000 -0430
78325 +++ new/libpcsxcore/libpcsxcore/ix86_64/iGte.h 1969-12-31 20:00:00.000000000 -0400
78326 @@ -1,672 +0,0 @@
78327 -/***************************************************************************
78328 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
78329 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
78330 - * *
78331 - * This program is free software; you can redistribute it and/or modify *
78332 - * it under the terms of the GNU General Public License as published by *
78333 - * the Free Software Foundation; either version 2 of the License, or *
78334 - * (at your option) any later version. *
78335 - * *
78336 - * This program is distributed in the hope that it will be useful, *
78337 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
78338 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
78339 - * GNU General Public License for more details. *
78340 - * *
78341 - * You should have received a copy of the GNU General Public License *
78342 - * along with this program; if not, write to the *
78343 - * Free Software Foundation, Inc., *
78344 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
78345 - ***************************************************************************/
78346 -
78347 -#ifndef __IGTE_H__
78348 -#define __IGTE_H__
78349 -
78350 -#include "../r3000a.h"
78351 -#include "../psxmem.h"
78352 -
78353 -#define CP2_FUNC(f) \
78354 -void gte##f(); \
78355 -static void rec##f() { \
78356 - iFlushRegs(); \
78357 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code); \
78358 - CALLFunc((uptr)gte##f); \
78359 -/* branch = 2; */\
78360 -}
78361 -
78362 -#define CP2_FUNCNC(f) \
78363 -void gte##f(); \
78364 -static void rec##f() { \
78365 - iFlushRegs(); \
78366 - CALLFunc((uptr)gte##f); \
78367 -/* branch = 2; */\
78368 -}
78369 -
78370 -
78371 -#if 0
78372 -CP2_FUNC(MFC2);
78373 -CP2_FUNC(MTC2);
78374 -CP2_FUNC(CFC2);
78375 -CP2_FUNC(CTC2);
78376 -CP2_FUNC(LWC2);
78377 -CP2_FUNC(SWC2);
78378 -#endif
78379 -
78380 -#if 1
78381 -void gteMFC2();
78382 -static void recMFC2() {
78383 -// Rt = Cop2D->Rd
78384 - if (!_Rt_) return;
78385 -
78386 - iRegs[_Rt_].state = ST_UNK;
78387 -
78388 - switch (_Rd_) {
78389 - case 29:
78390 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code);
78391 - CALLFunc((uptr)gteMFC2);
78392 - break;
78393 -
78394 - default:
78395 - MOV32MtoR(EAX, (uptr)&psxRegs.CP2D.r[_Rd_]);
78396 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
78397 - break;
78398 - }
78399 -}
78400 -
78401 -void gteMTC2();
78402 -static void recMTC2() {
78403 -// Cop2D->Rd = Rt
78404 - int fixt = 0;
78405 -
78406 -// iFlushRegs();
78407 -
78408 - switch (_Rd_) {
78409 - case 8: case 9: case 10: case 11:
78410 - fixt = 1; break;
78411 -
78412 - case 16: case 17: case 18: case 19:
78413 - fixt = 2; break;
78414 -
78415 - case 15:
78416 - case 28:
78417 - case 30:
78418 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code);
78419 - CALLFunc((uptr)gteMTC2);
78420 - break;
78421 - }
78422 -
78423 - if (IsConst(_Rt_)) {
78424 - if (fixt == 1) MOV32ItoM((uptr)&psxRegs.CP2D.r[_Rd_], (s16)iRegs[_Rt_].k);
78425 - else if (fixt == 2) MOV32ItoM((uptr)&psxRegs.CP2D.r[_Rd_], iRegs[_Rt_].k & 0xffff);
78426 - else MOV32ItoM((uptr)&psxRegs.CP2D.r[_Rd_], iRegs[_Rt_].k);
78427 - } else {
78428 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
78429 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
78430 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
78431 - MOV32RtoM((uptr)&psxRegs.CP2D.r[_Rd_], EAX);
78432 - }
78433 -}
78434 -
78435 -void gteLWC2();
78436 -static void recLWC2() {
78437 -// Cop2D->Rt = mem[Rs + Im] (unsigned)
78438 - int fixt = 0;
78439 -
78440 - switch (_Rt_) {
78441 - case 8: case 9: case 10: case 11:
78442 - fixt = 1; break;
78443 -
78444 - case 16: case 17: case 18: case 19:
78445 - fixt = 2; break;
78446 -
78447 - case 15:
78448 - case 28:
78449 - case 30:
78450 - iFlushRegs();
78451 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code);
78452 - CALLFunc((uptr)gteLWC2);
78453 - return;
78454 - }
78455 -
78456 - if (IsConst(_Rs_)) {
78457 - u32 addr = iRegs[_Rs_].k + _Imm_;
78458 - int t = addr >> 16;
78459 -
78460 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
78461 - MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1fffff]);
78462 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
78463 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
78464 - MOV32RtoM((uptr)&psxRegs.CP2D.r[_Rt_], EAX);
78465 - return;
78466 - }
78467 - if (t == 0x1f80 && addr < 0x1f801000) {
78468 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xfff]);
78469 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
78470 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
78471 - MOV32RtoM((uptr)&psxRegs.CP2D.r[_Rt_], EAX);
78472 - return;
78473 - }
78474 - }
78475 -
78476 - //iPushOfB();
78477 - SetArg_OfB(X86ARG1);
78478 - CALLFunc((uptr)psxMemRead32);
78479 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
78480 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
78481 - MOV32RtoM((uptr)&psxRegs.CP2D.r[_Rt_], EAX);
78482 -// ADD32ItoR(ESP, 4);
78483 - //resp+= 4;
78484 -}
78485 -
78486 -void gteSWC2();
78487 -static void recSWC2() {
78488 -// mem[Rs + Im] = Rt
78489 -
78490 - switch (_Rt_) {
78491 - case 29:
78492 - iFlushRegs();
78493 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code);
78494 - CALLFunc((uptr)gteSWC2);
78495 - return;
78496 - }
78497 -
78498 - if (IsConst(_Rs_)) {
78499 - u32 addr = iRegs[_Rs_].k + _Imm_;
78500 - int t = addr >> 16;
78501 -
78502 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
78503 - MOV32MtoR(EAX, (uptr)&psxRegs.CP2D.r[_Rt_]);
78504 - MOV32RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
78505 - return;
78506 - }
78507 - if (t == 0x1f80 && addr < 0x1f801000) {
78508 - MOV32MtoR(EAX, (uptr)&psxRegs.CP2D.r[_Rt_]);
78509 - MOV32RtoM((uptr)&psxH[addr & 0xfff], EAX);
78510 - return;
78511 - }
78512 - }
78513 -
78514 - //PUSH64M ((uptr)&psxRegs.CP2D.r[_Rt_]);
78515 - MOV32MtoR(X86ARG2, (uptr)&psxRegs.CP2D.r[_Rt_]);
78516 - //iPushOfB();
78517 - SetArg_OfB(X86ARG1);
78518 - CALLFunc((uptr)psxMemWrite32);
78519 -// ADD32ItoR(ESP, 8);
78520 - //resp+= 8;
78521 -}
78522 -
78523 -static void recCFC2() {
78524 -// Rt = Cop2C->Rd
78525 - if (!_Rt_) return;
78526 -
78527 - iRegs[_Rt_].state = ST_UNK;
78528 - MOV32MtoR(EAX, (uptr)&psxRegs.CP2C.r[_Rd_]);
78529 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
78530 -}
78531 -
78532 -static void recCTC2() {
78533 -// Cop2C->Rd = Rt
78534 -
78535 - if (IsConst(_Rt_)) {
78536 - MOV32ItoM((uptr)&psxRegs.CP2C.r[_Rd_], iRegs[_Rt_].k);
78537 - } else {
78538 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
78539 - MOV32RtoM((uptr)&psxRegs.CP2C.r[_Rd_], EAX);
78540 - }
78541 -}
78542 -
78543 -#endif
78544 -
78545 -CP2_FUNCNC(RTPS);
78546 -CP2_FUNC(OP);
78547 -CP2_FUNCNC(NCLIP);
78548 -CP2_FUNCNC(DPCS);
78549 -CP2_FUNCNC(INTPL);
78550 -CP2_FUNC(MVMVA);
78551 -CP2_FUNCNC(NCDS);
78552 -CP2_FUNCNC(NCDT);
78553 -CP2_FUNCNC(CDP);
78554 -CP2_FUNCNC(NCCS);
78555 -CP2_FUNCNC(CC);
78556 -CP2_FUNCNC(NCS);
78557 -CP2_FUNCNC(NCT);
78558 -CP2_FUNC(SQR);
78559 -CP2_FUNCNC(DCPL);
78560 -CP2_FUNCNC(DPCT);
78561 -CP2_FUNCNC(AVSZ3);
78562 -CP2_FUNCNC(AVSZ4);
78563 -CP2_FUNCNC(RTPT);
78564 -CP2_FUNC(GPF);
78565 -CP2_FUNC(GPL);
78566 -CP2_FUNCNC(NCCT);
78567 -
78568 -#if 0
78569 -
78570 -#define gteVX0 ((s16*)psxRegs.CP2D.r)[0]
78571 -#define gteVY0 ((s16*)psxRegs.CP2D.r)[1]
78572 -#define gteVZ0 ((s16*)psxRegs.CP2D.r)[2]
78573 -#define gteVX1 ((s16*)psxRegs.CP2D.r)[4]
78574 -#define gteVY1 ((s16*)psxRegs.CP2D.r)[5]
78575 -#define gteVZ1 ((s16*)psxRegs.CP2D.r)[6]
78576 -#define gteVX2 ((s16*)psxRegs.CP2D.r)[8]
78577 -#define gteVY2 ((s16*)psxRegs.CP2D.r)[9]
78578 -#define gteVZ2 ((s16*)psxRegs.CP2D.r)[10]
78579 -#define gteRGB psxRegs.CP2D.r[6]
78580 -#define gteOTZ ((s16*)psxRegs.CP2D.r)[7*2]
78581 -#define gteIR0 ((s32*)psxRegs.CP2D.r)[8]
78582 -#define gteIR1 ((s32*)psxRegs.CP2D.r)[9]
78583 -#define gteIR2 ((s32*)psxRegs.CP2D.r)[10]
78584 -#define gteIR3 ((s32*)psxRegs.CP2D.r)[11]
78585 -#define gteSX0 ((s16*)psxRegs.CP2D.r)[12*2]
78586 -#define gteSY0 ((s16*)psxRegs.CP2D.r)[12*2+1]
78587 -#define gteSX1 ((s16*)psxRegs.CP2D.r)[13*2]
78588 -#define gteSY1 ((s16*)psxRegs.CP2D.r)[13*2+1]
78589 -#define gteSX2 ((s16*)psxRegs.CP2D.r)[14*2]
78590 -#define gteSY2 ((s16*)psxRegs.CP2D.r)[14*2+1]
78591 -#define gteSXP ((s16*)psxRegs.CP2D.r)[15*2]
78592 -#define gteSYP ((s16*)psxRegs.CP2D.r)[15*2+1]
78593 -#define gteSZx ((u16*)psxRegs.CP2D.r)[16*2]
78594 -#define gteSZ0 ((u16*)psxRegs.CP2D.r)[17*2]
78595 -#define gteSZ1 ((u16*)psxRegs.CP2D.r)[18*2]
78596 -#define gteSZ2 ((u16*)psxRegs.CP2D.r)[19*2]
78597 -#define gteRGB0 psxRegs.CP2D.r[20]
78598 -#define gteRGB1 psxRegs.CP2D.r[21]
78599 -#define gteRGB2 psxRegs.CP2D.r[22]
78600 -#define gteMAC0 psxRegs.CP2D.r[24]
78601 -#define gteMAC1 ((s32*)psxRegs.CP2D.r)[25]
78602 -#define gteMAC2 ((s32*)psxRegs.CP2D.r)[26]
78603 -#define gteMAC3 ((s32*)psxRegs.CP2D.r)[27]
78604 -#define gteIRGB psxRegs.CP2D.r[28]
78605 -#define gteORGB psxRegs.CP2D.r[29]
78606 -#define gteLZCS psxRegs.CP2D.r[30]
78607 -#define gteLZCR psxRegs.CP2D.r[31]
78608 -
78609 -#define gteR ((u8 *)psxRegs.CP2D.r)[6*4]
78610 -#define gteG ((u8 *)psxRegs.CP2D.r)[6*4+1]
78611 -#define gteB ((u8 *)psxRegs.CP2D.r)[6*4+2]
78612 -#define gteCODE ((u8 *)psxRegs.CP2D.r)[6*4+3]
78613 -#define gteC gteCODE
78614 -
78615 -#define gteR0 ((u8 *)psxRegs.CP2D.r)[20*4]
78616 -#define gteG0 ((u8 *)psxRegs.CP2D.r)[20*4+1]
78617 -#define gteB0 ((u8 *)psxRegs.CP2D.r)[20*4+2]
78618 -#define gteCODE0 ((u8 *)psxRegs.CP2D.r)[20*4+3]
78619 -#define gteC0 gteCODE0
78620 -
78621 -#define gteR1 ((u8 *)psxRegs.CP2D.r)[21*4]
78622 -#define gteG1 ((u8 *)psxRegs.CP2D.r)[21*4+1]
78623 -#define gteB1 ((u8 *)psxRegs.CP2D.r)[21*4+2]
78624 -#define gteCODE1 ((u8 *)psxRegs.CP2D.r)[21*4+3]
78625 -#define gteC1 gteCODE1
78626 -
78627 -#define gteR2 ((u8 *)psxRegs.CP2D.r)[22*4]
78628 -#define gteG2 ((u8 *)psxRegs.CP2D.r)[22*4+1]
78629 -#define gteB2 ((u8 *)psxRegs.CP2D.r)[22*4+2]
78630 -#define gteCODE2 ((u8 *)psxRegs.CP2D.r)[22*4+3]
78631 -#define gteC2 gteCODE2
78632 -
78633 -
78634 -
78635 -#define gteR11 ((s16*)psxRegs.CP2C.r)[0]
78636 -#define gteR12 ((s16*)psxRegs.CP2C.r)[1]
78637 -#define gteR13 ((s16*)psxRegs.CP2C.r)[2]
78638 -#define gteR21 ((s16*)psxRegs.CP2C.r)[3]
78639 -#define gteR22 ((s16*)psxRegs.CP2C.r)[4]
78640 -#define gteR23 ((s16*)psxRegs.CP2C.r)[5]
78641 -#define gteR31 ((s16*)psxRegs.CP2C.r)[6]
78642 -#define gteR32 ((s16*)psxRegs.CP2C.r)[7]
78643 -#define gteR33 ((s16*)psxRegs.CP2C.r)[8]
78644 -#define gteTRX ((s32*)psxRegs.CP2C.r)[5]
78645 -#define gteTRY ((s32*)psxRegs.CP2C.r)[6]
78646 -#define gteTRZ ((s32*)psxRegs.CP2C.r)[7]
78647 -#define gteL11 ((s16*)psxRegs.CP2C.r)[16]
78648 -#define gteL12 ((s16*)psxRegs.CP2C.r)[17]
78649 -#define gteL13 ((s16*)psxRegs.CP2C.r)[18]
78650 -#define gteL21 ((s16*)psxRegs.CP2C.r)[19]
78651 -#define gteL22 ((s16*)psxRegs.CP2C.r)[20]
78652 -#define gteL23 ((s16*)psxRegs.CP2C.r)[21]
78653 -#define gteL31 ((s16*)psxRegs.CP2C.r)[22]
78654 -#define gteL32 ((s16*)psxRegs.CP2C.r)[23]
78655 -#define gteL33 ((s16*)psxRegs.CP2C.r)[24]
78656 -#define gteRBK ((s32*)psxRegs.CP2C.r)[13]
78657 -#define gteGBK ((s32*)psxRegs.CP2C.r)[14]
78658 -#define gteBBK ((s32*)psxRegs.CP2C.r)[15]
78659 -#define gteLR1 ((s16*)psxRegs.CP2C.r)[32]
78660 -#define gteLR2 ((s16*)psxRegs.CP2C.r)[33]
78661 -#define gteLR3 ((s16*)psxRegs.CP2C.r)[34]
78662 -#define gteLG1 ((s16*)psxRegs.CP2C.r)[35]
78663 -#define gteLG2 ((s16*)psxRegs.CP2C.r)[36]
78664 -#define gteLG3 ((s16*)psxRegs.CP2C.r)[37]
78665 -#define gteLB1 ((s16*)psxRegs.CP2C.r)[38]
78666 -#define gteLB2 ((s16*)psxRegs.CP2C.r)[39]
78667 -#define gteLB3 ((s16*)psxRegs.CP2C.r)[40]
78668 -#define gteRFC ((s32*)psxRegs.CP2C.r)[21]
78669 -#define gteGFC ((s32*)psxRegs.CP2C.r)[22]
78670 -#define gteBFC ((s32*)psxRegs.CP2C.r)[23]
78671 -#define gteOFX ((s32*)psxRegs.CP2C.r)[24]
78672 -#define gteOFY ((s32*)psxRegs.CP2C.r)[25]
78673 -#define gteH ((u16*)psxRegs.CP2C.r)[52]
78674 -#define gteDQA ((s16*)psxRegs.CP2C.r)[54]
78675 -#define gteDQB ((s32*)psxRegs.CP2C.r)[28]
78676 -#define gteZSF3 ((s16*)psxRegs.CP2C.r)[58]
78677 -#define gteZSF4 ((s16*)psxRegs.CP2C.r)[60]
78678 -#define gteFLAG psxRegs.CP2C.r[31]
78679 -
78680 -//#define SUM_FLAG if(gteFLAG & 0x7F87E000) gteFLAG |= 0x80000000;
78681 -
78682 -#define SUM_FLAG() { \
78683 - TEST32ItoM((uptr)&gteFLAG, 0x7F87E000); \
78684 - j8Ptr[0] = JZ8(0); \
78685 - OR32ItoM((uptr)&gteFLAG, 0x80000000); \
78686 - \
78687 - x86SetJ8(j8Ptr[0]); \
78688 -}
78689 -
78690 -#define LIM32X8(reg, gteout, negv, posv, flagb) { \
78691 - CMP32ItoR(reg, negv); \
78692 - j8Ptr[0] = JL8(0); \
78693 - CMP32ItoR(reg, posv); \
78694 - j8Ptr[1] = JG8(0); \
78695 - \
78696 - MOV8RtoM((uptr)&gteout, reg); \
78697 - j8Ptr[2] = JMP8(0); \
78698 - \
78699 - x86SetJ8(j8Ptr[0]); \
78700 - MOV8ItoM((uptr)&gteout, negv); \
78701 - j8Ptr[3] = JMP8(0); \
78702 - \
78703 - x86SetJ8(j8Ptr[1]); \
78704 - MOV8ItoM((uptr)&gteout, posv); \
78705 - \
78706 - x86SetJ8(j8Ptr[3]); \
78707 - OR32ItoM((uptr)&gteFLAG, 1<<flagb); \
78708 - \
78709 - x86SetJ8(j8Ptr[2]); \
78710 -}
78711 -
78712 -#define _LIM_B1(reg, gteout) LIM32X8(reg, gteout, 0, 255, 21);
78713 -#define _LIM_B2(reg, gteout) LIM32X8(reg, gteout, 0, 255, 20);
78714 -#define _LIM_B3(reg, gteout) LIM32X8(reg, gteout, 0, 255, 19);
78715 -
78716 -#define MAC2IRn(reg, ir, flagb, negv, posv) { \
78717 -/* CMP32ItoR(reg, negv);*/ \
78718 -/* j8Ptr[0] = JL8(0); */\
78719 -/* CMP32ItoR(reg, posv);*/ \
78720 -/* j8Ptr[1] = JG8(0);*/ \
78721 - \
78722 - MOV32RtoM((uptr)&ir, reg); \
78723 -/* j8Ptr[2] = JMP8(0);*/ \
78724 - \
78725 -/* x86SetJ8(j8Ptr[0]);*/ \
78726 -/* MOV32ItoM((uptr)&ir, negv);*/ \
78727 -/* j8Ptr[3] = JMP8(0);*/ \
78728 - \
78729 -/* x86SetJ8(j8Ptr[1]);*/ \
78730 -/* MOV32ItoM((uptr)&ir, posv);*/ \
78731 - \
78732 -/* x86SetJ8(j8Ptr[3]);*/ \
78733 -/* OR32ItoR((uptr)&gteFLAG, 1<<flagb);*/ \
78734 - \
78735 -/* x86SetJ8(j8Ptr[2]);*/ \
78736 -}
78737 -
78738 -
78739 -
78740 -#define gte_C11 gteLR1
78741 -#define gte_C12 gteLR2
78742 -#define gte_C13 gteLR3
78743 -#define gte_C21 gteLG1
78744 -#define gte_C22 gteLG2
78745 -#define gte_C23 gteLG3
78746 -#define gte_C31 gteLB1
78747 -#define gte_C32 gteLB2
78748 -#define gte_C33 gteLB3
78749 -
78750 -
78751 -#define _MVMVA_FUNC(vn, mx) { \
78752 - MOVSX32M16toR(EAX, (uptr)&mx##vn##1); \
78753 - IMUL32R(EBX); \
78754 -/* j8Ptr[0] = JO8(0);*/ \
78755 - MOV32RtoR(ECX, EAX); \
78756 - \
78757 - MOVSX32M16toR(EAX, (uptr)&mx##vn##2); \
78758 - IMUL32R(EDI); \
78759 -/* j8Ptr[1] = JO8(0);*/ \
78760 - ADD32RtoR(ECX, EAX); \
78761 -/* j8Ptr[2] = JO8(0);*/ \
78762 - \
78763 - MOVSX32M16toR(EAX, (uptr)&mx##vn##3); \
78764 - IMUL32R(ESI); \
78765 -/* j8Ptr[3] = JO8(0);*/ \
78766 - ADD32RtoR(ECX, EAX); \
78767 -/* j8Ptr[4] = JO8(0);*/ \
78768 -}
78769 -
78770 -/* SSX = (_v0) * mx##11 + (_v1) * mx##12 + (_v2) * mx##13;
78771 - SSY = (_v0) * mx##21 + (_v1) * mx##22 + (_v2) * mx##23;
78772 - SSZ = (_v0) * mx##31 + (_v1) * mx##32 + (_v2) * mx##33; */
78773 -
78774 -#define _MVMVA_ADD(_vx, jn) { \
78775 - ADD32MtoR(ECX, (uptr)&_vx); \
78776 -/* j8Ptr[jn] = JO8(0);*/ \
78777 -}
78778 -/* SSX+= gteRFC;
78779 - SSY+= gteGFC;
78780 - SSZ+= gteBFC;*/
78781 -
78782 -#define _MVMVA1(vn) { \
78783 - switch (psxRegs.code & 0x60000) { \
78784 - case 0x00000: /* R */ \
78785 - _MVMVA_FUNC(vn, gteR); break; \
78786 - case 0x20000: /* L */ \
78787 - _MVMVA_FUNC(vn, gteL); break; \
78788 - case 0x40000: /* C */ \
78789 - _MVMVA_FUNC(vn, gte_C); break; \
78790 - default: \
78791 - return; \
78792 - } \
78793 -}
78794 -
78795 -#define _MVMVA_LOAD(_v0, _v1, _v2) { \
78796 - MOVSX32M16toR(EBX, (uptr)&_v0); \
78797 - MOVSX32M16toR(EDI, (uptr)&_v1); \
78798 - MOVSX32M16toR(ESI, (uptr)&_v2); \
78799 -}
78800 -
78801 -static void recMVMVA() {
78802 - int i;
78803 -
78804 -// SysPrintf("GTE_MVMVA %lx\n", psxRegs.code & 0x1ffffff);
78805 -
78806 -/* PUSH32R(ESI);
78807 - PUSH32R(EDI);
78808 - PUSH32R(EBX);
78809 -*/
78810 - XOR32RtoR(EAX, EAX); /* gteFLAG = 0 */
78811 - MOV32RtoM((uptr)&gteFLAG, EAX);
78812 -
78813 - switch (psxRegs.code & 0x18000) {
78814 - case 0x00000: /* V0 */
78815 - _MVMVA_LOAD(gteVX0, gteVY0, gteVZ0); break;
78816 - case 0x08000: /* V1 */
78817 - _MVMVA_LOAD(gteVX1, gteVY1, gteVZ1); break;
78818 - case 0x10000: /* V2 */
78819 - _MVMVA_LOAD(gteVX2, gteVY2, gteVZ2); break;
78820 - case 0x18000: /* IR */
78821 - _MVMVA_LOAD(gteIR1, gteIR2, gteIR3); break;
78822 - }
78823 -
78824 -// MAC1
78825 - for (i=5; i<8; i++) j8Ptr[i] = 0;
78826 - _MVMVA1(1);
78827 -
78828 - if (psxRegs.code & 0x80000) {
78829 - SAR32ItoR(ECX, 12);
78830 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
78831 - }
78832 -
78833 - switch (psxRegs.code & 0x6000) {
78834 - case 0x0000: // Add TR
78835 - _MVMVA_ADD(gteTRX, 5); break;
78836 - case 0x2000: // Add BK
78837 - _MVMVA_ADD(gteRBK, 6); break;
78838 - case 0x4000: // Add FC
78839 - _MVMVA_ADD(gteRFC, 7); break;
78840 - }
78841 -/*
78842 - j8Ptr[9] = JMP8(0);
78843 - for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
78844 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);
78845 -
78846 -// TEST32ItoR(EDX, 0x80000000);
78847 - OR32ItoM((uptr)&gteFLAG, 1<<29);
78848 - x86SetJ8(j8Ptr[9]);*/
78849 - MOV32RtoM((uptr)&gteMAC1, ECX);
78850 -
78851 - if (psxRegs.code & 0x400) {
78852 - MAC2IRn(ECX, gteIR1, 24, 0, 32767);
78853 - } else {
78854 - MAC2IRn(ECX, gteIR1, 24, -32768, 32767);
78855 - }
78856 -
78857 -// MAC2
78858 - _MVMVA1(2);
78859 -
78860 - if (psxRegs.code & 0x80000) {
78861 - SAR32ItoR(ECX, 12);
78862 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
78863 - }
78864 -
78865 - switch (psxRegs.code & 0x6000) {
78866 - case 0x0000: // Add TR
78867 - _MVMVA_ADD(gteTRY, 5); break;
78868 - case 0x2000: // Add BK
78869 - _MVMVA_ADD(gteGBK, 6); break;
78870 - case 0x4000: // Add FC
78871 - _MVMVA_ADD(gteGFC, 7); break;
78872 - }
78873 -
78874 -/* for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
78875 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);*/
78876 - MOV32RtoM((uptr)&gteMAC2, ECX);
78877 -
78878 - if (psxRegs.code & 0x400) {
78879 - MAC2IRn(ECX, gteIR2, 23, 0, 32767);
78880 - } else {
78881 - MAC2IRn(ECX, gteIR2, 23, -32768, 32767);
78882 - }
78883 -
78884 -// MAC3
78885 - _MVMVA1(3);
78886 -
78887 - if (psxRegs.code & 0x80000) {
78888 - SAR32ItoR(ECX, 12);
78889 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
78890 - }
78891 -
78892 - switch (psxRegs.code & 0x6000) {
78893 - case 0x0000: // Add TR
78894 - _MVMVA_ADD(gteTRZ, 5); break;
78895 - case 0x2000: // Add BK
78896 - _MVMVA_ADD(gteBBK, 6); break;
78897 - case 0x4000: // Add FC
78898 - _MVMVA_ADD(gteBFC, 7); break;
78899 - }
78900 -
78901 -/* for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
78902 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);*/
78903 - MOV32RtoM((uptr)&gteMAC3, ECX);
78904 -
78905 - if (psxRegs.code & 0x400) {
78906 - MAC2IRn(ECX, gteIR3, 22, 0, 32767);
78907 - } else {
78908 - MAC2IRn(ECX, gteIR3, 22, -32768, 32767);
78909 - }
78910 -/* MAC2IR1()
78911 - else MAC2IR()*/
78912 -
78913 -// SUM_FLAG();
78914 -
78915 -/* POP32R(EBX);
78916 - POP32R(EDI);
78917 - POP32R(ESI);*/
78918 -}
78919 -
78920 -#if 0
78921 -
78922 -#define _GPF1(vn) { \
78923 - MOV32MtoR(EAX, (uptr)&gteIR##vn); \
78924 - IMUL32R(ECX); \
78925 -/* MOV32RtoR(ECX, EAX); */\
78926 -}
78927 -
78928 -static void recGPF() {
78929 -// SysPrintf("GTE_GPF %lx\n", psxRegs.code & 0x1ffffff);
78930 -
78931 - PUSH32R(EBX);
78932 -
78933 - XOR32RtoR(EBX, EBX); /* gteFLAG = 0 */
78934 -
78935 -/* gteMAC1 = NC_OVERFLOW1(gteIR0 * gteIR1);
78936 - gteMAC2 = NC_OVERFLOW2(gteIR0 * gteIR2);
78937 - gteMAC3 = NC_OVERFLOW3(gteIR0 * gteIR3);*/
78938 - MOV32MtoR(ECX, (uptr)&gteIR0);
78939 -// MAC1
78940 - _GPF1(1);
78941 -
78942 - if (psxRegs.code & 0x80000) {
78943 - SAR32ItoR(EAX, 12);
78944 - }
78945 - MAC2IRn(EAX, gteIR1, 24, -32768, 32767);
78946 - PUSH32R(EAX);
78947 -
78948 -// MAC2
78949 - _GPF1(2);
78950 -
78951 - if (psxRegs.code & 0x80000) {
78952 - SAR32ItoR(EAX, 12);
78953 - }
78954 - MAC2IRn(EAX, gteIR2, 23, -32768, 32767);
78955 - PUSH32R(EAX);
78956 -
78957 -// MAC3
78958 - _GPF1(3);
78959 -
78960 - if (psxRegs.code & 0x80000) {
78961 - SAR32ItoR(EAX, 12);
78962 - }
78963 - MAC2IRn(EAX, gteIR3, 22, -32768, 32767);
78964 -// MAC2IR();
78965 -
78966 -// gteRGB0 = gteRGB1;
78967 -// gteRGB1 = gteRGB2;
78968 - MOV32MtoR(EDX, (uptr)&gteRGB1);
78969 - MOV32MtoR(ECX, (uptr)&gteRGB2);
78970 - MOV32RtoM((uptr)&gteRGB0, EDX);
78971 - MOV32RtoM((uptr)&gteRGB1, ECX);
78972 -
78973 - POP32R(EDX);
78974 - POP32R(ECX);
78975 - SAR32ItoR(ECX, 4);
78976 - SAR32ItoR(EDX, 4);
78977 - SAR32ItoR(EAX, 4);
78978 -
78979 - _LIM_B1(ECX, gteR2);
78980 - _LIM_B2(EDX, gteG2);
78981 - _LIM_B3(EAX, gteB2);
78982 - MOV8MtoR(EAX, (uptr)&gteCODE);
78983 - MOV8RtoM((uptr)&gteCODE2, EAX);
78984 -
78985 -/* gteR2 = limB1(gteMAC1 / 16.0f);
78986 - gteG2 = limB2(gteMAC2 / 16.0f);
78987 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
78988 -
78989 - SUM_FLAG();
78990 - MOV32RtoM((uptr)&gteFLAG, EBX);
78991 -
78992 -// POP32R(EBX);
78993 -}
78994 -#endif
78995 -#endif
78996 -
78997 -
78998 -#endif /* __IGTE_H__ */
78999 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/iR3000A-64.c new/libpcsxcore/libpcsxcore/ix86_64/iR3000A-64.c
79000 --- original/libpcsxcore/libpcsxcore/ix86_64/iR3000A-64.c 2009-02-23 05:47:23.000000000 -0430
79001 +++ new/libpcsxcore/libpcsxcore/ix86_64/iR3000A-64.c 1969-12-31 20:00:00.000000000 -0400
79002 @@ -1,3018 +0,0 @@
79003 -/***************************************************************************
79004 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
79005 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
79006 - * *
79007 - * This program is free software; you can redistribute it and/or modify *
79008 - * it under the terms of the GNU General Public License as published by *
79009 - * the Free Software Foundation; either version 2 of the License, or *
79010 - * (at your option) any later version. *
79011 - * *
79012 - * This program is distributed in the hope that it will be useful, *
79013 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
79014 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
79015 - * GNU General Public License for more details. *
79016 - * *
79017 - * You should have received a copy of the GNU General Public License *
79018 - * along with this program; if not, write to the *
79019 - * Free Software Foundation, Inc., *
79020 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
79021 - ***************************************************************************/
79022 -
79023 -/*
79024 -* i386 assembly functions for R3000A core.
79025 -*/
79026 -
79027 -#include "ix86-64.h"
79028 -#include "../r3000a.h"
79029 -#include "../psxhle.h"
79030 -
79031 -//For mmap
79032 -#include <sys/mman.h>
79033 -
79034 -uptr** psxRecLUT;
79035 -
79036 -#undef PC_REC
79037 -#undef PC_REC8
79038 -#undef PC_REC16
79039 -#undef PC_REC32
79040 -#define PC_REC(x) (psxRecLUT[x >> 16] + (x & 0xffff))
79041 -#define PC_REC8(x) (*(u8 *)PC_REC(x))
79042 -#define PC_REC16(x) (*(u16*)PC_REC(x))
79043 -#define PC_REC32(x) (*(u32*)PC_REC(x))
79044 -
79045 -#define RECMEM_SIZE (32*1024*1024)
79046 -#define STACKSIZE 0x18
79047 -
79048 -static char *recMem; /* the recompiled blocks will be here */
79049 -static uptr *recRAM; /* and the ptr to the blocks here */
79050 -static uptr *recROM; /* and here */
79051 -
79052 -static u32 pc; /* recompiler pc */
79053 -static u32 pcold; /* recompiler oldpc */
79054 -static int count; /* recompiler intruction count */
79055 -static int branch; /* set for branch */
79056 -static u32 target; /* branch target */
79057 -static u32 resp;
79058 -
79059 -
79060 -typedef struct {
79061 - int state;
79062 - u32 k;
79063 - int reg;
79064 -} iRegisters;
79065 -
79066 -static iRegisters iRegs[32];
79067 -static iRegisters iRegsS[32];
79068 -
79069 -#define ST_UNK 0
79070 -#define ST_CONST 1
79071 -#define ST_MAPPED 2
79072 -
79073 -#define IsConst(reg) (iRegs[reg].state == ST_CONST)
79074 -#define IsMapped(reg) (iRegs[reg].state == ST_MAPPED)
79075 -
79076 -static void (*recBSC[64])();
79077 -static void (*recSPC[64])();
79078 -static void (*recREG[32])();
79079 -static void (*recCP0[32])();
79080 -static void (*recCP2[64])();
79081 -static void (*recCP2BSC[32])();
79082 -
79083 -
79084 -static void MapConst(int reg, u32 _const) {
79085 - iRegs[reg].k = _const;
79086 - iRegs[reg].state = ST_CONST;
79087 -}
79088 -
79089 -static void iFlushReg(int reg) {
79090 - if (IsConst(reg)) {
79091 - MOV32ItoM((uptr)&psxRegs.GPR.r[reg], iRegs[reg].k);
79092 - }
79093 - iRegs[reg].state = ST_UNK;
79094 -}
79095 -
79096 -static void iFlushRegs() {
79097 - int i;
79098 -
79099 - for (i=1; i<32; i++) {
79100 - iFlushReg(i);
79101 - }
79102 -}
79103 -
79104 -static void iRet() {
79105 - /* store cycle */
79106 - count = (pc - pcold)/4;
79107 - ADD32ItoM((uptr)&psxRegs.cycle, count);
79108 - //if (resp) ADD64ItoR(RSP, resp);
79109 - ADD64ItoR(RSP, STACKSIZE);
79110 - RET();
79111 -}
79112 -
79113 -static int iLoadTest() {
79114 - u32 tmp;
79115 -
79116 - // check for load delay
79117 - tmp = psxRegs.code >> 26;
79118 - switch (tmp) {
79119 - case 0x10: // COP0
79120 - switch (_Rs_) {
79121 - case 0x00: // MFC0
79122 - case 0x02: // CFC0
79123 - return 1;
79124 - }
79125 - break;
79126 - case 0x12: // COP2
79127 - switch (_Funct_) {
79128 - case 0x00:
79129 - switch (_Rs_) {
79130 - case 0x00: // MFC2
79131 - case 0x02: // CFC2
79132 - return 1;
79133 - }
79134 - break;
79135 - }
79136 - break;
79137 - case 0x32: // LWC2
79138 - return 1;
79139 - default:
79140 - if (tmp >= 0x20 && tmp <= 0x26) { // LB/LH/LWL/LW/LBU/LHU/LWR
79141 - return 1;
79142 - }
79143 - break;
79144 - }
79145 - return 0;
79146 -}
79147 -
79148 -/* set a pending branch */
79149 -static void SetBranch() {
79150 - branch = 1;
79151 - psxRegs.code = PSXMu32(pc);
79152 - pc+=4;
79153 -
79154 - if (iLoadTest() == 1) {
79155 - iFlushRegs();
79156 - MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
79157 - /* store cycle */
79158 - count = (pc - pcold)/4;
79159 - ADD32ItoM((uptr)&psxRegs.cycle, count);
79160 - //if (resp) ADD32ItoR(ESP, resp);
79161 -
79162 - //PUSH64M((uptr)&target);
79163 - MOV32MtoR(X86ARG2, (uptr)&target);
79164 - //PUSHI(_Rt_);
79165 - MOV64ItoR(X86ARG1, _Rt_);
79166 - CALLFunc((uptr)psxDelayTest);
79167 - //ADD32ItoR(ESP, 2*8);
79168 - ADD64ItoR(RSP, STACKSIZE);
79169 - RET();
79170 - return;
79171 - }
79172 -
79173 - recBSC[psxRegs.code>>26]();
79174 -
79175 - iFlushRegs();
79176 - MOV32MtoR(EAX, (uptr)&target);
79177 - MOV32RtoM((uptr)&psxRegs.pc, EAX);
79178 - CALLFunc((uptr)psxBranchTest);
79179 -
79180 - iRet();
79181 -}
79182 -
79183 -static void iJump(u32 branchPC) {
79184 - branch = 1;
79185 - psxRegs.code = PSXMu32(pc);
79186 - pc+=4;
79187 -
79188 - if (iLoadTest() == 1) {
79189 - iFlushRegs();
79190 - MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
79191 - /* store cycle */
79192 - count = (pc - pcold)/4;
79193 - ADD32ItoM((uptr)&psxRegs.cycle, count);
79194 - //if (resp) ADD32ItoR(ESP, resp);
79195 -
79196 - //PUSHI(branchPC);
79197 - MOV64ItoR(X86ARG2, branchPC);
79198 - //PUSHI(_Rt_);
79199 - MOV64ItoR(X86ARG1, _Rt_);
79200 - CALLFunc((uptr)psxDelayTest);
79201 - //ADD32ItoR(ESP, 2*8);
79202 - ADD64ItoR(RSP, STACKSIZE);
79203 - RET();
79204 - return;
79205 - }
79206 -
79207 - recBSC[psxRegs.code>>26]();
79208 -
79209 - iFlushRegs();
79210 - MOV32ItoM((uptr)&psxRegs.pc, branchPC);
79211 - CALLFunc((uptr)psxBranchTest);
79212 - /* store cycle */
79213 - count = (pc - pcold)/4;
79214 - ADD32ItoM((uptr)&psxRegs.cycle, count);
79215 - //if (resp) ADD32ItoR(RSP, resp);
79216 -
79217 - //done calling functions
79218 - ADD64ItoR(RSP, STACKSIZE);
79219 -
79220 - RET();
79221 - /*
79222 - // maybe just happened an interruption, check so
79223 - CMP32ItoM((uptr)&psxRegs.pc, branchPC);
79224 - j8Ptr[0] = JE8(0);
79225 -
79226 - RET();
79227 -
79228 - x86SetJ8(j8Ptr[0]);
79229 - MOV64MtoR(RAX, (uptr)PC_REC(branchPC));
79230 - //TEST32RtoR(RAX, RAX);
79231 - AND64RtoR(RAX,RAX);
79232 - j8Ptr[1] = JNE8(0);
79233 -
79234 - RET();
79235 -
79236 - x86SetJ8(j8Ptr[1]);
79237 -
79238 - RET();
79239 - //JMP32R(EAX);
79240 - JMPR(EAX);
79241 - */
79242 -}
79243 -
79244 -static void iBranch(u32 branchPC, int savectx) {
79245 - u32 respold=0;
79246 -
79247 - if (savectx) {
79248 - respold = resp;
79249 - memcpy(iRegsS, iRegs, sizeof(iRegs));
79250 - }
79251 -
79252 - branch = 1;
79253 - psxRegs.code = PSXMu32(pc);
79254 -
79255 - // the delay test is only made when the branch is taken
79256 - // savectx == 0 will mean that :)
79257 - if (savectx == 0 && iLoadTest() == 1) {
79258 - iFlushRegs();
79259 - MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
79260 - /* store cycle */
79261 - count = ((pc+4) - pcold)/4;
79262 - ADD32ItoM((uptr)&psxRegs.cycle, count);
79263 - //if (resp) ADD32ItoR(ESP, resp);
79264 -
79265 - //PUSHI(branchPC);
79266 - MOV64ItoR(X86ARG2, branchPC);
79267 - //PUSHI(_Rt_);
79268 - MOV64ItoR(X86ARG1,_Rt_);
79269 - CALLFunc((uptr)psxDelayTest);
79270 - //ADD32ItoR(ESP, 2*8);
79271 - ADD64ItoR(RSP, STACKSIZE);
79272 - RET();
79273 - return;
79274 - }
79275 -
79276 - pc+= 4;
79277 - recBSC[psxRegs.code>>26]();
79278 -
79279 - iFlushRegs();
79280 - MOV32ItoM((uptr)&psxRegs.pc, branchPC);
79281 - CALLFunc((uptr)psxBranchTest);
79282 - /* store cycle */
79283 - count = (pc - pcold)/4;
79284 - ADD32ItoM((uptr)&psxRegs.cycle, count);
79285 -
79286 - ADD64ItoR(RSP, STACKSIZE);
79287 -
79288 - // maybe just happened an interruption, check so
79289 - CMP32ItoM((uptr)&psxRegs.pc, branchPC);
79290 - j8Ptr[1] = JE8(0);
79291 -
79292 - RET();
79293 -
79294 - x86SetJ8(j8Ptr[1]);
79295 - MOV64MtoR(RAX, (uptr)PC_REC(branchPC));
79296 - //TEST32RtoR(EAX, EAX);
79297 - AND64RtoR(RAX,RAX);
79298 - j8Ptr[2] = JNE8(0);
79299 -
79300 - RET();
79301 -
79302 - x86SetJ8(j8Ptr[2]);
79303 - //JMP32R(EAX);
79304 - JMPR(EAX);
79305 -
79306 - pc-= 4;
79307 - if (savectx) {
79308 - resp = respold;
79309 - memcpy(iRegs, iRegsS, sizeof(iRegs));
79310 - }
79311 -}
79312 -
79313 -
79314 -char *txt0 = "EAX = %x : ECX = %x : EDX = %x\n";
79315 -char *txt1 = "EAX = %x\n";
79316 -char *txt2 = "M32 = %x\n";
79317 -
79318 -/*
79319 -void iLogX86() {
79320 - PUSHA32();
79321 -
79322 - PUSH32R (EDX);
79323 - PUSH32R (ECX);
79324 - PUSH32R (EAX);
79325 - PUSH32M ((uptr)&txt0);
79326 - CALLFunc((uptr)SysPrintf);
79327 - ADD32ItoR(ESP, 4*4);
79328 -
79329 - POPA32();
79330 -}
79331 -*/
79332 -
79333 -void iLogEAX() {
79334 - PUSH64R (EAX);
79335 - PUSH64M ((uptr)&txt1);
79336 - CALLFunc((uptr)SysPrintf);
79337 - ADD32ItoR(ESP, 8*2);
79338 -}
79339 -
79340 -void iLogM32(u32 mem) {
79341 - PUSH64M (mem);
79342 - PUSH64M ((uptr)&txt2);
79343 - CALLFunc((uptr)SysPrintf);
79344 - ADD32ItoR(ESP, 8*2);
79345 -}
79346 -
79347 -static void iDumpRegs() {
79348 - int i, j;
79349 -
79350 - printf("%lx %lx\n", psxRegs.pc, psxRegs.cycle);
79351 - for (i=0; i<4; i++) {
79352 - for (j=0; j<8; j++)
79353 - printf("%lx ", psxRegs.GPR.r[j*i]);
79354 - printf("\n");
79355 - }
79356 -}
79357 -
79358 -void iDumpBlock(char *ptr) {
79359 - FILE *f;
79360 - u32 i;
79361 -
79362 - SysPrintf("dump1 %x:%x, %x\n", psxRegs.pc, pc, psxRegs.cycle);
79363 -
79364 - for (i = psxRegs.pc; i < pc; i+=4)
79365 - SysPrintf("%s\n", disR3000AF(PSXMu32(i), i));
79366 -
79367 - fflush(stdout);
79368 - f = fopen("dump1", "w");
79369 - fwrite(ptr, 1, (uptr)x86Ptr - (uptr)ptr, f);
79370 - fclose(f);
79371 - //system("ndisasm -b64 dump1");
79372 - fflush(stdout);
79373 -}
79374 -
79375 -#define REC_FUNC(f) \
79376 -void psx##f(); \
79377 -static void rec##f() { \
79378 - iFlushRegs(); \
79379 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code); \
79380 - MOV32ItoM((uptr)&psxRegs.pc, (u32)pc); \
79381 - CALLFunc((uptr)psx##f); \
79382 -/* branch = 2; */\
79383 -}
79384 -
79385 -#define REC_SYS(f) \
79386 -void psx##f(); \
79387 -static void rec##f() { \
79388 - iFlushRegs(); \
79389 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code); \
79390 - MOV32ItoM((uptr)&psxRegs.pc, (u32)pc); \
79391 - CALLFunc((uptr)psx##f); \
79392 - branch = 2; \
79393 - iRet(); \
79394 -}
79395 -
79396 -#define REC_BRANCH(f) \
79397 -void psx##f(); \
79398 -static void rec##f() { \
79399 - iFlushRegs(); \
79400 - MOV32ItoM((uptr)&psxRegs.code, (u32)psxRegs.code); \
79401 - MOV32ItoM((uptr)&psxRegs.pc, (u32)pc); \
79402 - CALLFunc((uptr)psx##f); \
79403 - branch = 2; \
79404 - iRet(); \
79405 -}
79406 -
79407 -static void recRecompile();
79408 -
79409 -#define RECRAM_POS (&psxMemWrite32 - (0x280000*sizeof(void*)) - 0xc000000)
79410 -#define RECMEM_POS (RECRAM_POS - RECMEM_SIZE)
79411 -
79412 -static int recInit() {
79413 - int i;
79414 -
79415 - psxRecLUT = (uptr**) malloc(0x010000 * sizeof(void*));
79416 -
79417 - recMem = mmap(RECMEM_POS,
79418 - //recMem = mmap(0,
79419 - RECMEM_SIZE,
79420 - PROT_EXEC | PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
79421 - memset(recMem, 0, RECMEM_SIZE);
79422 -
79423 - recRAM = mmap(RECRAM_POS,
79424 - 0x280000*sizeof(void*),
79425 - PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
79426 - //recRAM = (uptr*) malloc(0x200000 * sizeof(void*));
79427 - //recROM = (uptr*) malloc(0x080000 * sizeof(void*));
79428 - recROM = &recRAM[0x200000];
79429 -
79430 - if (recRAM == NULL || recROM == NULL || recMem == NULL || psxRecLUT == NULL) {
79431 - SysMessage("Error allocating memory"); return -1;
79432 - }
79433 - memset(recRAM, 0, 0x200000 * sizeof(void*));
79434 - memset(recROM, 0, 0x080000 * sizeof(void*));
79435 -
79436 - for (i=0; i<0x80; i++) psxRecLUT[i + 0x0000] = &recRAM[((i & 0x1f) << 16)];
79437 - memcpy(psxRecLUT + 0x8000, psxRecLUT, 0x80 * sizeof(void*));
79438 - memcpy(psxRecLUT + 0xa000, psxRecLUT, 0x80 * sizeof(void*));
79439 -
79440 - for (i=0; i<0x08; i++) psxRecLUT[i + 0xbfc0] = &recROM[(i << 16)];
79441 -
79442 - return 0;
79443 -}
79444 -
79445 -static void recReset() {
79446 - memset(recRAM, 0, 0x200000 * sizeof(void*));
79447 - memset(recROM, 0, 0x080000 * sizeof(void*));
79448 -
79449 - //x86Init();
79450 - cpudetectInit();
79451 - x86SetPtr(recMem);
79452 -
79453 - branch = 0;
79454 - memset(iRegs, 0, sizeof(iRegs));
79455 - iRegs[0].state = ST_CONST;
79456 - iRegs[0].k = 0;
79457 -}
79458 -
79459 -static void recShutdown() {
79460 - if (recMem == NULL) return;
79461 - free(psxRecLUT);
79462 - //free(recMem);
79463 - munmap(recMem, RECMEM_SIZE);
79464 - //free(recRAM);
79465 - munmap(recMem, 0x280000*sizeof(void*));
79466 - //free(recROM);
79467 - x86Shutdown();
79468 -}
79469 -
79470 -static void recError() {
79471 - SysReset();
79472 - ClosePlugins();
79473 - SysMessage("Unrecoverable error while running recompiler\n");
79474 - SysRunGui();
79475 -}
79476 -
79477 -__inline static void execute() {
79478 - void (**recFunc)();
79479 - char *p;
79480 -
79481 - p = (char*)PC_REC(psxRegs.pc);
79482 - if (p != NULL)
79483 - recFunc = (void (**)()) p;
79484 - else { recError(); return; }
79485 -
79486 - if (*recFunc == 0) {
79487 - recRecompile();
79488 - }
79489 - (*recFunc)();
79490 -}
79491 -
79492 -static void recExecute() {
79493 - for (;;) execute();
79494 -}
79495 -
79496 -static void recExecuteBlock() {
79497 - execute();
79498 -}
79499 -
79500 -static void recClear(u32 Addr, u32 Size) {
79501 - memset((void*)PC_REC(Addr), 0, Size * sizeof(void*) * 4);
79502 -}
79503 -
79504 -static void recNULL() {
79505 -// SysMessage("recUNK: %8.8x\n", psxRegs.code);
79506 -}
79507 -
79508 -/*********************************************************
79509 -* goes to opcodes tables... *
79510 -* Format: table[something....] *
79511 -*********************************************************/
79512 -
79513 -//REC_SYS(SPECIAL);
79514 -#if 1
79515 -static void recSPECIAL() {
79516 - recSPC[_Funct_]();
79517 -}
79518 -#endif
79519 -
79520 -static void recREGIMM() {
79521 - recREG[_Rt_]();
79522 -}
79523 -
79524 -static void recCOP0() {
79525 - recCP0[_Rs_]();
79526 -}
79527 -
79528 -//REC_SYS(COP2);
79529 -#if 1
79530 -static void recCOP2() {
79531 - recCP2[_Funct_]();
79532 -}
79533 -#endif
79534 -
79535 -static void recBASIC() {
79536 - recCP2BSC[_Rs_]();
79537 -}
79538 -
79539 -//end of Tables opcodes...
79540 -
79541 -/*********************************************************
79542 -* Arithmetic with immediate operand *
79543 -* Format: OP rt, rs, immediate *
79544 -*********************************************************/
79545 -
79546 -#if 0
79547 -REC_FUNC(ADDI);
79548 -REC_FUNC(ADDIU);
79549 -REC_FUNC(ANDI);
79550 -REC_FUNC(ORI);
79551 -REC_FUNC(XORI);
79552 -REC_FUNC(SLTI);
79553 -REC_FUNC(SLTIU);
79554 -#endif
79555 -
79556 -#if 1
79557 -static void recADDIU() {
79558 -// Rt = Rs + Im
79559 - if (!_Rt_) return;
79560 -
79561 -// iFlushRegs();
79562 -
79563 - if (_Rs_ == _Rt_) {
79564 - if (IsConst(_Rt_)) {
79565 - iRegs[_Rt_].k+= _Imm_;
79566 - } else {
79567 - if (_Imm_ == 1) {
79568 - INC32M((uptr)&psxRegs.GPR.r[_Rt_]);
79569 - } else if (_Imm_ == -1) {
79570 - DEC32M((uptr)&psxRegs.GPR.r[_Rt_]);
79571 - } else if (_Imm_) {
79572 - ADD32ItoM((uptr)&psxRegs.GPR.r[_Rt_], _Imm_);
79573 - }
79574 - }
79575 - } else {
79576 - if (IsConst(_Rs_)) {
79577 - MapConst(_Rt_, iRegs[_Rs_].k + _Imm_);
79578 - } else {
79579 - iRegs[_Rt_].state = ST_UNK;
79580 -
79581 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79582 - if (_Imm_ == 1) {
79583 - INC32R(EAX);
79584 - } else if (_Imm_ == -1) {
79585 - DEC32R(EAX);
79586 - } else if (_Imm_) {
79587 - ADD32ItoR(EAX, _Imm_);
79588 - }
79589 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
79590 - }
79591 - }
79592 -}
79593 -
79594 -static void recADDI() {
79595 -// Rt = Rs + Im
79596 - recADDIU();
79597 -}
79598 -
79599 -static void recSLTI() {
79600 -// Rt = Rs < Im (signed)
79601 - if (!_Rt_) return;
79602 -
79603 -// iFlushRegs();
79604 -
79605 - if (IsConst(_Rs_)) {
79606 - MapConst(_Rt_, (s32)iRegs[_Rs_].k < _Imm_);
79607 - } else {
79608 - iRegs[_Rt_].state = ST_UNK;
79609 -
79610 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79611 - CMP32ItoR(EAX, _Imm_);
79612 - SETL8R (EAX);
79613 - AND32ItoR(EAX, 0xff);
79614 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
79615 - }
79616 -}
79617 -
79618 -static void recSLTIU() {
79619 -// Rt = Rs < Im (unsigned)
79620 - if (!_Rt_) return;
79621 -
79622 -// iFlushRegs();
79623 -
79624 - if (IsConst(_Rs_)) {
79625 - MapConst(_Rt_, iRegs[_Rs_].k < _ImmU_);
79626 - } else {
79627 - iRegs[_Rt_].state = ST_UNK;
79628 -
79629 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79630 - CMP32ItoR(EAX, _Imm_);
79631 - SETB8R (EAX);
79632 - AND32ItoR(EAX, 0xff);
79633 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
79634 - }
79635 -}
79636 -
79637 -static void recANDI() {
79638 -// Rt = Rs And Im
79639 - if (!_Rt_) return;
79640 -
79641 -// iFlushRegs();
79642 -
79643 - if (_Rs_ == _Rt_) {
79644 - if (IsConst(_Rt_)) {
79645 - iRegs[_Rt_].k&= _ImmU_;
79646 - } else {
79647 - AND32ItoM((uptr)&psxRegs.GPR.r[_Rt_], _ImmU_);
79648 - }
79649 - } else {
79650 - if (IsConst(_Rs_)) {
79651 - MapConst(_Rt_, iRegs[_Rs_].k & _ImmU_);
79652 - } else {
79653 - iRegs[_Rt_].state = ST_UNK;
79654 -
79655 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79656 - AND32ItoR(EAX, _ImmU_);
79657 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
79658 - }
79659 - }
79660 -}
79661 -
79662 -static void recORI() {
79663 -// Rt = Rs Or Im
79664 - if (!_Rt_) return;
79665 -
79666 -// iFlushRegs();
79667 -
79668 - if (_Rs_ == _Rt_) {
79669 - if (IsConst(_Rt_)) {
79670 - iRegs[_Rt_].k|= _ImmU_;
79671 - } else {
79672 - OR32ItoM((uptr)&psxRegs.GPR.r[_Rt_], _ImmU_);
79673 - }
79674 - } else {
79675 - if (IsConst(_Rs_)) {
79676 - MapConst(_Rt_, iRegs[_Rs_].k | _ImmU_);
79677 - } else {
79678 - iRegs[_Rt_].state = ST_UNK;
79679 -
79680 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79681 - if (_ImmU_) OR32ItoR (EAX, _ImmU_);
79682 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
79683 - }
79684 - }
79685 -}
79686 -
79687 -static void recXORI() {
79688 -// Rt = Rs Xor Im
79689 - if (!_Rt_) return;
79690 -
79691 -// iFlushRegs();
79692 -
79693 - if (_Rs_ == _Rt_) {
79694 - if (IsConst(_Rt_)) {
79695 - iRegs[_Rt_].k^= _ImmU_;
79696 - } else {
79697 - XOR32ItoM((uptr)&psxRegs.GPR.r[_Rt_], _ImmU_);
79698 - }
79699 - } else {
79700 - if (IsConst(_Rs_)) {
79701 - MapConst(_Rt_, iRegs[_Rs_].k ^ _ImmU_);
79702 - } else {
79703 - iRegs[_Rt_].state = ST_UNK;
79704 -
79705 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79706 - XOR32ItoR(EAX, _ImmU_);
79707 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
79708 - }
79709 - }
79710 -}
79711 -#endif
79712 -//end of * Arithmetic with immediate operand
79713 -
79714 -/*********************************************************
79715 -* Load higher 16 bits of the first word in GPR with imm *
79716 -* Format: OP rt, immediate *
79717 -*********************************************************/
79718 -//REC_FUNC(LUI);
79719 -#if 1
79720 -static void recLUI() {
79721 -// Rt = Imm << 16
79722 - if (!_Rt_) return;
79723 -
79724 - MapConst(_Rt_, psxRegs.code << 16);
79725 -}
79726 -#endif
79727 -//End of Load Higher .....
79728 -
79729 -
79730 -/*********************************************************
79731 -* Register arithmetic *
79732 -* Format: OP rd, rs, rt *
79733 -*********************************************************/
79734 -
79735 -
79736 -#if 0
79737 -REC_FUNC(ADD);
79738 -REC_FUNC(ADDU);
79739 -REC_FUNC(SUB);
79740 -REC_FUNC(SUBU);
79741 -REC_FUNC(AND);
79742 -REC_FUNC(OR);
79743 -REC_FUNC(XOR);
79744 -REC_FUNC(NOR);
79745 -REC_FUNC(SLT);
79746 -REC_FUNC(SLTU);
79747 -#endif
79748 -
79749 -#if 1
79750 -static void recADDU() {
79751 -// Rd = Rs + Rt
79752 - if (!_Rd_) return;
79753 -
79754 -// iFlushRegs();
79755 -
79756 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
79757 - MapConst(_Rd_, iRegs[_Rs_].k + iRegs[_Rt_].k);
79758 - } else if (IsConst(_Rs_)) {
79759 - iRegs[_Rd_].state = ST_UNK;
79760 -
79761 - if (_Rt_ == _Rd_) {
79762 - if (iRegs[_Rs_].k == 1) {
79763 - INC32M((uptr)&psxRegs.GPR.r[_Rd_]);
79764 - } else if (iRegs[_Rs_].k == -1) {
79765 - DEC32M((uptr)&psxRegs.GPR.r[_Rd_]);
79766 - } else if (iRegs[_Rs_].k) {
79767 - ADD32ItoM((uptr)&psxRegs.GPR.r[_Rd_], iRegs[_Rs_].k);
79768 - }
79769 - } else {
79770 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79771 - if (iRegs[_Rs_].k == 1) {
79772 - INC32R(EAX);
79773 - } else if (iRegs[_Rs_].k == 0xffffffff) {
79774 - DEC32R(EAX);
79775 - } else if (iRegs[_Rs_].k) {
79776 - ADD32ItoR(EAX, iRegs[_Rs_].k);
79777 - }
79778 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79779 - }
79780 - } else if (IsConst(_Rt_)) {
79781 - iRegs[_Rd_].state = ST_UNK;
79782 -
79783 - if (_Rs_ == _Rd_) {
79784 - if (iRegs[_Rt_].k == 1) {
79785 - INC32M((uptr)&psxRegs.GPR.r[_Rd_]);
79786 - } else if (iRegs[_Rt_].k == -1) {
79787 - DEC32M((uptr)&psxRegs.GPR.r[_Rd_]);
79788 - } else if (iRegs[_Rt_].k) {
79789 - ADD32ItoM((uptr)&psxRegs.GPR.r[_Rd_], iRegs[_Rt_].k);
79790 - }
79791 - } else {
79792 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79793 - if (iRegs[_Rt_].k == 1) {
79794 - INC32R(EAX);
79795 - } else if (iRegs[_Rt_].k == 0xffffffff) {
79796 - DEC32R(EAX);
79797 - } else if (iRegs[_Rt_].k) {
79798 - ADD32ItoR(EAX, iRegs[_Rt_].k);
79799 - }
79800 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79801 - }
79802 - } else {
79803 - iRegs[_Rd_].state = ST_UNK;
79804 -
79805 - if (_Rs_ == _Rd_) { // Rd+= Rt
79806 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79807 - ADD32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79808 - } else if (_Rt_ == _Rd_) { // Rd+= Rs
79809 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79810 - ADD32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79811 - } else { // Rd = Rs + Rt
79812 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79813 - ADD32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79814 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79815 - }
79816 - }
79817 -}
79818 -
79819 -static void recADD() {
79820 -// Rd = Rs + Rt
79821 - recADDU();
79822 -}
79823 -
79824 -static void recSUBU() {
79825 -// Rd = Rs - Rt
79826 - if (!_Rd_) return;
79827 -
79828 -// iFlushRegs();
79829 -
79830 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
79831 - MapConst(_Rd_, iRegs[_Rs_].k - iRegs[_Rt_].k);
79832 - } else if (IsConst(_Rs_)) {
79833 - iRegs[_Rd_].state = ST_UNK;
79834 -
79835 - MOV32ItoR(EAX, iRegs[_Rs_].k);
79836 - SUB32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79837 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79838 - } else if (IsConst(_Rt_)) {
79839 - iRegs[_Rd_].state = ST_UNK;
79840 -
79841 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79842 - SUB32ItoR(EAX, iRegs[_Rt_].k);
79843 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79844 - } else {
79845 - iRegs[_Rd_].state = ST_UNK;
79846 -
79847 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79848 - SUB32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79849 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79850 - }
79851 -}
79852 -
79853 -static void recSUB() {
79854 -// Rd = Rs - Rt
79855 - recSUBU();
79856 -}
79857 -
79858 -static void recAND() {
79859 -// Rd = Rs And Rt
79860 - if (!_Rd_) return;
79861 -
79862 -// iFlushRegs();
79863 -
79864 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
79865 - MapConst(_Rd_, iRegs[_Rs_].k & iRegs[_Rt_].k);
79866 - } else if (IsConst(_Rs_)) {
79867 - iRegs[_Rd_].state = ST_UNK;
79868 -
79869 - if (_Rd_ == _Rt_) { // Rd&= Rs
79870 - AND32ItoM((uptr)&psxRegs.GPR.r[_Rd_], iRegs[_Rs_].k);
79871 - } else {
79872 - MOV32ItoR(EAX, iRegs[_Rs_].k);
79873 - AND32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79874 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79875 - }
79876 - } else if (IsConst(_Rt_)) {
79877 - iRegs[_Rd_].state = ST_UNK;
79878 -
79879 - if (_Rd_ == _Rs_) { // Rd&= kRt
79880 - AND32ItoM((uptr)&psxRegs.GPR.r[_Rd_], iRegs[_Rt_].k);
79881 - } else { // Rd = Rs & kRt
79882 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79883 - AND32ItoR(EAX, iRegs[_Rt_].k);
79884 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79885 - }
79886 - } else {
79887 - iRegs[_Rd_].state = ST_UNK;
79888 -
79889 - if (_Rs_ == _Rd_) { // Rd&= Rt
79890 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79891 - AND32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79892 - } else if (_Rt_ == _Rd_) { // Rd&= Rs
79893 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79894 - AND32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79895 - } else { // Rd = Rs & Rt
79896 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79897 - AND32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79898 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79899 - }
79900 - }
79901 -}
79902 -
79903 -static void recOR() {
79904 -// Rd = Rs Or Rt
79905 - if (!_Rd_) return;
79906 -
79907 -// iFlushRegs();
79908 -
79909 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
79910 - MapConst(_Rd_, iRegs[_Rs_].k | iRegs[_Rt_].k);
79911 - } else if (IsConst(_Rs_)) {
79912 - iRegs[_Rd_].state = ST_UNK;
79913 -
79914 - MOV32ItoR(EAX, iRegs[_Rs_].k);
79915 - OR32MtoR (EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79916 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79917 - } else if (IsConst(_Rt_)) {
79918 - iRegs[_Rd_].state = ST_UNK;
79919 -
79920 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79921 - OR32ItoR (EAX, iRegs[_Rt_].k);
79922 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79923 - } else {
79924 - iRegs[_Rd_].state = ST_UNK;
79925 -
79926 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79927 - OR32MtoR (EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79928 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79929 - }
79930 -}
79931 -
79932 -static void recXOR() {
79933 -// Rd = Rs Xor Rt
79934 - if (!_Rd_) return;
79935 -
79936 -// iFlushRegs();
79937 -
79938 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
79939 - MapConst(_Rd_, iRegs[_Rs_].k ^ iRegs[_Rt_].k);
79940 - } else if (IsConst(_Rs_)) {
79941 - iRegs[_Rd_].state = ST_UNK;
79942 -
79943 - MOV32ItoR(EAX, iRegs[_Rs_].k);
79944 - XOR32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79945 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79946 - } else if (IsConst(_Rt_)) {
79947 - iRegs[_Rd_].state = ST_UNK;
79948 -
79949 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79950 - XOR32ItoR(EAX, iRegs[_Rt_].k);
79951 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79952 - } else {
79953 - iRegs[_Rd_].state = ST_UNK;
79954 -
79955 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79956 - XOR32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79957 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79958 - }
79959 -}
79960 -
79961 -static void recNOR() {
79962 -// Rd = Rs Nor Rt
79963 - if (!_Rd_) return;
79964 -
79965 -// iFlushRegs();
79966 -
79967 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
79968 - MapConst(_Rd_, ~(iRegs[_Rs_].k | iRegs[_Rt_].k));
79969 - } else if (IsConst(_Rs_)) {
79970 - iRegs[_Rd_].state = ST_UNK;
79971 -
79972 - MOV32ItoR(EAX, iRegs[_Rs_].k);
79973 - OR32MtoR (EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79974 - NOT32R (EAX);
79975 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79976 - } else if (IsConst(_Rt_)) {
79977 - iRegs[_Rd_].state = ST_UNK;
79978 -
79979 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79980 - OR32ItoR (EAX, iRegs[_Rt_].k);
79981 - NOT32R (EAX);
79982 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79983 - } else {
79984 - iRegs[_Rd_].state = ST_UNK;
79985 -
79986 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
79987 - OR32MtoR (EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
79988 - NOT32R (EAX);
79989 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
79990 - }
79991 -}
79992 -
79993 -static void recSLT() {
79994 -// Rd = Rs < Rt (signed)
79995 - if (!_Rd_) return;
79996 -
79997 -// iFlushRegs();
79998 -
79999 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
80000 - MapConst(_Rd_, (s32)iRegs[_Rs_].k < (s32)iRegs[_Rt_].k);
80001 - } else if (IsConst(_Rs_)) {
80002 - iRegs[_Rd_].state = ST_UNK;
80003 -
80004 - MOV32ItoR(EAX, iRegs[_Rs_].k);
80005 - CMP32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80006 - SETL8R (EAX);
80007 - AND32ItoR(EAX, 0xff);
80008 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
80009 - } else if (IsConst(_Rt_)) {
80010 - iRegs[_Rd_].state = ST_UNK;
80011 -
80012 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80013 - CMP32ItoR(EAX, iRegs[_Rt_].k);
80014 - SETL8R (EAX);
80015 - AND32ItoR(EAX, 0xff);
80016 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
80017 - } else {
80018 - iRegs[_Rd_].state = ST_UNK;
80019 -
80020 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80021 - CMP32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80022 - SETL8R (EAX);
80023 - AND32ItoR(EAX, 0xff);
80024 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
80025 - }
80026 -}
80027 -
80028 -static void recSLTU() {
80029 -// Rd = Rs < Rt (unsigned)
80030 - if (!_Rd_) return;
80031 -
80032 -// iFlushRegs();
80033 -
80034 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
80035 - MapConst(_Rd_, iRegs[_Rs_].k < iRegs[_Rt_].k);
80036 - } else if (IsConst(_Rs_)) {
80037 - iRegs[_Rd_].state = ST_UNK;
80038 -
80039 - MOV32ItoR(EAX, iRegs[_Rs_].k);
80040 - CMP32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80041 - SBB32RtoR(EAX, EAX);
80042 - NEG32R (EAX);
80043 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
80044 - } else if (IsConst(_Rt_)) {
80045 - iRegs[_Rd_].state = ST_UNK;
80046 -
80047 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80048 - CMP32ItoR(EAX, iRegs[_Rt_].k);
80049 - SBB32RtoR(EAX, EAX);
80050 - NEG32R (EAX);
80051 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
80052 - } else {
80053 - iRegs[_Rd_].state = ST_UNK;
80054 -
80055 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80056 - CMP32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80057 - SBB32RtoR(EAX, EAX);
80058 - NEG32R (EAX);
80059 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
80060 - }
80061 -}
80062 -#endif
80063 -//End of * Register arithmetic
80064 -
80065 -/*********************************************************
80066 -* Register mult/div & Register trap logic *
80067 -* Format: OP rs, rt *
80068 -*********************************************************/
80069 -
80070 -#if 0
80071 -REC_FUNC(MULT);
80072 -REC_FUNC(MULTU);
80073 -REC_FUNC(DIV);
80074 -REC_FUNC(DIVU);
80075 -#endif
80076 -
80077 -#if 1
80078 -static void recMULT() {
80079 -// Lo/Hi = Rs * Rt (signed)
80080 -
80081 -// iFlushRegs();
80082 -
80083 - if ((IsConst(_Rs_) && iRegs[_Rs_].k == 0) ||
80084 - (IsConst(_Rt_) && iRegs[_Rt_].k == 0)) {
80085 - XOR32RtoR(EAX, EAX);
80086 - MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
80087 - MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EAX);
80088 - return;
80089 - }
80090 -
80091 - if (IsConst(_Rs_)) {
80092 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("multrsk %x\n", iRegs[_Rs_].k);
80093 - } else {
80094 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80095 - }
80096 - if (IsConst(_Rt_)) {
80097 - MOV32ItoR(EDX, iRegs[_Rt_].k);// printf("multrtk %x\n", iRegs[_Rt_].k);
80098 - IMUL32R (EDX);
80099 - } else {
80100 - IMUL32M ((uptr)&psxRegs.GPR.r[_Rt_]);
80101 - }
80102 - MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
80103 - MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EDX);
80104 -}
80105 -
80106 -static void recMULTU() {
80107 -// Lo/Hi = Rs * Rt (unsigned)
80108 -
80109 -// iFlushRegs();
80110 -
80111 - if ((IsConst(_Rs_) && iRegs[_Rs_].k == 0) ||
80112 - (IsConst(_Rt_) && iRegs[_Rt_].k == 0)) {
80113 - XOR32RtoR(EAX, EAX);
80114 - MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
80115 - MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EAX);
80116 - return;
80117 - }
80118 -
80119 - if (IsConst(_Rs_)) {
80120 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("multursk %x\n", iRegs[_Rs_].k);
80121 - } else {
80122 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80123 - }
80124 - if (IsConst(_Rt_)) {
80125 - MOV32ItoR(EDX, iRegs[_Rt_].k);// printf("multurtk %x\n", iRegs[_Rt_].k);
80126 - MUL32R (EDX);
80127 - } else {
80128 - MUL32M ((uptr)&psxRegs.GPR.r[_Rt_]);
80129 - }
80130 - MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
80131 - MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EDX);
80132 -}
80133 -
80134 -static void recDIV() {
80135 -// Lo/Hi = Rs / Rt (signed)
80136 -
80137 -// iFlushRegs();
80138 -
80139 - if (IsConst(_Rt_)) {
80140 - if (iRegs[_Rt_].k == 0) return;
80141 - MOV32ItoR(ECX, iRegs[_Rt_].k);// printf("divrtk %x\n", iRegs[_Rt_].k);
80142 - } else {
80143 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
80144 - CMP32ItoR(ECX, 0);
80145 - j8Ptr[0] = JE8(0);
80146 - }
80147 - if (IsConst(_Rs_)) {
80148 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("divrsk %x\n", iRegs[_Rs_].k);
80149 - } else {
80150 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80151 - }
80152 - CDQ();
80153 - IDIV32R (ECX);
80154 - MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
80155 - MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EDX);
80156 - if (!IsConst(_Rt_)) {
80157 - x86SetJ8(j8Ptr[0]);
80158 - }
80159 -}
80160 -
80161 -static void recDIVU() {
80162 -// Lo/Hi = Rs / Rt (unsigned)
80163 -
80164 -// iFlushRegs();
80165 -
80166 - if (IsConst(_Rt_)) {
80167 - if (iRegs[_Rt_].k == 0) return;
80168 - MOV32ItoR(ECX, iRegs[_Rt_].k);// printf("divurtk %x\n", iRegs[_Rt_].k);
80169 - } else {
80170 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
80171 - CMP32ItoR(ECX, 0);
80172 - j8Ptr[0] = JE8(0);
80173 - }
80174 - if (IsConst(_Rs_)) {
80175 - MOV32ItoR(EAX, iRegs[_Rs_].k);// printf("divursk %x\n", iRegs[_Rs_].k);
80176 - } else {
80177 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80178 - }
80179 - XOR32RtoR(EDX, EDX);
80180 - DIV32R (ECX);
80181 - MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
80182 - MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EDX);
80183 - if (!IsConst(_Rt_)) {
80184 - x86SetJ8(j8Ptr[0]);
80185 - }
80186 -}
80187 -#endif
80188 -//End of * Register mult/div & Register trap logic
80189 -
80190 -#if 0
80191 -REC_FUNC(LB);
80192 -REC_FUNC(LBU);
80193 -REC_FUNC(LH);
80194 -REC_FUNC(LHU);
80195 -REC_FUNC(LW);
80196 -
80197 -REC_FUNC(SB);
80198 -REC_FUNC(SH);
80199 -REC_FUNC(SW);
80200 -
80201 -REC_FUNC(LWL);
80202 -REC_FUNC(LWR);
80203 -REC_FUNC(SWL);
80204 -REC_FUNC(SWR);
80205 -#endif
80206 -
80207 -
80208 -static void SetArg_OfB(x86IntRegType arg) {
80209 - if (IsConst(_Rs_))
80210 - MOV64ItoR(arg, iRegs[_Rs_].k + _Imm_);
80211 - else {
80212 - MOV32MtoR(arg, (uptr)&psxRegs.GPR.r[_Rs_]);
80213 - if (_Imm_)
80214 - ADD32ItoR(arg, _Imm_);
80215 - }
80216 -}
80217 -
80218 -#if 1
80219 -static void recLB() {
80220 -// Rt = mem[Rs + Im] (signed)
80221 -
80222 -// iFlushRegs();
80223 -
80224 - if (IsConst(_Rs_)) {
80225 - u32 addr = iRegs[_Rs_].k + _Imm_;
80226 - int t = addr >> 16;
80227 -
80228 - if ((t & 0xfff0) == 0xbfc0) {
80229 - if (!_Rt_) return;
80230 - // since bios is readonly it won't change
80231 - MapConst(_Rt_, psxRs8(addr));
80232 - return;
80233 - }
80234 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80235 - if (!_Rt_) return;
80236 - iRegs[_Rt_].state = ST_UNK;
80237 -
80238 - MOVSX32M8toR(EAX, (uptr)&psxM[addr & 0x1fffff]);
80239 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80240 - return;
80241 - }
80242 - if (t == 0x1f80 && addr < 0x1f801000) {
80243 - if (!_Rt_) return;
80244 - iRegs[_Rt_].state = ST_UNK;
80245 -
80246 - MOVSX32M8toR(EAX, (uptr)&psxH[addr & 0xfff]);
80247 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80248 - return;
80249 - }
80250 -// SysPrintf("unhandled r8 %x\n", addr);
80251 - }
80252 -
80253 - //iPushOfB();
80254 - SetArg_OfB(X86ARG1);
80255 - CALLFunc((uptr)psxMemRead8);
80256 - if (_Rt_) {
80257 - iRegs[_Rt_].state = ST_UNK;
80258 - MOVSX32R8toR(EAX, EAX);
80259 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80260 - }
80261 -// ADD32ItoR(ESP, 4);
80262 - //resp+= 4;
80263 -}
80264 -
80265 -static void recLBU() {
80266 -// Rt = mem[Rs + Im] (unsigned)
80267 -
80268 -// iFlushRegs();
80269 -
80270 - if (IsConst(_Rs_)) {
80271 - u32 addr = iRegs[_Rs_].k + _Imm_;
80272 - int t = addr >> 16;
80273 -
80274 - if ((t & 0xfff0) == 0xbfc0) {
80275 - if (!_Rt_) return;
80276 - // since bios is readonly it won't change
80277 - MapConst(_Rt_, psxRu8(addr));
80278 - return;
80279 - }
80280 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80281 - if (!_Rt_) return;
80282 - iRegs[_Rt_].state = ST_UNK;
80283 -
80284 - MOVZX32M8toR(EAX, (uptr)&psxM[addr & 0x1fffff]);
80285 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80286 - return;
80287 - }
80288 - if (t == 0x1f80 && addr < 0x1f801000) {
80289 - if (!_Rt_) return;
80290 - iRegs[_Rt_].state = ST_UNK;
80291 -
80292 - MOVZX32M8toR(EAX, (uptr)&psxH[addr & 0xfff]);
80293 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80294 - return;
80295 - }
80296 -// SysPrintf("unhandled r8u %x\n", addr);
80297 - }
80298 -
80299 - //iPushOfB();
80300 - SetArg_OfB(X86ARG1);
80301 - CALLFunc((uptr)psxMemRead8);
80302 - if (_Rt_) {
80303 - iRegs[_Rt_].state = ST_UNK;
80304 - MOVZX32R8toR(EAX, EAX);
80305 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80306 - }
80307 -// ADD32ItoR(ESP, 4);
80308 - //resp+= 4;
80309 -}
80310 -
80311 -static void recLH() {
80312 -// Rt = mem[Rs + Im] (signed)
80313 -
80314 -// iFlushRegs();
80315 -
80316 - if (IsConst(_Rs_)) {
80317 - u32 addr = iRegs[_Rs_].k + _Imm_;
80318 - int t = addr >> 16;
80319 -
80320 - if ((t & 0xfff0) == 0xbfc0) {
80321 - if (!_Rt_) return;
80322 - // since bios is readonly it won't change
80323 - MapConst(_Rt_, psxRs16(addr));
80324 - return;
80325 - }
80326 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80327 - if (!_Rt_) return;
80328 - iRegs[_Rt_].state = ST_UNK;
80329 -
80330 - MOVSX32M16toR(EAX, (uptr)&psxM[addr & 0x1fffff]);
80331 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80332 - return;
80333 - }
80334 - if (t == 0x1f80 && addr < 0x1f801000) {
80335 - if (!_Rt_) return;
80336 - iRegs[_Rt_].state = ST_UNK;
80337 -
80338 - MOVSX32M16toR(EAX, (uptr)&psxH[addr & 0xfff]);
80339 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80340 - return;
80341 - }
80342 -// SysPrintf("unhandled r16 %x\n", addr);
80343 - }
80344 -
80345 - //iPushOfB();
80346 - SetArg_OfB(X86ARG1);
80347 - CALLFunc((uptr)psxMemRead16);
80348 - if (_Rt_) {
80349 - iRegs[_Rt_].state = ST_UNK;
80350 - MOVSX32R16toR(EAX, EAX);
80351 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80352 - }
80353 -// ADD32ItoR(ESP, 4);
80354 - //resp+= 4;
80355 -}
80356 -
80357 -static void recLHU() {
80358 -// Rt = mem[Rs + Im] (unsigned)
80359 -
80360 -// iFlushRegs();
80361 -
80362 - if (IsConst(_Rs_)) {
80363 - u32 addr = iRegs[_Rs_].k + _Imm_;
80364 - int t = addr >> 16;
80365 -
80366 - if ((t & 0xfff0) == 0xbfc0) {
80367 - if (!_Rt_) return;
80368 - // since bios is readonly it won't change
80369 - MapConst(_Rt_, psxRu16(addr));
80370 - return;
80371 - }
80372 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80373 - if (!_Rt_) return;
80374 - iRegs[_Rt_].state = ST_UNK;
80375 -
80376 - MOVZX32M16toR(EAX, (uptr)&psxM[addr & 0x1fffff]);
80377 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80378 - return;
80379 - }
80380 - if (t == 0x1f80 && addr < 0x1f801000) {
80381 - if (!_Rt_) return;
80382 - iRegs[_Rt_].state = ST_UNK;
80383 -
80384 - MOVZX32M16toR(EAX, (uptr)&psxH[addr & 0xfff]);
80385 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80386 - return;
80387 - }
80388 - if (t == 0x1f80) {
80389 - if (addr >= 0x1f801c00 && addr < 0x1f801e00) {
80390 - if (!_Rt_) return;
80391 - iRegs[_Rt_].state = ST_UNK;
80392 -
80393 - //PUSHI (addr);
80394 - MOV64ItoR(X86ARG1, addr);
80395 - //CALLFunc ((uptr)SPU_readRegister);
80396 - MOV64ItoR(RAX, (uptr)SPU_readRegister);
80397 - CALL64R(RAX);
80398 - MOVZX32R16toR(EAX, EAX);
80399 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80400 -#ifndef __WIN32__
80401 - //resp+= 4;
80402 -#endif
80403 - return;
80404 - }
80405 - switch (addr) {
80406 - case 0x1f801100: case 0x1f801110: case 0x1f801120:
80407 - if (!_Rt_) return;
80408 - iRegs[_Rt_].state = ST_UNK;
80409 -
80410 - //PUSHI((addr >> 4) & 0x3);
80411 - MOV64ItoR(X86ARG1, (addr >> 4) & 0x3);
80412 - CALLFunc((uptr)psxRcntRcount);
80413 - MOVZX32R16toR(EAX, EAX);
80414 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80415 - //resp+= 4;
80416 - return;
80417 -
80418 - case 0x1f801104: case 0x1f801114: case 0x1f801124:
80419 - if (!_Rt_) return;
80420 - iRegs[_Rt_].state = ST_UNK;
80421 -
80422 - MOVZX32M16toR(EAX, (uptr)&psxCounters[(addr >> 4) & 0x3].mode);
80423 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80424 - return;
80425 -
80426 - case 0x1f801108: case 0x1f801118: case 0x1f801128:
80427 - if (!_Rt_) return;
80428 - iRegs[_Rt_].state = ST_UNK;
80429 -
80430 - MOVZX32M16toR(EAX, (uptr)&psxCounters[(addr >> 4) & 0x3].target);
80431 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80432 - return;
80433 - }
80434 - }
80435 -// SysPrintf("unhandled r16u %x\n", addr);
80436 - }
80437 -
80438 - //iPushOfB();
80439 - SetArg_OfB(X86ARG1);
80440 - CALLFunc((uptr)psxMemRead16);
80441 - if (_Rt_) {
80442 - iRegs[_Rt_].state = ST_UNK;
80443 - MOVZX32R16toR(EAX, EAX);
80444 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80445 - }
80446 -// ADD32ItoR(ESP, 4);
80447 - //resp+= 4;
80448 -}
80449 -
80450 -static void recLW() {
80451 -// Rt = mem[Rs + Im] (unsigned)
80452 -
80453 -// iFlushRegs();
80454 -
80455 - if (IsConst(_Rs_)) {
80456 - u32 addr = iRegs[_Rs_].k + _Imm_;
80457 - int t = addr >> 16;
80458 -
80459 - if ((t & 0xfff0) == 0xbfc0) {
80460 - if (!_Rt_) return;
80461 - // since bios is readonly it won't change
80462 - MapConst(_Rt_, psxRu32(addr));
80463 - return;
80464 - }
80465 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80466 - if (!_Rt_) return;
80467 - iRegs[_Rt_].state = ST_UNK;
80468 -
80469 - MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1fffff]);
80470 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80471 - return;
80472 - }
80473 - if (t == 0x1f80 && addr < 0x1f801000) {
80474 - if (!_Rt_) return;
80475 - iRegs[_Rt_].state = ST_UNK;
80476 -
80477 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xfff]);
80478 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80479 - return;
80480 - }
80481 - if (t == 0x1f80) {
80482 - switch (addr) {
80483 - case 0x1f801080: case 0x1f801084: case 0x1f801088:
80484 - case 0x1f801090: case 0x1f801094: case 0x1f801098:
80485 - case 0x1f8010a0: case 0x1f8010a4: case 0x1f8010a8:
80486 - case 0x1f8010b0: case 0x1f8010b4: case 0x1f8010b8:
80487 - case 0x1f8010c0: case 0x1f8010c4: case 0x1f8010c8:
80488 - case 0x1f8010d0: case 0x1f8010d4: case 0x1f8010d8:
80489 - case 0x1f8010e0: case 0x1f8010e4: case 0x1f8010e8:
80490 - case 0x1f801070: case 0x1f801074:
80491 - case 0x1f8010f0: case 0x1f8010f4:
80492 - if (!_Rt_) return;
80493 - iRegs[_Rt_].state = ST_UNK;
80494 -
80495 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xffff]);
80496 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80497 - return;
80498 -
80499 - case 0x1f801810:
80500 - if (!_Rt_) return;
80501 - iRegs[_Rt_].state = ST_UNK;
80502 -
80503 - //CALLFunc((uptr)GPU_readData);
80504 - MOV64ItoR(RAX, (uptr)GPU_readData);
80505 - CALL64R(RAX);
80506 -
80507 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80508 - return;
80509 -
80510 - case 0x1f801814:
80511 - if (!_Rt_) return;
80512 - iRegs[_Rt_].state = ST_UNK;
80513 -
80514 - //CALLFunc((uptr)GPU_readStatus);
80515 - MOV64ItoR(RAX, (uptr)GPU_readStatus);
80516 - CALL64R(RAX);
80517 -
80518 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80519 - return;
80520 - }
80521 - }
80522 -// SysPrintf("unhandled r32 %x\n", addr);
80523 - }
80524 -
80525 - //iPushOfB();
80526 - SetArg_OfB(X86ARG1);
80527 - CALLFunc((uptr)psxMemRead32);
80528 - if (_Rt_) {
80529 - iRegs[_Rt_].state = ST_UNK;
80530 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80531 - }
80532 -// ADD32ItoR(ESP, 4);
80533 - //resp+= 4;
80534 -}
80535 -
80536 -extern u32 LWL_MASK[4];
80537 -extern u32 LWL_SHIFT[4];
80538 -
80539 -void iLWLk(u32 shift) {
80540 - if (IsConst(_Rt_)) {
80541 - MOV32ItoR(ECX, iRegs[_Rt_].k);
80542 - } else {
80543 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
80544 - }
80545 - AND32ItoR(ECX, LWL_MASK[shift]);
80546 - SHL32ItoR(EAX, LWL_SHIFT[shift]);
80547 - OR32RtoR (EAX, ECX);
80548 -}
80549 -
80550 -void recLWL() {
80551 -// Rt = Rt Merge mem[Rs + Im]
80552 -
80553 - if (IsConst(_Rs_)) {
80554 - u32 addr = iRegs[_Rs_].k + _Imm_;
80555 - int t = addr >> 16;
80556 -
80557 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80558 - MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1ffffc]);
80559 - iLWLk(addr & 3);
80560 -
80561 - iRegs[_Rt_].state = ST_UNK;
80562 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80563 - return;
80564 - }
80565 - if (t == 0x1f80 && addr < 0x1f801000) {
80566 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xffc]);
80567 - iLWLk(addr & 3);
80568 -
80569 - iRegs[_Rt_].state = ST_UNK;
80570 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80571 - return;
80572 - }
80573 - }
80574 -
80575 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
80576 - else {
80577 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80578 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
80579 - }
80580 - //PUSH64R (EAX);
80581 - AND32ItoR(EAX, ~3);
80582 - //PUSH64R (EAX);
80583 - MOV32RtoR(X86ARG1, EAX);
80584 - CALLFunc((uptr)psxMemRead32);
80585 -
80586 - if (_Rt_) {
80587 - //ADD32ItoR(ESP, 4);
80588 - //POP64R (EDX);
80589 - if (IsConst(_Rs_)) MOV32ItoR(EDX, iRegs[_Rs_].k + _Imm_);
80590 - else {
80591 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rs_]);
80592 - if (_Imm_) ADD32ItoR(EDX, _Imm_);
80593 - }
80594 -
80595 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
80596 -
80597 - MOV64ItoR(ECX, (uptr)LWL_SHIFT);
80598 - MOV32RmStoR(ECX, ECX, EDX, 2);
80599 - SHL32CLtoR(EAX); // mem(EAX) << LWL_SHIFT[shift]
80600 -
80601 - MOV64ItoR(ECX, (uptr)LWL_MASK);
80602 - MOV32RmStoR(ECX, ECX, EDX, 2);
80603 - if (IsConst(_Rt_)) {
80604 - MOV32ItoR(EDX, iRegs[_Rt_].k);
80605 - } else {
80606 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rt_]);
80607 - }
80608 - AND32RtoR(EDX, ECX); // _rRt_ & LWL_MASK[shift]
80609 -
80610 - OR32RtoR(EAX, EDX);
80611 -
80612 - iRegs[_Rt_].state = ST_UNK;
80613 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80614 - //} else {
80615 - //ADD64ItoR(RSP, 8);
80616 - //resp+= 8;
80617 - }
80618 -}
80619 -
80620 -/*
80621 -static void recLWBlock(int count) {
80622 - u32 *code = PSXM(pc);
80623 - int i, respsave;
80624 -// Rt = mem[Rs + Im] (unsigned)
80625 -
80626 -// iFlushRegs();
80627 -
80628 - if (IsConst(_Rs_)) {
80629 - u32 addr = iRegs[_Rs_].k + _Imm_;
80630 - int t = addr >> 16;
80631 -
80632 - if ((t & 0xfff0) == 0xbfc0) {
80633 - // since bios is readonly it won't change
80634 - for (i=0; i<count; i++, code++, addr+=4) {
80635 - if (_fRt_(*code)) {
80636 - MapConst(_fRt_(*code), psxRu32(addr));
80637 - }
80638 - }
80639 - return;
80640 - }
80641 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80642 - for (i=0; i<count; i++, code++, addr+=4) {
80643 - if (!_fRt_(*code)) return;
80644 - iRegs[_fRt_(*code)].state = ST_UNK;
80645 -
80646 - MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1fffff]);
80647 - MOV32RtoM((uptr)&psxRegs.GPR.r[_fRt_(*code)], EAX);
80648 - }
80649 - return;
80650 - }
80651 - if (t == 0x1f80 && addr < 0x1f801000) {
80652 - for (i=0; i<count; i++, code++, addr+=4) {
80653 - if (!_fRt_(*code)) return;
80654 - iRegs[_fRt_(*code)].state = ST_UNK;
80655 -
80656 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xfff]);
80657 - MOV32RtoM((uptr)&psxRegs.GPR.r[_fRt_(*code)], EAX);
80658 - }
80659 - return;
80660 - }
80661 - }
80662 -
80663 - SysPrintf("recLWBlock %d: %d\n", count, IsConst(_Rs_));
80664 - //iPushOfB();
80665 - SetArg_OfB(X86ARG1);
80666 - CALLFunc((uptr)psxMemPointer);
80667 -// ADD32ItoR(ESP, 4);
80668 - //resp+= 4;
80669 -
80670 - respsave = resp; resp = 0;
80671 - //TEST32RtoR(EAX, EAX);
80672 - AND64RtoR(RAX,RAX);
80673 - j32Ptr[4] = JZ32(0);
80674 - XOR32RtoR(ECX, ECX);
80675 - for (i=0; i<count; i++, code++) {
80676 - if (_fRt_(*code)) {
80677 - iRegs[_fRt_(*code)].state = ST_UNK;
80678 -
80679 - MOV64RmStoR(EDX, EAX, ECX, 2);
80680 - MOV32RtoM((uptr)&psxRegs.GPR.r[_fRt_(*code)], EDX);
80681 - }
80682 - if (i != (count-1)) INC32R(ECX);
80683 - }
80684 - j32Ptr[5] = JMP32(0);
80685 - x86SetJ32(j32Ptr[4]);
80686 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
80687 - psxRegs.code = *code;
80688 - recLW();
80689 - }
80690 - //ADD32ItoR(ESP, resp);
80691 - x86SetJ32(j32Ptr[5]);
80692 - resp = respsave;
80693 -}
80694 -*/
80695 -
80696 -extern u32 LWR_MASK[4];
80697 -extern u32 LWR_SHIFT[4];
80698 -
80699 -void iLWRk(u32 shift) {
80700 - if (IsConst(_Rt_)) {
80701 - MOV32ItoR(ECX, iRegs[_Rt_].k);
80702 - } else {
80703 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
80704 - }
80705 - AND32ItoR(ECX, LWR_MASK[shift]);
80706 - SHR32ItoR(EAX, LWR_SHIFT[shift]);
80707 - OR32RtoR (EAX, ECX);
80708 -}
80709 -
80710 -void recLWR() {
80711 -// Rt = Rt Merge mem[Rs + Im]
80712 -
80713 - if (IsConst(_Rs_)) {
80714 - u32 addr = iRegs[_Rs_].k + _Imm_;
80715 - int t = addr >> 16;
80716 -
80717 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80718 - MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1ffffc]);
80719 - iLWRk(addr & 3);
80720 -
80721 - iRegs[_Rt_].state = ST_UNK;
80722 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80723 - return;
80724 - }
80725 - if (t == 0x1f80 && addr < 0x1f801000) {
80726 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xffc]);
80727 - iLWRk(addr & 3);
80728 -
80729 - iRegs[_Rt_].state = ST_UNK;
80730 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80731 - return;
80732 - }
80733 - }
80734 -
80735 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
80736 - else {
80737 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
80738 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
80739 - }
80740 - //PUSH64R (EAX);
80741 - AND32ItoR(EAX, ~3);
80742 - //PUSH64R (EAX);
80743 - MOV32RtoR(X86ARG1, EAX);
80744 - CALLFunc((uptr)psxMemRead32);
80745 -
80746 - if (_Rt_) {
80747 - //ADD32ItoR(ESP, 4);
80748 - //POP64R (EDX);
80749 - if (IsConst(_Rs_)) MOV32ItoR(EDX, iRegs[_Rs_].k + _Imm_);
80750 - else {
80751 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rs_]);
80752 - if (_Imm_) ADD32ItoR(EDX, _Imm_);
80753 - }
80754 -
80755 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
80756 -
80757 - MOV64ItoR(ECX, (uptr)LWR_SHIFT);
80758 - MOV32RmStoR(ECX, ECX, EDX, 2);
80759 - SHR32CLtoR(EAX); // mem(EAX) >> LWR_SHIFT[shift]
80760 -
80761 - MOV64ItoR(ECX, (uptr)LWR_MASK);
80762 - MOV32RmStoR(ECX, ECX, EDX, 2);
80763 -
80764 - if (IsConst(_Rt_)) {
80765 - MOV32ItoR(EDX, iRegs[_Rt_].k);
80766 - } else {
80767 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rt_]);
80768 - }
80769 - AND32RtoR(EDX, ECX); // _rRt_ & LWR_MASK[shift]
80770 -
80771 - OR32RtoR(EAX, EDX);
80772 -
80773 - iRegs[_Rt_].state = ST_UNK;
80774 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
80775 - //} else {
80776 - //ADD64ItoR(RSP, 8);
80777 - //resp+= 8;
80778 - }
80779 -}
80780 -
80781 -static void recSB() {
80782 -// mem[Rs + Im] = Rt
80783 -
80784 -// iFlushRegs();
80785 -
80786 - if (IsConst(_Rs_)) {
80787 - u32 addr = iRegs[_Rs_].k + _Imm_;
80788 - int t = addr >> 16;
80789 -
80790 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80791 - if (IsConst(_Rt_)) {
80792 - MOV8ItoM((uptr)&psxM[addr & 0x1fffff], (u8)iRegs[_Rt_].k);
80793 - } else {
80794 - MOV8MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80795 - MOV8RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
80796 - }
80797 - return;
80798 - }
80799 - if (t == 0x1f80 && addr < 0x1f801000) {
80800 - if (IsConst(_Rt_)) {
80801 - MOV8ItoM((uptr)&psxH[addr & 0xfff], (u8)iRegs[_Rt_].k);
80802 - } else {
80803 - MOV8MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80804 - MOV8RtoM((uptr)&psxH[addr & 0xfff], EAX);
80805 - }
80806 - return;
80807 - }
80808 -// SysPrintf("unhandled w8 %x\n", addr);
80809 - }
80810 -
80811 - if (IsConst(_Rt_)) {
80812 - MOV64ItoR(X86ARG2, iRegs[_Rt_].k);
80813 - } else {
80814 - MOV32MtoR(X86ARG2, (uptr)&psxRegs.GPR.r[_Rt_]);
80815 - }
80816 - //iPushOfB();
80817 - SetArg_OfB(X86ARG1);
80818 - CALLFunc((uptr)psxMemWrite8);
80819 -// ADD32ItoR(ESP, 8);
80820 - //resp+= 8;
80821 -}
80822 -
80823 -static void recSH() {
80824 -// mem[Rs + Im] = Rt
80825 -
80826 -// iFlushRegs();
80827 -
80828 - if (IsConst(_Rs_)) {
80829 - u32 addr = iRegs[_Rs_].k + _Imm_;
80830 - int t = addr >> 16;
80831 -
80832 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80833 - if (IsConst(_Rt_)) {
80834 - MOV16ItoM((uptr)&psxM[addr & 0x1fffff], (u16)iRegs[_Rt_].k);
80835 - } else {
80836 - MOV16MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80837 - MOV16RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
80838 - }
80839 - return;
80840 - }
80841 - if (t == 0x1f80 && addr < 0x1f801000) {
80842 - if (IsConst(_Rt_)) {
80843 - MOV16ItoM((uptr)&psxH[addr & 0xfff], (u16)iRegs[_Rt_].k);
80844 - } else {
80845 - MOV16MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80846 - MOV16RtoM((uptr)&psxH[addr & 0xfff], EAX);
80847 - }
80848 - return;
80849 - }
80850 - if (t == 0x1f80) {
80851 - if (addr >= 0x1f801c00 && addr < 0x1f801e00) {
80852 - if (IsConst(_Rt_)) {
80853 - //PUSHI(iRegs[_Rt_].k);
80854 - MOV64ItoR(X86ARG2, iRegs[_Rt_].k);
80855 - } else {
80856 - //PUSH64M((uptr)&psxRegs.GPR.r[_Rt_]);
80857 - MOV32MtoR(X86ARG2, (uptr)&psxRegs.GPR.r[_Rt_]);
80858 - }
80859 - //PUSHI (addr);
80860 - MOV64ItoR(X86ARG1, addr);
80861 - //CALLFunc ((uptr)SPU_writeRegister);
80862 - MOV64ItoR(RAX, (uptr)SPU_writeRegister);
80863 - CALL64R(RAX);
80864 -#ifndef __WIN32__
80865 - //resp+= 8;
80866 -#endif
80867 - return;
80868 - }
80869 - }
80870 -// SysPrintf("unhandled w16 %x\n", addr);
80871 - }
80872 -
80873 - if (IsConst(_Rt_)) {
80874 - MOV64ItoR(X86ARG2, iRegs[_Rt_].k);
80875 - } else {
80876 - MOV32MtoR(X86ARG2, (uptr)&psxRegs.GPR.r[_Rt_]);
80877 - }
80878 - //iPushOfB();
80879 - SetArg_OfB(X86ARG1);
80880 - CALLFunc((uptr)psxMemWrite16);
80881 -// ADD32ItoR(ESP, 8);
80882 - //resp+= 8;
80883 -}
80884 -
80885 -static void recSW() {
80886 -// mem[Rs + Im] = Rt
80887 -
80888 -// iFlushRegs();
80889 -
80890 - if (IsConst(_Rs_)) {
80891 - u32 addr = iRegs[_Rs_].k + _Imm_;
80892 - int t = addr >> 16;
80893 -
80894 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80895 - if (IsConst(_Rt_)) {
80896 - MOV32ItoM((uptr)&psxM[addr & 0x1fffff], iRegs[_Rt_].k);
80897 - } else {
80898 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80899 - MOV32RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
80900 - }
80901 - return;
80902 - }
80903 - if (t == 0x1f80 && addr < 0x1f801000) {
80904 - if (IsConst(_Rt_)) {
80905 - MOV32ItoM((uptr)&psxH[addr & 0xfff], iRegs[_Rt_].k);
80906 - } else {
80907 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80908 - MOV32RtoM((uptr)&psxH[addr & 0xfff], EAX);
80909 - }
80910 - return;
80911 - }
80912 - if (t == 0x1f80) {
80913 - switch (addr) {
80914 - case 0x1f801080: case 0x1f801084:
80915 - case 0x1f801090: case 0x1f801094:
80916 - case 0x1f8010a0: case 0x1f8010a4:
80917 - case 0x1f8010b0: case 0x1f8010b4:
80918 - case 0x1f8010c0: case 0x1f8010c4:
80919 - case 0x1f8010d0: case 0x1f8010d4:
80920 - case 0x1f8010e0: case 0x1f8010e4:
80921 - case 0x1f801074:
80922 - case 0x1f8010f0:
80923 - if (IsConst(_Rt_)) {
80924 - MOV32ItoM((uptr)&psxH[addr & 0xffff], iRegs[_Rt_].k);
80925 - } else {
80926 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
80927 - MOV32RtoM((uptr)&psxH[addr & 0xffff], EAX);
80928 - }
80929 - return;
80930 -
80931 - case 0x1f801810:
80932 - if (IsConst(_Rt_)) {
80933 - //PUSHI(iRegs[_Rt_].k);
80934 - MOV64ItoR(X86ARG1, iRegs[_Rt_].k);
80935 - } else {
80936 - //PUSH64M((uptr)&psxRegs.GPR.r[_Rt_]);
80937 - MOV32MtoR(X86ARG1, (uptr)&psxRegs.GPR.r[_Rt_]);
80938 - }
80939 - //CALLFunc((uptr)GPU_writeData);
80940 - MOV64ItoR(RAX, (uptr)GPU_writeData);
80941 - CALL64R(RAX);
80942 -#ifndef __WIN32__
80943 - //resp+= 4;
80944 -#endif
80945 - return;
80946 -
80947 - case 0x1f801814:
80948 - if (IsConst(_Rt_)) {
80949 - //PUSHI(iRegs[_Rt_].k);
80950 - MOV64ItoR(X86ARG1, iRegs[_Rt_].k);
80951 - } else {
80952 - //PUSH64M((uptr)&psxRegs.GPR.r[_Rt_]);
80953 - MOV32MtoR(X86ARG1, (uptr)&psxRegs.GPR.r[_Rt_]);
80954 - }
80955 - //CALLFunc((uptr)GPU_writeStatus);
80956 - MOV64ItoR(RAX, (uptr)GPU_writeStatus);
80957 - CALL64R(RAX);
80958 -#ifndef __WIN32__
80959 - //resp+= 4;
80960 -#endif
80961 - }
80962 - }
80963 -// SysPrintf("unhandled w32 %x\n", addr);
80964 - }
80965 -
80966 - if (IsConst(_Rt_)) {
80967 - MOV64ItoR(X86ARG2, iRegs[_Rt_].k);
80968 - } else {
80969 - MOV32MtoR(X86ARG2, (uptr)&psxRegs.GPR.r[_Rt_]);
80970 - }
80971 - SetArg_OfB(X86ARG1);
80972 - CALLFunc((uptr)psxMemWrite32);
80973 -// ADD32ItoR(ESP, 8);
80974 - //resp+= 8;
80975 -}
80976 -
80977 -/*
80978 -static void recSWBlock(int count) {
80979 - u32 *code;
80980 - int i, respsave;
80981 -// mem[Rs + Im] = Rt
80982 -
80983 -// iFlushRegs();
80984 -
80985 - if (IsConst(_Rs_)) {
80986 - u32 addr = iRegs[_Rs_].k + _Imm_;
80987 - int t = addr >> 16;
80988 - code = PSXM(pc);
80989 -
80990 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
80991 - for (i=0; i<count; i++, code++, addr+=4) {
80992 - if (IsConst(_fRt_(*code))) {
80993 - MOV32ItoM((uptr)&psxM[addr & 0x1fffff], iRegs[_fRt_(*code)].k);
80994 - } else {
80995 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_fRt_(*code)]);
80996 - MOV32RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
80997 - }
80998 - }
80999 - return;
81000 - }
81001 - if (t == 0x1f80 && addr < 0x1f801000) {
81002 - for (i=0; i<count; i++, code++, addr+=4) {
81003 - if (!_fRt_(*code)) return;
81004 - iRegs[_fRt_(*code)].state = ST_UNK;
81005 -
81006 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xfff]);
81007 - MOV32RtoM((uptr)&psxRegs.GPR.r[_fRt_(*code)], EAX);
81008 - }
81009 - return;
81010 - }
81011 - }
81012 -
81013 - SysPrintf("recSWBlock %d: %d\n", count, IsConst(_Rs_));
81014 - //iPushOfB();
81015 - SetArg_OfB(X86ARG1);
81016 - CALLFunc((uptr)psxMemPointer);
81017 -// ADD32ItoR(ESP, 4);
81018 - //resp+= 4;
81019 -
81020 - respsave = resp; resp = 0;
81021 - //TEST32RtoR(EAX, EAX);
81022 - AND64RtoR(RAX,RAX);
81023 - j32Ptr[4] = JZ32(0);
81024 - XOR32RtoR(ECX, ECX);
81025 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
81026 - if (IsConst(_fRt_(*code))) {
81027 - MOV32ItoR(EDX, iRegs[_fRt_(*code)].k);
81028 - } else {
81029 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_fRt_(*code)]);
81030 - }
81031 - MOV32RtoRmS(EAX, ECX, 2, EDX);
81032 - if (i != (count-1)) INC32R(ECX);
81033 - }
81034 - j32Ptr[5] = JMP32(0);
81035 - x86SetJ32(j32Ptr[4]);
81036 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
81037 - psxRegs.code = *code;
81038 - recSW();
81039 - }
81040 - //ADD32ItoR(ESP, resp);
81041 - x86SetJ32(j32Ptr[5]);
81042 - resp = respsave;
81043 -}
81044 -*/
81045 -
81046 -extern u32 SWL_MASK[4];
81047 -extern u32 SWL_SHIFT[4];
81048 -
81049 -void iSWLk(u32 shift) {
81050 - if (IsConst(_Rt_)) {
81051 - MOV32ItoR(ECX, iRegs[_Rt_].k);
81052 - } else {
81053 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
81054 - }
81055 - SHR32ItoR(ECX, SWL_SHIFT[shift]);
81056 - AND32ItoR(EAX, SWL_MASK[shift]);
81057 - OR32RtoR (EAX, ECX);
81058 -}
81059 -
81060 -void recSWL() {
81061 -// mem[Rs + Im] = Rt Merge mem[Rs + Im]
81062 -
81063 - if (IsConst(_Rs_)) {
81064 - u32 addr = iRegs[_Rs_].k + _Imm_;
81065 - int t = addr >> 16;
81066 -
81067 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
81068 - MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1ffffc]);
81069 - iSWLk(addr & 3);
81070 - MOV32RtoM((uptr)&psxM[addr & 0x1ffffc], EAX);
81071 - return;
81072 - }
81073 - if (t == 0x1f80 && addr < 0x1f801000) {
81074 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xffc]);
81075 - iSWLk(addr & 3);
81076 - MOV32RtoM((uptr)&psxH[addr & 0xffc], EAX);
81077 - return;
81078 - }
81079 - }
81080 -
81081 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
81082 - else {
81083 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81084 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
81085 - }
81086 - //PUSH64R (EAX);
81087 - AND32ItoR(EAX, ~3);
81088 -
81089 - //PUSH64R (EAX);
81090 - MOV32RtoR(X86ARG1, EAX);
81091 - CALLFunc((uptr)psxMemRead32);
81092 -
81093 - //ADD32ItoR(ESP, 4);
81094 - //POP64R (EDX);
81095 - if (IsConst(_Rs_)) MOV32ItoR(EDX, iRegs[_Rs_].k + _Imm_);
81096 - else {
81097 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rs_]);
81098 - if (_Imm_) ADD32ItoR(EDX, _Imm_);
81099 - }
81100 -
81101 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
81102 -
81103 - MOV64ItoR(ECX, (uptr)SWL_MASK);
81104 - MOV32RmStoR(ECX, ECX, EDX, 2);
81105 - AND32RtoR(EAX, ECX); // mem & SWL_MASK[shift]
81106 -
81107 - MOV64ItoR(ECX, (uptr)SWL_SHIFT);
81108 - MOV32RmStoR(ECX, ECX, EDX, 2);
81109 - if (IsConst(_Rt_)) {
81110 - MOV32ItoR(EDX, iRegs[_Rt_].k);
81111 - } else {
81112 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rt_]);
81113 - }
81114 - SHR32CLtoR(EDX); // _rRt_ >> SWL_SHIFT[shift]
81115 -
81116 - OR32RtoR (EAX, EDX);
81117 - //PUSH64R (EAX);
81118 - MOV32RtoR(X86ARG2, EAX);
81119 -
81120 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
81121 - else {
81122 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81123 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
81124 - }
81125 - AND32ItoR(EAX, ~3);
81126 - //PUSH64R (EAX);
81127 - MOV32RtoR(X86ARG1, EAX);
81128 -
81129 - CALLFunc((uptr)psxMemWrite32);
81130 -// ADD32ItoR(ESP, 8);
81131 - //resp+= 8;
81132 -}
81133 -
81134 -extern u32 SWR_MASK[4];
81135 -extern u32 SWR_SHIFT[4];
81136 -
81137 -void iSWRk(u32 shift) {
81138 - if (IsConst(_Rt_)) {
81139 - MOV32ItoR(ECX, iRegs[_Rt_].k);
81140 - } else {
81141 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
81142 - }
81143 - SHL32ItoR(ECX, SWR_SHIFT[shift]);
81144 - AND32ItoR(EAX, SWR_MASK[shift]);
81145 - OR32RtoR (EAX, ECX);
81146 -}
81147 -
81148 -void recSWR() {
81149 -// mem[Rs + Im] = Rt Merge mem[Rs + Im]
81150 -
81151 - if (IsConst(_Rs_)) {
81152 - u32 addr = iRegs[_Rs_].k + _Imm_;
81153 - int t = addr >> 16;
81154 -
81155 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
81156 - MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1ffffc]);
81157 - iSWRk(addr & 3);
81158 - MOV32RtoM((uptr)&psxM[addr & 0x1ffffc], EAX);
81159 - return;
81160 - }
81161 - if (t == 0x1f80 && addr < 0x1f801000) {
81162 - MOV32MtoR(EAX, (uptr)&psxH[addr & 0xffc]);
81163 - iSWRk(addr & 3);
81164 - MOV32RtoM((uptr)&psxH[addr & 0xffc], EAX);
81165 - return;
81166 - }
81167 - }
81168 -
81169 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
81170 - else {
81171 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81172 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
81173 - }
81174 - //PUSH64R (EAX);
81175 -
81176 - AND32ItoR(EAX, ~3);
81177 -
81178 - //PUSH64R (EAX);
81179 - MOV32RtoR(X86ARG1, EAX);
81180 -
81181 - CALLFunc((uptr)psxMemRead32);
81182 -
81183 - //ADD32ItoR(ESP, 4);
81184 - //POP64R (EDX);
81185 - if (IsConst(_Rs_)) MOV32ItoR(EDX, iRegs[_Rs_].k + _Imm_);
81186 - else {
81187 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rs_]);
81188 - if (_Imm_) ADD32ItoR(EDX, _Imm_);
81189 - }
81190 -
81191 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
81192 -
81193 - MOV64ItoR(ECX, (uptr)SWR_MASK);
81194 - MOV32RmStoR(ECX, ECX, EDX, 2);
81195 - AND32RtoR(EAX, ECX); // mem & SWR_MASK[shift]
81196 -
81197 - MOV64ItoR(ECX, (uptr)SWR_SHIFT);
81198 - MOV32RmStoR(ECX, ECX, EDX, 2);
81199 - if (IsConst(_Rt_)) {
81200 - MOV32ItoR(EDX, iRegs[_Rt_].k);
81201 - } else {
81202 - MOV32MtoR(EDX, (uptr)&psxRegs.GPR.r[_Rt_]);
81203 - }
81204 - SHL32CLtoR(EDX); // _rRt_ << SWR_SHIFT[shift]
81205 -
81206 - OR32RtoR (EAX, EDX);
81207 - //PUSH64R (EAX);
81208 - MOV32RtoR(X86ARG2, EAX);
81209 -
81210 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
81211 - else {
81212 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81213 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
81214 - }
81215 - AND32ItoR(EAX, ~3);
81216 - //PUSH64R (EAX);
81217 - MOV32RtoR(X86ARG1, EAX);
81218 - CALLFunc((uptr)psxMemWrite32);
81219 -// ADD32ItoR(ESP, 8);
81220 - //resp+= 8;
81221 -}
81222 -
81223 -#endif
81224 -
81225 -#if 0
81226 -REC_FUNC(SLL);
81227 -REC_FUNC(SRL);
81228 -REC_FUNC(SRA);
81229 -#endif
81230 -#if 1
81231 -static void recSLL() {
81232 -// Rd = Rt << Sa
81233 - if (!_Rd_) return;
81234 -
81235 -// iFlushRegs();
81236 -
81237 - if (IsConst(_Rt_)) {
81238 - MapConst(_Rd_, iRegs[_Rt_].k << _Sa_);
81239 - } else {
81240 - iRegs[_Rd_].state = ST_UNK;
81241 -
81242 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81243 - if (_Sa_) SHL32ItoR(EAX, _Sa_);
81244 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81245 - }
81246 -}
81247 -
81248 -static void recSRL() {
81249 -// Rd = Rt >> Sa
81250 - if (!_Rd_) return;
81251 -
81252 -// iFlushRegs();
81253 -
81254 - if (IsConst(_Rt_)) {
81255 - MapConst(_Rd_, iRegs[_Rt_].k >> _Sa_);
81256 - } else {
81257 - iRegs[_Rd_].state = ST_UNK;
81258 -
81259 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81260 - if (_Sa_) SHR32ItoR(EAX, _Sa_);
81261 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81262 - }
81263 -}
81264 -
81265 -static void recSRA() {
81266 -// Rd = Rt >> Sa
81267 - if (!_Rd_) return;
81268 -
81269 -// iFlushRegs();
81270 -
81271 - if (IsConst(_Rt_)) {
81272 - MapConst(_Rd_, (s32)iRegs[_Rt_].k >> _Sa_);
81273 - } else {
81274 - iRegs[_Rd_].state = ST_UNK;
81275 -
81276 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81277 - if (_Sa_) SAR32ItoR(EAX, _Sa_);
81278 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81279 - }
81280 -}
81281 -#endif
81282 -
81283 -#if 0
81284 -REC_FUNC(SLLV);
81285 -REC_FUNC(SRLV);
81286 -REC_FUNC(SRAV);
81287 -#endif
81288 -
81289 -#if 1
81290 -static void recSLLV() {
81291 -// Rd = Rt << Rs
81292 - if (!_Rd_) return;
81293 -
81294 -// iFlushRegs();
81295 -
81296 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
81297 - MapConst(_Rd_, iRegs[_Rt_].k << iRegs[_Rs_].k);
81298 - } else if (IsConst(_Rs_)) {
81299 - iRegs[_Rd_].state = ST_UNK;
81300 -
81301 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81302 - MOV32ItoR(ECX, iRegs[_Rs_].k);
81303 - SHL32CLtoR(EAX);
81304 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81305 - } else if (IsConst(_Rt_)) {
81306 - iRegs[_Rd_].state = ST_UNK;
81307 -
81308 - MOV32ItoR(EAX, iRegs[_Rt_].k);
81309 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rs_]);
81310 - SHL32CLtoR(EAX);
81311 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81312 - } else {
81313 - iRegs[_Rd_].state = ST_UNK;
81314 -
81315 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81316 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rs_]);
81317 - SHL32CLtoR(EAX);
81318 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81319 - }
81320 -}
81321 -
81322 -static void recSRLV() {
81323 -// Rd = Rt >> Rs
81324 - if (!_Rd_) return;
81325 -
81326 -// iFlushRegs();
81327 -
81328 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
81329 - MapConst(_Rd_, iRegs[_Rt_].k >> iRegs[_Rs_].k);
81330 - } else if (IsConst(_Rs_)) {
81331 - iRegs[_Rd_].state = ST_UNK;
81332 -
81333 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81334 - MOV32ItoR(ECX, iRegs[_Rs_].k);
81335 - SHR32CLtoR(EAX);
81336 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81337 - } else if (IsConst(_Rt_)) {
81338 - iRegs[_Rd_].state = ST_UNK;
81339 -
81340 - MOV32ItoR(EAX, iRegs[_Rt_].k);
81341 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rs_]);
81342 - SHR32CLtoR(EAX);
81343 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81344 - } else {
81345 - iRegs[_Rd_].state = ST_UNK;
81346 -
81347 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81348 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rs_]);
81349 - SHR32CLtoR(EAX);
81350 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81351 - }
81352 -}
81353 -
81354 -static void recSRAV() {
81355 -// Rd = Rt >> Rs
81356 - if (!_Rd_) return;
81357 -
81358 -// iFlushRegs();
81359 -
81360 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
81361 - MapConst(_Rd_, (s32)iRegs[_Rt_].k >> iRegs[_Rs_].k);
81362 - } else if (IsConst(_Rs_)) {
81363 - iRegs[_Rd_].state = ST_UNK;
81364 -
81365 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81366 - MOV32ItoR(ECX, iRegs[_Rs_].k);
81367 - SAR32CLtoR(EAX);
81368 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81369 - } else if (IsConst(_Rt_)) {
81370 - iRegs[_Rd_].state = ST_UNK;
81371 -
81372 - MOV32ItoR(EAX, iRegs[_Rt_].k);
81373 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rs_]);
81374 - SAR32CLtoR(EAX);
81375 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81376 - } else {
81377 - iRegs[_Rd_].state = ST_UNK;
81378 -
81379 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81380 - MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rs_]);
81381 - SAR32CLtoR(EAX);
81382 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81383 - }
81384 -}
81385 -#endif
81386 -
81387 -#if 0
81388 -REC_SYS(SYSCALL);
81389 -REC_SYS(BREAK);
81390 -#endif
81391 -
81392 -int dump;
81393 -
81394 -#if 1
81395 -static void recSYSCALL() {
81396 -// dump=1;
81397 - iFlushRegs();
81398 -
81399 - MOV32ItoR(EAX, pc - 4);
81400 - MOV32RtoM((uptr)&psxRegs.pc, EAX);
81401 - //PUSHI (branch == 1 ? 1 : 0);
81402 - //PUSHI (0x20);
81403 - MOV64ItoR(X86ARG2, branch == 1 ? 1 : 0);
81404 - MOV64ItoR(X86ARG1, 0x20);
81405 - CALLFunc((uptr)psxException);
81406 - //ADD32ItoR(ESP, 8);
81407 -
81408 - branch = 2;
81409 - iRet();
81410 -}
81411 -
81412 -static void recBREAK() {
81413 -}
81414 -#endif
81415 -
81416 -#if 0
81417 -REC_FUNC(MFHI);
81418 -REC_FUNC(MTHI);
81419 -REC_FUNC(MFLO);
81420 -REC_FUNC(MTLO);
81421 -#endif
81422 -#if 1
81423 -static void recMFHI() {
81424 -// Rd = Hi
81425 - if (!_Rd_) return;
81426 -
81427 - iRegs[_Rd_].state = ST_UNK;
81428 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.n.hi);
81429 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81430 -}
81431 -
81432 -static void recMTHI() {
81433 -// Hi = Rs
81434 -
81435 - if (IsConst(_Rs_)) {
81436 - MOV32ItoM((uptr)&psxRegs.GPR.n.hi, iRegs[_Rs_].k);
81437 - } else {
81438 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81439 - MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EAX);
81440 - }
81441 -}
81442 -
81443 -static void recMFLO() {
81444 -// Rd = Lo
81445 - if (!_Rd_) return;
81446 -
81447 - iRegs[_Rd_].state = ST_UNK;
81448 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.n.lo);
81449 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
81450 -}
81451 -
81452 -static void recMTLO() {
81453 -// Lo = Rs
81454 -
81455 - if (IsConst(_Rs_)) {
81456 - MOV32ItoM((uptr)&psxRegs.GPR.n.lo, iRegs[_Rs_].k);
81457 - } else {
81458 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81459 - MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
81460 - }
81461 -}
81462 -#endif
81463 -
81464 -#if 0
81465 -REC_BRANCH(J);
81466 -REC_BRANCH(JR);
81467 -REC_BRANCH(JAL);
81468 -REC_BRANCH(JALR);
81469 -REC_BRANCH(BLTZ);
81470 -REC_BRANCH(BGTZ);
81471 -REC_BRANCH(BLTZAL);
81472 -REC_BRANCH(BGEZAL);
81473 -REC_BRANCH(BNE);
81474 -REC_BRANCH(BEQ);
81475 -REC_BRANCH(BLEZ);
81476 -REC_BRANCH(BGEZ);
81477 -#endif
81478 -#if 1
81479 -static void recBLTZ() {
81480 -// Branch if Rs < 0
81481 - u32 bpc = _Imm_ * 4 + pc;
81482 -
81483 -// iFlushRegs();
81484 -
81485 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81486 - return;
81487 - }
81488 -
81489 - if (IsConst(_Rs_)) {
81490 - if ((s32)iRegs[_Rs_].k < 0) {
81491 - iJump(bpc); return;
81492 - } else {
81493 - iJump(pc+4); return;
81494 - }
81495 - }
81496 -
81497 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], 0);
81498 - j32Ptr[4] = JL32(0);
81499 -
81500 - iBranch(pc+4, 1);
81501 -
81502 - x86SetJ32(j32Ptr[4]);
81503 -
81504 - iBranch(bpc, 0);
81505 - pc+=4;
81506 -}
81507 -
81508 -static void recBGTZ() {
81509 -// Branch if Rs > 0
81510 - u32 bpc = _Imm_ * 4 + pc;
81511 -
81512 -// iFlushRegs();
81513 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81514 - return;
81515 - }
81516 -
81517 - if (IsConst(_Rs_)) {
81518 - if ((s32)iRegs[_Rs_].k > 0) {
81519 - iJump(bpc); return;
81520 - } else {
81521 - iJump(pc+4); return;
81522 - }
81523 - }
81524 -
81525 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], 0);
81526 - j32Ptr[4] = JG32(0);
81527 -
81528 - iBranch(pc+4, 1);
81529 -
81530 - x86SetJ32(j32Ptr[4]);
81531 -
81532 - iBranch(bpc, 0);
81533 - pc+=4;
81534 -}
81535 -
81536 -static void recBLTZAL() {
81537 -// Branch if Rs < 0
81538 - u32 bpc = _Imm_ * 4 + pc;
81539 -
81540 -// iFlushRegs();
81541 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81542 - return;
81543 - }
81544 -
81545 - if (IsConst(_Rs_)) {
81546 - if ((s32)iRegs[_Rs_].k < 0) {
81547 - MOV32ItoM((uptr)&psxRegs.GPR.r[31], pc + 4);
81548 - iJump(bpc); return;
81549 - } else {
81550 - iJump(pc+4); return;
81551 - }
81552 - }
81553 -
81554 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], 0);
81555 - j32Ptr[4] = JL32(0);
81556 -
81557 - iBranch(pc+4, 1);
81558 -
81559 - x86SetJ32(j32Ptr[4]);
81560 -
81561 - MOV32ItoM((uptr)&psxRegs.GPR.r[31], pc + 4);
81562 - iBranch(bpc, 0);
81563 - pc+=4;
81564 -}
81565 -
81566 -static void recBGEZAL() {
81567 -// Branch if Rs >= 0
81568 - u32 bpc = _Imm_ * 4 + pc;
81569 -
81570 -// iFlushRegs();
81571 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81572 - return;
81573 - }
81574 -
81575 - if (IsConst(_Rs_)) {
81576 - if ((s32)iRegs[_Rs_].k >= 0) {
81577 - MOV32ItoM((uptr)&psxRegs.GPR.r[31], pc + 4);
81578 - iJump(bpc); return;
81579 - } else {
81580 - iJump(pc+4); return;
81581 - }
81582 - }
81583 -
81584 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], 0);
81585 - j32Ptr[4] = JGE32(0);
81586 -
81587 - iBranch(pc+4, 1);
81588 -
81589 - x86SetJ32(j32Ptr[4]);
81590 -
81591 - MOV32ItoM((uptr)&psxRegs.GPR.r[31], pc + 4);
81592 - iBranch(bpc, 0);
81593 - pc+=4;
81594 -}
81595 -
81596 -static void recJ() {
81597 -// j target
81598 -
81599 - iJump(_Target_ * 4 + (pc & 0xf0000000));
81600 -}
81601 -
81602 -static void recJAL() {
81603 -// jal target
81604 -
81605 - MapConst(31, pc + 4);
81606 -
81607 - iJump(_Target_ * 4 + (pc & 0xf0000000));
81608 -}
81609 -
81610 -static void recJR() {
81611 -// jr Rs
81612 -
81613 - if (IsConst(_Rs_)) {
81614 - MOV32ItoM((uptr)&target, iRegs[_Rs_].k);
81615 - } else {
81616 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81617 - MOV32RtoM((uptr)&target, EAX);
81618 - }
81619 -
81620 - SetBranch();
81621 -}
81622 -
81623 -static void recJALR() {
81624 -// jalr Rs
81625 -
81626 - if (IsConst(_Rs_)) {
81627 - MOV32ItoM((uptr)&target, iRegs[_Rs_].k);
81628 - } else {
81629 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81630 - MOV32RtoM((uptr)&target, EAX);
81631 - }
81632 -
81633 - if (_Rd_) {
81634 - MapConst(_Rd_, pc + 4);
81635 - }
81636 -
81637 - SetBranch();
81638 -}
81639 -
81640 -static void recBEQ() {
81641 -// Branch if Rs == Rt
81642 - u32 bpc = _Imm_ * 4 + pc;
81643 -
81644 -// iFlushRegs();
81645 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81646 - return;
81647 - }
81648 -
81649 - if (_Rs_ == _Rt_) {
81650 - iJump(bpc);
81651 - } else {
81652 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
81653 - if (iRegs[_Rs_].k == iRegs[_Rt_].k) {
81654 - iJump(bpc); return;
81655 - } else {
81656 - iJump(pc+4); return;
81657 - }
81658 - } else if (IsConst(_Rs_)) {
81659 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rt_], iRegs[_Rs_].k);
81660 - } else if (IsConst(_Rt_)) {
81661 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], iRegs[_Rt_].k);
81662 - } else {
81663 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81664 - CMP32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81665 - }
81666 -
81667 - j32Ptr[4] = JE32(0);
81668 -
81669 - iBranch(pc+4, 1);
81670 -
81671 - x86SetJ32(j32Ptr[4]);
81672 -
81673 - iBranch(bpc, 0);
81674 - pc+=4;
81675 - }
81676 -}
81677 -
81678 -static void recBNE() {
81679 -// Branch if Rs != Rt
81680 - u32 bpc = _Imm_ * 4 + pc;
81681 -
81682 -// iFlushRegs();
81683 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81684 - return;
81685 - }
81686 -
81687 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
81688 - if (iRegs[_Rs_].k != iRegs[_Rt_].k) {
81689 - iJump(bpc); return;
81690 - } else {
81691 - iJump(pc+4); return;
81692 - }
81693 - } else if (IsConst(_Rs_)) {
81694 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rt_], iRegs[_Rs_].k);
81695 - } else if (IsConst(_Rt_)) {
81696 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], iRegs[_Rt_].k);
81697 - } else {
81698 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
81699 - CMP32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81700 - }
81701 - j32Ptr[4] = JNE32(0);
81702 -
81703 - iBranch(pc+4, 1);
81704 -
81705 - x86SetJ32(j32Ptr[4]);
81706 -
81707 - iBranch(bpc, 0);
81708 - pc+=4;
81709 -}
81710 -
81711 -static void recBLEZ() {
81712 -// Branch if Rs <= 0
81713 - u32 bpc = _Imm_ * 4 + pc;
81714 -
81715 -// iFlushRegs();
81716 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81717 - return;
81718 - }
81719 -
81720 - if (IsConst(_Rs_)) {
81721 - if ((s32)iRegs[_Rs_].k <= 0) {
81722 - iJump(bpc); return;
81723 - } else {
81724 - iJump(pc+4); return;
81725 - }
81726 - }
81727 -
81728 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], 0);
81729 - j32Ptr[4] = JLE32(0);
81730 -
81731 - iBranch(pc+4, 1);
81732 -
81733 - x86SetJ32(j32Ptr[4]);
81734 -
81735 - iBranch(bpc, 0);
81736 - pc+=4;
81737 -}
81738 -
81739 -static void recBGEZ() {
81740 -// Branch if Rs >= 0
81741 - u32 bpc = _Imm_ * 4 + pc;
81742 -
81743 -// iFlushRegs();
81744 - if (bpc == pc+4 && psxTestLoadDelay(_Rs_, PSXMu32(bpc)) == 0) {
81745 - return;
81746 - }
81747 -
81748 - if (IsConst(_Rs_)) {
81749 - if ((s32)iRegs[_Rs_].k >= 0) {
81750 - iJump(bpc); return;
81751 - } else {
81752 - iJump(pc+4); return;
81753 - }
81754 - }
81755 -
81756 - CMP32ItoM((uptr)&psxRegs.GPR.r[_Rs_], 0);
81757 - j32Ptr[4] = JGE32(0);
81758 -
81759 - iBranch(pc+4, 1);
81760 -
81761 - x86SetJ32(j32Ptr[4]);
81762 -
81763 - iBranch(bpc, 0);
81764 - pc+=4;
81765 -}
81766 -#endif
81767 -
81768 -#if 0
81769 -REC_FUNC(MFC0);
81770 -REC_SYS(MTC0);
81771 -REC_FUNC(CFC0);
81772 -REC_SYS(CTC0);
81773 -REC_FUNC(RFE);
81774 -#endif
81775 -//REC_SYS(MTC0);
81776 -#if 1
81777 -static void recMFC0() {
81778 -// Rt = Cop0->Rd
81779 - if (!_Rt_) return;
81780 -
81781 - iRegs[_Rt_].state = ST_UNK;
81782 - MOV32MtoR(EAX, (uptr)&psxRegs.CP0.r[_Rd_]);
81783 - MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
81784 -}
81785 -
81786 -static void recCFC0() {
81787 -// Rt = Cop0->Rd
81788 -
81789 - recMFC0();
81790 -}
81791 -
81792 -//*
81793 -void psxMTC0();
81794 -static void recMTC0() {
81795 -// Cop0->Rd = Rt
81796 -
81797 - if (IsConst(_Rt_)) {
81798 - switch (_Rd_) {
81799 - case 12:
81800 - MOV32ItoM((uptr)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k);
81801 - break;
81802 - case 13:
81803 - MOV32ItoM((uptr)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k & ~(0xfc00));
81804 - break;
81805 - default:
81806 - MOV32ItoM((uptr)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k);
81807 - break;
81808 - }
81809 - } else {
81810 - MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
81811 - switch (_Rd_) {
81812 - case 13:
81813 - AND32ItoR(EAX, ~(0xfc00));
81814 - break;
81815 - }
81816 - MOV32RtoM((uptr)&psxRegs.CP0.r[_Rd_], EAX);
81817 - }
81818 -
81819 - if (_Rd_ == 12 || _Rd_ == 13) {
81820 - iFlushRegs();
81821 - MOV32ItoM((uptr)&psxRegs.pc, (u32)pc);
81822 - CALLFunc((uptr)psxTestSWInts);
81823 - if (_Rd_ == 12)
81824 - OR32ItoM((uptr)&psxRegs.interrupt, 0x80000000);
81825 - if (branch == 0) {
81826 - branch = 2;
81827 - iRet();
81828 - }
81829 - }
81830 -}//*/
81831 -
81832 -static void recCTC0() {
81833 -// Cop0->Rd = Rt
81834 -
81835 - recMTC0();
81836 -}
81837 -
81838 -static void recRFE() {
81839 - MOV32MtoR(EAX, (uptr)&psxRegs.CP0.n.Status);
81840 - MOV32RtoR(ECX, EAX);
81841 - AND32ItoR(EAX, 0xfffffff0);
81842 - AND32ItoR(ECX, 0x3c);
81843 - SHR32ItoR(ECX, 2);
81844 - OR32RtoR (EAX, ECX);
81845 - MOV32RtoM((uptr)&psxRegs.CP0.n.Status, EAX);
81846 -
81847 - iFlushRegs();
81848 - MOV32ItoM((uptr)&psxRegs.pc, (u32)pc);
81849 - CALLFunc((uptr)psxTestSWInts);
81850 - if (branch == 0) {
81851 - branch = 2;
81852 - iRet();
81853 - }
81854 -}
81855 -#endif
81856 -
81857 -#include "iGte.h"
81858 -
81859 -//
81860 -
81861 -static void recHLE() {
81862 - iFlushRegs();
81863 -
81864 - //MOV32ItoR(EAX, (uptr)psxHLEt[psxRegs.code & 0xffff]);
81865 - //CALL32R(EAX);
81866 - CALLFunc((uptr)psxHLEt[psxRegs.code & 0xffff]);
81867 - branch = 2;
81868 - iRet();
81869 -}
81870 -
81871 -//
81872 -
81873 -static void (*recBSC[64])() = {
81874 - recSPECIAL, recREGIMM, recJ , recJAL , recBEQ , recBNE , recBLEZ, recBGTZ,
81875 - recADDI , recADDIU , recSLTI, recSLTIU, recANDI, recORI , recXORI, recLUI ,
81876 - recCOP0 , recNULL , recCOP2, recNULL , recNULL, recNULL, recNULL, recNULL,
81877 - recNULL , recNULL , recNULL, recNULL , recNULL, recNULL, recNULL, recNULL,
81878 - recLB , recLH , recLWL , recLW , recLBU , recLHU , recLWR , recNULL,
81879 - recSB , recSH , recSWL , recSW , recNULL, recNULL, recSWR , recNULL,
81880 - recNULL , recNULL , recLWC2, recNULL , recNULL, recNULL, recNULL, recNULL,
81881 - recNULL , recNULL , recSWC2, recHLE , recNULL, recNULL, recNULL, recNULL
81882 -};
81883 -
81884 -static void (*recSPC[64])() = {
81885 - recSLL , recNULL, recSRL , recSRA , recSLLV , recNULL , recSRLV, recSRAV,
81886 - recJR , recJALR, recNULL, recNULL, recSYSCALL, recBREAK, recNULL, recNULL,
81887 - recMFHI, recMTHI, recMFLO, recMTLO, recNULL , recNULL , recNULL, recNULL,
81888 - recMULT, recMULTU, recDIV, recDIVU, recNULL , recNULL , recNULL, recNULL,
81889 - recADD , recADDU, recSUB , recSUBU, recAND , recOR , recXOR , recNOR ,
81890 - recNULL, recNULL, recSLT , recSLTU, recNULL , recNULL , recNULL, recNULL,
81891 - recNULL, recNULL, recNULL, recNULL, recNULL , recNULL , recNULL, recNULL,
81892 - recNULL, recNULL, recNULL, recNULL, recNULL , recNULL , recNULL, recNULL
81893 -};
81894 -
81895 -static void (*recREG[32])() = {
81896 - recBLTZ , recBGEZ , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
81897 - recNULL , recNULL , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
81898 - recBLTZAL, recBGEZAL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
81899 - recNULL , recNULL , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
81900 -};
81901 -
81902 -static void (*recCP0[32])() = {
81903 - recMFC0, recNULL, recCFC0, recNULL, recMTC0, recNULL, recCTC0, recNULL,
81904 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
81905 - recRFE , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
81906 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
81907 -};
81908 -
81909 -static void (*recCP2[64])() = {
81910 - recBASIC, recRTPS , recNULL , recNULL, recNULL, recNULL , recNCLIP, recNULL, // 00
81911 - recNULL , recNULL , recNULL , recNULL, recOP , recNULL , recNULL , recNULL, // 08
81912 - recDPCS , recINTPL, recMVMVA, recNCDS, recCDP , recNULL , recNCDT , recNULL, // 10
81913 - recNULL , recNULL , recNULL , recNCCS, recCC , recNULL , recNCS , recNULL, // 18
81914 - recNCT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 20
81915 - recSQR , recDCPL , recDPCT , recNULL, recNULL, recAVSZ3, recAVSZ4, recNULL, // 28
81916 - recRTPT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 30
81917 - recNULL , recNULL , recNULL , recNULL, recNULL, recGPF , recGPL , recNCCT // 38
81918 -};
81919 -
81920 -static void (*recCP2BSC[32])() = {
81921 - recMFC2, recNULL, recCFC2, recNULL, recMTC2, recNULL, recCTC2, recNULL,
81922 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
81923 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
81924 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
81925 -};
81926 -
81927 -
81928 -static void recRecompile() {
81929 - char *p;
81930 - char *ptr;
81931 -
81932 - dump=0;
81933 - resp = 0;
81934 -
81935 - /* if x86Ptr reached the mem limit reset whole mem */
81936 - if (((uptr)x86Ptr - (uptr)recMem) >= (RECMEM_SIZE - 0x10000))
81937 - recReset();
81938 -
81939 - x86Align(32);
81940 - ptr = x86Ptr;
81941 -
81942 - *PC_REC(psxRegs.pc) = (uptr)x86Ptr;
81943 - pc = psxRegs.pc;
81944 - pcold = pc;
81945 -
81946 - //Make some stack space for function arguments spill (x86-64 calling conventions)
81947 - // 0x38 = 7 args, should be plenty...
81948 - SUB64ItoR(RSP, STACKSIZE);
81949 -
81950 - for (count=0; count<500;) {
81951 - p = (char *)PSXM(pc);
81952 - if (p == NULL) recError();
81953 - psxRegs.code = *(u32 *)p;
81954 -/*
81955 - if ((psxRegs.code >> 26) == 0x23) { // LW
81956 - int i;
81957 - u32 code;
81958 -
81959 - for (i=1;; i++) {
81960 - p = (char *)PSXM(pc+i*4);
81961 - if (p == NULL) recError();
81962 - code = *(u32 *)p;
81963 -
81964 - if ((code >> 26) != 0x23 ||
81965 - _fRs_(code) != _Rs_ ||
81966 - _fImm_(code) != (_Imm_+i*4))
81967 - break;
81968 - }
81969 - if (i > 1) {
81970 - recLWBlock(i);
81971 - pc = pc + i*4; continue;
81972 - }
81973 - }
81974 -
81975 - if ((psxRegs.code >> 26) == 0x2b) { // SW
81976 - int i;
81977 - u32 code;
81978 -
81979 - for (i=1;; i++) {
81980 - p = (char *)PSXM(pc+i*4);
81981 - if (p == NULL) recError();
81982 - code = *(u32 *)p;
81983 -
81984 - if ((code >> 26) != 0x2b ||
81985 - _fRs_(code) != _Rs_ ||
81986 - _fImm_(code) != (_Imm_+i*4))
81987 - break;
81988 - }
81989 - if (i > 1) {
81990 - recSWBlock(i);
81991 - pc = pc + i*4; continue;
81992 - }
81993 - }*/
81994 -
81995 - pc+=4; count++;
81996 - recBSC[psxRegs.code>>26]();
81997 -
81998 - if (branch) {
81999 - branch = 0;
82000 - if (dump) iDumpBlock(ptr);
82001 - return;
82002 - }
82003 - }
82004 -
82005 - iFlushRegs();
82006 -
82007 - MOV32ItoM((uptr)&psxRegs.pc, pc);
82008 - iRet();
82009 -}
82010 -
82011 -
82012 -R3000Acpu psxRec = {
82013 - recInit,
82014 - recReset,
82015 - recExecute,
82016 - recExecuteBlock,
82017 - recClear,
82018 - recShutdown
82019 -};
82020 -
82021 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/ix86-64.c new/libpcsxcore/libpcsxcore/ix86_64/ix86-64.c
82022 --- original/libpcsxcore/libpcsxcore/ix86_64/ix86-64.c 2007-12-29 17:48:01.000000000 -0430
82023 +++ new/libpcsxcore/libpcsxcore/ix86_64/ix86-64.c 1969-12-31 20:00:00.000000000 -0400
82024 @@ -1,3287 +0,0 @@
82025 -/*
82026 - * ix86 core v0.6.2
82027 - * Authors: linuzappz <linuzappz@pcsx.net>
82028 - * alexey silinov
82029 - * goldfinger
82030 - * zerofrog(@gmail.com)
82031 - */
82032 -
82033 -// stop compiling if NORECBUILD build (only for Visual Studio)
82034 -#if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
82035 -
82036 -#include <stdio.h>
82037 -#include <string.h>
82038 -#include <assert.h>
82039 -#include "ix86-64.h"
82040 -
82041 -#define SWAP(x, y) { *(u32*)&y ^= *(u32*)&x; *(u32*)&x ^= *(u32*)&y; *(u32*)&y ^= *(u32*)&x; }
82042 -
82043 -#ifdef __x86_64__
82044 -
82045 -#ifdef _MSC_VER
82046 -// visual studio calling convention
82047 -x86IntRegType g_x86savedregs[] = { RBX, RBP, RSI, RDI, R12, R13, R14, R15 };
82048 -x86IntRegType g_x86tempregs[] = { R8, R9, R10, R11, RDX, RCX };
82049 -
82050 -// arranged in savedreg -> tempreg order
82051 -x86IntRegType g_x86allregs[14] = { RBX, RBP, RSI, RDI, R12, R13, R14, R15, R8, R9, R10, R11, RDX, RCX };
82052 -
82053 -#else
82054 -// standard calling convention
82055 -
82056 -// registers saved by calling functions (no need to flush them across calls)
82057 -x86IntRegType g_x86savedregs[] = { RBX, RBP, R12, R13, R14, R15 };
82058 -// temp registers that need to be saved across calls
82059 -x86IntRegType g_x86tempregs[] = { RCX, RDX, R8, R9, R10, R11, RSI, RDI };
82060 -
82061 -// arranged in savedreg -> tempreg order
82062 -x86IntRegType g_x86allregs[14] = { RBX, RBP, R12, R13, R14, R15, RCX, RDX, R8, R9, R10, R11, RSI, RDI };
82063 -
82064 -#endif
82065 -
82066 -x86IntRegType g_x868bitregs[11] = { RBX, R12, R13, R14, R15, RCX, RDX, R8, R9, R10, R11 };
82067 -x86IntRegType g_x86non8bitregs[3] = { RBP, RSI, RDI };
82068 -
82069 -#endif // __x86_64__
82070 -
82071 -s8 *x86Ptr;
82072 -u8 *j8Ptr[32];
82073 -u32 *j32Ptr[32];
82074 -
82075 -extern void SysPrintf(char *fmt, ...);
82076 -
82077 -void WriteRmOffset(x86IntRegType to, int offset)
82078 -{
82079 - if( (to&7) == ESP ) {
82080 - if( offset == 0 ) {
82081 - ModRM( 0, 0, 4 );
82082 - ModRM( 0, ESP, 4 );
82083 - }
82084 - else if( offset < 128 && offset >= -128 ) {
82085 - ModRM( 1, 0, 4 );
82086 - ModRM( 0, ESP, 4 );
82087 - write8(offset);
82088 - }
82089 - else {
82090 - ModRM( 2, 0, 4 );
82091 - ModRM( 0, ESP, 4 );
82092 - write32(offset);
82093 - }
82094 - }
82095 - else {
82096 - if( offset == 0 ) {
82097 - ModRM( 0, 0, to );
82098 - }
82099 - else if( offset < 128 && offset >= -128 ) {
82100 - ModRM( 1, 0, to );
82101 - write8(offset);
82102 - }
82103 - else {
82104 - ModRM( 2, 0, to );
82105 - write32(offset);
82106 - }
82107 - }
82108 -}
82109 -
82110 -void WriteRmOffsetFrom(x86IntRegType to, x86IntRegType from, int offset)
82111 -{
82112 - if ((from&7) == ESP) {
82113 - if( offset == 0 ) {
82114 - ModRM( 0, to, 0x4 );
82115 - SibSB( 0, 0x4, 0x4 );
82116 - }
82117 - else if( offset < 128 && offset >= -128 ) {
82118 - ModRM( 1, to, 0x4 );
82119 - SibSB( 0, 0x4, 0x4 );
82120 - write8(offset);
82121 - }
82122 - else {
82123 - ModRM( 2, to, 0x4 );
82124 - SibSB( 0, 0x4, 0x4 );
82125 - write32(offset);
82126 - }
82127 - }
82128 - else {
82129 - if( offset == 0 ) {
82130 - ModRM( 0, to, from );
82131 - }
82132 - else if( offset < 128 && offset >= -128 ) {
82133 - ModRM( 1, to, from );
82134 - write8(offset);
82135 - }
82136 - else {
82137 - ModRM( 2, to, from );
82138 - write32(offset);
82139 - }
82140 - }
82141 -}
82142 -
82143 -// This function is just for rec debugging purposes
82144 -void CheckX86Ptr( void )
82145 -{
82146 -}
82147 -
82148 -void write64( u64 val )
82149 -{
82150 -#ifdef _DEBUG
82151 - CheckX86Ptr( );
82152 -#endif
82153 -
82154 - *(u64*)x86Ptr = val;
82155 - x86Ptr += 8;
82156 -}
82157 -
82158 -void ModRM( int mod, int rm, int reg )
82159 -{
82160 - write8( ( mod << 6 ) | ( (rm & 7) << 3 ) | ( reg & 7 ) );
82161 -}
82162 -
82163 -void SibSB( int ss, int rm, int index )
82164 -{
82165 - write8( ( ss << 6 ) | ( rm << 3 ) | ( index ) );
82166 -}
82167 -
82168 -void SET8R( int cc, int to )
82169 -{
82170 - RexB(0, to);
82171 - write8( 0x0F );
82172 - write8( cc );
82173 - write8( 0xC0 | ( to ) );
82174 -}
82175 -
82176 -u8* J8Rel( int cc, int to )
82177 -{
82178 - write8( cc );
82179 - write8( to );
82180 - return x86Ptr - 1;
82181 -}
82182 -
82183 -u16* J16Rel( int cc, u32 to )
82184 -{
82185 - write16( 0x0F66 );
82186 - write8( cc );
82187 - write16( to );
82188 - return (u16*)( x86Ptr - 2 );
82189 -}
82190 -
82191 -u32* J32Rel( int cc, u32 to )
82192 -{
82193 - write8( 0x0F );
82194 - write8( cc );
82195 - write32( to );
82196 - return (u32*)( x86Ptr - 4 );
82197 -}
82198 -
82199 -void CMOV32RtoR( int cc, int to, int from )
82200 -{
82201 - RexRB(0,to, from);
82202 - write8( 0x0F );
82203 - write8( cc );
82204 - ModRM( 3, to, from );
82205 -}
82206 -
82207 -void CMOV32MtoR( int cc, int to, uptr from )
82208 -{
82209 - RexR(0, to);
82210 - write8( 0x0F );
82211 - write8( cc );
82212 - ModRM( 0, to, DISP32 );
82213 - write32( MEMADDR(from, 4) );
82214 -}
82215 -
82216 -////////////////////////////////////////////////////
82217 -void x86SetPtr( char* ptr )
82218 -{
82219 - x86Ptr = ptr;
82220 -}
82221 -
82222 -////////////////////////////////////////////////////
82223 -void x86Shutdown( void )
82224 -{
82225 -}
82226 -
82227 -////////////////////////////////////////////////////
82228 -void x86SetJ8( u8* j8 )
82229 -{
82230 - u32 jump = ( x86Ptr - (s8*)j8 ) - 1;
82231 -
82232 - if ( jump > 0x7f ) {
82233 - assert(0);
82234 - SysPrintf( "j8 greater than 0x7f!!\n" );
82235 - }
82236 - *j8 = (u8)jump;
82237 -}
82238 -
82239 -void x86SetJ8A( u8* j8 )
82240 -{
82241 - u32 jump = ( x86Ptr - (s8*)j8 ) - 1;
82242 -
82243 - if ( jump > 0x7f ) {
82244 - assert(0);
82245 - SysPrintf( "j8 greater than 0x7f!!\n" );
82246 - }
82247 -
82248 - if( ((uptr)x86Ptr&0xf) > 4 ) {
82249 -
82250 - uptr newjump = jump + 16-((uptr)x86Ptr&0xf);
82251 -
82252 - if( newjump <= 0x7f ) {
82253 - jump = newjump;
82254 - while((uptr)x86Ptr&0xf) *x86Ptr++ = 0x90;
82255 - }
82256 - }
82257 - *j8 = (u8)jump;
82258 -}
82259 -
82260 -void x86SetJ16( u16 *j16 )
82261 -{
82262 - // doesn't work
82263 - u32 jump = ( x86Ptr - (s8*)j16 ) - 2;
82264 -
82265 - if ( jump > 0x7fff ) {
82266 - assert(0);
82267 - SysPrintf( "j16 greater than 0x7fff!!\n" );
82268 - }
82269 - *j16 = (u16)jump;
82270 -}
82271 -
82272 -void x86SetJ16A( u16 *j16 )
82273 -{
82274 - if( ((uptr)x86Ptr&0xf) > 4 ) {
82275 - while((uptr)x86Ptr&0xf) *x86Ptr++ = 0x90;
82276 - }
82277 - x86SetJ16(j16);
82278 -}
82279 -
82280 -////////////////////////////////////////////////////
82281 -void x86SetJ32( u32* j32 )
82282 -{
82283 - *j32 = ( x86Ptr - (s8*)j32 ) - 4;
82284 -}
82285 -
82286 -void x86SetJ32A( u32* j32 )
82287 -{
82288 - while((uptr)x86Ptr&0xf) *x86Ptr++ = 0x90;
82289 - x86SetJ32(j32);
82290 -}
82291 -
82292 -////////////////////////////////////////////////////
82293 -void x86Align( int bytes )
82294 -{
82295 - // fordward align
82296 - x86Ptr = (s8*)( ( (uptr)x86Ptr + bytes - 1) & ~( bytes - 1 ) );
82297 -}
82298 -
82299 -/********************/
82300 -/* IX86 intructions */
82301 -/********************/
82302 -
82303 -void STC( void )
82304 -{
82305 - write8( 0xF9 );
82306 -}
82307 -
82308 -void CLC( void )
82309 -{
82310 - write8( 0xF8 );
82311 -}
82312 -
82313 -////////////////////////////////////
82314 -// mov instructions /
82315 -////////////////////////////////////
82316 -
82317 -/* mov r64 to r64 */
82318 -void MOV64RtoR( x86IntRegType to, x86IntRegType from )
82319 -{
82320 - RexRB(1, from, to);
82321 - write8( 0x89 );
82322 - ModRM( 3, from, to );
82323 -}
82324 -
82325 -/* mov r64 to m64 */
82326 -void MOV64RtoM( uptr to, x86IntRegType from )
82327 -{
82328 - RexR(1, from);
82329 - write8( 0x89 );
82330 - ModRM( 0, from, DISP32 );
82331 - write32( (u32)MEMADDR(to, 4) );
82332 -}
82333 -
82334 -/* mov m64 to r64 */
82335 -void MOV64MtoR( x86IntRegType to, uptr from )
82336 -{
82337 - RexR(1, to);
82338 - write8( 0x8B );
82339 - ModRM( 0, to, DISP32 );
82340 - write32( (u32)MEMADDR(from, 4) );
82341 -}
82342 -
82343 -/* mov imm32 to m64 */
82344 -void MOV64I32toM(uptr to, u32 from )
82345 -{
82346 - Rex(1, 0, 0, 0);
82347 - write8( 0xC7 );
82348 - ModRM( 0, 0, DISP32 );
82349 - write32( MEMADDR(to, 8) );
82350 - write32( from );
82351 -}
82352 -
82353 -// mov imm64 to r64
82354 -void MOV64ItoR( x86IntRegType to, u64 from)
82355 -{
82356 - RexB(1, to);
82357 - write8( 0xB8 | (to & 0x7) );
82358 - write64( from );
82359 -}
82360 -
82361 -/* mov imm32 to r64 */
82362 -void MOV64I32toR( x86IntRegType to, s32 from )
82363 -{
82364 - RexB(1, to);
82365 - write8( 0xC7 );
82366 - ModRM( 0, 0, to );
82367 - write32( from );
82368 -}
82369 -
82370 -// mov imm64 to [r64+off]
82371 -void MOV64ItoRmOffset( x86IntRegType to, u32 from, int offset)
82372 -{
82373 - RexB(1,to);
82374 - write8( 0xC7 );
82375 - WriteRmOffset(to, offset);
82376 - write32(from);
82377 -}
82378 -
82379 -// mov [r64+offset] to r64
82380 -void MOV64RmOffsettoR( x86IntRegType to, x86IntRegType from, int offset )
82381 -{
82382 - RexRB(1, to, from);
82383 - write8( 0x8B );
82384 - WriteRmOffsetFrom(to, from, offset);
82385 -}
82386 -
82387 -/* mov [r64][r64*scale] to r64 */
82388 -void MOV64RmStoR( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale) {
82389 - RexRXB(1, to, from2, from);
82390 - write8( 0x8B );
82391 - ModRM( 0, to, 0x4 );
82392 - SibSB(scale, from2, from );
82393 -}
82394 -
82395 -/* mov r64 to [r64+offset] */
82396 -void MOV64RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset )
82397 -{
82398 - RexRB(1,from,to);
82399 - write8( 0x89 );
82400 - WriteRmOffsetFrom(from, to, offset);
82401 -}
82402 -
82403 -/* mov r64 to [r64][r64*scale] */
82404 -void MOV64RtoRmS( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale) {
82405 - RexRXB(1, to, from2, from);
82406 - write8( 0x89 );
82407 - ModRM( 0, to, 0x4 );
82408 - SibSB(scale, from2, from );
82409 -}
82410 -
82411 -
82412 -/* mov r32 to r32 */
82413 -void MOV32RtoR( x86IntRegType to, x86IntRegType from )
82414 -{
82415 - RexRB(0, from, to);
82416 - write8( 0x89 );
82417 - ModRM( 3, from, to );
82418 -}
82419 -
82420 -/* mov r32 to m32 */
82421 -void MOV32RtoM( uptr to, x86IntRegType from )
82422 -{
82423 - RexR(0, from);
82424 - write8( 0x89 );
82425 - ModRM( 0, from, DISP32 );
82426 - write32( MEMADDR(to, 4) );
82427 -}
82428 -
82429 -/* mov m32 to r32 */
82430 -void MOV32MtoR( x86IntRegType to, uptr from )
82431 -{
82432 - RexR(0, to);
82433 - write8( 0x8B );
82434 - ModRM( 0, to, DISP32 );
82435 - write32( MEMADDR(from, 4) );
82436 -}
82437 -
82438 -/* mov [r32] to r32 */
82439 -void MOV32RmtoR( x86IntRegType to, x86IntRegType from ) {
82440 - RexRB(0, to, from);
82441 - write8(0x8B);
82442 - WriteRmOffsetFrom(to, from, 0);
82443 -}
82444 -
82445 -void MOV32RmtoROffset( x86IntRegType to, x86IntRegType from, int offset ) {
82446 - RexRB(0, to, from);
82447 - write8( 0x8B );
82448 - WriteRmOffsetFrom(to, from, offset);
82449 -}
82450 -
82451 -/* mov [r32+r32*scale] to r32 */
82452 -void MOV32RmStoR( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale) {
82453 - RexRXB(0,to,from2,from);
82454 - write8( 0x8B );
82455 - ModRM( 0, to, 0x4 );
82456 - SibSB(scale, from2, from );
82457 -}
82458 -
82459 -// mov r32 to [r32<<scale+from2]
82460 -void MOV32RmSOffsettoR( x86IntRegType to, x86IntRegType from1, int from2, int scale )
82461 -{
82462 - RexRXB(0,to,from1,0);
82463 - write8( 0x8B );
82464 - ModRM( 0, to, 0x4 );
82465 - ModRM( scale, from1, 5);
82466 - write32(from2);
82467 -}
82468 -
82469 -/* mov r32 to [r32] */
82470 -void MOV32RtoRm( x86IntRegType to, x86IntRegType from ) {
82471 - RexRB(0, from, to);
82472 - if ((to&7) == ESP) {
82473 - write8( 0x89 );
82474 - ModRM( 0, from, 0x4 );
82475 - SibSB( 0, 0x4, 0x4 );
82476 - } else {
82477 - write8( 0x89 );
82478 - ModRM( 0, from, to );
82479 - }
82480 -}
82481 -
82482 -/* mov r32 to [r32][r32*scale] */
82483 -void MOV32RtoRmS( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale) {
82484 - RexRXB(0, to, from2, from);
82485 - write8( 0x89 );
82486 - ModRM( 0, to, 0x4 );
82487 - SibSB(scale, from2, from );
82488 -}
82489 -
82490 -/* mov imm32 to r32 */
82491 -void MOV32ItoR( x86IntRegType to, u32 from )
82492 -{
82493 - RexB(0, to);
82494 - write8( 0xB8 | (to & 0x7) );
82495 - write32( from );
82496 -}
82497 -
82498 -/* mov imm32 to m32 */
82499 -void MOV32ItoM(uptr to, u32 from )
82500 -{
82501 - write8( 0xC7 );
82502 -
82503 - if (to <= 0xffffffff) {
82504 - ModRM( 0, 0, 0x4 );
82505 - SibSB( 0, 0x4, 0x5 );
82506 - write32( (u32)to );
82507 - } else {
82508 - assert((sptr)MEMADDR(to,8) <= 0x7fffffff && (sptr)MEMADDR(to,8) >= -0x7fffffff);
82509 - ModRM( 0, 0, DISP32 );
82510 - write32( MEMADDR(to, 8) );
82511 - }
82512 - write32( from );
82513 -}
82514 -
82515 -// mov imm32 to [r32+off]
82516 -void MOV32ItoRmOffset( x86IntRegType to, u32 from, int offset)
82517 -{
82518 - RexB(0,to);
82519 - write8( 0xC7 );
82520 - WriteRmOffset(to, offset);
82521 - write32(from);
82522 -}
82523 -
82524 -// mov r32 to [r32+off]
82525 -void MOV32RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset)
82526 -{
82527 - RexRB(0,from,to);
82528 - write8( 0x89 );
82529 - WriteRmOffsetFrom(from, to, offset);
82530 -}
82531 -
82532 -/* mov r16 to m16 */
82533 -void MOV16RtoM(uptr to, x86IntRegType from )
82534 -{
82535 - write8( 0x66 );
82536 - RexR(0,from);
82537 - write8( 0x89 );
82538 - ModRM( 0, from, DISP32 );
82539 - write32( MEMADDR(to, 4) );
82540 -}
82541 -
82542 -/* mov m16 to r16 */
82543 -void MOV16MtoR( x86IntRegType to, uptr from )
82544 -{
82545 - write8( 0x66 );
82546 - RexR(0,to);
82547 - write8( 0x8B );
82548 - ModRM( 0, to, DISP32 );
82549 - write32( MEMADDR(from, 4) );
82550 -}
82551 -
82552 -void MOV16RmtoR( x86IntRegType to, x86IntRegType from)
82553 -{
82554 - write8( 0x66 );
82555 - RexRB(0,to,from);
82556 - write8( 0x8B );
82557 - WriteRmOffsetFrom(to, from, 0);
82558 -}
82559 -
82560 -void MOV16RmtoROffset( x86IntRegType to, x86IntRegType from, int offset )
82561 -{
82562 - write8( 0x66 );
82563 - RexRB(0,to,from);
82564 - write8( 0x8B );
82565 - WriteRmOffsetFrom(to, from, offset);
82566 -}
82567 -
82568 -void MOV16RmSOffsettoR( x86IntRegType to, x86IntRegType from1, u32 from2, int scale )
82569 -{
82570 - write8(0x66);
82571 - RexRXB(0,to,from1,0);
82572 - write8( 0x8B );
82573 - ModRM( 0, to, 0x4 );
82574 - ModRM( scale, from1, 5);
82575 - write32(from2);
82576 -}
82577 -
82578 -void MOV16RtoRm(x86IntRegType to, x86IntRegType from)
82579 -{
82580 - write8( 0x66 );
82581 - RexRB(0,from,to);
82582 - write8( 0x89 );
82583 - ModRM( 0, from, to );
82584 -}
82585 -
82586 -/* mov imm16 to m16 */
82587 -void MOV16ItoM( uptr to, u16 from )
82588 -{
82589 - write8( 0x66 );
82590 - write8( 0xC7 );
82591 - ModRM( 0, 0, DISP32 );
82592 - write32( MEMADDR(to, 6) );
82593 - write16( from );
82594 -}
82595 -
82596 -/* mov r16 to [r32][r32*scale] */
82597 -void MOV16RtoRmS( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale) {
82598 - write8( 0x66 );
82599 - RexRXB(0,to,from2,from);
82600 - write8( 0x89 );
82601 - ModRM( 0, to, 0x4 );
82602 - SibSB(scale, from2, from );
82603 -}
82604 -
82605 -void MOV16ItoR( x86IntRegType to, u16 from )
82606 -{
82607 - RexB(0, to);
82608 - write16( 0xB866 | ((to & 0x7)<<8) );
82609 - write16( from );
82610 -}
82611 -
82612 -// mov imm16 to [r16+off]
82613 -void MOV16ItoRmOffset( x86IntRegType to, u16 from, u32 offset)
82614 -{
82615 - write8(0x66);
82616 - RexB(0,to);
82617 - write8( 0xC7 );
82618 - WriteRmOffset(to, offset);
82619 - write16(from);
82620 -}
82621 -
82622 -// mov r16 to [r16+off]
82623 -void MOV16RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset)
82624 -{
82625 - write8(0x66);
82626 - RexRB(0,from,to);
82627 - write8( 0x89 );
82628 - WriteRmOffsetFrom(from, to, offset);
82629 -}
82630 -
82631 -/* mov r8 to m8 */
82632 -void MOV8RtoM( uptr to, x86IntRegType from )
82633 -{
82634 - RexR(0,from);
82635 - write8( 0x88 );
82636 - ModRM( 0, from, DISP32 );
82637 - write32( MEMADDR(to, 4) );
82638 -}
82639 -
82640 -/* mov m8 to r8 */
82641 -void MOV8MtoR( x86IntRegType to, uptr from )
82642 -{
82643 - RexR(0,to);
82644 - write8( 0x8A );
82645 - ModRM( 0, to, DISP32 );
82646 - write32( MEMADDR(from, 4) );
82647 -}
82648 -
82649 -/* mov [r32] to r8 */
82650 -void MOV8RmtoR(x86IntRegType to, x86IntRegType from)
82651 -{
82652 - RexRB(0,to,from);
82653 - write8( 0x8A );
82654 - WriteRmOffsetFrom(to, from, 0);
82655 -}
82656 -
82657 -void MOV8RmtoROffset(x86IntRegType to, x86IntRegType from, int offset)
82658 -{
82659 - RexRB(0,to,from);
82660 - write8( 0x8A );
82661 - WriteRmOffsetFrom(to, from, offset);
82662 -}
82663 -
82664 -void MOV8RtoRm(x86IntRegType to, x86IntRegType from)
82665 -{
82666 - RexRB(0,from,to);
82667 - write8( 0x88 );
82668 - WriteRmOffsetFrom(from, to, 0);
82669 -}
82670 -
82671 -/* mov imm8 to m8 */
82672 -void MOV8ItoM( uptr to, u8 from )
82673 -{
82674 - write8( 0xC6 );
82675 - ModRM( 0, 0, DISP32 );
82676 - write32( MEMADDR(to, 5) );
82677 - write8( from );
82678 -}
82679 -
82680 -// mov imm8 to r8
82681 -void MOV8ItoR( x86IntRegType to, u8 from )
82682 -{
82683 - RexB(0, to);
82684 - write8( 0xB0 | (to & 0x7) );
82685 - write8( from );
82686 -}
82687 -
82688 -// mov imm8 to [r8+off]
82689 -void MOV8ItoRmOffset( x86IntRegType to, u8 from, int offset)
82690 -{
82691 - assert( to != ESP );
82692 - RexB(0,to);
82693 - write8( 0xC6 );
82694 - WriteRmOffset(to,offset);
82695 - write8(from);
82696 -}
82697 -
82698 -// mov r8 to [r8+off]
82699 -void MOV8RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset)
82700 -{
82701 - assert( to != ESP );
82702 - RexRB(0,from,to);
82703 - write8( 0x88 );
82704 - WriteRmOffsetFrom(from,to,offset);
82705 -}
82706 -
82707 -/* movsx r8 to r32 */
82708 -void MOVSX32R8toR( x86IntRegType to, x86IntRegType from )
82709 -{
82710 - RexRB(0,to,from);
82711 - write16( 0xBE0F );
82712 - ModRM( 3, to, from );
82713 -}
82714 -
82715 -void MOVSX32Rm8toR( x86IntRegType to, x86IntRegType from )
82716 -{
82717 - RexRB(0,to,from);
82718 - write16( 0xBE0F );
82719 - ModRM( 0, to, from );
82720 -}
82721 -
82722 -void MOVSX32Rm8toROffset( x86IntRegType to, x86IntRegType from, int offset )
82723 -{
82724 - RexRB(0,to,from);
82725 - write16( 0xBE0F );
82726 - WriteRmOffsetFrom(to,from,offset);
82727 -}
82728 -
82729 -/* movsx m8 to r32 */
82730 -void MOVSX32M8toR( x86IntRegType to, uptr from )
82731 -{
82732 - RexR(0,to);
82733 - write16( 0xBE0F );
82734 - ModRM( 0, to, DISP32 );
82735 - write32( MEMADDR(from, 4) );
82736 -}
82737 -
82738 -/* movsx r16 to r32 */
82739 -void MOVSX32R16toR( x86IntRegType to, x86IntRegType from )
82740 -{
82741 - RexRB(0,to,from);
82742 - write16( 0xBF0F );
82743 - ModRM( 3, to, from );
82744 -}
82745 -
82746 -void MOVSX32Rm16toR( x86IntRegType to, x86IntRegType from )
82747 -{
82748 - RexRB(0,to,from);
82749 - write16( 0xBF0F );
82750 - ModRM( 0, to, from );
82751 -}
82752 -
82753 -void MOVSX32Rm16toROffset( x86IntRegType to, x86IntRegType from, int offset )
82754 -{
82755 - RexRB(0,to,from);
82756 - write16( 0xBF0F );
82757 - WriteRmOffsetFrom(to,from,offset);
82758 -}
82759 -
82760 -/* movsx m16 to r32 */
82761 -void MOVSX32M16toR( x86IntRegType to, uptr from )
82762 -{
82763 - RexR(0,to);
82764 - write16( 0xBF0F );
82765 - ModRM( 0, to, DISP32 );
82766 - write32( MEMADDR(from, 4) );
82767 -}
82768 -
82769 -/* movzx r8 to r32 */
82770 -void MOVZX32R8toR( x86IntRegType to, x86IntRegType from )
82771 -{
82772 - RexRB(0,to,from);
82773 - write16( 0xB60F );
82774 - ModRM( 3, to, from );
82775 -}
82776 -
82777 -void MOVZX32Rm8toR( x86IntRegType to, x86IntRegType from )
82778 -{
82779 - RexRB(0,to,from);
82780 - write16( 0xB60F );
82781 - ModRM( 0, to, from );
82782 -}
82783 -
82784 -void MOVZX32Rm8toROffset( x86IntRegType to, x86IntRegType from, int offset )
82785 -{
82786 - RexRB(0,to,from);
82787 - write16( 0xB60F );
82788 - WriteRmOffsetFrom(to,from,offset);
82789 -}
82790 -
82791 -/* movzx m8 to r32 */
82792 -void MOVZX32M8toR( x86IntRegType to, uptr from )
82793 -{
82794 - RexR(0,to);
82795 - write16( 0xB60F );
82796 - ModRM( 0, to, DISP32 );
82797 - write32( MEMADDR(from, 4) );
82798 -}
82799 -
82800 -/* movzx r16 to r32 */
82801 -void MOVZX32R16toR( x86IntRegType to, x86IntRegType from )
82802 -{
82803 - RexRB(0,to,from);
82804 - write16( 0xB70F );
82805 - ModRM( 3, to, from );
82806 -}
82807 -
82808 -void MOVZX32Rm16toR( x86IntRegType to, x86IntRegType from )
82809 -{
82810 - RexRB(0,to,from);
82811 - write16( 0xB70F );
82812 - ModRM( 0, to, from );
82813 -}
82814 -
82815 -void MOVZX32Rm16toROffset( x86IntRegType to, x86IntRegType from, int offset )
82816 -{
82817 - RexRB(0,to,from);
82818 - write16( 0xB70F );
82819 - WriteRmOffsetFrom(to,from,offset);
82820 -}
82821 -
82822 -/* movzx m16 to r32 */
82823 -void MOVZX32M16toR( x86IntRegType to, uptr from )
82824 -{
82825 - RexR(0,to);
82826 - write16( 0xB70F );
82827 - ModRM( 0, to, DISP32 );
82828 - write32( MEMADDR(from, 4) );
82829 -}
82830 -
82831 -#ifdef __x86_64__
82832 -
82833 -/* movzx r8 to r64 */
82834 -void MOVZX64R8toR( x86IntRegType to, x86IntRegType from )
82835 -{
82836 - RexRB(1,to,from);
82837 - write16( 0xB60F );
82838 - ModRM( 3, to, from );
82839 -}
82840 -
82841 -void MOVZX64Rm8toR( x86IntRegType to, x86IntRegType from )
82842 -{
82843 - RexRB(1,to,from);
82844 - write16( 0xB60F );
82845 - ModRM( 0, to, from );
82846 -}
82847 -
82848 -void MOVZX64Rm8toROffset( x86IntRegType to, x86IntRegType from, int offset )
82849 -{
82850 - RexRB(1,to,from);
82851 - write16( 0xB60F );
82852 - WriteRmOffsetFrom(to,from,offset);
82853 -}
82854 -
82855 -/* movzx m8 to r64 */
82856 -void MOVZX64M8toR( x86IntRegType to, uptr from )
82857 -{
82858 - RexR(1,to);
82859 - write16( 0xB60F );
82860 - ModRM( 0, to, DISP32 );
82861 - write32( MEMADDR(from, 4) );
82862 -}
82863 -
82864 -/* movzx r16 to r64 */
82865 -void MOVZX64R16toR( x86IntRegType to, x86IntRegType from )
82866 -{
82867 - RexRB(1,to,from);
82868 - write16( 0xB70F );
82869 - ModRM( 3, to, from );
82870 -}
82871 -
82872 -void MOVZX64Rm16toR( x86IntRegType to, x86IntRegType from )
82873 -{
82874 - RexRB(1,to,from);
82875 - write16( 0xB70F );
82876 - ModRM( 0, to, from );
82877 -}
82878 -
82879 -void MOVZX64Rm16toROffset( x86IntRegType to, x86IntRegType from, int offset )
82880 -{
82881 - RexRB(1,to,from);
82882 - write16( 0xB70F );
82883 - WriteRmOffsetFrom(to,from,offset);
82884 -}
82885 -
82886 -/* movzx m16 to r64 */
82887 -void MOVZX64M16toR( x86IntRegType to, uptr from )
82888 -{
82889 - RexR(1,to);
82890 - write16( 0xB70F );
82891 - ModRM( 0, to, DISP32 );
82892 - write32( MEMADDR(from, 4) );
82893 -}
82894 -#endif
82895 -
82896 -/* cmovbe r32 to r32 */
82897 -void CMOVBE32RtoR( x86IntRegType to, x86IntRegType from )
82898 -{
82899 - CMOV32RtoR( 0x46, to, from );
82900 -}
82901 -
82902 -/* cmovbe m32 to r32*/
82903 -void CMOVBE32MtoR( x86IntRegType to, uptr from )
82904 -{
82905 - CMOV32MtoR( 0x46, to, from );
82906 -}
82907 -
82908 -/* cmovb r32 to r32 */
82909 -void CMOVB32RtoR( x86IntRegType to, x86IntRegType from )
82910 -{
82911 - CMOV32RtoR( 0x42, to, from );
82912 -}
82913 -
82914 -/* cmovb m32 to r32*/
82915 -void CMOVB32MtoR( x86IntRegType to, uptr from )
82916 -{
82917 - CMOV32MtoR( 0x42, to, from );
82918 -}
82919 -
82920 -/* cmovae r32 to r32 */
82921 -void CMOVAE32RtoR( x86IntRegType to, x86IntRegType from )
82922 -{
82923 - CMOV32RtoR( 0x43, to, from );
82924 -}
82925 -
82926 -/* cmovae m32 to r32*/
82927 -void CMOVAE32MtoR( x86IntRegType to, uptr from )
82928 -{
82929 - CMOV32MtoR( 0x43, to, from );
82930 -}
82931 -
82932 -/* cmova r32 to r32 */
82933 -void CMOVA32RtoR( x86IntRegType to, x86IntRegType from )
82934 -{
82935 - CMOV32RtoR( 0x47, to, from );
82936 -}
82937 -
82938 -/* cmova m32 to r32*/
82939 -void CMOVA32MtoR( x86IntRegType to, uptr from )
82940 -{
82941 - CMOV32MtoR( 0x47, to, from );
82942 -}
82943 -
82944 -/* cmovo r32 to r32 */
82945 -void CMOVO32RtoR( x86IntRegType to, x86IntRegType from )
82946 -{
82947 - CMOV32RtoR( 0x40, to, from );
82948 -}
82949 -
82950 -/* cmovo m32 to r32 */
82951 -void CMOVO32MtoR( x86IntRegType to, uptr from )
82952 -{
82953 - CMOV32MtoR( 0x40, to, from );
82954 -}
82955 -
82956 -/* cmovp r32 to r32 */
82957 -void CMOVP32RtoR( x86IntRegType to, x86IntRegType from )
82958 -{
82959 - CMOV32RtoR( 0x4A, to, from );
82960 -}
82961 -
82962 -/* cmovp m32 to r32 */
82963 -void CMOVP32MtoR( x86IntRegType to, uptr from )
82964 -{
82965 - CMOV32MtoR( 0x4A, to, from );
82966 -}
82967 -
82968 -/* cmovs r32 to r32 */
82969 -void CMOVS32RtoR( x86IntRegType to, x86IntRegType from )
82970 -{
82971 - CMOV32RtoR( 0x48, to, from );
82972 -}
82973 -
82974 -/* cmovs m32 to r32 */
82975 -void CMOVS32MtoR( x86IntRegType to, uptr from )
82976 -{
82977 - CMOV32MtoR( 0x48, to, from );
82978 -}
82979 -
82980 -/* cmovno r32 to r32 */
82981 -void CMOVNO32RtoR( x86IntRegType to, x86IntRegType from )
82982 -{
82983 - CMOV32RtoR( 0x41, to, from );
82984 -}
82985 -
82986 -/* cmovno m32 to r32 */
82987 -void CMOVNO32MtoR( x86IntRegType to, uptr from )
82988 -{
82989 - CMOV32MtoR( 0x41, to, from );
82990 -}
82991 -
82992 -/* cmovnp r32 to r32 */
82993 -void CMOVNP32RtoR( x86IntRegType to, x86IntRegType from )
82994 -{
82995 - CMOV32RtoR( 0x4B, to, from );
82996 -}
82997 -
82998 -/* cmovnp m32 to r32 */
82999 -void CMOVNP32MtoR( x86IntRegType to, uptr from )
83000 -{
83001 - CMOV32MtoR( 0x4B, to, from );
83002 -}
83003 -
83004 -/* cmovns r32 to r32 */
83005 -void CMOVNS32RtoR( x86IntRegType to, x86IntRegType from )
83006 -{
83007 - CMOV32RtoR( 0x49, to, from );
83008 -}
83009 -
83010 -/* cmovns m32 to r32 */
83011 -void CMOVNS32MtoR( x86IntRegType to, uptr from )
83012 -{
83013 - CMOV32MtoR( 0x49, to, from );
83014 -}
83015 -
83016 -/* cmovne r32 to r32 */
83017 -void CMOVNE32RtoR( x86IntRegType to, x86IntRegType from )
83018 -{
83019 - CMOV32RtoR( 0x45, to, from );
83020 -}
83021 -
83022 -/* cmovne m32 to r32*/
83023 -void CMOVNE32MtoR( x86IntRegType to, uptr from )
83024 -{
83025 - CMOV32MtoR( 0x45, to, from );
83026 -}
83027 -
83028 -/* cmove r32 to r32*/
83029 -void CMOVE32RtoR( x86IntRegType to, x86IntRegType from )
83030 -{
83031 - CMOV32RtoR( 0x44, to, from );
83032 -}
83033 -
83034 -/* cmove m32 to r32*/
83035 -void CMOVE32MtoR( x86IntRegType to, uptr from )
83036 -{
83037 - CMOV32MtoR( 0x44, to, from );
83038 -}
83039 -
83040 -/* cmovg r32 to r32*/
83041 -void CMOVG32RtoR( x86IntRegType to, x86IntRegType from )
83042 -{
83043 - CMOV32RtoR( 0x4F, to, from );
83044 -}
83045 -
83046 -/* cmovg m32 to r32*/
83047 -void CMOVG32MtoR( x86IntRegType to, uptr from )
83048 -{
83049 - CMOV32MtoR( 0x4F, to, from );
83050 -}
83051 -
83052 -/* cmovge r32 to r32*/
83053 -void CMOVGE32RtoR( x86IntRegType to, x86IntRegType from )
83054 -{
83055 - CMOV32RtoR( 0x4D, to, from );
83056 -}
83057 -
83058 -/* cmovge m32 to r32*/
83059 -void CMOVGE32MtoR( x86IntRegType to, uptr from )
83060 -{
83061 - CMOV32MtoR( 0x4D, to, from );
83062 -}
83063 -
83064 -/* cmovl r32 to r32*/
83065 -void CMOVL32RtoR( x86IntRegType to, x86IntRegType from )
83066 -{
83067 - CMOV32RtoR( 0x4C, to, from );
83068 -}
83069 -
83070 -/* cmovl m32 to r32*/
83071 -void CMOVL32MtoR( x86IntRegType to, uptr from )
83072 -{
83073 - CMOV32MtoR( 0x4C, to, from );
83074 -}
83075 -
83076 -/* cmovle r32 to r32*/
83077 -void CMOVLE32RtoR( x86IntRegType to, x86IntRegType from )
83078 -{
83079 - CMOV32RtoR( 0x4E, to, from );
83080 -}
83081 -
83082 -/* cmovle m32 to r32*/
83083 -void CMOVLE32MtoR( x86IntRegType to, uptr from )
83084 -{
83085 - CMOV32MtoR( 0x4E, to, from );
83086 -}
83087 -
83088 -////////////////////////////////////
83089 -// arithmetic instructions /
83090 -////////////////////////////////////
83091 -
83092 -/* add imm32 to r64 */
83093 -void ADD64ItoR( x86IntRegType to, u32 from )
83094 -{
83095 - Rex(1, 0, 0, to >> 3);
83096 - if ( to == EAX) {
83097 - write8( 0x05 );
83098 - } else {
83099 - write8( 0x81 );
83100 - ModRM( 3, 0, to );
83101 - }
83102 - write32( from );
83103 -}
83104 -
83105 -/* add m64 to r64 */
83106 -void ADD64MtoR( x86IntRegType to, uptr from )
83107 -{
83108 - Rex(1, to >> 3, 0, 0);
83109 - write8( 0x03 );
83110 - ModRM( 0, to, DISP32 );
83111 - write32( MEMADDR(from, 4) );
83112 -}
83113 -
83114 -/* add r64 to r64 */
83115 -void ADD64RtoR( x86IntRegType to, x86IntRegType from )
83116 -{
83117 - RexRB(1, from, to);
83118 - write8( 0x01 );
83119 - ModRM( 3, from, to );
83120 -}
83121 -
83122 -/* add imm32 to r32 */
83123 -void ADD32ItoR( x86IntRegType to, u32 from )
83124 -{
83125 - RexB(0, to);
83126 - if ( to == EAX) {
83127 - write8( 0x05 );
83128 - }
83129 - else {
83130 - write8( 0x81 );
83131 - ModRM( 3, 0, to );
83132 - }
83133 - write32( from );
83134 -}
83135 -
83136 -/* add imm32 to m32 */
83137 -void ADD32ItoM( uptr to, u32 from )
83138 -{
83139 - write8( 0x81 );
83140 - ModRM( 0, 0, DISP32 );
83141 - write32( MEMADDR(to, 8) );
83142 - write32( from );
83143 -}
83144 -
83145 -// add imm32 to [r32+off]
83146 -void ADD32ItoRmOffset( x86IntRegType to, u32 from, int offset)
83147 -{
83148 - RexB(0,to);
83149 - write8( 0x81 );
83150 - WriteRmOffset(to,offset);
83151 - write32(from);
83152 -}
83153 -
83154 -/* add r32 to r32 */
83155 -void ADD32RtoR( x86IntRegType to, x86IntRegType from )
83156 -{
83157 - RexRB(0, from, to);
83158 - write8( 0x01 );
83159 - ModRM( 3, from, to );
83160 -}
83161 -
83162 -/* add r32 to m32 */
83163 -void ADD32RtoM(uptr to, x86IntRegType from )
83164 -{
83165 - RexR(0,from);
83166 - write8( 0x01 );
83167 - ModRM( 0, from, DISP32 );
83168 - write32( MEMADDR(to, 4) );
83169 -}
83170 -
83171 -/* add m32 to r32 */
83172 -void ADD32MtoR( x86IntRegType to, uptr from )
83173 -{
83174 - RexR(0,to);
83175 - write8( 0x03 );
83176 - ModRM( 0, to, DISP32 );
83177 - write32( MEMADDR(from, 4) );
83178 -}
83179 -
83180 -// add r16 to r16
83181 -void ADD16RtoR( x86IntRegType to , x86IntRegType from )
83182 -{
83183 - write8(0x66);
83184 - RexRB(0,to,from);
83185 - write8( 0x03 );
83186 - ModRM( 3, to, from );
83187 -}
83188 -
83189 -/* add imm16 to r16 */
83190 -void ADD16ItoR( x86IntRegType to, u16 from )
83191 -{
83192 - write8( 0x66 );
83193 - RexB(0,to);
83194 - if ( to == EAX)
83195 - {
83196 - write8( 0x05 );
83197 - }
83198 - else
83199 - {
83200 - write8( 0x81 );
83201 - ModRM( 3, 0, to );
83202 - }
83203 - write16( from );
83204 -}
83205 -
83206 -/* add imm16 to m16 */
83207 -void ADD16ItoM( uptr to, u16 from )
83208 -{
83209 - write8( 0x66 );
83210 - write8( 0x81 );
83211 - ModRM( 0, 0, DISP32 );
83212 - write32( MEMADDR(to, 6) );
83213 - write16( from );
83214 -}
83215 -
83216 -/* add r16 to m16 */
83217 -void ADD16RtoM(uptr to, x86IntRegType from )
83218 -{
83219 - write8( 0x66 );
83220 - RexR(0,from);
83221 - write8( 0x01 );
83222 - ModRM( 0, from, DISP32 );
83223 - write32( MEMADDR(to, 4) );
83224 -}
83225 -
83226 -/* add m16 to r16 */
83227 -void ADD16MtoR( x86IntRegType to, uptr from )
83228 -{
83229 - write8( 0x66 );
83230 - RexR(0,to);
83231 - write8( 0x03 );
83232 - ModRM( 0, to, DISP32 );
83233 - write32( MEMADDR(from, 4) );
83234 -}
83235 -
83236 -// add m8 to r8
83237 -void ADD8MtoR( x86IntRegType to, uptr from )
83238 -{
83239 - RexR(0,to);
83240 - write8( 0x02 );
83241 - ModRM( 0, to, DISP32 );
83242 - write32( MEMADDR(from, 4) );
83243 -}
83244 -
83245 -/* adc imm32 to r32 */
83246 -void ADC32ItoR( x86IntRegType to, u32 from )
83247 -{
83248 - RexB(0,to);
83249 - if ( to == EAX ) {
83250 - write8( 0x15 );
83251 - }
83252 - else {
83253 - write8( 0x81 );
83254 - ModRM( 3, 2, to );
83255 - }
83256 - write32( from );
83257 -}
83258 -
83259 -/* adc imm32 to m32 */
83260 -void ADC32ItoM( uptr to, u32 from )
83261 -{
83262 - write8( 0x81 );
83263 - ModRM( 0, 2, DISP32 );
83264 - write32( MEMADDR(to, 8) );
83265 - write32( from );
83266 -}
83267 -
83268 -/* adc r32 to r32 */
83269 -void ADC32RtoR( x86IntRegType to, x86IntRegType from )
83270 -{
83271 - RexRB(0,from,to);
83272 - write8( 0x11 );
83273 - ModRM( 3, from, to );
83274 -}
83275 -
83276 -/* adc m32 to r32 */
83277 -void ADC32MtoR( x86IntRegType to, uptr from )
83278 -{
83279 - RexR(0,to);
83280 - write8( 0x13 );
83281 - ModRM( 0, to, DISP32 );
83282 - write32( MEMADDR(from, 4) );
83283 -}
83284 -
83285 -// adc r32 to m32
83286 -void ADC32RtoM( uptr to, x86IntRegType from )
83287 -{
83288 - RexR(0,from);
83289 - write8( 0x11 );
83290 - ModRM( 0, from, DISP32 );
83291 - write32( MEMADDR(to, 4) );
83292 -}
83293 -
83294 -
83295 -#ifdef __x86_64__
83296 -void INC32R( x86IntRegType to )
83297 -{
83298 - write8( 0xFF );
83299 - ModRM(3,0,to);
83300 -}
83301 -#else
83302 -/* inc r32 */
83303 -void INC32R( x86IntRegType to )
83304 -{
83305 - X86_64ASSERT();
83306 - write8( 0x40 + to );
83307 -}
83308 -#endif
83309 -/* inc m32 */
83310 -void INC32M( uptr to )
83311 -{
83312 - write8( 0xFF );
83313 - ModRM( 0, 0, DISP32 );
83314 - write32( MEMADDR(to, 4) );
83315 -}
83316 -
83317 -/* inc r16 */
83318 -void INC16R( x86IntRegType to )
83319 -{
83320 - X86_64ASSERT();
83321 - write8( 0x66 );
83322 - write8( 0x40 + to );
83323 -}
83324 -
83325 -/* inc m16 */
83326 -void INC16M( uptr to )
83327 -{
83328 - write8( 0x66 );
83329 - write8( 0xFF );
83330 - ModRM( 0, 0, DISP32 );
83331 - write32( MEMADDR(to, 4) );
83332 -}
83333 -
83334 -
83335 -/* sub imm32 to r64 */
83336 -void SUB64ItoR( x86IntRegType to, u32 from )
83337 -{
83338 - RexB(1, to);
83339 - if ( to == EAX ) {
83340 - write8( 0x2D );
83341 - }
83342 - else {
83343 - write8( 0x81 );
83344 - ModRM( 3, 5, to );
83345 - }
83346 - write32( from );
83347 -}
83348 -
83349 -/* sub r64 to r64 */
83350 -void SUB64RtoR( x86IntRegType to, x86IntRegType from )
83351 -{
83352 - RexRB(1, from, to);
83353 - write8( 0x29 );
83354 - ModRM( 3, from, to );
83355 -}
83356 -
83357 -/* sub m64 to r64 */
83358 -void SUB64MtoR( x86IntRegType to, uptr from )
83359 -{
83360 - RexR(1, to);
83361 - write8( 0x2B );
83362 - ModRM( 0, to, DISP32 );
83363 - write32( MEMADDR(from, 4) );
83364 -}
83365 -
83366 -/* sub imm32 to r32 */
83367 -void SUB32ItoR( x86IntRegType to, u32 from )
83368 -{
83369 - RexB(0,to);
83370 - if ( to == EAX ) {
83371 - write8( 0x2D );
83372 - }
83373 - else {
83374 - write8( 0x81 );
83375 - ModRM( 3, 5, to );
83376 - }
83377 - write32( from );
83378 -}
83379 -
83380 -/* sub imm32 to m32 */
83381 -void SUB32ItoM( uptr to, u32 from )
83382 -{
83383 - write8( 0x81 );
83384 - ModRM( 0, 5, DISP32 );
83385 - write32( MEMADDR(to, 8) );
83386 - write32( from );
83387 -}
83388 -
83389 -/* sub r32 to r32 */
83390 -void SUB32RtoR( x86IntRegType to, x86IntRegType from )
83391 -{
83392 - RexRB(0, from, to);
83393 - write8( 0x29 );
83394 - ModRM( 3, from, to );
83395 -}
83396 -
83397 -/* sub m32 to r32 */
83398 -void SUB32MtoR( x86IntRegType to, uptr from )
83399 -{
83400 - RexR(0,to);
83401 - write8( 0x2B );
83402 - ModRM( 0, to, DISP32 );
83403 - write32( MEMADDR(from, 4) );
83404 -}
83405 -
83406 -// sub r32 to m32
83407 -void SUB32RtoM( uptr to, x86IntRegType from )
83408 -{
83409 - RexR(0,from);
83410 - write8( 0x29 );
83411 - ModRM( 0, from, DISP32 );
83412 - write32( MEMADDR(to, 4) );
83413 -}
83414 -
83415 -// sub r16 to r16
83416 -void SUB16RtoR( x86IntRegType to, u16 from )
83417 -{
83418 - write8(0x66);
83419 - RexRB(0,to,from);
83420 - write8( 0x2b );
83421 - ModRM( 3, to, from );
83422 -}
83423 -
83424 -/* sub imm16 to r16 */
83425 -void SUB16ItoR( x86IntRegType to, u16 from ) {
83426 - write8( 0x66 );
83427 - RexB(0,to);
83428 - if ( to == EAX ) {
83429 - write8( 0x2D );
83430 - } else {
83431 - write8( 0x81 );
83432 - ModRM( 3, 5, to );
83433 - }
83434 - write16( from );
83435 -}
83436 -
83437 -/* sub imm16 to m16 */
83438 -void SUB16ItoM( uptr to, u16 from ) {
83439 - write8( 0x66 );
83440 - write8( 0x81 );
83441 - ModRM( 0, 5, DISP32 );
83442 - write32( MEMADDR(to, 6) );
83443 - write16( from );
83444 -}
83445 -
83446 -/* sub m16 to r16 */
83447 -void SUB16MtoR( x86IntRegType to, uptr from ) {
83448 - write8( 0x66 );
83449 - RexR(0,to);
83450 - write8( 0x2B );
83451 - ModRM( 0, to, DISP32 );
83452 - write32( MEMADDR(from, 4) );
83453 -}
83454 -
83455 -/* sbb r64 to r64 */
83456 -void SBB64RtoR( x86IntRegType to, x86IntRegType from ) {
83457 - RexRB(1, from,to);
83458 - write8( 0x19 );
83459 - ModRM( 3, from, to );
83460 -}
83461 -
83462 -/* sbb imm32 to r32 */
83463 -void SBB32ItoR( x86IntRegType to, u32 from ) {
83464 - RexB(0,to);
83465 - if ( to == EAX ) {
83466 - write8( 0x1D );
83467 - } else {
83468 - write8( 0x81 );
83469 - ModRM( 3, 3, to );
83470 - }
83471 - write32( from );
83472 -}
83473 -
83474 -/* sbb imm32 to m32 */
83475 -void SBB32ItoM( uptr to, u32 from ) {
83476 - write8( 0x81 );
83477 - ModRM( 0, 3, DISP32 );
83478 - write32( MEMADDR(to, 8) );
83479 - write32( from );
83480 -}
83481 -
83482 -/* sbb r32 to r32 */
83483 -void SBB32RtoR( x86IntRegType to, x86IntRegType from )
83484 -{
83485 - RexRB(0,from,to);
83486 - write8( 0x19 );
83487 - ModRM( 3, from, to );
83488 -}
83489 -
83490 -/* sbb m32 to r32 */
83491 -void SBB32MtoR( x86IntRegType to, uptr from )
83492 -{
83493 - RexR(0,to);
83494 - write8( 0x1B );
83495 - ModRM( 0, to, DISP32 );
83496 - write32( MEMADDR(from, 4) );
83497 -}
83498 -
83499 -/* sbb r32 to m32 */
83500 -void SBB32RtoM( uptr to, x86IntRegType from )
83501 -{
83502 - RexR(0,from);
83503 - write8( 0x19 );
83504 - ModRM( 0, from, DISP32 );
83505 - write32( MEMADDR(to, 4) );
83506 -}
83507 -
83508 -#ifdef __x86_64__
83509 -void DEC32R( x86IntRegType to )
83510 -{
83511 - write8( 0xFF );
83512 - ModRM(3,1,to);
83513 -}
83514 -#else
83515 -/* dec r32 */
83516 -void DEC32R( x86IntRegType to )
83517 -{
83518 - X86_64ASSERT();
83519 - write8( 0x48 + to );
83520 -}
83521 -#endif
83522 -
83523 -/* dec m32 */
83524 -void DEC32M( uptr to )
83525 -{
83526 - write8( 0xFF );
83527 - ModRM( 0, 1, DISP32 );
83528 - write32( MEMADDR(to, 4) );
83529 -}
83530 -
83531 -/* dec r16 */
83532 -void DEC16R( x86IntRegType to )
83533 -{
83534 - X86_64ASSERT();
83535 - write8( 0x66 );
83536 - write8( 0x48 + to );
83537 -}
83538 -
83539 -/* dec m16 */
83540 -void DEC16M( uptr to )
83541 -{
83542 - write8( 0x66 );
83543 - write8( 0xFF );
83544 - ModRM( 0, 1, DISP32 );
83545 - write32( MEMADDR(to, 4) );
83546 -}
83547 -
83548 -/* mul eax by r32 to edx:eax */
83549 -void MUL32R( x86IntRegType from )
83550 -{
83551 - RexB(0,from);
83552 - write8( 0xF7 );
83553 - ModRM( 3, 4, from );
83554 -}
83555 -
83556 -/* imul eax by r32 to edx:eax */
83557 -void IMUL32R( x86IntRegType from )
83558 -{
83559 - RexB(0,from);
83560 - write8( 0xF7 );
83561 - ModRM( 3, 5, from );
83562 -}
83563 -
83564 -/* mul eax by m32 to edx:eax */
83565 -void MUL32M( uptr from )
83566 -{
83567 - write8( 0xF7 );
83568 - ModRM( 0, 4, DISP32 );
83569 - write32( MEMADDR(from, 4) );
83570 -}
83571 -
83572 -/* imul eax by m32 to edx:eax */
83573 -void IMUL32M( uptr from )
83574 -{
83575 - write8( 0xF7 );
83576 - ModRM( 0, 5, DISP32 );
83577 - write32( MEMADDR(from, 4) );
83578 -}
83579 -
83580 -/* imul r32 by r32 to r32 */
83581 -void IMUL32RtoR( x86IntRegType to, x86IntRegType from )
83582 -{
83583 - RexRB(0,to,from);
83584 - write16( 0xAF0F );
83585 - ModRM( 3, to, from );
83586 -}
83587 -
83588 -/* div eax by r32 to edx:eax */
83589 -void DIV32R( x86IntRegType from )
83590 -{
83591 - RexB(0,from);
83592 - write8( 0xF7 );
83593 - ModRM( 3, 6, from );
83594 -}
83595 -
83596 -/* idiv eax by r32 to edx:eax */
83597 -void IDIV32R( x86IntRegType from )
83598 -{
83599 - RexB(0,from);
83600 - write8( 0xF7 );
83601 - ModRM( 3, 7, from );
83602 -}
83603 -
83604 -/* div eax by m32 to edx:eax */
83605 -void DIV32M( uptr from )
83606 -{
83607 - write8( 0xF7 );
83608 - ModRM( 0, 6, DISP32 );
83609 - write32( MEMADDR(from, 4) );
83610 -}
83611 -
83612 -/* idiv eax by m32 to edx:eax */
83613 -void IDIV32M( uptr from )
83614 -{
83615 - write8( 0xF7 );
83616 - ModRM( 0, 7, DISP32 );
83617 - write32( MEMADDR(from, 4) );
83618 -}
83619 -
83620 -////////////////////////////////////
83621 -// shifting instructions /
83622 -////////////////////////////////////
83623 -
83624 -/* shl imm8 to r64 */
83625 -void SHL64ItoR( x86IntRegType to, u8 from )
83626 -{
83627 - RexB(1, to);
83628 - if ( from == 1 )
83629 - {
83630 - write8( 0xD1 );
83631 - ModRM( 3, 4, to );
83632 - return;
83633 - }
83634 - write8( 0xC1 );
83635 - ModRM( 3, 4, to );
83636 - write8( from );
83637 -}
83638 -
83639 -/* shl cl to r64 */
83640 -void SHL64CLtoR( x86IntRegType to )
83641 -{
83642 - RexB(1, to);
83643 - write8( 0xD3 );
83644 - ModRM( 3, 4, to );
83645 -}
83646 -
83647 -/* shr imm8 to r64 */
83648 -void SHR64ItoR( x86IntRegType to, u8 from )
83649 -{
83650 - RexB(1,to);
83651 - if ( from == 1 ) {
83652 - write8( 0xD1 );
83653 - ModRM( 3, 5, to );
83654 - return;
83655 - }
83656 - write8( 0xC1 );
83657 - ModRM( 3, 5, to );
83658 - write8( from );
83659 -}
83660 -
83661 -/* shr cl to r64 */
83662 -void SHR64CLtoR( x86IntRegType to )
83663 -{
83664 - RexB(1, to);
83665 - write8( 0xD3 );
83666 - ModRM( 3, 5, to );
83667 -}
83668 -
83669 -/* shl imm8 to r32 */
83670 -void SHL32ItoR( x86IntRegType to, u8 from )
83671 -{
83672 - RexB(0, to);
83673 - if ( from == 1 )
83674 - {
83675 - write8( 0xD1 );
83676 - write8( 0xE0 | (to & 0x7) );
83677 - return;
83678 - }
83679 - write8( 0xC1 );
83680 - ModRM( 3, 4, to );
83681 - write8( from );
83682 -}
83683 -
83684 -/* shl imm8 to m32 */
83685 -void SHL32ItoM( uptr to, u8 from )
83686 -{
83687 - if ( from == 1 )
83688 - {
83689 - write8( 0xD1 );
83690 - ModRM( 0, 4, DISP32 );
83691 - write32( MEMADDR(to, 4) );
83692 - }
83693 - else
83694 - {
83695 - write8( 0xC1 );
83696 - ModRM( 0, 4, DISP32 );
83697 - write32( MEMADDR(to, 5) );
83698 - write8( from );
83699 - }
83700 -}
83701 -
83702 -/* shl cl to r32 */
83703 -void SHL32CLtoR( x86IntRegType to )
83704 -{
83705 - RexB(0,to);
83706 - write8( 0xD3 );
83707 - ModRM( 3, 4, to );
83708 -}
83709 -
83710 -// shl imm8 to r16
83711 -void SHL16ItoR( x86IntRegType to, u8 from )
83712 -{
83713 - write8(0x66);
83714 - RexB(0,to);
83715 - if ( from == 1 )
83716 - {
83717 - write8( 0xD1 );
83718 - write8( 0xE0 | (to & 0x7) );
83719 - return;
83720 - }
83721 - write8( 0xC1 );
83722 - ModRM( 3, 4, to );
83723 - write8( from );
83724 -}
83725 -
83726 -// shl imm8 to r8
83727 -void SHL8ItoR( x86IntRegType to, u8 from )
83728 -{
83729 - RexB(0,to);
83730 - if ( from == 1 )
83731 - {
83732 - write8( 0xD0 );
83733 - write8( 0xE0 | (to & 0x7) );
83734 - return;
83735 - }
83736 - write8( 0xC0 );
83737 - ModRM( 3, 4, to );
83738 - write8( from );
83739 -}
83740 -
83741 -/* shr imm8 to r32 */
83742 -void SHR32ItoR( x86IntRegType to, u8 from ) {
83743 - RexB(0,to);
83744 - if ( from == 1 )
83745 - {
83746 - write8( 0xD1 );
83747 - write8( 0xE8 | (to & 0x7) );
83748 - }
83749 - else
83750 - {
83751 - write8( 0xC1 );
83752 - ModRM( 3, 5, to );
83753 - write8( from );
83754 - }
83755 -}
83756 -
83757 -/* shr imm8 to m32 */
83758 -void SHR32ItoM( uptr to, u8 from )
83759 -{
83760 - if ( from == 1 )
83761 - {
83762 - write8( 0xD1 );
83763 - ModRM( 0, 5, DISP32 );
83764 - write32( MEMADDR(to, 4) );
83765 - }
83766 - else
83767 - {
83768 - write8( 0xC1 );
83769 - ModRM( 0, 5, DISP32 );
83770 - write32( MEMADDR(to, 5) );
83771 - write8( from );
83772 - }
83773 -}
83774 -
83775 -/* shr cl to r32 */
83776 -void SHR32CLtoR( x86IntRegType to )
83777 -{
83778 - RexB(0,to);
83779 - write8( 0xD3 );
83780 - ModRM( 3, 5, to );
83781 -}
83782 -
83783 -// shr imm8 to r8
83784 -void SHR8ItoR( x86IntRegType to, u8 from )
83785 -{
83786 - RexB(0,to);
83787 - if ( from == 1 )
83788 - {
83789 - write8( 0xD0 );
83790 - write8( 0xE8 | (to & 0x7) );
83791 - }
83792 - else
83793 - {
83794 - write8( 0xC0 );
83795 - ModRM( 3, 5, to );
83796 - write8( from );
83797 - }
83798 -}
83799 -
83800 -/* sar imm8 to r64 */
83801 -void SAR64ItoR( x86IntRegType to, u8 from )
83802 -{
83803 - RexB(1,to);
83804 - if ( from == 1 )
83805 - {
83806 - write8( 0xD1 );
83807 - ModRM( 3, 7, to );
83808 - return;
83809 - }
83810 - write8( 0xC1 );
83811 - ModRM( 3, 7, to );
83812 - write8( from );
83813 -}
83814 -
83815 -/* sar cl to r64 */
83816 -void SAR64CLtoR( x86IntRegType to )
83817 -{
83818 - RexB(1, to);
83819 - write8( 0xD3 );
83820 - ModRM( 3, 7, to );
83821 -}
83822 -
83823 -/* sar imm8 to r32 */
83824 -void SAR32ItoR( x86IntRegType to, u8 from )
83825 -{
83826 - RexB(0,to);
83827 - if ( from == 1 )
83828 - {
83829 - write8( 0xD1 );
83830 - ModRM( 3, 7, to );
83831 - return;
83832 - }
83833 - write8( 0xC1 );
83834 - ModRM( 3, 7, to );
83835 - write8( from );
83836 -}
83837 -
83838 -/* sar imm8 to m32 */
83839 -void SAR32ItoM( uptr to, u8 from )
83840 -{
83841 - write8( 0xC1 );
83842 - ModRM( 0, 7, DISP32 );
83843 - write32( MEMADDR(to, 5) );
83844 - write8( from );
83845 -}
83846 -
83847 -/* sar cl to r32 */
83848 -void SAR32CLtoR( x86IntRegType to )
83849 -{
83850 - RexB(0,to);
83851 - write8( 0xD3 );
83852 - ModRM( 3, 7, to );
83853 -}
83854 -
83855 -// sar imm8 to r16
83856 -void SAR16ItoR( x86IntRegType to, u8 from )
83857 -{
83858 - write8(0x66);
83859 - RexB(0,to);
83860 - if ( from == 1 )
83861 - {
83862 - write8( 0xD1 );
83863 - ModRM( 3, 7, to );
83864 - return;
83865 - }
83866 - write8( 0xC1 );
83867 - ModRM( 3, 7, to );
83868 - write8( from );
83869 -}
83870 -
83871 -void ROR32ItoR( x86IntRegType to,u8 from )
83872 -{
83873 - RexB(0,to);
83874 - if ( from == 1 ) {
83875 - write8( 0xd1 );
83876 - write8( 0xc8 | to );
83877 - }
83878 - else
83879 - {
83880 - write8( 0xc1 );
83881 - write8( 0xc8 | to );
83882 - write8( from );
83883 - }
83884 -}
83885 -
83886 -void RCR32ItoR( x86IntRegType to, u8 from )
83887 -{
83888 - RexB(0,to);
83889 - if ( from == 1 ) {
83890 - write8( 0xd1 );
83891 - write8( 0xd8 | to );
83892 - }
83893 - else
83894 - {
83895 - write8( 0xc1 );
83896 - write8( 0xd8 | to );
83897 - write8( from );
83898 - }
83899 -}
83900 -
83901 -// shld imm8 to r32
83902 -void SHLD32ItoR( x86IntRegType to, x86IntRegType from, u8 shift )
83903 -{
83904 - RexRB(0,from,to);
83905 - write8( 0x0F );
83906 - write8( 0xA4 );
83907 - ModRM( 3, from, to );
83908 - write8( shift );
83909 -}
83910 -
83911 -// shrd imm8 to r32
83912 -void SHRD32ItoR( x86IntRegType to, x86IntRegType from, u8 shift )
83913 -{
83914 - RexRB(0,from,to);
83915 - write8( 0x0F );
83916 - write8( 0xAC );
83917 - ModRM( 3, from, to );
83918 - write8( shift );
83919 -}
83920 -
83921 -////////////////////////////////////
83922 -// logical instructions /
83923 -////////////////////////////////////
83924 -
83925 -/* or imm32 to r32 */
83926 -void OR64ItoR( x86IntRegType to, u32 from )
83927 -{
83928 - RexB(1, to);
83929 - if ( to == EAX ) {
83930 - write8( 0x0D );
83931 - } else {
83932 - write8( 0x81 );
83933 - ModRM( 3, 1, to );
83934 - }
83935 - write32( from );
83936 -}
83937 -
83938 -/* or m64 to r64 */
83939 -void OR64MtoR( x86IntRegType to, uptr from )
83940 -{
83941 - RexR(1, to);
83942 - write8( 0x0B );
83943 - ModRM( 0, to, DISP32 );
83944 - write32( MEMADDR(from, 4) );
83945 -}
83946 -
83947 -/* or r64 to r64 */
83948 -void OR64RtoR( x86IntRegType to, x86IntRegType from )
83949 -{
83950 - RexRB(1, from, to);
83951 - write8( 0x09 );
83952 - ModRM( 3, from, to );
83953 -}
83954 -
83955 -// or r32 to m64
83956 -void OR64RtoM(uptr to, x86IntRegType from )
83957 -{
83958 - RexR(1,from);
83959 - write8( 0x09 );
83960 - ModRM( 0, from, DISP32 );
83961 - write32( MEMADDR(to, 4) );
83962 -}
83963 -
83964 -/* or imm32 to r32 */
83965 -void OR32ItoR( x86IntRegType to, u32 from )
83966 -{
83967 - RexB(0,to);
83968 - if ( to == EAX ) {
83969 - write8( 0x0D );
83970 - }
83971 - else {
83972 - write8( 0x81 );
83973 - ModRM( 3, 1, to );
83974 - }
83975 - write32( from );
83976 -}
83977 -
83978 -/* or imm32 to m32 */
83979 -void OR32ItoM(uptr to, u32 from )
83980 -{
83981 - write8( 0x81 );
83982 - ModRM( 0, 1, DISP32 );
83983 - write32( MEMADDR(to, 8) );
83984 - write32( from );
83985 -}
83986 -
83987 -/* or r32 to r32 */
83988 -void OR32RtoR( x86IntRegType to, x86IntRegType from )
83989 -{
83990 - RexRB(0,from,to);
83991 - write8( 0x09 );
83992 - ModRM( 3, from, to );
83993 -}
83994 -
83995 -/* or r32 to m32 */
83996 -void OR32RtoM(uptr to, x86IntRegType from )
83997 -{
83998 - RexR(0,from);
83999 - write8( 0x09 );
84000 - ModRM( 0, from, DISP32 );
84001 - write32( MEMADDR(to, 4) );
84002 -}
84003 -
84004 -/* or m32 to r32 */
84005 -void OR32MtoR( x86IntRegType to, uptr from )
84006 -{
84007 - RexR(0,to);
84008 - write8( 0x0B );
84009 - ModRM( 0, to, DISP32 );
84010 - write32( MEMADDR(from, 4) );
84011 -}
84012 -
84013 -// or r16 to r16
84014 -void OR16RtoR( x86IntRegType to, x86IntRegType from )
84015 -{
84016 - write8(0x66);
84017 - RexRB(0,from,to);
84018 - write8( 0x09 );
84019 - ModRM( 3, from, to );
84020 -}
84021 -
84022 -// or imm16 to r16
84023 -void OR16ItoR( x86IntRegType to, u16 from )
84024 -{
84025 - write8(0x66);
84026 - RexB(0,to);
84027 - if ( to == EAX ) {
84028 - write8( 0x0D );
84029 - }
84030 - else {
84031 - write8( 0x81 );
84032 - ModRM( 3, 1, to );
84033 - }
84034 - write16( from );
84035 -}
84036 -
84037 -// or imm16 to m316
84038 -void OR16ItoM( uptr to, u16 from )
84039 -{
84040 - write8(0x66);
84041 - write8( 0x81 );
84042 - ModRM( 0, 1, DISP32 );
84043 - write32( MEMADDR(to, 6) );
84044 - write16( from );
84045 -}
84046 -
84047 -/* or m16 to r16 */
84048 -void OR16MtoR( x86IntRegType to, uptr from )
84049 -{
84050 - write8(0x66);
84051 - RexR(0,to);
84052 - write8( 0x0B );
84053 - ModRM( 0, to, DISP32 );
84054 - write32( MEMADDR(from, 4) );
84055 -}
84056 -
84057 -// or r16 to m16
84058 -void OR16RtoM( uptr to, x86IntRegType from )
84059 -{
84060 - write8(0x66);
84061 - RexR(0,from);
84062 - write8( 0x09 );
84063 - ModRM( 0, from, DISP32 );
84064 - write32( MEMADDR(to, 4) );
84065 -}
84066 -
84067 -// or r8 to r8
84068 -void OR8RtoR( x86IntRegType to, x86IntRegType from )
84069 -{
84070 - RexRB(0,from,to);
84071 - write8( 0x08 );
84072 - ModRM( 3, from, to );
84073 -}
84074 -
84075 -// or r8 to m8
84076 -void OR8RtoM( uptr to, x86IntRegType from )
84077 -{
84078 - RexR(0,from);
84079 - write8( 0x08 );
84080 - ModRM( 0, from, DISP32 );
84081 - write32( MEMADDR(to, 4) );
84082 -}
84083 -
84084 -// or imm8 to m8
84085 -void OR8ItoM( uptr to, u8 from )
84086 -{
84087 - write8( 0x80 );
84088 - ModRM( 0, 1, DISP32 );
84089 - write32( MEMADDR(to, 5) );
84090 - write8( from );
84091 -}
84092 -
84093 -// or m8 to r8
84094 -void OR8MtoR( x86IntRegType to, uptr from )
84095 -{
84096 - RexR(0,to);
84097 - write8( 0x0A );
84098 - ModRM( 0, to, DISP32 );
84099 - write32( MEMADDR(from, 4) );
84100 -}
84101 -
84102 -/* xor imm32 to r64 */
84103 -void XOR64ItoR( x86IntRegType to, u32 from )
84104 -{
84105 - RexB(1,to);
84106 - if ( to == EAX ) {
84107 - write8( 0x35 );
84108 - } else {
84109 - write8( 0x81 );
84110 - ModRM( 3, 6, to );
84111 - }
84112 - write32( from );
84113 -}
84114 -
84115 -/* xor r64 to r64 */
84116 -void XOR64RtoR( x86IntRegType to, x86IntRegType from )
84117 -{
84118 - RexRB(1, from, to);
84119 - write8( 0x31 );
84120 - ModRM( 3, from, to );
84121 -}
84122 -
84123 -/* xor m64 to r64 */
84124 -void XOR64MtoR( x86IntRegType to, uptr from )
84125 -{
84126 - RexR(1, to);
84127 - write8( 0x33 );
84128 - ModRM( 0, to, DISP32 );
84129 - write32( MEMADDR(from, 4) );
84130 -}
84131 -
84132 -/* xor r64 to m64 */
84133 -void XOR64RtoM( uptr to, x86IntRegType from )
84134 -{
84135 - RexR(1,from);
84136 - write8( 0x31 );
84137 - ModRM( 0, from, DISP32 );
84138 - write32( MEMADDR(to, 4) );
84139 -}
84140 -
84141 -/* xor imm32 to r32 */
84142 -void XOR32ItoR( x86IntRegType to, u32 from )
84143 -{
84144 - RexB(0,to);
84145 - if ( to == EAX ) {
84146 - write8( 0x35 );
84147 - }
84148 - else {
84149 - write8( 0x81 );
84150 - ModRM( 3, 6, to );
84151 - }
84152 - write32( from );
84153 -}
84154 -
84155 -/* xor imm32 to m32 */
84156 -void XOR32ItoM( uptr to, u32 from )
84157 -{
84158 - write8( 0x81 );
84159 - ModRM( 0, 6, DISP32 );
84160 - write32( MEMADDR(to, 8) );
84161 - write32( from );
84162 -}
84163 -
84164 -/* xor r32 to r32 */
84165 -void XOR32RtoR( x86IntRegType to, x86IntRegType from )
84166 -{
84167 - RexRB(0,from,to);
84168 - write8( 0x31 );
84169 - ModRM( 3, from, to );
84170 -}
84171 -
84172 -/* xor r16 to r16 */
84173 -void XOR16RtoR( x86IntRegType to, x86IntRegType from )
84174 -{
84175 - write8( 0x66 );
84176 - RexRB(0,from,to);
84177 - write8( 0x31 );
84178 - ModRM( 3, from, to );
84179 -}
84180 -
84181 -/* xor r32 to m32 */
84182 -void XOR32RtoM( uptr to, x86IntRegType from )
84183 -{
84184 - RexR(0,from);
84185 - write8( 0x31 );
84186 - ModRM( 0, from, DISP32 );
84187 - write32( MEMADDR(to, 4) );
84188 -}
84189 -
84190 -/* xor m32 to r32 */
84191 -void XOR32MtoR( x86IntRegType to, uptr from )
84192 -{
84193 - RexR(0,to);
84194 - write8( 0x33 );
84195 - ModRM( 0, to, DISP32 );
84196 - write32( MEMADDR(from, 4) );
84197 -}
84198 -
84199 -// xor imm16 to r16
84200 -void XOR16ItoR( x86IntRegType to, u16 from )
84201 -{
84202 - write8(0x66);
84203 - RexB(0,to);
84204 - if ( to == EAX ) {
84205 - write8( 0x35 );
84206 - }
84207 - else {
84208 - write8( 0x81 );
84209 - ModRM( 3, 6, to );
84210 - }
84211 - write16( from );
84212 -}
84213 -
84214 -// xor r16 to m16
84215 -void XOR16RtoM( uptr to, x86IntRegType from )
84216 -{
84217 - write8(0x66);
84218 - RexR(0,from);
84219 - write8( 0x31 );
84220 - ModRM( 0, from, DISP32 );
84221 - write32( MEMADDR(to, 4) );
84222 -}
84223 -
84224 -/* and imm32 to r64 */
84225 -void AND64I32toR( x86IntRegType to, u32 from )
84226 -{
84227 - RexB(1, to);
84228 - if ( to == EAX ) {
84229 - write8( 0x25 );
84230 - } else {
84231 - write8( 0x81 );
84232 - ModRM( 3, 0x4, to );
84233 - }
84234 - write32( from );
84235 -}
84236 -
84237 -/* and m64 to r64 */
84238 -void AND64MtoR( x86IntRegType to, uptr from )
84239 -{
84240 - RexR(1, to);
84241 - write8( 0x23 );
84242 - ModRM( 0, to, DISP32 );
84243 - write32( MEMADDR(from, 4) );
84244 -}
84245 -
84246 -/* and r64 to m64 */
84247 -void AND64RtoM( uptr to, x86IntRegType from )
84248 -{
84249 - RexR(1, from);
84250 - write8( 0x21 );
84251 - ModRM( 0, from, DISP32 );
84252 - write32( MEMADDR(to, 4) );
84253 -}
84254 -
84255 -/* and r64 to r64 */
84256 -void AND64RtoR( x86IntRegType to, x86IntRegType from )
84257 -{
84258 - RexRB(1, from, to);
84259 - write8( 0x21 );
84260 - ModRM( 3, from, to );
84261 -}
84262 -
84263 -/* and imm32 to m64 */
84264 -void AND64I32toM( uptr to, u32 from )
84265 -{
84266 - Rex(1,0,0,0);
84267 - write8( 0x81 );
84268 - ModRM( 0, 0x4, DISP32 );
84269 - write32( MEMADDR(to, 8) );
84270 - write32( from );
84271 -}
84272 -
84273 -/* and imm32 to r32 */
84274 -void AND32ItoR( x86IntRegType to, u32 from )
84275 -{
84276 - RexB(0,to);
84277 - if ( to == EAX ) {
84278 - write8( 0x25 );
84279 - } else {
84280 - write8( 0x81 );
84281 - ModRM( 3, 0x4, to );
84282 - }
84283 - write32( from );
84284 -}
84285 -
84286 -/* and sign ext imm8 to r32 */
84287 -void AND32I8toR( x86IntRegType to, u8 from )
84288 -{
84289 - RexB(0,to);
84290 - write8( 0x83 );
84291 - ModRM( 3, 0x4, to );
84292 - write8( from );
84293 -}
84294 -
84295 -/* and imm32 to m32 */
84296 -void AND32ItoM( uptr to, u32 from )
84297 -{
84298 - write8( 0x81 );
84299 - ModRM( 0, 0x4, DISP32 );
84300 - write32( MEMADDR(to, 8) );
84301 - write32( from );
84302 -}
84303 -
84304 -/* and sign ext imm8 to m32 */
84305 -void AND32I8toM( uptr to, u8 from )
84306 -{
84307 - write8( 0x83 );
84308 - ModRM( 0, 0x4, DISP32 );
84309 - write32( MEMADDR(to, 5) );
84310 - write8( from );
84311 -}
84312 -
84313 -/* and r32 to r32 */
84314 -void AND32RtoR( x86IntRegType to, x86IntRegType from )
84315 -{
84316 - RexRB(0,from,to);
84317 - write8( 0x21 );
84318 - ModRM( 3, from, to );
84319 -}
84320 -
84321 -/* and r32 to m32 */
84322 -void AND32RtoM( uptr to, x86IntRegType from )
84323 -{
84324 - RexR(0,from);
84325 - write8( 0x21 );
84326 - ModRM( 0, from, DISP32 );
84327 - write32( MEMADDR(to, 4) );
84328 -}
84329 -
84330 -/* and m32 to r32 */
84331 -void AND32MtoR( x86IntRegType to, uptr from )
84332 -{
84333 - RexR(0,to);
84334 - write8( 0x23 );
84335 - ModRM( 0, to, DISP32 );
84336 - write32( MEMADDR(from, 4) );
84337 -}
84338 -
84339 -// and r16 to r16
84340 -void AND16RtoR( x86IntRegType to, x86IntRegType from )
84341 -{
84342 - write8(0x66);
84343 - RexRB(0,to,from);
84344 - write8( 0x23 );
84345 - ModRM( 3, to, from );
84346 -}
84347 -
84348 -/* and imm16 to r16 */
84349 -void AND16ItoR( x86IntRegType to, u16 from )
84350 -{
84351 - write8(0x66);
84352 - RexB(0,to);
84353 - if ( to == EAX ) {
84354 - write8( 0x25 );
84355 - } else {
84356 - write8( 0x81 );
84357 - ModRM( 3, 0x4, to );
84358 - }
84359 - write16( from );
84360 -}
84361 -
84362 -/* and imm16 to m16 */
84363 -void AND16ItoM( uptr to, u16 from )
84364 -{
84365 - write8( 0x8166 );
84366 - ModRM( 0, 0x4, DISP32 );
84367 - write32( MEMADDR(to, 6) );
84368 - write16( from );
84369 -}
84370 -
84371 -/* and r16 to m16 */
84372 -void AND16RtoM( uptr to, x86IntRegType from )
84373 -{
84374 - write8( 0x66 );
84375 - RexR(0,from);
84376 - write8( 0x21 );
84377 - ModRM( 0, from, DISP32 );
84378 - write32( MEMADDR(to, 4) );
84379 -}
84380 -
84381 -/* and m16 to r16 */
84382 -void AND16MtoR( x86IntRegType to, uptr from )
84383 -{
84384 - write8( 0x66 );
84385 - RexR(0,to);
84386 - write8( 0x23 );
84387 - ModRM( 0, to, DISP32 );
84388 - write32( MEMADDR(from, 4));
84389 -}
84390 -
84391 -/* and imm8 to r8 */
84392 -void AND8ItoR( x86IntRegType to, u8 from )
84393 -{
84394 - RexB(0,to);
84395 - if ( to == EAX ) {
84396 - write8( 0x24 );
84397 - } else {
84398 - write8( 0x80 );
84399 - ModRM( 3, 0x4, to );
84400 - }
84401 - write8( from );
84402 -}
84403 -
84404 -/* and imm8 to m8 */
84405 -void AND8ItoM( uptr to, u8 from )
84406 -{
84407 - write8( 0x80 );
84408 - ModRM( 0, 0x4, DISP32 );
84409 - write32( MEMADDR(to, 5) );
84410 - write8( from );
84411 -}
84412 -
84413 -// and r8 to r8
84414 -void AND8RtoR( x86IntRegType to, x86IntRegType from )
84415 -{
84416 - RexRB(0,to,from);
84417 - write8( 0x22 );
84418 - ModRM( 3, to, from );
84419 -}
84420 -
84421 -/* and r8 to m8 */
84422 -void AND8RtoM( uptr to, x86IntRegType from )
84423 -{
84424 - RexR(0,from);
84425 - write8( 0x20 );
84426 - ModRM( 0, from, DISP32 );
84427 - write32( MEMADDR(to, 4) );
84428 -}
84429 -
84430 -/* and m8 to r8 */
84431 -void AND8MtoR( x86IntRegType to, uptr from )
84432 -{
84433 - RexR(0,to);
84434 - write8( 0x22 );
84435 - ModRM( 0, to, DISP32 );
84436 - write32( MEMADDR(from, 4));
84437 -}
84438 -
84439 -/* not r64 */
84440 -void NOT64R( x86IntRegType from )
84441 -{
84442 - RexB(1, from);
84443 - write8( 0xF7 );
84444 - ModRM( 3, 2, from );
84445 -}
84446 -
84447 -/* not r32 */
84448 -void NOT32R( x86IntRegType from )
84449 -{
84450 - RexB(0,from);
84451 - write8( 0xF7 );
84452 - ModRM( 3, 2, from );
84453 -}
84454 -
84455 -// not m32
84456 -void NOT32M( uptr from )
84457 -{
84458 - write8( 0xF7 );
84459 - ModRM( 0, 2, DISP32 );
84460 - write32( MEMADDR(from, 4));
84461 -}
84462 -
84463 -/* neg r64 */
84464 -void NEG64R( x86IntRegType from )
84465 -{
84466 - RexB(1, from);
84467 - write8( 0xF7 );
84468 - ModRM( 3, 3, from );
84469 -}
84470 -
84471 -/* neg r32 */
84472 -void NEG32R( x86IntRegType from )
84473 -{
84474 - RexB(0,from);
84475 - write8( 0xF7 );
84476 - ModRM( 3, 3, from );
84477 -}
84478 -
84479 -void NEG32M( uptr from )
84480 -{
84481 - write8( 0xF7 );
84482 - ModRM( 0, 3, DISP32 );
84483 - write32( MEMADDR(from, 4));
84484 -}
84485 -
84486 -/* neg r16 */
84487 -void NEG16R( x86IntRegType from )
84488 -{
84489 - write8( 0x66 );
84490 - RexB(0,from);
84491 - write8( 0xF7 );
84492 - ModRM( 3, 3, from );
84493 -}
84494 -
84495 -////////////////////////////////////
84496 -// jump instructions /
84497 -////////////////////////////////////
84498 -
84499 -u8* JMP( uptr to ) {
84500 - uptr jump = ( x86Ptr - (s8*)to ) - 1;
84501 -
84502 - if ( jump > 0x7f ) {
84503 - assert( to <= 0xffffffff );
84504 - return (u8*)JMP32( to );
84505 - } else {
84506 - return (u8*)JMP8( to );
84507 - }
84508 -}
84509 -
84510 -/* jmp rel8 */
84511 -u8* JMP8( u8 to )
84512 -{
84513 - write8( 0xEB );
84514 - write8( to );
84515 - return x86Ptr - 1;
84516 -}
84517 -
84518 -/* jmp rel32 */
84519 -u32* JMP32( uptr to )
84520 -{
84521 - assert( (sptr)to <= 0x7fffffff && (sptr)to >= -0x7fffffff );
84522 - write8( 0xE9 );
84523 - write32( to );
84524 - return (u32*)(x86Ptr - 4 );
84525 -}
84526 -
84527 -/* jmp r32/r64 */
84528 -void JMPR( x86IntRegType to )
84529 -{
84530 - RexB(0, to);
84531 - write8( 0xFF );
84532 - ModRM( 3, 4, to );
84533 -}
84534 -
84535 -// jmp m32
84536 -void JMP32M( uptr to )
84537 -{
84538 - write8( 0xFF );
84539 - ModRM( 0, 4, DISP32 );
84540 - write32( MEMADDR(to, 4));
84541 -}
84542 -
84543 -/* jp rel8 */
84544 -u8* JP8( u8 to ) {
84545 - return J8Rel( 0x7A, to );
84546 -}
84547 -
84548 -/* jnp rel8 */
84549 -u8* JNP8( u8 to ) {
84550 - return J8Rel( 0x7B, to );
84551 -}
84552 -
84553 -/* je rel8 */
84554 -u8* JE8( u8 to ) {
84555 - return J8Rel( 0x74, to );
84556 -}
84557 -
84558 -/* jz rel8 */
84559 -u8* JZ8( u8 to )
84560 -{
84561 - return J8Rel( 0x74, to );
84562 -}
84563 -
84564 -/* js rel8 */
84565 -u8* JS8( u8 to )
84566 -{
84567 - return J8Rel( 0x78, to );
84568 -}
84569 -
84570 -/* jns rel8 */
84571 -u8* JNS8( u8 to )
84572 -{
84573 - return J8Rel( 0x79, to );
84574 -}
84575 -
84576 -/* jg rel8 */
84577 -u8* JG8( u8 to )
84578 -{
84579 - return J8Rel( 0x7F, to );
84580 -}
84581 -
84582 -/* jge rel8 */
84583 -u8* JGE8( u8 to )
84584 -{
84585 - return J8Rel( 0x7D, to );
84586 -}
84587 -
84588 -/* jl rel8 */
84589 -u8* JL8( u8 to )
84590 -{
84591 - return J8Rel( 0x7C, to );
84592 -}
84593 -
84594 -/* ja rel8 */
84595 -u8* JA8( u8 to )
84596 -{
84597 - return J8Rel( 0x77, to );
84598 -}
84599 -
84600 -u8* JAE8( u8 to )
84601 -{
84602 - return J8Rel( 0x73, to );
84603 -}
84604 -
84605 -/* jb rel8 */
84606 -u8* JB8( u8 to )
84607 -{
84608 - return J8Rel( 0x72, to );
84609 -}
84610 -
84611 -/* jbe rel8 */
84612 -u8* JBE8( u8 to )
84613 -{
84614 - return J8Rel( 0x76, to );
84615 -}
84616 -
84617 -/* jle rel8 */
84618 -u8* JLE8( u8 to )
84619 -{
84620 - return J8Rel( 0x7E, to );
84621 -}
84622 -
84623 -/* jne rel8 */
84624 -u8* JNE8( u8 to )
84625 -{
84626 - return J8Rel( 0x75, to );
84627 -}
84628 -
84629 -/* jnz rel8 */
84630 -u8* JNZ8( u8 to )
84631 -{
84632 - return J8Rel( 0x75, to );
84633 -}
84634 -
84635 -/* jng rel8 */
84636 -u8* JNG8( u8 to )
84637 -{
84638 - return J8Rel( 0x7E, to );
84639 -}
84640 -
84641 -/* jnge rel8 */
84642 -u8* JNGE8( u8 to )
84643 -{
84644 - return J8Rel( 0x7C, to );
84645 -}
84646 -
84647 -/* jnl rel8 */
84648 -u8* JNL8( u8 to )
84649 -{
84650 - return J8Rel( 0x7D, to );
84651 -}
84652 -
84653 -/* jnle rel8 */
84654 -u8* JNLE8( u8 to )
84655 -{
84656 - return J8Rel( 0x7F, to );
84657 -}
84658 -
84659 -/* jo rel8 */
84660 -u8* JO8( u8 to )
84661 -{
84662 - return J8Rel( 0x70, to );
84663 -}
84664 -
84665 -/* jno rel8 */
84666 -u8* JNO8( u8 to )
84667 -{
84668 - return J8Rel( 0x71, to );
84669 -}
84670 -
84671 -// jb rel8
84672 -u16* JB16( u16 to )
84673 -{
84674 - return J16Rel( 0x82, to );
84675 -}
84676 -
84677 -// jb rel32
84678 -u32* JB32( u32 to )
84679 -{
84680 - return J32Rel( 0x82, to );
84681 -}
84682 -
84683 -/* je rel32 */
84684 -u32* JE32( u32 to )
84685 -{
84686 - return J32Rel( 0x84, to );
84687 -}
84688 -
84689 -/* jz rel32 */
84690 -u32* JZ32( u32 to )
84691 -{
84692 - return J32Rel( 0x84, to );
84693 -}
84694 -
84695 -/* jg rel32 */
84696 -u32* JG32( u32 to )
84697 -{
84698 - return J32Rel( 0x8F, to );
84699 -}
84700 -
84701 -/* jge rel32 */
84702 -u32* JGE32( u32 to )
84703 -{
84704 - return J32Rel( 0x8D, to );
84705 -}
84706 -
84707 -/* jl rel32 */
84708 -u32* JL32( u32 to )
84709 -{
84710 - return J32Rel( 0x8C, to );
84711 -}
84712 -
84713 -/* jle rel32 */
84714 -u32* JLE32( u32 to )
84715 -{
84716 - return J32Rel( 0x8E, to );
84717 -}
84718 -
84719 -/* jae rel32 */
84720 -u32* JAE32( u32 to )
84721 -{
84722 - return J32Rel( 0x83, to );
84723 -}
84724 -
84725 -/* jne rel32 */
84726 -u32* JNE32( u32 to )
84727 -{
84728 - return J32Rel( 0x85, to );
84729 -}
84730 -
84731 -/* jnz rel32 */
84732 -u32* JNZ32( u32 to )
84733 -{
84734 - return J32Rel( 0x85, to );
84735 -}
84736 -
84737 -/* jng rel32 */
84738 -u32* JNG32( u32 to )
84739 -{
84740 - return J32Rel( 0x8E, to );
84741 -}
84742 -
84743 -/* jnge rel32 */
84744 -u32* JNGE32( u32 to )
84745 -{
84746 - return J32Rel( 0x8C, to );
84747 -}
84748 -
84749 -/* jnl rel32 */
84750 -u32* JNL32( u32 to )
84751 -{
84752 - return J32Rel( 0x8D, to );
84753 -}
84754 -
84755 -/* jnle rel32 */
84756 -u32* JNLE32( u32 to )
84757 -{
84758 - return J32Rel( 0x8F, to );
84759 -}
84760 -
84761 -/* jo rel32 */
84762 -u32* JO32( u32 to )
84763 -{
84764 - return J32Rel( 0x80, to );
84765 -}
84766 -
84767 -/* jno rel32 */
84768 -u32* JNO32( u32 to )
84769 -{
84770 - return J32Rel( 0x81, to );
84771 -}
84772 -
84773 -// js rel32
84774 -u32* JS32( u32 to )
84775 -{
84776 - return J32Rel( 0x88, to );
84777 -}
84778 -
84779 -
84780 -/* call func */
84781 -void CALLFunc( uptr func )
84782 -{
84783 - func -= ( (uptr)x86Ptr + 5 );
84784 - assert( (sptr)func <= 0x7fffffff && (sptr)func >= -0x7fffffff );
84785 - CALL32(func);
84786 -}
84787 -
84788 -/* call rel32 */
84789 -void CALL32( u32 to )
84790 -{
84791 - write8( 0xE8 );
84792 - write32( to );
84793 -}
84794 -
84795 -/* call r32 */
84796 -void CALL32R( x86IntRegType to )
84797 -{
84798 - write8( 0xFF );
84799 - ModRM( 3, 2, to );
84800 -}
84801 -
84802 -/* call r64 */
84803 -void CALL64R( x86IntRegType to )
84804 -{
84805 - RexB(0, to);
84806 - write8( 0xFF );
84807 - ModRM( 3, 2, to );
84808 -}
84809 -
84810 -/* call m32 */
84811 -void CALL32M( uptr to )
84812 -{
84813 - write8( 0xFF );
84814 - ModRM( 0, 2, DISP32 );
84815 - write32( MEMADDR(to, 4) );
84816 -}
84817 -
84818 -
84819 -////////////////////////////////////
84820 -// misc instructions /
84821 -////////////////////////////////////
84822 -
84823 -/* cmp imm32 to r64 */
84824 -void CMP64I32toR( x86IntRegType to, u32 from )
84825 -{
84826 - RexB(1, to);
84827 - if ( to == EAX ) {
84828 - write8( 0x3D );
84829 - }
84830 - else {
84831 - write8( 0x81 );
84832 - ModRM( 3, 7, to );
84833 - }
84834 - write32( from );
84835 -}
84836 -
84837 -/* cmp m64 to r64 */
84838 -void CMP64MtoR( x86IntRegType to, uptr from )
84839 -{
84840 - RexR(1, to);
84841 - write8( 0x3B );
84842 - ModRM( 0, to, DISP32 );
84843 - write32( MEMADDR(from, 4) );
84844 -}
84845 -
84846 -// cmp r64 to r64
84847 -void CMP64RtoR( x86IntRegType to, x86IntRegType from )
84848 -{
84849 - RexRB(1,from,to);
84850 - write8( 0x39 );
84851 - ModRM( 3, from, to );
84852 -}
84853 -
84854 -/* cmp imm32 to r32 */
84855 -void CMP32ItoR( x86IntRegType to, u32 from )
84856 -{
84857 - RexB(0,to);
84858 - if ( to == EAX ) {
84859 - write8( 0x3D );
84860 - }
84861 - else {
84862 - write8( 0x81 );
84863 - ModRM( 3, 7, to );
84864 - }
84865 - write32( from );
84866 -}
84867 -
84868 -/* cmp imm32 to m32 */
84869 -void CMP32ItoM( uptr to, u32 from )
84870 -{
84871 - write8( 0x81 );
84872 - ModRM( 0, 7, DISP32 );
84873 - write32( MEMADDR(to, 8) );
84874 - write32( from );
84875 -}
84876 -
84877 -/* cmp r32 to r32 */
84878 -void CMP32RtoR( x86IntRegType to, x86IntRegType from )
84879 -{
84880 - RexRB(0,from,to);
84881 - write8( 0x39 );
84882 - ModRM( 3, from, to );
84883 -}
84884 -
84885 -/* cmp m32 to r32 */
84886 -void CMP32MtoR( x86IntRegType to, uptr from )
84887 -{
84888 - RexR(0,to);
84889 - write8( 0x3B );
84890 - ModRM( 0, to, DISP32 );
84891 - write32( MEMADDR(from, 4) );
84892 -}
84893 -
84894 -// cmp imm8 to [r32]
84895 -void CMP32I8toRm( x86IntRegType to, u8 from)
84896 -{
84897 - RexB(0,to);
84898 - write8( 0x83 );
84899 - ModRM( 0, 7, to );
84900 - write8(from);
84901 -}
84902 -
84903 -// cmp imm32 to [r32+off]
84904 -void CMP32I8toRmOffset8( x86IntRegType to, u8 from, u8 off)
84905 -{
84906 - RexB(0,to);
84907 - write8( 0x83 );
84908 - ModRM( 1, 7, to );
84909 - write8(off);
84910 - write8(from);
84911 -}
84912 -
84913 -// cmp imm8 to [r32]
84914 -void CMP32I8toM( uptr to, u8 from)
84915 -{
84916 - write8( 0x83 );
84917 - ModRM( 0, 7, DISP32 );
84918 - write32( MEMADDR(to, 5) );
84919 - write8( from );
84920 -}
84921 -
84922 -/* cmp imm16 to r16 */
84923 -void CMP16ItoR( x86IntRegType to, u16 from )
84924 -{
84925 - write8( 0x66 );
84926 - RexB(0,to);
84927 - if ( to == EAX )
84928 - {
84929 - write8( 0x3D );
84930 - }
84931 - else
84932 - {
84933 - write8( 0x81 );
84934 - ModRM( 3, 7, to );
84935 - }
84936 - write16( from );
84937 -}
84938 -
84939 -/* cmp imm16 to m16 */
84940 -void CMP16ItoM( uptr to, u16 from )
84941 -{
84942 - write8( 0x66 );
84943 - write8( 0x81 );
84944 - ModRM( 0, 7, DISP32 );
84945 - write32( MEMADDR(to, 6) );
84946 - write16( from );
84947 -}
84948 -
84949 -/* cmp r16 to r16 */
84950 -void CMP16RtoR( x86IntRegType to, x86IntRegType from )
84951 -{
84952 - write8( 0x66 );
84953 - RexRB(0,from,to);
84954 - write8( 0x39 );
84955 - ModRM( 3, from, to );
84956 -}
84957 -
84958 -/* cmp m16 to r16 */
84959 -void CMP16MtoR( x86IntRegType to, uptr from )
84960 -{
84961 - write8( 0x66 );
84962 - RexR(0,to);
84963 - write8( 0x3B );
84964 - ModRM( 0, to, DISP32 );
84965 - write32( MEMADDR(from, 4) );
84966 -}
84967 -
84968 -// cmp imm8 to r8
84969 -void CMP8ItoR( x86IntRegType to, u8 from )
84970 -{
84971 - RexB(0,to);
84972 - if ( to == EAX )
84973 - {
84974 - write8( 0x3C );
84975 - }
84976 - else
84977 - {
84978 - write8( 0x80 );
84979 - ModRM( 3, 7, to );
84980 - }
84981 - write8( from );
84982 -}
84983 -
84984 -// cmp m8 to r8
84985 -void CMP8MtoR( x86IntRegType to, uptr from )
84986 -{
84987 - RexR(0,to);
84988 - write8( 0x3A );
84989 - ModRM( 0, to, DISP32 );
84990 - write32( MEMADDR(from, 4) );
84991 -}
84992 -
84993 -/* test imm32 to r32 */
84994 -void TEST32ItoR( x86IntRegType to, u32 from )
84995 -{
84996 - RexB(0,to);
84997 - if ( to == EAX )
84998 - {
84999 - write8( 0xA9 );
85000 - }
85001 - else
85002 - {
85003 - write8( 0xF7 );
85004 - ModRM( 3, 0, to );
85005 - }
85006 - write32( from );
85007 -}
85008 -
85009 -void TEST32ItoM( uptr to, u32 from )
85010 -{
85011 - write8( 0xF7 );
85012 - ModRM( 0, 0, DISP32 );
85013 - write32( MEMADDR(to, 8) );
85014 - write32( from );
85015 -}
85016 -
85017 -/* test r32 to r32 */
85018 -void TEST32RtoR( x86IntRegType to, x86IntRegType from )
85019 -{
85020 - RexRB(0,from,to);
85021 - write8( 0x85 );
85022 - ModRM( 3, from, to );
85023 -}
85024 -
85025 -// test imm32 to [r32]
85026 -void TEST32ItoRm( x86IntRegType to, u32 from )
85027 -{
85028 - RexB(0,to);
85029 - write8( 0xF7 );
85030 - ModRM( 0, 0, to );
85031 - write32(from);
85032 -}
85033 -
85034 -// test imm16 to r16
85035 -void TEST16ItoR( x86IntRegType to, u16 from )
85036 -{
85037 - write8(0x66);
85038 - RexB(0,to);
85039 - if ( to == EAX )
85040 - {
85041 - write8( 0xA9 );
85042 - }
85043 - else
85044 - {
85045 - write8( 0xF7 );
85046 - ModRM( 3, 0, to );
85047 - }
85048 - write16( from );
85049 -}
85050 -
85051 -// test r16 to r16
85052 -void TEST16RtoR( x86IntRegType to, x86IntRegType from )
85053 -{
85054 - write8(0x66);
85055 - RexRB(0,from,to);
85056 - write16( 0x85 );
85057 - ModRM( 3, from, to );
85058 -}
85059 -
85060 -// test imm8 to r8
85061 -void TEST8ItoR( x86IntRegType to, u8 from )
85062 -{
85063 - RexB(0,to);
85064 - if ( to == EAX )
85065 - {
85066 - write8( 0xA8 );
85067 - }
85068 - else
85069 - {
85070 - write8( 0xF6 );
85071 - ModRM( 3, 0, to );
85072 - }
85073 - write8( from );
85074 -}
85075 -
85076 -// test imm8 to r8
85077 -void TEST8ItoM( uptr to, u8 from )
85078 -{
85079 - write8( 0xF6 );
85080 - ModRM( 0, 0, DISP32 );
85081 - write32( MEMADDR(to, 5) );
85082 - write8( from );
85083 -}
85084 -
85085 -/* sets r8 */
85086 -void SETS8R( x86IntRegType to )
85087 -{
85088 - SET8R( 0x98, to );
85089 -}
85090 -
85091 -/* setl r8 */
85092 -void SETL8R( x86IntRegType to )
85093 -{
85094 - SET8R( 0x9C, to );
85095 -}
85096 -
85097 -// setge r8
85098 -void SETGE8R( x86IntRegType to ) { SET8R(0x9d, to); }
85099 -// setg r8
85100 -void SETG8R( x86IntRegType to ) { SET8R(0x9f, to); }
85101 -// seta r8
85102 -void SETA8R( x86IntRegType to ) { SET8R(0x97, to); }
85103 -// setae r8
85104 -void SETAE8R( x86IntRegType to ) { SET8R(0x99, to); }
85105 -/* setb r8 */
85106 -void SETB8R( x86IntRegType to ) { SET8R( 0x92, to ); }
85107 -/* setb r8 */
85108 -void SETNZ8R( x86IntRegType to ) { SET8R( 0x95, to ); }
85109 -// setz r8
85110 -void SETZ8R( x86IntRegType to ) { SET8R(0x94, to); }
85111 -// sete r8
85112 -void SETE8R( x86IntRegType to ) { SET8R(0x94, to); }
85113 -
85114 -/* push imm32 */
85115 -void PUSH32I( u32 from )
85116 -{
85117 - //X86_64ASSERT(); //becomes sign extended in x86_64
85118 - write8( 0x68 );
85119 - write32( from );
85120 -}
85121 -
85122 -#ifdef __x86_64__
85123 -
85124 -/* push r64 */
85125 -void PUSH64R( x86IntRegType from )
85126 -{
85127 - RexB(0,from);
85128 - //write8( 0x51 | from );
85129 - write8( 0x50 | from );
85130 -}
85131 -
85132 -/* push m64 */
85133 -void PUSH64M( uptr from )
85134 -{
85135 - write8( 0xFF );
85136 - ModRM( 0, 6, DISP32 );
85137 - write32( MEMADDR(from, 4) );
85138 -}
85139 -
85140 -/* pop r64 */
85141 -void POP64R( x86IntRegType from ) {
85142 - RexB(0,from);
85143 - //write8( 0x59 | from );
85144 - write8( 0x58 | from );
85145 -}
85146 -
85147 -void PUSHR(x86IntRegType from) { PUSH64R(from); }
85148 -void POPR(x86IntRegType from) { POP64R(from); }
85149 -
85150 -#else
85151 -
85152 -/* push r32 */
85153 -void PUSH32R( x86IntRegType from ) { write8( 0x50 | from ); }
85154 -
85155 -/* push m32 */
85156 -void PUSH32M( uptr from )
85157 -{
85158 - write8( 0xFF );
85159 - ModRM( 0, 6, DISP32 );
85160 - write32( MEMADDR(from, 4) );
85161 -}
85162 -
85163 -/* pop r32 */
85164 -void POP32R( x86IntRegType from ) { write8( 0x58 | from ); }
85165 -
85166 -/* pushad */
85167 -void PUSHA32( void ) { write8( 0x60 ); }
85168 -
85169 -/* popad */
85170 -void POPA32( void ) { write8( 0x61 ); }
85171 -
85172 -void PUSHR(x86IntRegType from) { PUSH32R(from); }
85173 -void POPR(x86IntRegType from) { POP32R(from); }
85174 -
85175 -#endif
85176 -
85177 -
85178 -/* pushfd */
85179 -void PUSHFD( void ) { write8( 0x9C ); }
85180 -/* popfd */
85181 -void POPFD( void ) { write8( 0x9D ); }
85182 -
85183 -void RET( void ) { write8( 0xC3 ); }
85184 -void RET2( void ) { write16( 0xc3f3 ); }
85185 -
85186 -void CBW( void ) { write16( 0x9866 ); }
85187 -void CWD( void ) { write8( 0x98 ); }
85188 -void CDQ( void ) { write8( 0x99 ); }
85189 -void CWDE() { write8(0x98); }
85190 -
85191 -#ifdef __x86_64__
85192 -void CDQE( void ) { RexR(1,0); write8( 0x98 ); }
85193 -#endif
85194 -
85195 -void LAHF() { write8(0x9f); }
85196 -void SAHF() { write8(0x9e); }
85197 -
85198 -void BT32ItoR( x86IntRegType to, x86IntRegType from )
85199 -{
85200 - write16( 0xBA0F );
85201 - write8( 0xE0 | to );
85202 - write8( from );
85203 -}
85204 -
85205 -void BSRRtoR(x86IntRegType to, x86IntRegType from)
85206 -{
85207 - write16( 0xBD0F );
85208 - ModRM( 3, from, to );
85209 -}
85210 -
85211 -void BSWAP32R( x86IntRegType to )
85212 -{
85213 - write8( 0x0F );
85214 - write8( 0xC8 + to );
85215 -}
85216 -
85217 -// to = from + offset
85218 -void LEA16RtoR(x86IntRegType to, x86IntRegType from, u16 offset)
85219 -{
85220 - write8(0x66);
85221 - LEA32RtoR(to, from, offset);
85222 -}
85223 -
85224 -void LEA32RtoR(x86IntRegType to, x86IntRegType from, u32 offset)
85225 -{
85226 - RexRB(0,to,from);
85227 - write8(0x8d);
85228 -
85229 - if( (from&7) == ESP ) {
85230 - if( offset == 0 ) {
85231 - ModRM(1, to, from);
85232 - write8(0x24);
85233 - }
85234 - else if( offset < 128 ) {
85235 - ModRM(1, to, from);
85236 - write8(0x24);
85237 - write8(offset);
85238 - }
85239 - else {
85240 - ModRM(2, to, from);
85241 - write8(0x24);
85242 - write32(offset);
85243 - }
85244 - }
85245 - else {
85246 - if( offset == 0 && from != EBP && from!=ESP ) {
85247 - ModRM(0, to, from);
85248 - }
85249 - else if( offset < 128 ) {
85250 - ModRM(1, to, from);
85251 - write8(offset);
85252 - }
85253 - else {
85254 - ModRM(2, to, from);
85255 - write32(offset);
85256 - }
85257 - }
85258 -}
85259 -
85260 -// to = from0 + from1
85261 -void LEA16RRtoR(x86IntRegType to, x86IntRegType from0, x86IntRegType from1)
85262 -{
85263 - write8(0x66);
85264 - LEA32RRtoR(to, from0, from1);
85265 -}
85266 -
85267 -void LEA32RRtoR(x86IntRegType to, x86IntRegType from0, x86IntRegType from1)
85268 -{
85269 - RexRXB(0, to, from0, from1);
85270 - write8(0x8d);
85271 -
85272 - if( (from1&7) == EBP ) {
85273 - ModRM(1, to, 4);
85274 - ModRM(0, from0, from1);
85275 - write8(0);
85276 - }
85277 - else {
85278 - ModRM(0, to, 4);
85279 - ModRM(0, from0, from1);
85280 - }
85281 -}
85282 -
85283 -// to = from << scale (max is 3)
85284 -void LEA16RStoR(x86IntRegType to, x86IntRegType from, u32 scale)
85285 -{
85286 - write8(0x66);
85287 - LEA32RStoR(to, from, scale);
85288 -}
85289 -
85290 -void LEA32RStoR(x86IntRegType to, x86IntRegType from, u32 scale)
85291 -{
85292 - if( to == from ) {
85293 - SHL32ItoR(to, scale);
85294 - return;
85295 - }
85296 -
85297 - if( from != ESP ) {
85298 - RexRXB(0,to,from,0);
85299 - write8(0x8d);
85300 - ModRM(0, to, 4);
85301 - ModRM(scale, from, 5);
85302 - write32(0);
85303 - }
85304 - else {
85305 - assert( to != ESP );
85306 - MOV32RtoR(to, from);
85307 - LEA32RStoR(to, to, scale);
85308 - }
85309 -}
85310 -
85311 -#endif
85312 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/ix86-64.h new/libpcsxcore/libpcsxcore/ix86_64/ix86-64.h
85313 --- original/libpcsxcore/libpcsxcore/ix86_64/ix86-64.h 2007-10-08 17:13:28.000000000 -0400
85314 +++ new/libpcsxcore/libpcsxcore/ix86_64/ix86-64.h 1969-12-31 20:00:00.000000000 -0400
85315 @@ -1,1777 +0,0 @@
85316 -/*
85317 - * ix86 definitions v0.6.2
85318 - * Authors: linuzappz <linuzappz@pcsx.net>
85319 - * alexey silinov
85320 - * goldfinger
85321 - * shadow < shadow@pcsx2.net >
85322 - */
85323 -
85324 -#ifndef __IX86_H__
85325 -#define __IX86_H__
85326 -
85327 -#ifdef __cplusplus
85328 -extern "C" {
85329 -#endif
85330 -
85331 -#include "../psxcommon.h" // Basic types header
85332 -
85333 -#if defined(__MINGW32__)
85334 -#define PCSX2_ALIGNED16(x) __declspec(align(16)) x
85335 -#else
85336 -#define PCSX2_ALIGNED16(x) x __attribute((aligned(16)))
85337 -#endif
85338 -
85339 -
85340 -#ifdef __x86_64__
85341 -#define XMMREGS 16
85342 -#define X86REGS 16
85343 -#else
85344 -#define XMMREGS 8
85345 -#define X86REGS 8
85346 -#endif
85347 -
85348 -#define MMXREGS 8
85349 -
85350 -#define SIB 4
85351 -#define DISP32 5
85352 -
85353 -// general types
85354 -typedef int x86IntRegType;
85355 -#define EAX 0
85356 -#define EBX 3
85357 -#define ECX 1
85358 -#define EDX 2
85359 -#define ESI 6
85360 -#define EDI 7
85361 -#define EBP 5
85362 -#define ESP 4
85363 -
85364 -#ifdef __x86_64__
85365 -#define RAX 0
85366 -#define RBX 3
85367 -#define RCX 1
85368 -#define RDX 2
85369 -#define RSI 6
85370 -#define RDI 7
85371 -#define RBP 5
85372 -#define RSP 4
85373 -#define R8 8
85374 -#define R9 9
85375 -#define R10 10
85376 -#define R11 11
85377 -#define R12 12
85378 -#define R13 13
85379 -#define R14 14
85380 -#define R15 15
85381 -
85382 -#define X86_TEMP RAX // don't allocate anything
85383 -
85384 -#ifdef _MSC_VER
85385 -extern x86IntRegType g_x86savedregs[8];
85386 -extern x86IntRegType g_x86tempregs[6];
85387 -#else
85388 -extern x86IntRegType g_x86savedregs[6];
85389 -extern x86IntRegType g_x86tempregs[8];
85390 -#endif
85391 -
85392 -extern x86IntRegType g_x86allregs[14]; // all registers that can be used by the recs
85393 -extern x86IntRegType g_x868bitregs[11];
85394 -extern x86IntRegType g_x86non8bitregs[3];
85395 -
85396 -#ifdef _MSC_VER
85397 -#define X86ARG1 RCX
85398 -#define X86ARG2 RDX
85399 -#define X86ARG3 R8
85400 -#define X86ARG4 R9
85401 -#else
85402 -#define X86ARG1 RDI
85403 -#define X86ARG2 RSI
85404 -#define X86ARG3 RDX
85405 -#define X86ARG4 RCX
85406 -#endif
85407 -
85408 -#else
85409 -
85410 -#define X86ARG1 EAX
85411 -#define X86ARG2 ECX
85412 -#define X86ARG3 EDX
85413 -#define X86ARG4 EBX
85414 -
85415 -#endif // __x86_64__
85416 -
85417 -#define MM0 0
85418 -#define MM1 1
85419 -#define MM2 2
85420 -#define MM3 3
85421 -#define MM4 4
85422 -#define MM5 5
85423 -#define MM6 6
85424 -#define MM7 7
85425 -
85426 -typedef int x86MMXRegType;
85427 -
85428 -#define XMM0 0
85429 -#define XMM1 1
85430 -#define XMM2 2
85431 -#define XMM3 3
85432 -#define XMM4 4
85433 -#define XMM5 5
85434 -#define XMM6 6
85435 -#define XMM7 7
85436 -#define XMM8 8
85437 -#define XMM9 9
85438 -#define XMM10 10
85439 -#define XMM11 11
85440 -#define XMM12 12
85441 -#define XMM13 13
85442 -#define XMM14 14
85443 -#define XMM15 15
85444 -
85445 -typedef int x86SSERegType;
85446 -
85447 -typedef enum
85448 -{
85449 - XMMT_INT = 0, // integer (sse2 only)
85450 - XMMT_FPS = 1, // floating point
85451 - //XMMT_FPD = 3, // double
85452 -} XMMSSEType;
85453 -
85454 -extern XMMSSEType g_xmmtypes[XMMREGS];
85455 -
85456 -void cpudetectInit( void );//this is all that needs to be called and will fill up the below structs
85457 -
85458 -//cpu capabilities structure
85459 -typedef struct {
85460 - u32 hasFloatingPointUnit;
85461 - u32 hasVirtual8086ModeEnhancements;
85462 - u32 hasDebuggingExtensions;
85463 - u32 hasPageSizeExtensions;
85464 - u32 hasTimeStampCounter;
85465 - u32 hasModelSpecificRegisters;
85466 - u32 hasPhysicalAddressExtension;
85467 - u32 hasCOMPXCHG8BInstruction;
85468 - u32 hasAdvancedProgrammableInterruptController;
85469 - u32 hasSEPFastSystemCall;
85470 - u32 hasMemoryTypeRangeRegisters;
85471 - u32 hasPTEGlobalFlag;
85472 - u32 hasMachineCheckArchitecture;
85473 - u32 hasConditionalMoveAndCompareInstructions;
85474 - u32 hasFGPageAttributeTable;
85475 - u32 has36bitPageSizeExtension;
85476 - u32 hasProcessorSerialNumber;
85477 - u32 hasCFLUSHInstruction;
85478 - u32 hasDebugStore;
85479 - u32 hasACPIThermalMonitorAndClockControl;
85480 - u32 hasMultimediaExtensions;
85481 - u32 hasFastStreamingSIMDExtensionsSaveRestore;
85482 - u32 hasStreamingSIMDExtensions;
85483 - u32 hasStreamingSIMD2Extensions;
85484 - u32 hasSelfSnoop;
85485 - u32 hasHyperThreading;
85486 - u32 hasThermalMonitor;
85487 - u32 hasIntel64BitArchitecture;
85488 - u32 hasStreamingSIMD3Extensions;
85489 - //that is only for AMDs
85490 - u32 hasMultimediaExtensionsExt;
85491 - u32 hasAMD64BitArchitecture;
85492 - u32 has3DNOWInstructionExtensionsExt;
85493 - u32 has3DNOWInstructionExtensions;
85494 -} CAPABILITIES;
85495 -
85496 -extern CAPABILITIES cpucaps;
85497 -
85498 -typedef struct {
85499 -
85500 - u32 x86Family; // Processor Family
85501 - u32 x86Model; // Processor Model
85502 - u32 x86PType; // Processor Type
85503 - u32 x86StepID; // Stepping ID
85504 - u32 x86Flags; // Feature Flags
85505 - u32 x86EFlags; // Extended Feature Flags
85506 - //all the above returns hex values
85507 - s8 x86ID[16]; // Vendor ID //the vendor creator (in %s)
85508 - s8 x86Type[20]; //cpu type in char format //the cpu type (in %s)
85509 - s8 x86Fam[50]; // family in char format //the original cpu name string (in %s)
85510 - u32 cpuspeed; // speed of cpu //this will give cpu speed (in %d)
85511 -} CPUINFO;
85512 -
85513 -extern CPUINFO cpuinfo;
85514 -
85515 -extern s8 *x86Ptr;
85516 -extern u8 *j8Ptr[32];
85517 -extern u32 *j32Ptr[32];
85518 -
85519 -
85520 -#ifdef __x86_64__
85521 -#define X86_64ASSERT() assert(0)
85522 -#define MEMADDR(addr, oplen) ((addr) - ((u64)x86Ptr + ((u64)oplen)))
85523 -#else
85524 -#define X86_64ASSERT()
85525 -#define MEMADDR(addr, oplen) (addr)
85526 -#endif
85527 -
85528 -#ifdef __x86_64__
85529 -#define Rex( w, r, x, b ) write8( 0x40 | ((w) << 3) | ((r) << 2) | ((x) << 1) | (b) );
85530 -#define RexR(w, reg) if( w||(reg)>=8 ) { Rex(w, (reg)>=8, 0, 0); }
85531 -#define RexB(w, base) if( w||(base)>=8 ) { Rex(w, 0, 0, (base)>=8); }
85532 -#define RexRB(w, reg, base) if( w || (reg) >= 8 || (base)>=8 ) { Rex(w, (reg)>=8, 0, (base)>=8); }
85533 -#define RexRXB(w, reg, index, base) if( w||(reg) >= 8 || (index) >= 8 || (base) >= 8 ) { \
85534 - Rex(w, (reg)>=8, (index)>=8, (base)>=8); \
85535 - }
85536 -#else
85537 -#define Rex(w,r,x,b) assert(0);
85538 -#define RexR(w, reg) if( w||(reg)>=8 ) assert(0);
85539 -#define RexB(w, base) if( w||(base)>=8 ) assert(0);
85540 -#define RexRB(w, reg, base) if( w||(reg) >= 8 || (base)>=8 ) assert(0);
85541 -#define RexRXB(w, reg, index, base) if( w||(reg) >= 8 || (index) >= 8 || (base) >= 8 ) assert(0);
85542 -#endif
85543 -
85544 -void write8( int val );
85545 -void write16( int val );
85546 -void write32( u32 val );
85547 -void write64( u64 val );
85548 -
85549 -
85550 -void x86SetPtr( char *ptr );
85551 -void x86Shutdown( void );
85552 -
85553 -void x86SetJ8( u8 *j8 );
85554 -void x86SetJ8A( u8 *j8 );
85555 -void x86SetJ16( u16 *j16 );
85556 -void x86SetJ16A( u16 *j16 );
85557 -void x86SetJ32( u32 *j32 );
85558 -void x86SetJ32A( u32 *j32 );
85559 -
85560 -void x86Align( int bytes );
85561 -u64 GetCPUTick( void );
85562 -
85563 -// General Helper functions
85564 -void ModRM( int mod, int rm, int reg );
85565 -void SibSB( int ss, int rm, int index );
85566 -void SET8R( int cc, int to );
85567 -u8* J8Rel( int cc, int to );
85568 -u32* J32Rel( int cc, u32 to );
85569 -void CMOV32RtoR( int cc, int to, int from );
85570 -void CMOV32MtoR( int cc, int to, uptr from );
85571 -
85572 -//******************
85573 -// IX86 intructions
85574 -//******************
85575 -
85576 -//
85577 -// * scale values:
85578 -// * 0 - *1
85579 -// * 1 - *2
85580 -// * 2 - *4
85581 -// * 3 - *8
85582 -//
85583 -
85584 -void STC( void );
85585 -void CLC( void );
85586 -
85587 -////////////////////////////////////
85588 -// mov instructions //
85589 -////////////////////////////////////
85590 -
85591 -// mov r64 to r64
85592 -void MOV64RtoR( x86IntRegType to, x86IntRegType from );
85593 -// mov r64 to m64
85594 -void MOV64RtoM( uptr to, x86IntRegType from );
85595 -// mov m64 to r64
85596 -void MOV64MtoR( x86IntRegType to, uptr from );
85597 -// mov sign ext imm32 to m64
85598 -void MOV64I32toM( uptr to, u32 from );
85599 -// mov sign ext imm32 to r64
85600 -void MOV64I32toR( x86IntRegType to, s32 from);
85601 -// mov imm64 to r64
85602 -void MOV64ItoR( x86IntRegType to, u64 from);
85603 -// mov imm64 to [r64+off]
85604 -void MOV64ItoRmOffset( x86IntRegType to, u32 from, int offset);
85605 -// mov [r64+offset] to r64
85606 -void MOV64RmOffsettoR( x86IntRegType to, x86IntRegType from, int offset );
85607 -// mov [r64][r64*scale] to r64
85608 -void MOV64RmStoR( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale);
85609 -// mov r64 to [r64+offset]
85610 -void MOV64RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset );
85611 -// mov r64 to [r64][r64*scale]
85612 -void MOV64RtoRmS( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale);
85613 -
85614 -// mov r32 to r32
85615 -void MOV32RtoR( x86IntRegType to, x86IntRegType from );
85616 -// mov r32 to m32
85617 -void MOV32RtoM( uptr to, x86IntRegType from );
85618 -// mov m32 to r32
85619 -void MOV32MtoR( x86IntRegType to, uptr from );
85620 -// mov [r32] to r32
85621 -void MOV32RmtoR( x86IntRegType to, x86IntRegType from );
85622 -void MOV32RmtoROffset( x86IntRegType to, x86IntRegType from, int offset );
85623 -// mov [r32][r32<<scale] to r32
85624 -void MOV32RmStoR( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale );
85625 -// mov [imm32(from2) + r32(from1)<<scale] to r32
85626 -void MOV32RmSOffsettoR( x86IntRegType to, x86IntRegType from1, int from2, int scale );
85627 -// mov r32 to [r32]
85628 -void MOV32RtoRm( x86IntRegType to, x86IntRegType from );
85629 -// mov r32 to [r32][r32*scale]
85630 -void MOV32RtoRmS( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale );
85631 -// mov imm32 to r32
85632 -void MOV32ItoR( x86IntRegType to, u32 from );
85633 -// mov imm32 to m32
85634 -void MOV32ItoM( uptr to, u32 from );
85635 -// mov imm32 to [r32+off]
85636 -void MOV32ItoRmOffset( x86IntRegType to, u32 from, int offset);
85637 -// mov r32 to [r32+off]
85638 -void MOV32RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset);
85639 -
85640 -// mov r16 to m16
85641 -void MOV16RtoM( uptr to, x86IntRegType from );
85642 -// mov m16 to r16
85643 -void MOV16MtoR( x86IntRegType to, uptr from );
85644 -// mov [r32] to r16
85645 -void MOV16RmtoR( x86IntRegType to, x86IntRegType from ) ;
85646 -void MOV16RmtoROffset( x86IntRegType to, x86IntRegType from, int offset );
85647 -// mov [imm32(from2) + r32(from1)<<scale] to r16
85648 -void MOV16RmSOffsettoR( x86IntRegType to, x86IntRegType from1, u32 from2, int scale );
85649 -// mov r16 to [r32]
85650 -void MOV16RtoRm(x86IntRegType to, x86IntRegType from);
85651 -// mov imm16 to m16
85652 -void MOV16ItoM( uptr to, u16 from );
85653 -/* mov r16 to [r32][r32*scale] */
85654 -void MOV16RtoRmS( x86IntRegType to, x86IntRegType from, x86IntRegType from2, int scale);
85655 -// mov imm16 to r16
85656 -void MOV16ItoR( x86IntRegType to, u16 from );
85657 -// mov imm16 to [r16+off]
85658 -void MOV16ItoRmOffset( x86IntRegType to, u16 from, u32 offset);
85659 -// mov r16 to [r16+off]
85660 -void MOV16RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset);
85661 -
85662 -// mov r8 to m8
85663 -void MOV8RtoM( uptr to, x86IntRegType from );
85664 -// mov m8 to r8
85665 -void MOV8MtoR( x86IntRegType to, uptr from );
85666 -// mov [r32] to r8
85667 -void MOV8RmtoR(x86IntRegType to, x86IntRegType from);
85668 -void MOV8RmtoROffset(x86IntRegType to, x86IntRegType from, int offset);
85669 -// mov r8 to [r32]
85670 -void MOV8RtoRm(x86IntRegType to, x86IntRegType from);
85671 -// mov imm8 to m8
85672 -void MOV8ItoM( uptr to, u8 from );
85673 -// mov imm8 to r8
85674 -void MOV8ItoR( x86IntRegType to, u8 from );
85675 -// mov imm8 to [r8+off]
85676 -void MOV8ItoRmOffset( x86IntRegType to, u8 from, int offset);
85677 -// mov r8 to [r8+off]
85678 -void MOV8RtoRmOffset( x86IntRegType to, x86IntRegType from, int offset);
85679 -
85680 -// movsx r8 to r32
85681 -void MOVSX32R8toR( x86IntRegType to, x86IntRegType from );
85682 -void MOVSX32Rm8toR( x86IntRegType to, x86IntRegType from );
85683 -void MOVSX32Rm8toROffset( x86IntRegType to, x86IntRegType from, int offset );
85684 -// movsx m8 to r32
85685 -void MOVSX32M8toR( x86IntRegType to, uptr from );
85686 -// movsx r16 to r32
85687 -void MOVSX32R16toR( x86IntRegType to, x86IntRegType from );
85688 -void MOVSX32Rm16toR( x86IntRegType to, x86IntRegType from );
85689 -void MOVSX32Rm16toROffset( x86IntRegType to, x86IntRegType from, int offset );
85690 -// movsx m16 to r32
85691 -void MOVSX32M16toR( x86IntRegType to, uptr from );
85692 -
85693 -// movzx r8 to r32
85694 -void MOVZX32R8toR( x86IntRegType to, x86IntRegType from );
85695 -void MOVZX32Rm8toR( x86IntRegType to, x86IntRegType from );
85696 -void MOVZX32Rm8toROffset( x86IntRegType to, x86IntRegType from, int offset );
85697 -// movzx m8 to r32
85698 -void MOVZX32M8toR( x86IntRegType to, uptr from );
85699 -// movzx r16 to r32
85700 -void MOVZX32R16toR( x86IntRegType to, x86IntRegType from );
85701 -void MOVZX32Rm16toR( x86IntRegType to, x86IntRegType from );
85702 -void MOVZX32Rm16toROffset( x86IntRegType to, x86IntRegType from, int offset );
85703 -// movzx m16 to r32
85704 -void MOVZX32M16toR( x86IntRegType to, uptr from );
85705 -
85706 -#ifdef __x86_64__
85707 -void MOVZX64R8toR( x86IntRegType to, x86IntRegType from );
85708 -void MOVZX64Rm8toR( x86IntRegType to, x86IntRegType from );
85709 -void MOVZX64Rm8toROffset( x86IntRegType to, x86IntRegType from, int offset );
85710 -// movzx m8 to r64
85711 -void MOVZX64M8toR( x86IntRegType to, uptr from );
85712 -// movzx r16 to r64
85713 -void MOVZX64R16toR( x86IntRegType to, x86IntRegType from );
85714 -void MOVZX64Rm16toR( x86IntRegType to, x86IntRegType from );
85715 -void MOVZX64Rm16toROffset( x86IntRegType to, x86IntRegType from, int offset );
85716 -// movzx m16 to r64
85717 -void MOVZX64M16toR( x86IntRegType to, uptr from );
85718 -#endif
85719 -
85720 -// cmovbe r32 to r32
85721 -void CMOVBE32RtoR( x86IntRegType to, x86IntRegType from );
85722 -// cmovbe m32 to r32
85723 -void CMOVBE32MtoR( x86IntRegType to, uptr from );
85724 -// cmovb r32 to r32
85725 -void CMOVB32RtoR( x86IntRegType to, x86IntRegType from );
85726 -// cmovb m32 to r32
85727 -void CMOVB32MtoR( x86IntRegType to, uptr from );
85728 -// cmovae r32 to r32
85729 -void CMOVAE32RtoR( x86IntRegType to, x86IntRegType from );
85730 -// cmovae m32 to r32
85731 -void CMOVAE32MtoR( x86IntRegType to, uptr from );
85732 -// cmova r32 to r32
85733 -void CMOVA32RtoR( x86IntRegType to, x86IntRegType from );
85734 -// cmova m32 to r32
85735 -void CMOVA32MtoR( x86IntRegType to, uptr from );
85736 -
85737 -// cmovo r32 to r32
85738 -void CMOVO32RtoR( x86IntRegType to, x86IntRegType from );
85739 -// cmovo m32 to r32
85740 -void CMOVO32MtoR( x86IntRegType to, uptr from );
85741 -// cmovp r32 to r32
85742 -void CMOVP32RtoR( x86IntRegType to, x86IntRegType from );
85743 -// cmovp m32 to r32
85744 -void CMOVP32MtoR( x86IntRegType to, uptr from );
85745 -// cmovs r32 to r32
85746 -void CMOVS32RtoR( x86IntRegType to, x86IntRegType from );
85747 -// cmovs m32 to r32
85748 -void CMOVS32MtoR( x86IntRegType to, uptr from );
85749 -// cmovno r32 to r32
85750 -void CMOVNO32RtoR( x86IntRegType to, x86IntRegType from );
85751 -// cmovno m32 to r32
85752 -void CMOVNO32MtoR( x86IntRegType to, uptr from );
85753 -// cmovnp r32 to r32
85754 -void CMOVNP32RtoR( x86IntRegType to, x86IntRegType from );
85755 -// cmovnp m32 to r32
85756 -void CMOVNP32MtoR( x86IntRegType to, uptr from );
85757 -// cmovns r32 to r32
85758 -void CMOVNS32RtoR( x86IntRegType to, x86IntRegType from );
85759 -// cmovns m32 to r32
85760 -void CMOVNS32MtoR( x86IntRegType to, uptr from );
85761 -
85762 -// cmovne r32 to r32
85763 -void CMOVNE32RtoR( x86IntRegType to, x86IntRegType from );
85764 -// cmovne m32 to r32
85765 -void CMOVNE32MtoR( x86IntRegType to, uptr from );
85766 -// cmove r32 to r32
85767 -void CMOVE32RtoR( x86IntRegType to, x86IntRegType from );
85768 -// cmove m32 to r32
85769 -void CMOVE32MtoR( x86IntRegType to, uptr from );
85770 -// cmovg r32 to r32
85771 -void CMOVG32RtoR( x86IntRegType to, x86IntRegType from );
85772 -// cmovg m32 to r32
85773 -void CMOVG32MtoR( x86IntRegType to, uptr from );
85774 -// cmovge r32 to r32
85775 -void CMOVGE32RtoR( x86IntRegType to, x86IntRegType from );
85776 -// cmovge m32 to r32
85777 -void CMOVGE32MtoR( x86IntRegType to, uptr from );
85778 -// cmovl r32 to r32
85779 -void CMOVL32RtoR( x86IntRegType to, x86IntRegType from );
85780 -// cmovl m32 to r32
85781 -void CMOVL32MtoR( x86IntRegType to, uptr from );
85782 -// cmovle r32 to r32
85783 -void CMOVLE32RtoR( x86IntRegType to, x86IntRegType from );
85784 -// cmovle m32 to r32
85785 -void CMOVLE32MtoR( x86IntRegType to, uptr from );
85786 -
85787 -////////////////////////////////////
85788 -// arithmetic instructions //
85789 -////////////////////////////////////
85790 -
85791 -// add imm32 to r64
85792 -void ADD64ItoR( x86IntRegType to, u32 from );
85793 -// add m64 to r64
85794 -void ADD64MtoR( x86IntRegType to, uptr from );
85795 -
85796 -// add imm32 to r32
85797 -void ADD32ItoR( x86IntRegType to, u32 from );
85798 -// add imm32 to m32
85799 -void ADD32ItoM( uptr to, u32 from );
85800 -// add imm32 to [r32+off]
85801 -void ADD32ItoRmOffset( x86IntRegType to, u32 from, int offset);
85802 -// add r32 to r32
85803 -void ADD32RtoR( x86IntRegType to, x86IntRegType from );
85804 -// add r32 to m32
85805 -void ADD32RtoM( uptr to, x86IntRegType from );
85806 -// add m32 to r32
85807 -void ADD32MtoR( x86IntRegType to, uptr from );
85808 -
85809 -// add r16 to r16
85810 -void ADD16RtoR( x86IntRegType to , x86IntRegType from );
85811 -// add imm16 to r16
85812 -void ADD16ItoR( x86IntRegType to, u16 from );
85813 -// add imm16 to m16
85814 -void ADD16ItoM( uptr to, u16 from );
85815 -// add r16 to m16
85816 -void ADD16RtoM( uptr to, x86IntRegType from );
85817 -// add m16 to r16
85818 -void ADD16MtoR( x86IntRegType to, uptr from );
85819 -
85820 -// add m8 to r8
85821 -void ADD8MtoR( x86IntRegType to, uptr from );
85822 -
85823 -// adc imm32 to r32
85824 -void ADC32ItoR( x86IntRegType to, u32 from );
85825 -// adc imm32 to m32
85826 -void ADC32ItoM( uptr to, u32 from );
85827 -// adc r32 to r32
85828 -void ADC32RtoR( x86IntRegType to, x86IntRegType from );
85829 -// adc m32 to r32
85830 -void ADC32MtoR( x86IntRegType to, uptr from );
85831 -// adc r32 to m32
85832 -void ADC32RtoM( uptr to, x86IntRegType from );
85833 -
85834 -// inc r32
85835 -void INC32R( x86IntRegType to );
85836 -// inc m32
85837 -void INC32M( uptr to );
85838 -// inc r16
85839 -void INC16R( x86IntRegType to );
85840 -// inc m16
85841 -void INC16M( uptr to );
85842 -
85843 -// sub m64 to r64
85844 -void SUB64MtoR( x86IntRegType to, uptr from );
85845 -
85846 -// sub imm32 to r32
85847 -void SUB32ItoR( x86IntRegType to, u32 from );
85848 -// sub imm32 to m32
85849 -void SUB32ItoM( uptr to, u32 from ) ;
85850 -// sub r32 to r32
85851 -void SUB32RtoR( x86IntRegType to, x86IntRegType from );
85852 -// sub m32 to r32
85853 -void SUB32MtoR( x86IntRegType to, uptr from ) ;
85854 -// sub r32 to m32
85855 -void SUB32RtoM( uptr to, x86IntRegType from );
85856 -// sub r16 to r16
85857 -void SUB16RtoR( x86IntRegType to, u16 from );
85858 -// sub imm16 to r16
85859 -void SUB16ItoR( x86IntRegType to, u16 from );
85860 -// sub imm16 to m16
85861 -void SUB16ItoM( uptr to, u16 from ) ;
85862 -// sub m16 to r16
85863 -void SUB16MtoR( x86IntRegType to, uptr from );
85864 -
85865 -// sbb r64 to r64
85866 -void SBB64RtoR( x86IntRegType to, x86IntRegType from );
85867 -
85868 -// sbb imm32 to r32
85869 -void SBB32ItoR( x86IntRegType to, u32 from );
85870 -// sbb imm32 to m32
85871 -void SBB32ItoM( uptr to, u32 from );
85872 -// sbb r32 to r32
85873 -void SBB32RtoR( x86IntRegType to, x86IntRegType from );
85874 -// sbb m32 to r32
85875 -void SBB32MtoR( x86IntRegType to, uptr from );
85876 -// sbb r32 to m32
85877 -void SBB32RtoM( uptr to, x86IntRegType from );
85878 -
85879 -// dec r32
85880 -void DEC32R( x86IntRegType to );
85881 -// dec m32
85882 -void DEC32M( uptr to );
85883 -// dec r16
85884 -void DEC16R( x86IntRegType to );
85885 -// dec m16
85886 -void DEC16M( uptr to );
85887 -
85888 -// mul eax by r32 to edx:eax
85889 -void MUL32R( x86IntRegType from );
85890 -// mul eax by m32 to edx:eax
85891 -void MUL32M( uptr from );
85892 -
85893 -// imul eax by r32 to edx:eax
85894 -void IMUL32R( x86IntRegType from );
85895 -// imul eax by m32 to edx:eax
85896 -void IMUL32M( uptr from );
85897 -// imul r32 by r32 to r32
85898 -void IMUL32RtoR( x86IntRegType to, x86IntRegType from );
85899 -
85900 -// div eax by r32 to edx:eax
85901 -void DIV32R( x86IntRegType from );
85902 -// div eax by m32 to edx:eax
85903 -void DIV32M( uptr from );
85904 -
85905 -// idiv eax by r32 to edx:eax
85906 -void IDIV32R( x86IntRegType from );
85907 -// idiv eax by m32 to edx:eax
85908 -void IDIV32M( uptr from );
85909 -
85910 -////////////////////////////////////
85911 -// shifting instructions //
85912 -////////////////////////////////////
85913 -
85914 -// shl imm8 to r64
85915 -void SHL64ItoR( x86IntRegType to, u8 from );
85916 -// shl cl to r64
85917 -void SHL64CLtoR( x86IntRegType to );
85918 -// shr imm8 to r64
85919 -void SHR64ItoR( x86IntRegType to, u8 from );
85920 -// shr cl to r64
85921 -void SHR64CLtoR( x86IntRegType to );
85922 -// sar imm8 to r64
85923 -void SAR64ItoR( x86IntRegType to, u8 from );
85924 -// sar cl to r64
85925 -void SAR64CLtoR( x86IntRegType to );
85926 -
85927 -// shl imm8 to r32
85928 -void SHL32ItoR( x86IntRegType to, u8 from );
85929 -/* shl imm8 to m32 */
85930 -void SHL32ItoM( uptr to, u8 from );
85931 -// shl cl to r32
85932 -void SHL32CLtoR( x86IntRegType to );
85933 -
85934 -// shl imm8 to r16
85935 -void SHL16ItoR( x86IntRegType to, u8 from );
85936 -// shl imm8 to r8
85937 -void SHL8ItoR( x86IntRegType to, u8 from );
85938 -
85939 -// shr imm8 to r32
85940 -void SHR32ItoR( x86IntRegType to, u8 from );
85941 -/* shr imm8 to m32 */
85942 -void SHR32ItoM( uptr to, u8 from );
85943 -// shr cl to r32
85944 -void SHR32CLtoR( x86IntRegType to );
85945 -
85946 -// shr imm8 to r8
85947 -void SHR8ItoR( x86IntRegType to, u8 from );
85948 -
85949 -// sar imm8 to r32
85950 -void SAR32ItoR( x86IntRegType to, u8 from );
85951 -// sar imm8 to m32
85952 -void SAR32ItoM( uptr to, u8 from );
85953 -// sar cl to r32
85954 -void SAR32CLtoR( x86IntRegType to );
85955 -
85956 -// sar imm8 to r16
85957 -void SAR16ItoR( x86IntRegType to, u8 from );
85958 -
85959 -// ror imm8 to r32 (rotate right)
85960 -void ROR32ItoR( x86IntRegType to,u8 from );
85961 -
85962 -void RCR32ItoR( x86IntRegType to,u8 from );
85963 -// shld imm8 to r32
85964 -void SHLD32ItoR( x86IntRegType to, x86IntRegType from, u8 shift );
85965 -// shrd imm8 to r32
85966 -void SHRD32ItoR( x86IntRegType to, x86IntRegType from, u8 shift );
85967 -
85968 -// sal imm8 to r32
85969 -#define SAL32ItoR SHL32ItoR
85970 -// sal cl to r32
85971 -#define SAL32CLtoR SHL32CLtoR
85972 -
85973 -// logical instructions
85974 -
85975 -// or imm32 to r64
85976 -void OR64ItoR( x86IntRegType to, u32 from );
85977 -// or m64 to r64
85978 -void OR64MtoR( x86IntRegType to, uptr from );
85979 -// or r64 to r64
85980 -void OR64RtoR( x86IntRegType to, x86IntRegType from );
85981 -// or r32 to m64
85982 -void OR64RtoM( uptr to, x86IntRegType from );
85983 -
85984 -// or imm32 to r32
85985 -void OR32ItoR( x86IntRegType to, u32 from );
85986 -// or imm32 to m32
85987 -void OR32ItoM( uptr to, u32 from );
85988 -// or r32 to r32
85989 -void OR32RtoR( x86IntRegType to, x86IntRegType from );
85990 -// or r32 to m32
85991 -void OR32RtoM( uptr to, x86IntRegType from );
85992 -// or m32 to r32
85993 -void OR32MtoR( x86IntRegType to, uptr from );
85994 -// or r16 to r16
85995 -void OR16RtoR( x86IntRegType to, x86IntRegType from );
85996 -// or imm16 to r16
85997 -void OR16ItoR( x86IntRegType to, u16 from );
85998 -// or imm16 to m16
85999 -void OR16ItoM( uptr to, u16 from );
86000 -// or m16 to r16
86001 -void OR16MtoR( x86IntRegType to, uptr from );
86002 -// or r16 to m16
86003 -void OR16RtoM( uptr to, x86IntRegType from );
86004 -
86005 -// or r8 to r8
86006 -void OR8RtoR( x86IntRegType to, x86IntRegType from );
86007 -// or r8 to m8
86008 -void OR8RtoM( uptr to, x86IntRegType from );
86009 -// or imm8 to m8
86010 -void OR8ItoM( uptr to, u8 from );
86011 -// or m8 to r8
86012 -void OR8MtoR( x86IntRegType to, uptr from );
86013 -
86014 -// xor imm32 to r64
86015 -void XOR64ItoR( x86IntRegType to, u32 from );
86016 -// xor r64 to r64
86017 -void XOR64RtoR( x86IntRegType to, x86IntRegType from );
86018 -// xor m64 to r64
86019 -void XOR64MtoR( x86IntRegType to, uptr from );
86020 -// xor r64 to r64
86021 -void XOR64RtoR( x86IntRegType to, x86IntRegType from );
86022 -// xor r64 to m64
86023 -void XOR64RtoM( uptr to, x86IntRegType from );
86024 -// xor imm32 to r32
86025 -void XOR32ItoR( x86IntRegType to, u32 from );
86026 -// xor imm32 to m32
86027 -void XOR32ItoM( uptr to, u32 from );
86028 -// xor r32 to r32
86029 -void XOR32RtoR( x86IntRegType to, x86IntRegType from );
86030 -// xor r16 to r16
86031 -void XOR16RtoR( x86IntRegType to, x86IntRegType from );
86032 -// xor r32 to m32
86033 -void XOR32RtoM( uptr to, x86IntRegType from );
86034 -// xor m32 to r32
86035 -void XOR32MtoR( x86IntRegType to, uptr from );
86036 -// xor r16 to m16
86037 -void XOR16RtoM( uptr to, x86IntRegType from );
86038 -// xor imm16 to r16
86039 -void XOR16ItoR( x86IntRegType to, u16 from );
86040 -
86041 -// and imm32 to r64
86042 -void AND64I32toR( x86IntRegType to, u32 from );
86043 -// and m64 to r64
86044 -void AND64MtoR( x86IntRegType to, uptr from );
86045 -// and r64 to m64
86046 -void AND64RtoM( uptr to, x86IntRegType from );
86047 -// and r64 to r64
86048 -void AND64RtoR( x86IntRegType to, x86IntRegType from );
86049 -// and imm32 to m64
86050 -void AND64I32toM( uptr to, u32 from );
86051 -
86052 -// and imm32 to r32
86053 -void AND32ItoR( x86IntRegType to, u32 from );
86054 -// and sign ext imm8 to r32
86055 -void AND32I8toR( x86IntRegType to, u8 from );
86056 -// and imm32 to m32
86057 -void AND32ItoM( uptr to, u32 from );
86058 -// and sign ext imm8 to m32
86059 -void AND32I8toM( uptr to, u8 from );
86060 -// and r32 to r32
86061 -void AND32RtoR( x86IntRegType to, x86IntRegType from );
86062 -// and r32 to m32
86063 -void AND32RtoM( uptr to, x86IntRegType from );
86064 -// and m32 to r32
86065 -void AND32MtoR( x86IntRegType to, uptr from );
86066 -// and r16 to r16
86067 -void AND16RtoR( x86IntRegType to, x86IntRegType from );
86068 -// and imm16 to r16
86069 -void AND16ItoR( x86IntRegType to, u16 from );
86070 -// and imm16 to m16
86071 -void AND16ItoM( uptr to, u16 from );
86072 -// and r16 to m16
86073 -void AND16RtoM( uptr to, x86IntRegType from );
86074 -// and m16 to r16
86075 -void AND16MtoR( x86IntRegType to, uptr from );
86076 -// and imm8 to r8
86077 -void AND8ItoR( x86IntRegType to, u8 from );
86078 -// and imm8 to m32
86079 -void AND8ItoM( uptr to, u8 from );
86080 -// and r8 to m8
86081 -void AND8RtoM( uptr to, x86IntRegType from );
86082 -// and m8 to r8
86083 -void AND8MtoR( x86IntRegType to, uptr from );
86084 -// and r8 to r8
86085 -void AND8RtoR( x86IntRegType to, x86IntRegType from );
86086 -
86087 -// not r64
86088 -void NOT64R( x86IntRegType from );
86089 -// not r32
86090 -void NOT32R( x86IntRegType from );
86091 -// not m32
86092 -void NOT32M( uptr from );
86093 -// neg r64
86094 -void NEG64R( x86IntRegType from );
86095 -// neg r32
86096 -void NEG32R( x86IntRegType from );
86097 -// neg m32
86098 -void NEG32M( uptr from );
86099 -// neg r16
86100 -void NEG16R( x86IntRegType from );
86101 -
86102 -////////////////////////////////////
86103 -// jump instructions //
86104 -////////////////////////////////////
86105 -
86106 -// jmp rel8
86107 -u8* JMP8( u8 to );
86108 -
86109 -// jmp rel32
86110 -u32* JMP32( uptr to );
86111 -// jmp r32 (r64 if __x86_64__)
86112 -void JMPR( x86IntRegType to );
86113 -// jmp m32
86114 -void JMP32M( uptr to );
86115 -
86116 -// jp rel8
86117 -u8* JP8( u8 to );
86118 -// jnp rel8
86119 -u8* JNP8( u8 to );
86120 -// je rel8
86121 -u8* JE8( u8 to );
86122 -// jz rel8
86123 -u8* JZ8( u8 to );
86124 -// jg rel8
86125 -u8* JG8( u8 to );
86126 -// jge rel8
86127 -u8* JGE8( u8 to );
86128 -// js rel8
86129 -u8* JS8( u8 to );
86130 -// jns rel8
86131 -u8* JNS8( u8 to );
86132 -// jl rel8
86133 -u8* JL8( u8 to );
86134 -// ja rel8
86135 -u8* JA8( u8 to );
86136 -// jae rel8
86137 -u8* JAE8( u8 to );
86138 -// jb rel8
86139 -u8* JB8( u8 to );
86140 -// jbe rel8
86141 -u8* JBE8( u8 to );
86142 -// jle rel8
86143 -u8* JLE8( u8 to );
86144 -// jne rel8
86145 -u8* JNE8( u8 to );
86146 -// jnz rel8
86147 -u8* JNZ8( u8 to );
86148 -// jng rel8
86149 -u8* JNG8( u8 to );
86150 -// jnge rel8
86151 -u8* JNGE8( u8 to );
86152 -// jnl rel8
86153 -u8* JNL8( u8 to );
86154 -// jnle rel8
86155 -u8* JNLE8( u8 to );
86156 -// jo rel8
86157 -u8* JO8( u8 to );
86158 -// jno rel8
86159 -u8* JNO8( u8 to );
86160 -
86161 -// jb rel8
86162 -u16* JB16( u16 to );
86163 -
86164 -// jb rel32
86165 -u32* JB32( u32 to );
86166 -// je rel32
86167 -u32* JE32( u32 to );
86168 -// jz rel32
86169 -u32* JZ32( u32 to );
86170 -// jg rel32
86171 -u32* JG32( u32 to );
86172 -// jge rel32
86173 -u32* JGE32( u32 to );
86174 -// jl rel32
86175 -u32* JL32( u32 to );
86176 -// jle rel32
86177 -u32* JLE32( u32 to );
86178 -// jae rel32
86179 -u32* JAE32( u32 to );
86180 -// jne rel32
86181 -u32* JNE32( u32 to );
86182 -// jnz rel32
86183 -u32* JNZ32( u32 to );
86184 -// jng rel32
86185 -u32* JNG32( u32 to );
86186 -// jnge rel32
86187 -u32* JNGE32( u32 to );
86188 -// jnl rel32
86189 -u32* JNL32( u32 to );
86190 -// jnle rel32
86191 -u32* JNLE32( u32 to );
86192 -// jo rel32
86193 -u32* JO32( u32 to );
86194 -// jno rel32
86195 -u32* JNO32( u32 to );
86196 -// js rel32
86197 -u32* JS32( u32 to );
86198 -
86199 -// call func
86200 -void CALLFunc( uptr func); // based on CALL32
86201 -// call rel32
86202 -void CALL32( u32 to );
86203 -// call r32
86204 -void CALL32R( x86IntRegType to );
86205 -// call m32
86206 -void CALL32M( uptr to );
86207 -
86208 -
86209 -////////////////////////////////////
86210 -// misc instructions //
86211 -////////////////////////////////////
86212 -
86213 -// cmp imm32 to r64
86214 -void CMP64I32toR( x86IntRegType to, u32 from );
86215 -// cmp m64 to r64
86216 -void CMP64MtoR( x86IntRegType to, uptr from );
86217 -// cmp r64 to r64
86218 -void CMP64RtoR( x86IntRegType to, x86IntRegType from );
86219 -
86220 -// cmp imm32 to r32
86221 -void CMP32ItoR( x86IntRegType to, u32 from );
86222 -// cmp imm32 to m32
86223 -void CMP32ItoM( uptr to, u32 from );
86224 -// cmp r32 to r32
86225 -void CMP32RtoR( x86IntRegType to, x86IntRegType from );
86226 -// cmp m32 to r32
86227 -void CMP32MtoR( x86IntRegType to, uptr from );
86228 -// cmp imm32 to [r32]
86229 -void CMP32I8toRm( x86IntRegType to, u8 from);
86230 -// cmp imm32 to [r32+off]
86231 -void CMP32I8toRmOffset8( x86IntRegType to, u8 from, u8 off);
86232 -// cmp imm8 to [r32]
86233 -void CMP32I8toM( uptr to, u8 from);
86234 -
86235 -// cmp imm16 to r16
86236 -void CMP16ItoR( x86IntRegType to, u16 from );
86237 -// cmp imm16 to m16
86238 -void CMP16ItoM( uptr to, u16 from );
86239 -// cmp r16 to r16
86240 -void CMP16RtoR( x86IntRegType to, x86IntRegType from );
86241 -// cmp m16 to r16
86242 -void CMP16MtoR( x86IntRegType to, uptr from );
86243 -
86244 -// cmp imm8 to r8
86245 -void CMP8ItoR( x86IntRegType to, u8 from );
86246 -// cmp m8 to r8
86247 -void CMP8MtoR( x86IntRegType to, uptr from );
86248 -
86249 -// test imm32 to r32
86250 -void TEST32ItoR( x86IntRegType to, u32 from );
86251 -// test imm32 to m32
86252 -void TEST32ItoM( uptr to, u32 from );
86253 -// test r32 to r32
86254 -void TEST32RtoR( x86IntRegType to, x86IntRegType from );
86255 -// test imm32 to [r32]
86256 -void TEST32ItoRm( x86IntRegType to, u32 from );
86257 -// test imm16 to r16
86258 -void TEST16ItoR( x86IntRegType to, u16 from );
86259 -// test r16 to r16
86260 -void TEST16RtoR( x86IntRegType to, x86IntRegType from );
86261 -// test imm8 to r8
86262 -void TEST8ItoR( x86IntRegType to, u8 from );
86263 -// test imm8 to r8
86264 -void TEST8ItoM( uptr to, u8 from );
86265 -
86266 -// sets r8
86267 -void SETS8R( x86IntRegType to );
86268 -// setl r8
86269 -void SETL8R( x86IntRegType to );
86270 -// setge r8
86271 -void SETGE8R( x86IntRegType to );
86272 -// setge r8
86273 -void SETG8R( x86IntRegType to );
86274 -// seta r8
86275 -void SETA8R( x86IntRegType to );
86276 -// setae r8
86277 -void SETAE8R( x86IntRegType to );
86278 -// setb r8
86279 -void SETB8R( x86IntRegType to );
86280 -// setnz r8
86281 -void SETNZ8R( x86IntRegType to );
86282 -// setz r8
86283 -void SETZ8R( x86IntRegType to );
86284 -// sete r8
86285 -void SETE8R( x86IntRegType to );
86286 -
86287 -// push imm32
86288 -void PUSH32I( u32 from );
86289 -
86290 -#ifdef __x86_64__
86291 -void PUSHI( u32 from );
86292 -// push r64
86293 -void PUSH64R( x86IntRegType from );
86294 -// push m64
86295 -void PUSH64M( uptr from );
86296 -// pop r32
86297 -void POP64R( x86IntRegType from );
86298 -#else
86299 -// push r32
86300 -void PUSH32R( x86IntRegType from );
86301 -// push m32
86302 -void PUSH32M( u32 from );
86303 -// push imm32
86304 -void PUSH32I( u32 from );
86305 -// pop r32
86306 -void POP32R( x86IntRegType from );
86307 -// pushad
86308 -void PUSHA32( void );
86309 -// popad
86310 -void POPA32( void );
86311 -#endif
86312 -
86313 -void PUSHR(x86IntRegType from);
86314 -void POPR(x86IntRegType from);
86315 -
86316 -// pushfd
86317 -void PUSHFD( void );
86318 -// popfd
86319 -void POPFD( void );
86320 -// ret
86321 -void RET( void );
86322 -// ret (2-byte code used for misprediction)
86323 -void RET2( void );
86324 -
86325 -void CBW();
86326 -void CWDE();
86327 -// cwd
86328 -void CWD( void );
86329 -// cdq
86330 -void CDQ( void );
86331 -// cdqe
86332 -void CDQE( void );
86333 -
86334 -void LAHF();
86335 -void SAHF();
86336 -
86337 -void BT32ItoR( x86IntRegType to, x86IntRegType from );
86338 -void BSRRtoR(x86IntRegType to, x86IntRegType from);
86339 -void BSWAP32R( x86IntRegType to );
86340 -
86341 -// to = from + offset
86342 -void LEA16RtoR(x86IntRegType to, x86IntRegType from, u16 offset);
86343 -void LEA32RtoR(x86IntRegType to, x86IntRegType from, u32 offset);
86344 -
86345 -// to = from0 + from1
86346 -void LEA16RRtoR(x86IntRegType to, x86IntRegType from0, x86IntRegType from1);
86347 -void LEA32RRtoR(x86IntRegType to, x86IntRegType from0, x86IntRegType from1);
86348 -
86349 -// to = from << scale (max is 3)
86350 -void LEA16RStoR(x86IntRegType to, x86IntRegType from, u32 scale);
86351 -void LEA32RStoR(x86IntRegType to, x86IntRegType from, u32 scale);
86352 -
86353 -//******************
86354 -// FPU instructions
86355 -//******************
86356 -
86357 -// fild m32 to fpu reg stack
86358 -void FILD32( u32 from );
86359 -// fistp m32 from fpu reg stack
86360 -void FISTP32( u32 from );
86361 -// fld m32 to fpu reg stack
86362 -void FLD32( u32 from );
86363 -// fld st(i)
86364 -void FLD(int st);
86365 -// fld1 (push +1.0f on the stack)
86366 -void FLD1();
86367 -// fld1 (push log_2 e on the stack)
86368 -void FLDL2E();
86369 -// fst m32 from fpu reg stack
86370 -void FST32( u32 to );
86371 -// fstp m32 from fpu reg stack
86372 -void FSTP32( u32 to );
86373 -// fstp st(i)
86374 -void FSTP(int st);
86375 -
86376 -// fldcw fpu control word from m16
86377 -void FLDCW( u32 from );
86378 -// fstcw fpu control word to m16
86379 -void FNSTCW( u32 to );
86380 -void FXAM();
86381 -void FDECSTP();
86382 -// frndint
86383 -void FRNDINT();
86384 -void FXCH(int st);
86385 -void F2XM1();
86386 -void FSCALE();
86387 -
86388 -// fadd ST(src) to fpu reg stack ST(0)
86389 -void FADD32Rto0( x86IntRegType src );
86390 -// fadd ST(0) to fpu reg stack ST(src)
86391 -void FADD320toR( x86IntRegType src );
86392 -// fsub ST(src) to fpu reg stack ST(0)
86393 -void FSUB32Rto0( x86IntRegType src );
86394 -// fsub ST(0) to fpu reg stack ST(src)
86395 -void FSUB320toR( x86IntRegType src );
86396 -// fsubp -> subtract ST(0) from ST(1), store in ST(1) and POP stack
86397 -void FSUBP( void );
86398 -// fmul ST(src) to fpu reg stack ST(0)
86399 -void FMUL32Rto0( x86IntRegType src );
86400 -// fmul ST(0) to fpu reg stack ST(src)
86401 -void FMUL320toR( x86IntRegType src );
86402 -// fdiv ST(src) to fpu reg stack ST(0)
86403 -void FDIV32Rto0( x86IntRegType src );
86404 -// fdiv ST(0) to fpu reg stack ST(src)
86405 -void FDIV320toR( x86IntRegType src );
86406 -// fdiv ST(0) to fpu reg stack ST(src), pop stack, store in ST(src)
86407 -void FDIV320toRP( x86IntRegType src );
86408 -
86409 -// fadd m32 to fpu reg stack
86410 -void FADD32( u32 from );
86411 -// fsub m32 to fpu reg stack
86412 -void FSUB32( u32 from );
86413 -// fmul m32 to fpu reg stack
86414 -void FMUL32( u32 from );
86415 -// fdiv m32 to fpu reg stack
86416 -void FDIV32( u32 from );
86417 -// fcomi st, st( i)
86418 -void FCOMI( x86IntRegType src );
86419 -// fcomip st, st( i)
86420 -void FCOMIP( x86IntRegType src );
86421 -// fucomi st, st( i)
86422 -void FUCOMI( x86IntRegType src );
86423 -// fucomip st, st( i)
86424 -void FUCOMIP( x86IntRegType src );
86425 -// fcom m32 to fpu reg stack
86426 -void FCOM32( u32 from );
86427 -// fabs fpu reg stack
86428 -void FABS( void );
86429 -// fsqrt fpu reg stack
86430 -void FSQRT( void );
86431 -// ftan fpu reg stack
86432 -void FPATAN( void );
86433 -// fsin fpu reg stack
86434 -void FSIN( void );
86435 -// fchs fpu reg stack
86436 -void FCHS( void );
86437 -
86438 -// fcmovb fpu reg to fpu reg stack
86439 -void FCMOVB32( x86IntRegType from );
86440 -// fcmove fpu reg to fpu reg stack
86441 -void FCMOVE32( x86IntRegType from );
86442 -// fcmovbe fpu reg to fpu reg stack
86443 -void FCMOVBE32( x86IntRegType from );
86444 -// fcmovu fpu reg to fpu reg stack
86445 -void FCMOVU32( x86IntRegType from );
86446 -// fcmovnb fpu reg to fpu reg stack
86447 -void FCMOVNB32( x86IntRegType from );
86448 -// fcmovne fpu reg to fpu reg stack
86449 -void FCMOVNE32( x86IntRegType from );
86450 -// fcmovnbe fpu reg to fpu reg stack
86451 -void FCMOVNBE32( x86IntRegType from );
86452 -// fcmovnu fpu reg to fpu reg stack
86453 -void FCMOVNU32( x86IntRegType from );
86454 -void FCOMP32( u32 from );
86455 -void FNSTSWtoAX( void );
86456 -
86457 -// probably a little extreme here, but x86-64 should NOT use MMX
86458 -#ifdef __x86_64__
86459 -
86460 -#define MMXONLY(code)
86461 -
86462 -#else
86463 -
86464 -#define MMXONLY(code) code
86465 -
86466 -//******************
86467 -// MMX instructions
86468 -//******************
86469 -
86470 -// r64 = mm
86471 -
86472 -// movq m64 to r64
86473 -void MOVQMtoR( x86MMXRegType to, uptr from );
86474 -// movq r64 to m64
86475 -void MOVQRtoM( uptr to, x86MMXRegType from );
86476 -
86477 -// pand r64 to r64
86478 -void PANDRtoR( x86MMXRegType to, x86MMXRegType from );
86479 -void PANDNRtoR( x86MMXRegType to, x86MMXRegType from );
86480 -// pand m64 to r64 ;
86481 -void PANDMtoR( x86MMXRegType to, uptr from );
86482 -// pandn r64 to r64
86483 -void PANDNRtoR( x86MMXRegType to, x86MMXRegType from );
86484 -// pandn r64 to r64
86485 -void PANDNMtoR( x86MMXRegType to, uptr from );
86486 -// por r64 to r64
86487 -void PORRtoR( x86MMXRegType to, x86MMXRegType from );
86488 -// por m64 to r64
86489 -void PORMtoR( x86MMXRegType to, uptr from );
86490 -// pxor r64 to r64
86491 -void PXORRtoR( x86MMXRegType to, x86MMXRegType from );
86492 -// pxor m64 to r64
86493 -void PXORMtoR( x86MMXRegType to, uptr from );
86494 -
86495 -// psllq r64 to r64
86496 -void PSLLQRtoR( x86MMXRegType to, x86MMXRegType from );
86497 -// psllq m64 to r64
86498 -void PSLLQMtoR( x86MMXRegType to, uptr from );
86499 -// psllq imm8 to r64
86500 -void PSLLQItoR( x86MMXRegType to, u8 from );
86501 -// psrlq r64 to r64
86502 -void PSRLQRtoR( x86MMXRegType to, x86MMXRegType from );
86503 -// psrlq m64 to r64
86504 -void PSRLQMtoR( x86MMXRegType to, uptr from );
86505 -// psrlq imm8 to r64
86506 -void PSRLQItoR( x86MMXRegType to, u8 from );
86507 -
86508 -// paddusb r64 to r64
86509 -void PADDUSBRtoR( x86MMXRegType to, x86MMXRegType from );
86510 -// paddusb m64 to r64
86511 -void PADDUSBMtoR( x86MMXRegType to, uptr from );
86512 -// paddusw r64 to r64
86513 -void PADDUSWRtoR( x86MMXRegType to, x86MMXRegType from );
86514 -// paddusw m64 to r64
86515 -void PADDUSWMtoR( x86MMXRegType to, uptr from );
86516 -
86517 -// paddb r64 to r64
86518 -void PADDBRtoR( x86MMXRegType to, x86MMXRegType from );
86519 -// paddb m64 to r64
86520 -void PADDBMtoR( x86MMXRegType to, uptr from );
86521 -// paddw r64 to r64
86522 -void PADDWRtoR( x86MMXRegType to, x86MMXRegType from );
86523 -// paddw m64 to r64
86524 -void PADDWMtoR( x86MMXRegType to, uptr from );
86525 -// paddd r64 to r64
86526 -void PADDDRtoR( x86MMXRegType to, x86MMXRegType from );
86527 -// paddd m64 to r64
86528 -void PADDDMtoR( x86MMXRegType to, uptr from );
86529 -void PADDSBRtoR( x86MMXRegType to, x86MMXRegType from );
86530 -void PADDSWRtoR( x86MMXRegType to, x86MMXRegType from );
86531 -
86532 -// paddq m64 to r64 (sse2 only?)
86533 -void PADDQMtoR( x86MMXRegType to, uptr from );
86534 -// paddq r64 to r64 (sse2 only?)
86535 -void PADDQRtoR( x86MMXRegType to, x86MMXRegType from );
86536 -
86537 -void PSUBSBRtoR( x86MMXRegType to, x86MMXRegType from );
86538 -void PSUBSWRtoR( x86MMXRegType to, x86MMXRegType from );
86539 -
86540 -void PSUBBRtoR( x86MMXRegType to, x86MMXRegType from );
86541 -void PSUBWRtoR( x86MMXRegType to, x86MMXRegType from );
86542 -void PSUBDRtoR( x86MMXRegType to, x86MMXRegType from );
86543 -void PSUBDMtoR( x86MMXRegType to, uptr from );
86544 -
86545 -// psubq m64 to r64 (sse2 only?)
86546 -void PSUBQMtoR( x86MMXRegType to, uptr from );
86547 -// psubq r64 to r64 (sse2 only?)
86548 -void PSUBQRtoR( x86MMXRegType to, x86MMXRegType from );
86549 -
86550 -// pmuludq m64 to r64 (sse2 only?)
86551 -void PMULUDQMtoR( x86MMXRegType to, uptr from );
86552 -// pmuludq r64 to r64 (sse2 only?)
86553 -void PMULUDQRtoR( x86MMXRegType to, x86MMXRegType from );
86554 -
86555 -void PCMPEQBRtoR( x86MMXRegType to, x86MMXRegType from );
86556 -void PCMPEQWRtoR( x86MMXRegType to, x86MMXRegType from );
86557 -void PCMPEQDRtoR( x86MMXRegType to, x86MMXRegType from );
86558 -void PCMPEQDMtoR( x86MMXRegType to, uptr from );
86559 -void PCMPGTBRtoR( x86MMXRegType to, x86MMXRegType from );
86560 -void PCMPGTWRtoR( x86MMXRegType to, x86MMXRegType from );
86561 -void PCMPGTDRtoR( x86MMXRegType to, x86MMXRegType from );
86562 -void PCMPGTDMtoR( x86MMXRegType to, uptr from );
86563 -void PSRLWItoR( x86MMXRegType to, u8 from );
86564 -void PSRLDItoR( x86MMXRegType to, u8 from );
86565 -void PSRLDRtoR( x86MMXRegType to, x86MMXRegType from );
86566 -void PSLLWItoR( x86MMXRegType to, u8 from );
86567 -void PSLLDItoR( x86MMXRegType to, u8 from );
86568 -void PSLLDRtoR( x86MMXRegType to, x86MMXRegType from );
86569 -void PSRAWItoR( x86MMXRegType to, u8 from );
86570 -void PSRADItoR( x86MMXRegType to, u8 from );
86571 -void PSRADRtoR( x86MMXRegType to, x86MMXRegType from );
86572 -void PUNPCKLDQRtoR( x86MMXRegType to, x86MMXRegType from );
86573 -void PUNPCKLDQMtoR( x86MMXRegType to, uptr from );
86574 -void PUNPCKHDQRtoR( x86MMXRegType to, x86MMXRegType from );
86575 -void PUNPCKHDQMtoR( x86MMXRegType to, uptr from );
86576 -void MOVQ64ItoR( x86MMXRegType reg, u64 i ); //Prototype.Todo add all consts to end of block.not after jr $+8
86577 -void MOVQRtoR( x86MMXRegType to, x86MMXRegType from );
86578 -void MOVQRmtoROffset( x86MMXRegType to, x86IntRegType from, u32 offset );
86579 -void MOVQRtoRmOffset( x86IntRegType to, x86MMXRegType from, u32 offset );
86580 -void MOVDMtoMMX( x86MMXRegType to, uptr from );
86581 -void MOVDMMXtoM( uptr to, x86MMXRegType from );
86582 -void MOVD32RtoMMX( x86MMXRegType to, x86IntRegType from );
86583 -void MOVD32RmtoMMX( x86MMXRegType to, x86IntRegType from );
86584 -void MOVD32RmOffsettoMMX( x86MMXRegType to, x86IntRegType from, u32 offset );
86585 -void MOVD32MMXtoR( x86IntRegType to, x86MMXRegType from );
86586 -void MOVD32MMXtoRm( x86IntRegType to, x86MMXRegType from );
86587 -void MOVD32MMXtoRmOffset( x86IntRegType to, x86MMXRegType from, u32 offset );
86588 -void PINSRWRtoMMX( x86MMXRegType to, x86SSERegType from, u8 imm8 );
86589 -void PSHUFWRtoR(x86MMXRegType to, x86MMXRegType from, u8 imm8);
86590 -void PSHUFWMtoR(x86MMXRegType to, uptr from, u8 imm8);
86591 -void MASKMOVQRtoR(x86MMXRegType to, x86MMXRegType from);
86592 -
86593 -// emms
86594 -void EMMS( void );
86595 -
86596 -//**********************************************************************************/
86597 -//PACKSSWB,PACKSSDW: Pack Saturate Signed Word 64bits
86598 -//**********************************************************************************
86599 -void PACKSSWBMMXtoMMX(x86MMXRegType to, x86MMXRegType from);
86600 -void PACKSSDWMMXtoMMX(x86MMXRegType to, x86MMXRegType from);
86601 -
86602 -void PMOVMSKBMMXtoR(x86IntRegType to, x86MMXRegType from);
86603 -
86604 -void SSE2_MOVDQ2Q_XMM_to_MM( x86MMXRegType to, x86SSERegType from);
86605 -void SSE2_MOVQ2DQ_MM_to_XMM( x86SSERegType to, x86MMXRegType from);
86606 -
86607 -#endif // !__x86_64__
86608 -
86609 -//*********************
86610 -// SSE instructions *
86611 -//*********************
86612 -void SSE_MOVAPS_M128_to_XMM( x86SSERegType to, uptr from );
86613 -void SSE_MOVAPS_XMM_to_M128( uptr to, x86SSERegType from );
86614 -void SSE_MOVAPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86615 -
86616 -void SSE_MOVUPS_M128_to_XMM( x86SSERegType to, uptr from );
86617 -void SSE_MOVUPS_XMM_to_M128( uptr to, x86SSERegType from );
86618 -
86619 -void SSE_MOVSS_M32_to_XMM( x86SSERegType to, uptr from );
86620 -void SSE_MOVSS_XMM_to_M32( u32 to, x86SSERegType from );
86621 -void SSE_MOVSS_XMM_to_Rm( x86IntRegType to, x86SSERegType from );
86622 -void SSE_MOVSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86623 -void SSE_MOVSS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset );
86624 -void SSE_MOVSS_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset );
86625 -
86626 -void SSE2_MOVSD_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86627 -
86628 -void SSE2_MOVQ_M64_to_XMM( x86SSERegType to, uptr from );
86629 -void SSE2_MOVQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86630 -void SSE2_MOVQ_XMM_to_M64( u32 to, x86SSERegType from );
86631 -
86632 -void SSE_MASKMOVDQU_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86633 -
86634 -void SSE_MOVLPS_M64_to_XMM( x86SSERegType to, uptr from );
86635 -void SSE_MOVLPS_XMM_to_M64( u32 to, x86SSERegType from );
86636 -void SSE_MOVLPS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset );
86637 -void SSE_MOVLPS_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset );
86638 -
86639 -void SSE_MOVHPS_M64_to_XMM( x86SSERegType to, uptr from );
86640 -void SSE_MOVHPS_XMM_to_M64( u32 to, x86SSERegType from );
86641 -void SSE_MOVHPS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset );
86642 -void SSE_MOVHPS_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset );
86643 -
86644 -void SSE_MOVLHPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86645 -void SSE_MOVHLPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86646 -void SSE_MOVLPSRmtoR( x86SSERegType to, x86IntRegType from );
86647 -void SSE_MOVLPSRmtoROffset( x86SSERegType to, x86IntRegType from, int offset );
86648 -void SSE_MOVLPSRtoRm( x86SSERegType to, x86IntRegType from );
86649 -void SSE_MOVLPSRtoRmOffset( x86SSERegType to, x86IntRegType from, int offset );
86650 -
86651 -void SSE_MOVAPSRmStoR( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale );
86652 -void SSE_MOVAPSRtoRmS( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale );
86653 -void SSE_MOVAPSRtoRmOffset( x86IntRegType to, x86SSERegType from, int offset );
86654 -void SSE_MOVAPSRmtoROffset( x86SSERegType to, x86IntRegType from, int offset );
86655 -void SSE_MOVUPSRmStoR( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale );
86656 -void SSE_MOVUPSRtoRmS( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale );
86657 -void SSE_MOVUPSRtoRm( x86IntRegType to, x86IntRegType from );
86658 -void SSE_MOVUPSRmtoR( x86IntRegType to, x86IntRegType from );
86659 -
86660 -void SSE_MOVUPSRmtoROffset( x86SSERegType to, x86IntRegType from, int offset );
86661 -void SSE_MOVUPSRtoRmOffset( x86SSERegType to, x86IntRegType from, int offset );
86662 -
86663 -void SSE2_MOVDQARtoRmOffset( x86IntRegType to, x86SSERegType from, int offset );
86664 -void SSE2_MOVDQARmtoROffset( x86SSERegType to, x86IntRegType from, int offset );
86665 -
86666 -void SSE_RCPPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86667 -void SSE_RCPPS_M128_to_XMM( x86SSERegType to, uptr from );
86668 -void SSE_RCPSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86669 -void SSE_RCPSS_M32_to_XMM( x86SSERegType to, uptr from );
86670 -
86671 -void SSE_ORPS_M128_to_XMM( x86SSERegType to, uptr from );
86672 -void SSE_ORPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86673 -void SSE_XORPS_M128_to_XMM( x86SSERegType to, uptr from );
86674 -void SSE_XORPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86675 -void SSE_ANDPS_M128_to_XMM( x86SSERegType to, uptr from );
86676 -void SSE_ANDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86677 -void SSE_ANDNPS_M128_to_XMM( x86SSERegType to, uptr from );
86678 -void SSE_ANDNPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86679 -void SSE_ADDPS_M128_to_XMM( x86SSERegType to, uptr from );
86680 -void SSE_ADDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86681 -void SSE_ADDSS_M32_to_XMM( x86SSERegType to, uptr from );
86682 -void SSE_ADDSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86683 -void SSE_SUBPS_M128_to_XMM( x86SSERegType to, uptr from );
86684 -void SSE_SUBPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86685 -void SSE_SUBSS_M32_to_XMM( x86SSERegType to, uptr from );
86686 -void SSE_SUBSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86687 -void SSE_MULPS_M128_to_XMM( x86SSERegType to, uptr from );
86688 -void SSE_MULPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86689 -void SSE_MULSS_M32_to_XMM( x86SSERegType to, uptr from );
86690 -void SSE_MULSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86691 -void SSE_CMPEQSS_M32_to_XMM( x86SSERegType to, uptr from );
86692 -void SSE_CMPEQSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86693 -void SSE_CMPLTSS_M32_to_XMM( x86SSERegType to, uptr from );
86694 -void SSE_CMPLTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86695 -void SSE_CMPLESS_M32_to_XMM( x86SSERegType to, uptr from );
86696 -void SSE_CMPLESS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86697 -void SSE_CMPUNORDSS_M32_to_XMM( x86SSERegType to, uptr from );
86698 -void SSE_CMPUNORDSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86699 -void SSE_CMPNESS_M32_to_XMM( x86SSERegType to, uptr from );
86700 -void SSE_CMPNESS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86701 -void SSE_CMPNLTSS_M32_to_XMM( x86SSERegType to, uptr from );
86702 -void SSE_CMPNLTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86703 -void SSE_CMPNLESS_M32_to_XMM( x86SSERegType to, uptr from );
86704 -void SSE_CMPNLESS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86705 -void SSE_CMPORDSS_M32_to_XMM( x86SSERegType to, uptr from );
86706 -void SSE_CMPORDSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86707 -
86708 -void SSE_UCOMISS_M32_to_XMM( x86SSERegType to, uptr from );
86709 -void SSE_UCOMISS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86710 -
86711 -#ifndef __x86_64__
86712 -void SSE_PMAXSW_MM_to_MM( x86MMXRegType to, x86MMXRegType from );
86713 -void SSE_PMINSW_MM_to_MM( x86MMXRegType to, x86MMXRegType from );
86714 -void SSE_CVTPI2PS_MM_to_XMM( x86SSERegType to, x86MMXRegType from );
86715 -void SSE_CVTPS2PI_M64_to_MM( x86MMXRegType to, uptr from );
86716 -void SSE_CVTPS2PI_XMM_to_MM( x86MMXRegType to, x86SSERegType from );
86717 -#endif
86718 -void SSE_CVTPI2PS_M64_to_XMM( x86SSERegType to, uptr from );
86719 -void SSE_CVTTSS2SI_M32_to_R32(x86IntRegType to, uptr from);
86720 -void SSE_CVTTSS2SI_XMM_to_R32(x86IntRegType to, x86SSERegType from);
86721 -void SSE_CVTSI2SS_M32_to_XMM(x86SSERegType to, uptr from);
86722 -void SSE_CVTSI2SS_R_to_XMM(x86SSERegType to, x86IntRegType from);
86723 -
86724 -void SSE2_CVTDQ2PS_M128_to_XMM( x86SSERegType to, uptr from );
86725 -void SSE2_CVTDQ2PS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86726 -void SSE2_CVTPS2DQ_M128_to_XMM( x86SSERegType to, uptr from );
86727 -void SSE2_CVTPS2DQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86728 -void SSE2_CVTTPS2DQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86729 -
86730 -void SSE_MAXPS_M128_to_XMM( x86SSERegType to, uptr from );
86731 -void SSE_MAXPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86732 -void SSE_MAXSS_M32_to_XMM( x86SSERegType to, uptr from );
86733 -void SSE_MAXSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86734 -void SSE_MINPS_M128_to_XMM( x86SSERegType to, uptr from );
86735 -void SSE_MINPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86736 -void SSE_MINSS_M32_to_XMM( x86SSERegType to, uptr from );
86737 -void SSE_MINSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86738 -void SSE_RSQRTPS_M128_to_XMM( x86SSERegType to, uptr from );
86739 -void SSE_RSQRTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86740 -void SSE_RSQRTSS_M32_to_XMM( x86SSERegType to, uptr from );
86741 -void SSE_RSQRTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86742 -void SSE_SQRTPS_M128_to_XMM( x86SSERegType to, uptr from );
86743 -void SSE_SQRTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86744 -void SSE_SQRTSS_M32_to_XMM( x86SSERegType to, uptr from );
86745 -void SSE_SQRTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86746 -void SSE_UNPCKLPS_M128_to_XMM( x86SSERegType to, uptr from );
86747 -void SSE_UNPCKLPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86748 -void SSE_UNPCKHPS_M128_to_XMM( x86SSERegType to, uptr from );
86749 -void SSE_UNPCKHPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86750 -void SSE_SHUFPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 );
86751 -void SSE_SHUFPS_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 );
86752 -void SSE_SHUFPS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset, u8 imm8 );
86753 -void SSE_CMPEQPS_M128_to_XMM( x86SSERegType to, uptr from );
86754 -void SSE_CMPEQPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86755 -void SSE_CMPLTPS_M128_to_XMM( x86SSERegType to, uptr from );
86756 -void SSE_CMPLTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86757 -void SSE_CMPLEPS_M128_to_XMM( x86SSERegType to, uptr from );
86758 -void SSE_CMPLEPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86759 -void SSE_CMPUNORDPS_M128_to_XMM( x86SSERegType to, uptr from );
86760 -void SSE_CMPUNORDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86761 -void SSE_CMPNEPS_M128_to_XMM( x86SSERegType to, uptr from );
86762 -void SSE_CMPNEPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86763 -void SSE_CMPNLTPS_M128_to_XMM( x86SSERegType to, uptr from );
86764 -void SSE_CMPNLTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86765 -void SSE_CMPNLEPS_M128_to_XMM( x86SSERegType to, uptr from );
86766 -void SSE_CMPNLEPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86767 -void SSE_CMPORDPS_M128_to_XMM( x86SSERegType to, uptr from );
86768 -void SSE_CMPORDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86769 -void SSE_DIVPS_M128_to_XMM( x86SSERegType to, uptr from );
86770 -void SSE_DIVPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86771 -void SSE_DIVSS_M32_to_XMM( x86SSERegType to, uptr from );
86772 -void SSE_DIVSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86773 -// VectorPath
86774 -void SSE2_PSHUFD_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 );
86775 -void SSE2_PSHUFD_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 );
86776 -
86777 -void SSE2_PSHUFLW_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 );
86778 -void SSE2_PSHUFLW_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 );
86779 -void SSE2_PSHUFHW_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 );
86780 -void SSE2_PSHUFHW_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 );
86781 -
86782 -void SSE_STMXCSR( uptr from );
86783 -void SSE_LDMXCSR( uptr from );
86784 -
86785 -
86786 -//*********************
86787 -// SSE 2 Instructions*
86788 -//*********************
86789 -void SSE2_MOVDQA_M128_to_XMM(x86SSERegType to, uptr from);
86790 -void SSE2_MOVDQA_XMM_to_M128( uptr to, x86SSERegType from);
86791 -void SSE2_MOVDQA_XMM_to_XMM( x86SSERegType to, x86SSERegType from);
86792 -
86793 -void SSE2_MOVDQU_M128_to_XMM(x86SSERegType to, uptr from);
86794 -void SSE2_MOVDQU_XMM_to_M128( uptr to, x86SSERegType from);
86795 -void SSE2_MOVDQU_XMM_to_XMM( x86SSERegType to, x86SSERegType from);
86796 -
86797 -void SSE2_PSRLW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86798 -void SSE2_PSRLW_M128_to_XMM(x86SSERegType to, uptr from);
86799 -void SSE2_PSRLW_I8_to_XMM(x86SSERegType to, u8 imm8);
86800 -void SSE2_PSRLD_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86801 -void SSE2_PSRLD_M128_to_XMM(x86SSERegType to, uptr from);
86802 -void SSE2_PSRLD_I8_to_XMM(x86SSERegType to, u8 imm8);
86803 -void SSE2_PSRLQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86804 -void SSE2_PSRLQ_M128_to_XMM(x86SSERegType to, uptr from);
86805 -void SSE2_PSRLQ_I8_to_XMM(x86SSERegType to, u8 imm8);
86806 -void SSE2_PSRLDQ_I8_to_XMM(x86SSERegType to, u8 imm8);
86807 -void SSE2_PSRAW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86808 -void SSE2_PSRAW_M128_to_XMM(x86SSERegType to, uptr from);
86809 -void SSE2_PSRAW_I8_to_XMM(x86SSERegType to, u8 imm8);
86810 -void SSE2_PSRAD_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86811 -void SSE2_PSRAD_M128_to_XMM(x86SSERegType to, uptr from);
86812 -void SSE2_PSRAD_I8_to_XMM(x86SSERegType to, u8 imm8);
86813 -void SSE2_PSLLW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86814 -void SSE2_PSLLW_M128_to_XMM(x86SSERegType to, uptr from);
86815 -void SSE2_PSLLW_I8_to_XMM(x86SSERegType to, u8 imm8);
86816 -void SSE2_PSLLD_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86817 -void SSE2_PSLLD_M128_to_XMM(x86SSERegType to, uptr from);
86818 -void SSE2_PSLLD_I8_to_XMM(x86SSERegType to, u8 imm8);
86819 -void SSE2_PSLLQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86820 -void SSE2_PSLLQ_M128_to_XMM(x86SSERegType to, uptr from);
86821 -void SSE2_PSLLQ_I8_to_XMM(x86SSERegType to, u8 imm8);
86822 -void SSE2_PSLLDQ_I8_to_XMM(x86SSERegType to, u8 imm8);
86823 -void SSE2_PMAXSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86824 -void SSE2_PMAXSW_M128_to_XMM( x86SSERegType to, uptr from );
86825 -void SSE2_PMAXUB_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86826 -void SSE2_PMAXUB_M128_to_XMM( x86SSERegType to, uptr from );
86827 -void SSE2_PMINSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86828 -void SSE2_PMINSW_M128_to_XMM( x86SSERegType to, uptr from );
86829 -void SSE2_PMINUB_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86830 -void SSE2_PMINUB_M128_to_XMM( x86SSERegType to, uptr from );
86831 -void SSE2_PADDSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86832 -void SSE2_PADDSB_M128_to_XMM( x86SSERegType to, uptr from );
86833 -void SSE2_PADDSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86834 -void SSE2_PADDSW_M128_to_XMM( x86SSERegType to, uptr from );
86835 -void SSE2_PSUBSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86836 -void SSE2_PSUBSB_M128_to_XMM( x86SSERegType to, uptr from );
86837 -void SSE2_PSUBSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86838 -void SSE2_PSUBSW_M128_to_XMM( x86SSERegType to, uptr from );
86839 -void SSE2_PSUBUSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86840 -void SSE2_PSUBUSB_M128_to_XMM( x86SSERegType to, uptr from );
86841 -void SSE2_PSUBUSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86842 -void SSE2_PSUBUSW_M128_to_XMM( x86SSERegType to, uptr from );
86843 -void SSE2_PAND_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86844 -void SSE2_PAND_M128_to_XMM( x86SSERegType to, uptr from );
86845 -void SSE2_PANDN_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86846 -void SSE2_PANDN_M128_to_XMM( x86SSERegType to, uptr from );
86847 -void SSE2_PXOR_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86848 -void SSE2_PXOR_M128_to_XMM( x86SSERegType to, uptr from );
86849 -void SSE2_PADDW_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86850 -void SSE2_PADDW_M128_to_XMM(x86SSERegType to, uptr from );
86851 -void SSE2_PADDUSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86852 -void SSE2_PADDUSB_M128_to_XMM( x86SSERegType to, uptr from );
86853 -void SSE2_PADDUSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86854 -void SSE2_PADDUSW_M128_to_XMM( x86SSERegType to, uptr from );
86855 -void SSE2_PADDB_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86856 -void SSE2_PADDB_M128_to_XMM(x86SSERegType to, uptr from );
86857 -void SSE2_PADDD_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86858 -void SSE2_PADDD_M128_to_XMM(x86SSERegType to, uptr from );
86859 -void SSE2_PADDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86860 -void SSE2_PADDQ_M128_to_XMM(x86SSERegType to, uptr from );
86861 -
86862 -//**********************************************************************************/
86863 -//PACKSSWB,PACKSSDW: Pack Saturate Signed Word
86864 -//**********************************************************************************
86865 -void SSE2_PACKSSWB_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86866 -void SSE2_PACKSSWB_M128_to_XMM(x86SSERegType to, uptr from);
86867 -void SSE2_PACKSSDW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86868 -void SSE2_PACKSSDW_M128_to_XMM(x86SSERegType to, uptr from);
86869 -
86870 -void SSE2_PACKUSWB_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86871 -void SSE2_PACKUSWB_M128_to_XMM(x86SSERegType to, uptr from);
86872 -
86873 -//**********************************************************************************/
86874 -//PUNPCKHWD: Unpack 16bit high
86875 -//**********************************************************************************
86876 -void SSE2_PUNPCKLBW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86877 -void SSE2_PUNPCKLBW_M128_to_XMM(x86SSERegType to, uptr from);
86878 -void SSE2_PUNPCKHBW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86879 -void SSE2_PUNPCKHBW_M128_to_XMM(x86SSERegType to, uptr from);
86880 -
86881 -void SSE2_PUNPCKLWD_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86882 -void SSE2_PUNPCKLWD_M128_to_XMM(x86SSERegType to, uptr from);
86883 -void SSE2_PUNPCKHWD_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86884 -void SSE2_PUNPCKHWD_M128_to_XMM(x86SSERegType to, uptr from);
86885 -
86886 -void SSE2_PUNPCKLDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86887 -void SSE2_PUNPCKLDQ_M128_to_XMM(x86SSERegType to, uptr from);
86888 -void SSE2_PUNPCKHDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86889 -void SSE2_PUNPCKHDQ_M128_to_XMM(x86SSERegType to, uptr from);
86890 -
86891 -void SSE2_PUNPCKLQDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86892 -void SSE2_PUNPCKLQDQ_M128_to_XMM(x86SSERegType to, uptr from);
86893 -
86894 -void SSE2_PUNPCKHQDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86895 -void SSE2_PUNPCKHQDQ_M128_to_XMM(x86SSERegType to, uptr from);
86896 -
86897 -// mult by half words
86898 -void SSE2_PMULLW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86899 -void SSE2_PMULLW_M128_to_XMM(x86SSERegType to, uptr from);
86900 -void SSE2_PMULHW_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86901 -void SSE2_PMULHW_M128_to_XMM(x86SSERegType to, uptr from);
86902 -
86903 -void SSE2_PMULUDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86904 -void SSE2_PMULUDQ_M128_to_XMM(x86SSERegType to, uptr from);
86905 -
86906 -
86907 -//**********************************************************************************/
86908 -//PMOVMSKB: Create 16bit mask from signs of 8bit integers
86909 -//**********************************************************************************
86910 -void SSE2_PMOVMSKB_XMM_to_R32(x86IntRegType to, x86SSERegType from);
86911 -
86912 -void SSE_MOVMSKPS_XMM_to_R32(x86IntRegType to, x86SSERegType from);
86913 -void SSE2_MOVMSKPD_XMM_to_R32(x86IntRegType to, x86SSERegType from);
86914 -
86915 -//**********************************************************************************/
86916 -//PEXTRW,PINSRW: Packed Extract/Insert Word *
86917 -//**********************************************************************************
86918 -void SSE_PEXTRW_XMM_to_R32(x86IntRegType to, x86SSERegType from, u8 imm8 );
86919 -void SSE_PINSRW_R32_to_XMM(x86SSERegType from, x86IntRegType to, u8 imm8 );
86920 -
86921 -
86922 -//**********************************************************************************/
86923 -//PSUBx: Subtract Packed Integers *
86924 -//**********************************************************************************
86925 -void SSE2_PSUBB_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86926 -void SSE2_PSUBB_M128_to_XMM(x86SSERegType to, uptr from );
86927 -void SSE2_PSUBW_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86928 -void SSE2_PSUBW_M128_to_XMM(x86SSERegType to, uptr from );
86929 -void SSE2_PSUBD_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86930 -void SSE2_PSUBD_M128_to_XMM(x86SSERegType to, uptr from );
86931 -void SSE2_PSUBQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86932 -void SSE2_PSUBQ_M128_to_XMM(x86SSERegType to, uptr from );
86933 -///////////////////////////////////////////////////////////////////////////////////////
86934 -//**********************************************************************************/
86935 -//PCMPxx: Compare Packed Integers *
86936 -//**********************************************************************************
86937 -void SSE2_PCMPGTB_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86938 -void SSE2_PCMPGTB_M128_to_XMM(x86SSERegType to, uptr from );
86939 -void SSE2_PCMPGTW_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86940 -void SSE2_PCMPGTW_M128_to_XMM(x86SSERegType to, uptr from );
86941 -void SSE2_PCMPGTD_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86942 -void SSE2_PCMPGTD_M128_to_XMM(x86SSERegType to, uptr from );
86943 -void SSE2_PCMPEQB_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86944 -void SSE2_PCMPEQB_M128_to_XMM(x86SSERegType to, uptr from );
86945 -void SSE2_PCMPEQW_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86946 -void SSE2_PCMPEQW_M128_to_XMM(x86SSERegType to, uptr from );
86947 -void SSE2_PCMPEQD_XMM_to_XMM(x86SSERegType to, x86SSERegType from );
86948 -void SSE2_PCMPEQD_M128_to_XMM(x86SSERegType to, uptr from );
86949 -//**********************************************************************************/
86950 -//MOVD: Move Dword(32bit) to /from XMM reg *
86951 -//**********************************************************************************
86952 -void SSE2_MOVD_M32_to_XMM( x86SSERegType to, uptr from );
86953 -void SSE2_MOVD_R_to_XMM( x86SSERegType to, x86IntRegType from );
86954 -void SSE2_MOVD_Rm_to_XMM( x86SSERegType to, x86IntRegType from );
86955 -void SSE2_MOVD_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset );
86956 -void SSE2_MOVD_XMM_to_M32( u32 to, x86SSERegType from );
86957 -void SSE2_MOVD_XMM_to_R( x86IntRegType to, x86SSERegType from );
86958 -void SSE2_MOVD_XMM_to_Rm( x86IntRegType to, x86SSERegType from );
86959 -void SSE2_MOVD_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset );
86960 -
86961 -#ifdef __x86_64__
86962 -void SSE2_MOVQ_XMM_to_R( x86IntRegType to, x86SSERegType from );
86963 -void SSE2_MOVQ_R_to_XMM( x86SSERegType to, x86IntRegType from );
86964 -#endif
86965 -
86966 -//**********************************************************************************/
86967 -//POR : SSE Bitwise OR *
86968 -//**********************************************************************************
86969 -void SSE2_POR_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86970 -void SSE2_POR_M128_to_XMM( x86SSERegType to, uptr from );
86971 -
86972 -void SSE3_HADDPS_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86973 -void SSE3_HADDPS_M128_to_XMM(x86SSERegType to, uptr from);
86974 -
86975 -void SSE3_MOVSLDUP_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86976 -void SSE3_MOVSLDUP_M128_to_XMM(x86SSERegType to, uptr from);
86977 -void SSE3_MOVSHDUP_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
86978 -void SSE3_MOVSHDUP_M128_to_XMM(x86SSERegType to, uptr from);
86979 -//*********************
86980 -// SSE-X - uses both SSE,SSE2 code and tries to keep consistensies between the data
86981 -// Uses g_xmmtypes to infer the correct type.
86982 -//*********************
86983 -void SSEX_MOVDQA_M128_to_XMM( x86SSERegType to, uptr from );
86984 -void SSEX_MOVDQA_XMM_to_M128( uptr to, x86SSERegType from );
86985 -void SSEX_MOVDQA_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86986 -
86987 -void SSEX_MOVDQARmtoROffset( x86SSERegType to, x86IntRegType from, int offset );
86988 -void SSEX_MOVDQARtoRmOffset( x86IntRegType to, x86SSERegType from, int offset );
86989 -
86990 -void SSEX_MOVDQU_M128_to_XMM( x86SSERegType to, uptr from );
86991 -void SSEX_MOVDQU_XMM_to_M128( uptr to, x86SSERegType from );
86992 -void SSEX_MOVDQU_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
86993 -
86994 -void SSEX_MOVD_M32_to_XMM( x86SSERegType to, uptr from );
86995 -void SSEX_MOVD_XMM_to_M32( u32 to, x86SSERegType from );
86996 -void SSEX_MOVD_XMM_to_Rm( x86IntRegType to, x86SSERegType from );
86997 -void SSEX_MOVD_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset );
86998 -void SSEX_MOVD_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset );
86999 -
87000 -void SSEX_POR_M128_to_XMM( x86SSERegType to, uptr from );
87001 -void SSEX_POR_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
87002 -void SSEX_PXOR_M128_to_XMM( x86SSERegType to, uptr from );
87003 -void SSEX_PXOR_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
87004 -void SSEX_PAND_M128_to_XMM( x86SSERegType to, uptr from );
87005 -void SSEX_PAND_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
87006 -void SSEX_PANDN_M128_to_XMM( x86SSERegType to, uptr from );
87007 -void SSEX_PANDN_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
87008 -
87009 -void SSEX_PUNPCKLDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
87010 -void SSEX_PUNPCKLDQ_M128_to_XMM(x86SSERegType to, uptr from);
87011 -void SSEX_PUNPCKHDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from);
87012 -void SSEX_PUNPCKHDQ_M128_to_XMM(x86SSERegType to, uptr from);
87013 -
87014 -void SSEX_MOVHLPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
87015 -
87016 -//*********************
87017 -// 3DNOW instructions *
87018 -//*********************
87019 -void FEMMS( void );
87020 -void PFCMPEQMtoR( x86IntRegType to, uptr from );
87021 -void PFCMPGTMtoR( x86IntRegType to, uptr from );
87022 -void PFCMPGEMtoR( x86IntRegType to, uptr from );
87023 -void PFADDMtoR( x86IntRegType to, uptr from );
87024 -void PFADDRtoR( x86IntRegType to, x86IntRegType from );
87025 -void PFSUBMtoR( x86IntRegType to, uptr from );
87026 -void PFSUBRtoR( x86IntRegType to, x86IntRegType from );
87027 -void PFMULMtoR( x86IntRegType to, uptr from );
87028 -void PFMULRtoR( x86IntRegType to, x86IntRegType from );
87029 -void PFRCPMtoR( x86IntRegType to, uptr from );
87030 -void PFRCPRtoR( x86IntRegType to, x86IntRegType from );
87031 -void PFRCPIT1RtoR( x86IntRegType to, x86IntRegType from );
87032 -void PFRCPIT2RtoR( x86IntRegType to, x86IntRegType from );
87033 -void PFRSQRTRtoR( x86IntRegType to, x86IntRegType from );
87034 -void PFRSQIT1RtoR( x86IntRegType to, x86IntRegType from );
87035 -void PF2IDMtoR( x86IntRegType to, uptr from );
87036 -void PF2IDRtoR( x86IntRegType to, x86IntRegType from );
87037 -void PI2FDMtoR( x86IntRegType to, uptr from );
87038 -void PI2FDRtoR( x86IntRegType to, x86IntRegType from );
87039 -void PFMAXMtoR( x86IntRegType to, uptr from );
87040 -void PFMAXRtoR( x86IntRegType to, x86IntRegType from );
87041 -void PFMINMtoR( x86IntRegType to, uptr from );
87042 -void PFMINRtoR( x86IntRegType to, x86IntRegType from );
87043 -
87044 -void SSE2EMU_MOVSD_XMM_to_XMM( x86SSERegType to, x86SSERegType from);
87045 -void SSE2EMU_MOVQ_M64_to_XMM( x86SSERegType to, uptr from);
87046 -void SSE2EMU_MOVQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from);
87047 -void SSE2EMU_MOVD_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset );
87048 -void SSE2EMU_MOVD_XMM_to_RmOffset(x86IntRegType to, x86SSERegType from, int offset );
87049 -
87050 -#ifndef __x86_64__
87051 -void SSE2EMU_MOVDQ2Q_XMM_to_MM( x86MMXRegType to, x86SSERegType from);
87052 -void SSE2EMU_MOVQ2DQ_MM_to_XMM( x86SSERegType to, x86MMXRegType from);
87053 -#endif
87054 -
87055 -/* SSE2 emulated functions for SSE CPU's by kekko*/
87056 -
87057 -void SSE2EMU_PSHUFD_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 );
87058 -void SSE2EMU_MOVD_XMM_to_R( x86IntRegType to, x86SSERegType from );
87059 -void SSE2EMU_CVTPS2DQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from );
87060 -void SSE2EMU_CVTDQ2PS_M128_to_XMM( x86SSERegType to, uptr from );
87061 -void SSE2EMU_MOVD_XMM_to_M32( u32 to, x86SSERegType from );
87062 -void SSE2EMU_MOVD_R_to_XMM( x86SSERegType to, x86IntRegType from );
87063 -
87064 -////////////////////////////////////////////////////
87065 -#ifdef _DEBUG
87066 -#define WRITECHECK() CheckX86Ptr()
87067 -#else
87068 -#define WRITECHECK()
87069 -#endif
87070 -
87071 -#define write8(val ) { \
87072 - *(u8*)x86Ptr = (u8)val; \
87073 - x86Ptr++; \
87074 -} \
87075 -
87076 -#define write16(val ) \
87077 -{ \
87078 - *(u16*)x86Ptr = (u16)val; \
87079 - x86Ptr += 2; \
87080 -} \
87081 -
87082 -#define write32( val ) \
87083 -{ \
87084 - *(u32*)x86Ptr = val; \
87085 - x86Ptr += 4; \
87086 -} \
87087 -
87088 -#ifdef __cplusplus
87089 -}
87090 -#endif
87091 -
87092 -#endif // __IX86_H__
87093 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/ix86_3dnow.c new/libpcsxcore/libpcsxcore/ix86_64/ix86_3dnow.c
87094 --- original/libpcsxcore/libpcsxcore/ix86_64/ix86_3dnow.c 2007-10-08 17:13:28.000000000 -0400
87095 +++ new/libpcsxcore/libpcsxcore/ix86_64/ix86_3dnow.c 1969-12-31 20:00:00.000000000 -0400
87096 @@ -1,188 +0,0 @@
87097 -// stop compiling if NORECBUILD build (only for Visual Studio)
87098 -#if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
87099 -
87100 -#include "ix86-64.h"
87101 -
87102 -/**********************/
87103 -/* 3DNOW instructions */
87104 -/**********************/
87105 -
87106 -/* femms */
87107 -void FEMMS( void )
87108 -{
87109 - write16( 0x0E0F );
87110 -}
87111 -
87112 -void PFCMPEQMtoR( x86IntRegType to, uptr from )
87113 -{
87114 - write16( 0x0F0F );
87115 - ModRM( 0, to, DISP32 );
87116 - write32( from );
87117 - write8( 0xB0 );
87118 -}
87119 -
87120 -void PFCMPGTMtoR( x86IntRegType to, uptr from )
87121 -{
87122 - write16( 0x0F0F );
87123 - ModRM( 0, to, DISP32 );
87124 - write32( from );
87125 - write8( 0xA0 );
87126 -}
87127 -
87128 -void PFCMPGEMtoR( x86IntRegType to, uptr from )
87129 -{
87130 - write16( 0x0F0F );
87131 - ModRM( 0, to, DISP32 );
87132 - write32( from );
87133 - write8( 0x90 );
87134 -}
87135 -
87136 -void PFADDMtoR( x86IntRegType to, uptr from )
87137 -{
87138 - write16( 0x0F0F );
87139 - ModRM( 0, to, DISP32 );
87140 - write32( from );
87141 - write8( 0x9E );
87142 -}
87143 -
87144 -void PFADDRtoR( x86IntRegType to, x86IntRegType from )
87145 -{
87146 - write16( 0x0F0F );
87147 - ModRM( 3, to, from );
87148 - write8( 0x9E );
87149 -}
87150 -
87151 -void PFSUBMtoR( x86IntRegType to, uptr from )
87152 -{
87153 - write16( 0x0F0F );
87154 - ModRM( 0, to, DISP32 );
87155 - write32( from );
87156 - write8( 0x9A );
87157 -}
87158 -
87159 -void PFSUBRtoR( x86IntRegType to, x86IntRegType from )
87160 -{
87161 - write16( 0x0F0F );
87162 - ModRM( 3, to, from );
87163 - write8( 0x9A );
87164 -}
87165 -
87166 -void PFMULMtoR( x86IntRegType to, uptr from )
87167 -{
87168 - write16( 0x0F0F );
87169 - ModRM( 0, to, DISP32 );
87170 - write32( from );
87171 - write8( 0xB4 );
87172 -}
87173 -
87174 -void PFMULRtoR( x86IntRegType to, x86IntRegType from )
87175 -{
87176 - write16( 0x0F0F );
87177 - ModRM( 3, to, from );
87178 - write8( 0xB4 );
87179 -}
87180 -
87181 -void PFRCPMtoR( x86IntRegType to, uptr from )
87182 -{
87183 - write16( 0x0F0F );
87184 - ModRM( 0, to, DISP32 );
87185 - write32( from );
87186 - write8( 0x96 );
87187 -}
87188 -
87189 -void PFRCPRtoR( x86IntRegType to, x86IntRegType from )
87190 -{
87191 - write16( 0x0F0F );
87192 - ModRM( 3, to, from );
87193 - write8( 0x96 );
87194 -}
87195 -
87196 -void PFRCPIT1RtoR( x86IntRegType to, x86IntRegType from )
87197 -{
87198 - write16( 0x0F0F );
87199 - ModRM( 3, to, from );
87200 - write8( 0xA6 );
87201 -}
87202 -
87203 -void PFRCPIT2RtoR( x86IntRegType to, x86IntRegType from )
87204 -{
87205 - write16( 0x0F0F );
87206 - ModRM( 3, to, from );
87207 - write8( 0xB6 );
87208 -}
87209 -
87210 -void PFRSQRTRtoR( x86IntRegType to, x86IntRegType from )
87211 -{
87212 - write16( 0x0F0F );
87213 - ModRM( 3, to, from );
87214 - write8( 0x97 );
87215 -}
87216 -
87217 -void PFRSQIT1RtoR( x86IntRegType to, x86IntRegType from )
87218 -{
87219 - write16( 0x0F0F );
87220 - ModRM( 3, to, from );
87221 - write8( 0xA7 );
87222 -}
87223 -
87224 -void PF2IDMtoR( x86IntRegType to, uptr from )
87225 -{
87226 - write16( 0x0F0F );
87227 - ModRM( 0, to, DISP32 );
87228 - write32( from );
87229 - write8( 0x1D );
87230 -}
87231 -
87232 -void PF2IDRtoR( x86IntRegType to, x86IntRegType from )
87233 -{
87234 - write16( 0x0F0F );
87235 - ModRM( 3, to, from );
87236 - write8( 0x1D );
87237 -}
87238 -
87239 -void PI2FDMtoR( x86IntRegType to, uptr from )
87240 -{
87241 - write16( 0x0F0F );
87242 - ModRM( 0, to, DISP32 );
87243 - write32( from );
87244 - write8( 0x0D );
87245 -}
87246 -
87247 -void PI2FDRtoR( x86IntRegType to, x86IntRegType from )
87248 -{
87249 - write16( 0x0F0F );
87250 - ModRM( 3, to, from );
87251 - write8( 0x0D );
87252 -}
87253 -
87254 -void PFMAXMtoR( x86IntRegType to, uptr from )
87255 -{
87256 - write16( 0x0F0F );
87257 - ModRM( 0, to, DISP32 );
87258 - write32( from );
87259 - write8( 0xA4 );
87260 -}
87261 -
87262 -void PFMAXRtoR( x86IntRegType to, x86IntRegType from )
87263 -{
87264 - write16( 0x0F0F );
87265 - ModRM( 3, to, from );
87266 - write8( 0xA4 );
87267 -}
87268 -
87269 -void PFMINMtoR( x86IntRegType to, uptr from )
87270 -{
87271 - write16( 0x0F0F );
87272 - ModRM( 0, to, DISP32 );
87273 - write32( from );
87274 - write8( 0x94 );
87275 -}
87276 -
87277 -void PFMINRtoR( x86IntRegType to, x86IntRegType from )
87278 -{
87279 - write16( 0x0F0F );
87280 - ModRM( 3, to, from );
87281 - write8( 0x94 );
87282 -}
87283 -
87284 -#endif
87285 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/ix86_cpudetect.c new/libpcsxcore/libpcsxcore/ix86_64/ix86_cpudetect.c
87286 --- original/libpcsxcore/libpcsxcore/ix86_64/ix86_cpudetect.c 2007-10-08 17:13:28.000000000 -0400
87287 +++ new/libpcsxcore/libpcsxcore/ix86_64/ix86_cpudetect.c 1969-12-31 20:00:00.000000000 -0400
87288 @@ -1,487 +0,0 @@
87289 -/* Cpudetection lib
87290 - * Copyright (C) 2002-2003 Pcsx2 Team
87291 - *
87292 - * This program is free software; you can redistribute it and/or modify
87293 - * it under the terms of the GNU General Public License as published by
87294 - * the Free Software Foundation; either version 2 of the License, or
87295 - * (at your option) any later version.
87296 - *
87297 - * This program is distributed in the hope that it will be useful,
87298 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
87299 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
87300 - * GNU General Public License for more details.
87301 - *
87302 - * You should have received a copy of the GNU General Public License
87303 - * along with this program; if not, write to the Free Software
87304 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
87305 - */
87306 -#if defined (_WIN32)
87307 -#include <windows.h>
87308 -#endif
87309 -
87310 -#include <string.h>
87311 -#include <stdio.h>
87312 -
87313 -#include "ix86-64.h"
87314 -
87315 -#if defined (_MSC_VER) && _MSC_VER >= 1400
87316 -
87317 - void __cpuid(int* CPUInfo, int InfoType);
87318 - unsigned __int64 __rdtsc();
87319 -
87320 - #pragma intrinsic(__cpuid)
87321 - #pragma intrinsic(__rdtsc)
87322 -
87323 -#endif
87324 -
87325 -CAPABILITIES cpucaps;
87326 -CPUINFO cpuinfo;
87327 -
87328 -#define cpuid(cmd,a,b,c,d) \
87329 - __asm__ __volatile__("xchgl %%ebx, %1; cpuid; xchgl %%ebx, %1" \
87330 - : "=a" (a), "=r" (b), "=c" (c), "=d" (d) : "0" (cmd))
87331 -
87332 -static s32 iCpuId( u32 cmd, u32 *regs )
87333 -{
87334 - int flag=1;
87335 -
87336 -#if defined (_MSC_VER) && _MSC_VER >= 1400
87337 -
87338 - __cpuid( regs, cmd );
87339 -
87340 - return 0;
87341 -
87342 -#elif defined (_MSC_VER)
87343 -
87344 -#ifdef __x86_64__
87345 - assert(0);
87346 -#else // __x86_64__
87347 - __asm
87348 - {
87349 - push ebx;
87350 - push edi;
87351 -
87352 - pushfd;
87353 - pop eax;
87354 - mov edx, eax;
87355 - xor eax, 1 << 21;
87356 - push eax;
87357 - popfd;
87358 - pushfd;
87359 - pop eax;
87360 - xor eax, edx;
87361 - mov flag, eax;
87362 - }
87363 - if ( ! flag )
87364 - {
87365 - return -1;
87366 - }
87367 -
87368 - __asm
87369 - {
87370 - mov eax, cmd;
87371 - cpuid;
87372 - mov edi, [regs]
87373 - mov [edi], eax;
87374 - mov [edi+4], ebx;
87375 - mov [edi+8], ecx;
87376 - mov [edi+12], edx;
87377 -
87378 - pop edi;
87379 - pop ebx;
87380 - }
87381 -#endif // __x86_64__
87382 - return 0;
87383 -
87384 -
87385 -#else
87386 -
87387 -#ifndef __x86_64__
87388 - // see if we can use cpuid
87389 - __asm__ __volatile__ (
87390 - "sub $0x18, %%esp\n"
87391 - "pushf\n"
87392 - "pop %%eax\n"
87393 - "mov %%eax, %%edx\n"
87394 - "xor $0x200000, %%eax\n"
87395 - "push %%eax\n"
87396 - "popf\n"
87397 - "pushf\n"
87398 - "pop %%eax\n"
87399 - "xor %%edx, %%eax\n"
87400 - "mov %%eax, %0\n"
87401 - "add $0x18, %%esp\n"
87402 - : "=r"(flag) :
87403 - );
87404 -#endif
87405 -
87406 - if ( !flag )
87407 - return -1;
87408 -
87409 - cpuid(cmd, regs[0], regs[1], regs[2], regs[3]);
87410 -
87411 -#endif // _MSC_VER
87412 -}
87413 -
87414 -u64 GetCPUTick( void )
87415 -{
87416 -#if defined (_MSC_VER) && _MSC_VER >= 1400
87417 -
87418 - return __rdtsc();
87419 -
87420 -#elif defined(__MSCW32__) && !defined(__x86_64__)
87421 -
87422 - __asm rdtsc;
87423 -
87424 -#else
87425 -
87426 - u32 _a, _d;
87427 - __asm__ __volatile__ ("rdtsc" : "=a"(_a), "=d"(_d));
87428 - return (u64)_a | ((u64)_d << 32);
87429 -
87430 -#endif
87431 -}
87432 -
87433 -#if defined __LINUX__
87434 -
87435 -#include <sys/time.h>
87436 -#include <errno.h>
87437 -//*
87438 -unsigned long timeGetTime2()
87439 -{
87440 - struct timeval tv;
87441 - gettimeofday(&tv, 0); // well, maybe there are better ways
87442 - return (unsigned long)tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works
87443 -}
87444 -//*/
87445 -#endif
87446 -
87447 -s64 CPUSpeedHz( unsigned int time )
87448 -{
87449 - s64 timeStart,
87450 - timeStop;
87451 - s64 startTick,
87452 - endTick;
87453 - s64 overhead;
87454 -
87455 - if( ! cpucaps.hasTimeStampCounter )
87456 - {
87457 - return 0; //check if function is supported
87458 - }
87459 -
87460 - overhead = GetCPUTick() - GetCPUTick();
87461 -
87462 - timeStart = timeGetTime2( );
87463 - while( timeGetTime2( ) == timeStart )
87464 - {
87465 - timeStart = timeGetTime2( );
87466 - }
87467 - for(;;)
87468 - {
87469 - timeStop = timeGetTime2( );
87470 - if ( ( timeStop - timeStart ) > 1 )
87471 - {
87472 - startTick = GetCPUTick( );
87473 - break;
87474 - }
87475 - }
87476 -
87477 - timeStart = timeStop;
87478 - for(;;)
87479 - {
87480 - timeStop = timeGetTime2( );
87481 - if ( ( timeStop - timeStart ) > time )
87482 - {
87483 - endTick = GetCPUTick( );
87484 - break;
87485 - }
87486 - }
87487 -
87488 - return (s64)( ( endTick - startTick ) + ( overhead ) );
87489 -}
87490 -
87491 -////////////////////////////////////////////////////
87492 -void cpudetectInit( void )
87493 -{
87494 - u32 regs[ 4 ];
87495 - u32 cmds;
87496 - u32 AMDspeed;
87497 - s8 AMDspeedString[10];
87498 - int cputype=0; // Cpu type
87499 - //AMD 64 STUFF
87500 - u32 x86_64_8BITBRANDID;
87501 - u32 x86_64_12BITBRANDID;
87502 - memset( cpuinfo.x86ID, 0, sizeof( cpuinfo.x86ID ) );
87503 - cpuinfo.x86Family = 0;
87504 - cpuinfo.x86Model = 0;
87505 - cpuinfo.x86PType = 0;
87506 - cpuinfo.x86StepID = 0;
87507 - cpuinfo.x86Flags = 0;
87508 - cpuinfo.x86EFlags = 0;
87509 -
87510 - if ( iCpuId( 0, regs ) == -1 ) return;
87511 -
87512 - cmds = regs[ 0 ];
87513 - ((u32*)cpuinfo.x86ID)[ 0 ] = regs[ 1 ];
87514 - ((u32*)cpuinfo.x86ID)[ 1 ] = regs[ 3 ];
87515 - ((u32*)cpuinfo.x86ID)[ 2 ] = regs[ 2 ];
87516 - if ( cmds >= 0x00000001 )
87517 - {
87518 - if ( iCpuId( 0x00000001, regs ) != -1 )
87519 - {
87520 - cpuinfo.x86StepID = regs[ 0 ] & 0xf;
87521 - cpuinfo.x86Model = (regs[ 0 ] >> 4) & 0xf;
87522 - cpuinfo.x86Family = (regs[ 0 ] >> 8) & 0xf;
87523 - cpuinfo.x86PType = (regs[ 0 ] >> 12) & 0x3;
87524 - x86_64_8BITBRANDID = regs[1] & 0xff;
87525 - cpuinfo.x86Flags = regs[ 3 ];
87526 - }
87527 - }
87528 - if ( iCpuId( 0x80000000, regs ) != -1 )
87529 - {
87530 - cmds = regs[ 0 ];
87531 - if ( cmds >= 0x80000001 )
87532 - {
87533 - if ( iCpuId( 0x80000001, regs ) != -1 )
87534 - {
87535 - x86_64_12BITBRANDID = regs[1] & 0xfff;
87536 - cpuinfo.x86EFlags = regs[ 3 ];
87537 -
87538 - }
87539 - }
87540 - }
87541 - switch(cpuinfo.x86PType)
87542 - {
87543 - case 0:
87544 - strcpy( cpuinfo.x86Type, "Standard OEM");
87545 - break;
87546 - case 1:
87547 - strcpy( cpuinfo.x86Type, "Overdrive");
87548 - break;
87549 - case 2:
87550 - strcpy( cpuinfo.x86Type, "Dual");
87551 - break;
87552 - case 3:
87553 - strcpy( cpuinfo.x86Type, "Reserved");
87554 - break;
87555 - default:
87556 - strcpy( cpuinfo.x86Type, "Unknown");
87557 - break;
87558 - }
87559 - if ( cpuinfo.x86ID[ 0 ] == 'G' ){ cputype=0;}//trick lines but if you know a way better ;p
87560 - if ( cpuinfo.x86ID[ 0 ] == 'A' ){ cputype=1;}
87561 -
87562 - if ( cputype == 0 ) //intel cpu
87563 - {
87564 - if( ( cpuinfo.x86Family >= 7 ) && ( cpuinfo.x86Family < 15 ) )
87565 - {
87566 - strcpy( cpuinfo.x86Fam, "Intel P6 family (Not PIV and Higher then PPro" );
87567 - }
87568 - else
87569 - {
87570 - switch( cpuinfo.x86Family )
87571 - {
87572 - // Start at 486 because if it's below 486 there is no cpuid instruction
87573 - case 4:
87574 - strcpy( cpuinfo.x86Fam, "Intel 486" );
87575 - break;
87576 - case 5:
87577 - switch( cpuinfo.x86Model )
87578 - {
87579 - case 4:
87580 - case 8: // 0.25 µm
87581 - strcpy( cpuinfo.x86Fam, "Intel Pentium (MMX)");
87582 - break;
87583 - default:
87584 - strcpy( cpuinfo.x86Fam, "Intel Pentium" );
87585 - }
87586 - break;
87587 - case 6:
87588 - switch( cpuinfo.x86Model )
87589 - {
87590 - case 0: // Pentium pro (P6 A-Step)
87591 - case 1: // Pentium pro
87592 - strcpy( cpuinfo.x86Fam, "Intel Pentium Pro" );
87593 - break;
87594 -
87595 - case 2: // 66 MHz FSB
87596 - case 5: // Xeon/Celeron (0.25 µm)
87597 - case 6: // Internal L2 cache
87598 - strcpy( cpuinfo.x86Fam, "Intel Pentium II" );
87599 - break;
87600 -
87601 - case 7: // Xeon external L2 cache
87602 - case 8: // Xeon/Celeron with 256 KB on-die L2 cache
87603 - case 10: // Xeon/Celeron with 1 or 2 MB on-die L2 cache
87604 - case 11: // Xeon/Celeron with Tualatin core, on-die cache
87605 - strcpy( cpuinfo.x86Fam, "Intel Pentium III" );
87606 - break;
87607 - case 15: // Core 2 Duo Allendale/Conroe
87608 - strcpy( cpuinfo.x86Fam, "Intel Core 2 Duo" );
87609 - break;
87610 -
87611 - default:
87612 - strcpy( cpuinfo.x86Fam, "Intel Pentium Pro (Unknown)" );
87613 - }
87614 - break;
87615 - case 15:
87616 - switch( cpuinfo.x86Model )
87617 - {
87618 - case 0: // Willamette (A-Step)
87619 - case 1: // Willamette
87620 - strcpy( cpuinfo.x86Fam, "Willamette Intel Pentium IV" );
87621 - break;
87622 - case 2: // Northwood
87623 - strcpy( cpuinfo.x86Fam, "Northwood Intel Pentium IV" );
87624 - break;
87625 -
87626 - default:
87627 - strcpy( cpuinfo.x86Fam, "Intel Pentium IV (Unknown)" );
87628 - break;
87629 - }
87630 - break;
87631 - default:
87632 - strcpy( cpuinfo.x86Fam, "Unknown Intel CPU" );
87633 - }
87634 - }
87635 - }
87636 - else if ( cputype == 1 ) //AMD cpu
87637 - {
87638 - if( cpuinfo.x86Family >= 7 )
87639 - {
87640 - if((x86_64_12BITBRANDID !=0) || (x86_64_8BITBRANDID !=0))
87641 - {
87642 - if(x86_64_8BITBRANDID == 0 )
87643 - {
87644 - switch((x86_64_12BITBRANDID >>6)& 0x3f)
87645 - {
87646 - case 4:
87647 - strcpy(cpuinfo.x86Fam,"AMD Athlon(tm) 64 Processor");
87648 - AMDspeed = 22 + (x86_64_12BITBRANDID & 0x1f);
87649 - //AMDspeedString = strtol(AMDspeed, (char**)NULL,10);
87650 - sprintf(AMDspeedString," %d",AMDspeed);
87651 - strcat(AMDspeedString,"00+");
87652 - strcat(cpuinfo.x86Fam,AMDspeedString);
87653 - break;
87654 - case 12:
87655 - strcpy(cpuinfo.x86Fam,"AMD Opteron(tm) Processor");
87656 - break;
87657 - case 5:
87658 - strcpy( cpuinfo.x86Fam, "AMD Athlon X2 Processor" );
87659 - AMDspeed = 22 + (x86_64_12BITBRANDID & 0x1f);
87660 - //AMDspeedString = strtol(AMDspeed, (char**)NULL,10);
87661 - sprintf(AMDspeedString," %d",AMDspeed);
87662 - strcat(AMDspeedString,"00+");
87663 - strcat(cpuinfo.x86Fam,AMDspeedString);
87664 - break;
87665 - case 44:
87666 - strcpy( cpuinfo.x86Fam, "AMD Opteron(tm) Dual Core Processor" );
87667 - break;
87668 - default:
87669 - strcpy(cpuinfo.x86Fam,"Unknown AMD 64 proccesor");
87670 -
87671 - }
87672 - }
87673 - else //8bit brand id is non zero
87674 - {
87675 - strcpy(cpuinfo.x86Fam,"Unsupported yet AMD64 cpu");
87676 - }
87677 - }
87678 - else
87679 - {
87680 - strcpy( cpuinfo.x86Fam, "AMD K7+ Processor" );
87681 - }
87682 - }
87683 - else
87684 - {
87685 - switch ( cpuinfo.x86Family )
87686 - {
87687 - case 4:
87688 - switch( cpuinfo.x86Model )
87689 - {
87690 - case 14:
87691 - case 15: // Write-back enhanced
87692 - strcpy( cpuinfo.x86Fam, "AMD 5x86 Processor" );
87693 - break;
87694 -
87695 - case 3: // DX2
87696 - case 7: // Write-back enhanced DX2
87697 - case 8: // DX4
87698 - case 9: // Write-back enhanced DX4
87699 - strcpy( cpuinfo.x86Fam, "AMD 486 Processor" );
87700 - break;
87701 -
87702 -
87703 - default:
87704 - strcpy( cpuinfo.x86Fam, "AMD Unknown Processor" );
87705 -
87706 - }
87707 - break;
87708 -
87709 - case 5:
87710 - switch( cpuinfo.x86Model)
87711 - {
87712 - case 0: // SSA 5 (75, 90 and 100 Mhz)
87713 - case 1: // 5k86 (PR 120 and 133 MHz)
87714 - case 2: // 5k86 (PR 166 MHz)
87715 - case 3: // K5 5k86 (PR 200 MHz)
87716 - strcpy( cpuinfo.x86Fam, "AMD K5 Processor" );
87717 - break;
87718 -
87719 - case 6:
87720 - case 7: // (0.25 µm)
87721 - case 8: // K6-2
87722 - case 9: // K6-III
87723 - case 14: // K6-2+ / K6-III+
87724 - strcpy( cpuinfo.x86Fam, "AMD K6 Series Processor" );
87725 - break;
87726 -
87727 - default:
87728 - strcpy( cpuinfo.x86Fam, "AMD Unknown Processor" );
87729 - }
87730 - break;
87731 - case 6:
87732 - strcpy( cpuinfo.x86Fam, "AMD Athlon XP Processor" );
87733 - break;
87734 - default:
87735 - strcpy( cpuinfo.x86Fam, "Unknown AMD CPU" );
87736 - }
87737 - }
87738 - }
87739 - //capabilities
87740 - cpucaps.hasFloatingPointUnit = ( cpuinfo.x86Flags >> 0 ) & 1;
87741 - cpucaps.hasVirtual8086ModeEnhancements = ( cpuinfo.x86Flags >> 1 ) & 1;
87742 - cpucaps.hasDebuggingExtensions = ( cpuinfo.x86Flags >> 2 ) & 1;
87743 - cpucaps.hasPageSizeExtensions = ( cpuinfo.x86Flags >> 3 ) & 1;
87744 - cpucaps.hasTimeStampCounter = ( cpuinfo.x86Flags >> 4 ) & 1;
87745 - cpucaps.hasModelSpecificRegisters = ( cpuinfo.x86Flags >> 5 ) & 1;
87746 - cpucaps.hasPhysicalAddressExtension = ( cpuinfo.x86Flags >> 6 ) & 1;
87747 - cpucaps.hasMachineCheckArchitecture = ( cpuinfo.x86Flags >> 7 ) & 1;
87748 - cpucaps.hasCOMPXCHG8BInstruction = ( cpuinfo.x86Flags >> 8 ) & 1;
87749 - cpucaps.hasAdvancedProgrammableInterruptController = ( cpuinfo.x86Flags >> 9 ) & 1;
87750 - cpucaps.hasSEPFastSystemCall = ( cpuinfo.x86Flags >> 11 ) & 1;
87751 - cpucaps.hasMemoryTypeRangeRegisters = ( cpuinfo.x86Flags >> 12 ) & 1;
87752 - cpucaps.hasPTEGlobalFlag = ( cpuinfo.x86Flags >> 13 ) & 1;
87753 - cpucaps.hasMachineCheckArchitecture = ( cpuinfo.x86Flags >> 14 ) & 1;
87754 - cpucaps.hasConditionalMoveAndCompareInstructions = ( cpuinfo.x86Flags >> 15 ) & 1;
87755 - cpucaps.hasFGPageAttributeTable = ( cpuinfo.x86Flags >> 16 ) & 1;
87756 - cpucaps.has36bitPageSizeExtension = ( cpuinfo.x86Flags >> 17 ) & 1;
87757 - cpucaps.hasProcessorSerialNumber = ( cpuinfo.x86Flags >> 18 ) & 1;
87758 - cpucaps.hasCFLUSHInstruction = ( cpuinfo.x86Flags >> 19 ) & 1;
87759 - cpucaps.hasDebugStore = ( cpuinfo.x86Flags >> 21 ) & 1;
87760 - cpucaps.hasACPIThermalMonitorAndClockControl = ( cpuinfo.x86Flags >> 22 ) & 1;
87761 - cpucaps.hasMultimediaExtensions = ( cpuinfo.x86Flags >> 23 ) & 1; //mmx
87762 - cpucaps.hasFastStreamingSIMDExtensionsSaveRestore = ( cpuinfo.x86Flags >> 24 ) & 1;
87763 - cpucaps.hasStreamingSIMDExtensions = ( cpuinfo.x86Flags >> 25 ) & 1; //sse
87764 - cpucaps.hasStreamingSIMD2Extensions = ( cpuinfo.x86Flags >> 26 ) & 1; //sse2
87765 - cpucaps.hasSelfSnoop = ( cpuinfo.x86Flags >> 27 ) & 1;
87766 - cpucaps.hasHyperThreading = ( cpuinfo.x86Flags >> 28 ) & 1;
87767 - cpucaps.hasThermalMonitor = ( cpuinfo.x86Flags >> 29 ) & 1;
87768 - cpucaps.hasIntel64BitArchitecture = ( cpuinfo.x86Flags >> 30 ) & 1;
87769 - //that is only for AMDs
87770 - cpucaps.hasMultimediaExtensionsExt = ( cpuinfo.x86EFlags >> 22 ) & 1; //mmx2
87771 - cpucaps.hasAMD64BitArchitecture = ( cpuinfo.x86EFlags >> 29 ) & 1; //64bit cpu
87772 - cpucaps.has3DNOWInstructionExtensionsExt = ( cpuinfo.x86EFlags >> 30 ) & 1; //3dnow+
87773 - cpucaps.has3DNOWInstructionExtensions = ( cpuinfo.x86EFlags >> 31 ) & 1; //3dnow
87774 - cpuinfo.cpuspeed = (u32 )(CPUSpeedHz( 1000 ) / 1000000);
87775 -}
87776 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/ix86_fpu.c new/libpcsxcore/libpcsxcore/ix86_64/ix86_fpu.c
87777 --- original/libpcsxcore/libpcsxcore/ix86_64/ix86_fpu.c 2007-10-08 17:13:28.000000000 -0400
87778 +++ new/libpcsxcore/libpcsxcore/ix86_64/ix86_fpu.c 1969-12-31 20:00:00.000000000 -0400
87779 @@ -1,274 +0,0 @@
87780 -// stop compiling if NORECBUILD build (only for Visual Studio)
87781 -#if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
87782 -
87783 -#include <stdio.h>
87784 -#include <string.h>
87785 -#include "ix86-64.h"
87786 -
87787 -/********************/
87788 -/* FPU instructions */
87789 -/********************/
87790 -
87791 -/* fild m32 to fpu reg stack */
87792 -void FILD32( u32 from )
87793 -{
87794 - write8( 0xDB );
87795 - ModRM( 0, 0x0, DISP32 );
87796 - write32( MEMADDR(from, 4) );
87797 -}
87798 -
87799 -/* fistp m32 from fpu reg stack */
87800 -void FISTP32( u32 from )
87801 -{
87802 - write8( 0xDB );
87803 - ModRM( 0, 0x3, DISP32 );
87804 - write32( MEMADDR(from, 4) );
87805 -}
87806 -
87807 -/* fld m32 to fpu reg stack */
87808 -void FLD32( u32 from )
87809 -{
87810 - write8( 0xD9 );
87811 - ModRM( 0, 0x0, DISP32 );
87812 - write32( MEMADDR(from, 4) );
87813 -}
87814 -
87815 -// fld st(i)
87816 -void FLD(int st) { write16(0xc0d9+(st<<8)); }
87817 -
87818 -void FLD1() { write16(0xe8d9); }
87819 -void FLDL2E() { write16(0xead9); }
87820 -
87821 -/* fst m32 from fpu reg stack */
87822 -void FST32( u32 to )
87823 -{
87824 - write8( 0xD9 );
87825 - ModRM( 0, 0x2, DISP32 );
87826 - write32( MEMADDR(to, 4) );
87827 -}
87828 -
87829 -/* fstp m32 from fpu reg stack */
87830 -void FSTP32( u32 to )
87831 -{
87832 - write8( 0xD9 );
87833 - ModRM( 0, 0x3, DISP32 );
87834 - write32( MEMADDR(to, 4) );
87835 -}
87836 -
87837 -// fstp st(i)
87838 -void FSTP(int st) { write16(0xd8dd+(st<<8)); }
87839 -
87840 -/* fldcw fpu control word from m16 */
87841 -void FLDCW( u32 from )
87842 -{
87843 - write8( 0xD9 );
87844 - ModRM( 0, 0x5, DISP32 );
87845 - write32( MEMADDR(from, 4) );
87846 -}
87847 -
87848 -/* fnstcw fpu control word to m16 */
87849 -void FNSTCW( u32 to )
87850 -{
87851 - write8( 0xD9 );
87852 - ModRM( 0, 0x7, DISP32 );
87853 - write32( MEMADDR(to, 4) );
87854 -}
87855 -
87856 -void FNSTSWtoAX( void )
87857 -{
87858 - write16( 0xE0DF );
87859 -}
87860 -
87861 -void FXAM()
87862 -{
87863 - write16(0xe5d9);
87864 -}
87865 -
87866 -void FDECSTP() { write16(0xf6d9); }
87867 -void FRNDINT() { write16(0xfcd9); }
87868 -void FXCH(int st) { write16(0xc8d9+(st<<8)); }
87869 -void F2XM1() { write16(0xf0d9); }
87870 -void FSCALE() { write16(0xfdd9); }
87871 -
87872 -/* fadd ST(src) to fpu reg stack ST(0) */
87873 -void FADD32Rto0( x86IntRegType src )
87874 -{
87875 - write8( 0xD8 );
87876 - write8( 0xC0 + src );
87877 -}
87878 -
87879 -/* fadd ST(0) to fpu reg stack ST(src) */
87880 -void FADD320toR( x86IntRegType src )
87881 -{
87882 - write8( 0xDC );
87883 - write8( 0xC0 + src );
87884 -}
87885 -
87886 -/* fsub ST(src) to fpu reg stack ST(0) */
87887 -void FSUB32Rto0( x86IntRegType src )
87888 -{
87889 - write8( 0xD8 );
87890 - write8( 0xE0 + src );
87891 -}
87892 -
87893 -/* fsub ST(0) to fpu reg stack ST(src) */
87894 -void FSUB320toR( x86IntRegType src )
87895 -{
87896 - write8( 0xDC );
87897 - write8( 0xE8 + src );
87898 -}
87899 -
87900 -/* fsubp -> substract ST(0) from ST(1), store in ST(1) and POP stack */
87901 -void FSUBP( void )
87902 -{
87903 - write8( 0xDE );
87904 - write8( 0xE9 );
87905 -}
87906 -
87907 -/* fmul ST(src) to fpu reg stack ST(0) */
87908 -void FMUL32Rto0( x86IntRegType src )
87909 -{
87910 - write8( 0xD8 );
87911 - write8( 0xC8 + src );
87912 -}
87913 -
87914 -/* fmul ST(0) to fpu reg stack ST(src) */
87915 -void FMUL320toR( x86IntRegType src )
87916 -{
87917 - write8( 0xDC );
87918 - write8( 0xC8 + src );
87919 -}
87920 -
87921 -/* fdiv ST(src) to fpu reg stack ST(0) */
87922 -void FDIV32Rto0( x86IntRegType src )
87923 -{
87924 - write8( 0xD8 );
87925 - write8( 0xF0 + src );
87926 -}
87927 -
87928 -/* fdiv ST(0) to fpu reg stack ST(src) */
87929 -void FDIV320toR( x86IntRegType src )
87930 -{
87931 - write8( 0xDC );
87932 - write8( 0xF8 + src );
87933 -}
87934 -
87935 -void FDIV320toRP( x86IntRegType src )
87936 -{
87937 - write8( 0xDE );
87938 - write8( 0xF8 + src );
87939 -}
87940 -
87941 -/* fadd m32 to fpu reg stack */
87942 -void FADD32( u32 from )
87943 -{
87944 - write8( 0xD8 );
87945 - ModRM( 0, 0x0, DISP32 );
87946 - write32( MEMADDR(from, 4) );
87947 -}
87948 -
87949 -/* fsub m32 to fpu reg stack */
87950 -void FSUB32( u32 from )
87951 -{
87952 - write8( 0xD8 );
87953 - ModRM( 0, 0x4, DISP32 );
87954 - write32( MEMADDR(from, 4) );
87955 -}
87956 -
87957 -/* fmul m32 to fpu reg stack */
87958 -void FMUL32( u32 from )
87959 -{
87960 - write8( 0xD8 );
87961 - ModRM( 0, 0x1, DISP32 );
87962 - write32( MEMADDR(from, 4) );
87963 -}
87964 -
87965 -/* fdiv m32 to fpu reg stack */
87966 -void FDIV32( u32 from )
87967 -{
87968 - write8( 0xD8 );
87969 - ModRM( 0, 0x6, DISP32 );
87970 - write32( MEMADDR(from, 4) );
87971 -}
87972 -
87973 -/* fabs fpu reg stack */
87974 -void FABS( void )
87975 -{
87976 - write16( 0xE1D9 );
87977 -}
87978 -
87979 -/* fsqrt fpu reg stack */
87980 -void FSQRT( void )
87981 -{
87982 - write16( 0xFAD9 );
87983 -}
87984 -
87985 -void FPATAN(void) { write16(0xf3d9); }
87986 -void FSIN(void) { write16(0xfed9); }
87987 -
87988 -/* fchs fpu reg stack */
87989 -void FCHS( void )
87990 -{
87991 - write16( 0xE0D9 );
87992 -}
87993 -
87994 -/* fcomi st, st(i) */
87995 -void FCOMI( x86IntRegType src )
87996 -{
87997 - write8( 0xDB );
87998 - write8( 0xF0 + src );
87999 -}
88000 -
88001 -/* fcomip st, st(i) */
88002 -void FCOMIP( x86IntRegType src )
88003 -{
88004 - write8( 0xDF );
88005 - write8( 0xF0 + src );
88006 -}
88007 -
88008 -/* fucomi st, st(i) */
88009 -void FUCOMI( x86IntRegType src )
88010 -{
88011 - write8( 0xDB );
88012 - write8( 0xE8 + src );
88013 -}
88014 -
88015 -/* fucomip st, st(i) */
88016 -void FUCOMIP( x86IntRegType src )
88017 -{
88018 - write8( 0xDF );
88019 - write8( 0xE8 + src );
88020 -}
88021 -
88022 -/* fcom m32 to fpu reg stack */
88023 -void FCOM32( u32 from )
88024 -{
88025 - write8( 0xD8 );
88026 - ModRM( 0, 0x2, DISP32 );
88027 - write32( MEMADDR(from, 4) );
88028 -}
88029 -
88030 -/* fcomp m32 to fpu reg stack */
88031 -void FCOMP32( u32 from )
88032 -{
88033 - write8( 0xD8 );
88034 - ModRM( 0, 0x3, DISP32 );
88035 - write32( MEMADDR(from, 4) );
88036 -}
88037 -
88038 -#define FCMOV32( low, high ) \
88039 - { \
88040 - write8( low ); \
88041 - write8( high + from ); \
88042 - }
88043 -
88044 -void FCMOVB32( x86IntRegType from ) { FCMOV32( 0xDA, 0xC0 ); }
88045 -void FCMOVE32( x86IntRegType from ) { FCMOV32( 0xDA, 0xC8 ); }
88046 -void FCMOVBE32( x86IntRegType from ) { FCMOV32( 0xDA, 0xD0 ); }
88047 -void FCMOVU32( x86IntRegType from ) { FCMOV32( 0xDA, 0xD8 ); }
88048 -void FCMOVNB32( x86IntRegType from ) { FCMOV32( 0xDB, 0xC0 ); }
88049 -void FCMOVNE32( x86IntRegType from ) { FCMOV32( 0xDB, 0xC8 ); }
88050 -void FCMOVNBE32( x86IntRegType from ) { FCMOV32( 0xDB, 0xD0 ); }
88051 -void FCMOVNU32( x86IntRegType from ) { FCMOV32( 0xDB, 0xD8 ); }
88052 -
88053 -#endif
88054 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/ix86_mmx.c new/libpcsxcore/libpcsxcore/ix86_64/ix86_mmx.c
88055 --- original/libpcsxcore/libpcsxcore/ix86_64/ix86_mmx.c 2007-10-08 17:13:28.000000000 -0400
88056 +++ new/libpcsxcore/libpcsxcore/ix86_64/ix86_mmx.c 1969-12-31 20:00:00.000000000 -0400
88057 @@ -1,636 +0,0 @@
88058 -// stop compiling if NORECBUILD build (only for Visual Studio)
88059 -#if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
88060 -
88061 -#include "ix86-64.h"
88062 -
88063 -#include <assert.h>
88064 -
88065 -/********************/
88066 -/* MMX instructions */
88067 -/********************/
88068 -
88069 -// r64 = mm
88070 -
88071 -/* movq m64 to r64 */
88072 -void MOVQMtoR( x86MMXRegType to, uptr from )
88073 -{
88074 - write16( 0x6F0F );
88075 - ModRM( 0, to, DISP32 );
88076 - write32( MEMADDR(from, 4) );
88077 -}
88078 -
88079 -/* movq r64 to m64 */
88080 -void MOVQRtoM( uptr to, x86MMXRegType from )
88081 -{
88082 - write16( 0x7F0F );
88083 - ModRM( 0, from, DISP32 );
88084 - write32(MEMADDR(to, 4));
88085 -}
88086 -
88087 -/* pand r64 to r64 */
88088 -void PANDRtoR( x86MMXRegType to, x86MMXRegType from )
88089 -{
88090 - write16( 0xDB0F );
88091 - ModRM( 3, to, from );
88092 -}
88093 -
88094 -void PANDNRtoR( x86MMXRegType to, x86MMXRegType from )
88095 -{
88096 - write16( 0xDF0F );
88097 - ModRM( 3, to, from );
88098 -}
88099 -
88100 -/* por r64 to r64 */
88101 -void PORRtoR( x86MMXRegType to, x86MMXRegType from )
88102 -{
88103 - write16( 0xEB0F );
88104 - ModRM( 3, to, from );
88105 -}
88106 -
88107 -/* pxor r64 to r64 */
88108 -void PXORRtoR( x86MMXRegType to, x86MMXRegType from )
88109 -{
88110 - write16( 0xEF0F );
88111 - ModRM( 3, to, from );
88112 -}
88113 -
88114 -/* psllq r64 to r64 */
88115 -void PSLLQRtoR( x86MMXRegType to, x86MMXRegType from )
88116 -{
88117 - write16( 0xF30F );
88118 - ModRM( 3, to, from );
88119 -}
88120 -
88121 -/* psllq m64 to r64 */
88122 -void PSLLQMtoR( x86MMXRegType to, uptr from )
88123 -{
88124 - write16( 0xF30F );
88125 - ModRM( 0, to, DISP32 );
88126 - write32( MEMADDR(from, 4) );
88127 -}
88128 -
88129 -/* psllq imm8 to r64 */
88130 -void PSLLQItoR( x86MMXRegType to, u8 from )
88131 -{
88132 - write16( 0x730F );
88133 - ModRM( 3, 6, to);
88134 - write8( from );
88135 -}
88136 -
88137 -/* psrlq r64 to r64 */
88138 -void PSRLQRtoR( x86MMXRegType to, x86MMXRegType from )
88139 -{
88140 - write16( 0xD30F );
88141 - ModRM( 3, to, from );
88142 -}
88143 -
88144 -/* psrlq m64 to r64 */
88145 -void PSRLQMtoR( x86MMXRegType to, uptr from )
88146 -{
88147 - write16( 0xD30F );
88148 - ModRM( 0, to, DISP32 );
88149 - write32( MEMADDR(from, 4) );
88150 -}
88151 -
88152 -/* psrlq imm8 to r64 */
88153 -void PSRLQItoR( x86MMXRegType to, u8 from )
88154 -{
88155 - write16( 0x730F );
88156 - ModRM( 3, 2, to);
88157 - write8( from );
88158 -}
88159 -
88160 -/* paddusb r64 to r64 */
88161 -void PADDUSBRtoR( x86MMXRegType to, x86MMXRegType from )
88162 -{
88163 - write16( 0xDC0F );
88164 - ModRM( 3, to, from );
88165 -}
88166 -
88167 -/* paddusb m64 to r64 */
88168 -void PADDUSBMtoR( x86MMXRegType to, uptr from )
88169 -{
88170 - write16( 0xDC0F );
88171 - ModRM( 0, to, DISP32 );
88172 - write32( MEMADDR(from, 4) );
88173 -}
88174 -
88175 -/* paddusw r64 to r64 */
88176 -void PADDUSWRtoR( x86MMXRegType to, x86MMXRegType from )
88177 -{
88178 - write16( 0xDD0F );
88179 - ModRM( 3, to, from );
88180 -}
88181 -
88182 -/* paddusw m64 to r64 */
88183 -void PADDUSWMtoR( x86MMXRegType to, uptr from )
88184 -{
88185 - write16( 0xDD0F );
88186 - ModRM( 0, to, DISP32 );
88187 - write32( MEMADDR(from, 4) );
88188 -}
88189 -
88190 -/* paddb r64 to r64 */
88191 -void PADDBRtoR( x86MMXRegType to, x86MMXRegType from )
88192 -{
88193 - write16( 0xFC0F );
88194 - ModRM( 3, to, from );
88195 -}
88196 -
88197 -/* paddb m64 to r64 */
88198 -void PADDBMtoR( x86MMXRegType to, uptr from )
88199 -{
88200 - write16( 0xFC0F );
88201 - ModRM( 0, to, DISP32 );
88202 - write32( MEMADDR(from, 4) );
88203 -}
88204 -
88205 -/* paddw r64 to r64 */
88206 -void PADDWRtoR( x86MMXRegType to, x86MMXRegType from )
88207 -{
88208 - write16( 0xFD0F );
88209 - ModRM( 3, to, from );
88210 -}
88211 -
88212 -/* paddw m64 to r64 */
88213 -void PADDWMtoR( x86MMXRegType to, uptr from )
88214 -{
88215 - write16( 0xFD0F );
88216 - ModRM( 0, to, DISP32 );
88217 - write32( MEMADDR(from, 4) );
88218 -}
88219 -
88220 -/* paddd r64 to r64 */
88221 -void PADDDRtoR( x86MMXRegType to, x86MMXRegType from )
88222 -{
88223 - write16( 0xFE0F );
88224 - ModRM( 3, to, from );
88225 -}
88226 -
88227 -/* paddd m64 to r64 */
88228 -void PADDDMtoR( x86MMXRegType to, uptr from )
88229 -{
88230 - write16( 0xFE0F );
88231 - ModRM( 0, to, DISP32 );
88232 - write32( MEMADDR(from, 4) );
88233 -}
88234 -
88235 -/* emms */
88236 -void EMMS( void )
88237 -{
88238 - write16( 0x770F );
88239 -}
88240 -
88241 -void PADDSBRtoR( x86MMXRegType to, x86MMXRegType from )
88242 -{
88243 - write16( 0xEC0F );
88244 - ModRM( 3, to, from );
88245 -}
88246 -
88247 -void PADDSWRtoR( x86MMXRegType to, x86MMXRegType from )
88248 -{
88249 - write16( 0xED0F );
88250 - ModRM( 3, to, from );
88251 -}
88252 -
88253 -// paddq m64 to r64 (sse2 only?)
88254 -void PADDQMtoR( x86MMXRegType to, uptr from )
88255 -{
88256 - write16( 0xD40F );
88257 - ModRM( 0, to, DISP32 );
88258 - write32( MEMADDR(from, 4) );
88259 -}
88260 -
88261 -// paddq r64 to r64 (sse2 only?)
88262 -void PADDQRtoR( x86MMXRegType to, x86MMXRegType from )
88263 -{
88264 - write16( 0xD40F );
88265 - ModRM( 3, to, from );
88266 -}
88267 -
88268 -void PSUBSBRtoR( x86MMXRegType to, x86MMXRegType from )
88269 -{
88270 - write16( 0xE80F );
88271 - ModRM( 3, to, from );
88272 -}
88273 -
88274 -void PSUBSWRtoR( x86MMXRegType to, x86MMXRegType from )
88275 -{
88276 - write16( 0xE90F );
88277 - ModRM( 3, to, from );
88278 -}
88279 -
88280 -
88281 -void PSUBBRtoR( x86MMXRegType to, x86MMXRegType from )
88282 -{
88283 - write16( 0xF80F );
88284 - ModRM( 3, to, from );
88285 -}
88286 -
88287 -void PSUBWRtoR( x86MMXRegType to, x86MMXRegType from )
88288 -{
88289 - write16( 0xF90F );
88290 - ModRM( 3, to, from );
88291 -}
88292 -
88293 -void PSUBDRtoR( x86MMXRegType to, x86MMXRegType from )
88294 -{
88295 - write16( 0xFA0F );
88296 - ModRM( 3, to, from );
88297 -}
88298 -
88299 -void PSUBDMtoR( x86MMXRegType to, uptr from )
88300 -{
88301 - write16( 0xFA0F );
88302 - ModRM( 0, to, DISP32 );
88303 - write32( MEMADDR(from, 4) );
88304 -}
88305 -
88306 -void PSUBUSBRtoR( x86MMXRegType to, x86MMXRegType from )
88307 -{
88308 - write16( 0xD80F );
88309 - ModRM( 3, to, from );
88310 -}
88311 -
88312 -void PSUBUSWRtoR( x86MMXRegType to, x86MMXRegType from )
88313 -{
88314 - write16( 0xD90F );
88315 - ModRM( 3, to, from );
88316 -}
88317 -
88318 -// psubq m64 to r64 (sse2 only?)
88319 -void PSUBQMtoR( x86MMXRegType to, uptr from )
88320 -{
88321 - write16( 0xFB0F );
88322 - ModRM( 0, to, DISP32 );
88323 - write32( MEMADDR(from, 4) );
88324 -}
88325 -
88326 -// psubq r64 to r64 (sse2 only?)
88327 -void PSUBQRtoR( x86MMXRegType to, x86MMXRegType from )
88328 -{
88329 - write16( 0xFB0F );
88330 - ModRM( 3, to, from );
88331 -}
88332 -
88333 -// pmuludq m64 to r64 (sse2 only?)
88334 -void PMULUDQMtoR( x86MMXRegType to, uptr from )
88335 -{
88336 - write16( 0xF40F );
88337 - ModRM( 0, to, DISP32 );
88338 - write32( MEMADDR(from, 4) );
88339 -}
88340 -
88341 -// pmuludq r64 to r64 (sse2 only?)
88342 -void PMULUDQRtoR( x86MMXRegType to, x86MMXRegType from )
88343 -{
88344 - write16( 0xF40F );
88345 - ModRM( 3, to, from );
88346 -}
88347 -
88348 -void PCMPEQBRtoR( x86MMXRegType to, x86MMXRegType from )
88349 -{
88350 - write16( 0x740F );
88351 - ModRM( 3, to, from );
88352 -}
88353 -
88354 -void PCMPEQWRtoR( x86MMXRegType to, x86MMXRegType from )
88355 -{
88356 - write16( 0x750F );
88357 - ModRM( 3, to, from );
88358 -}
88359 -
88360 -void PCMPEQDRtoR( x86MMXRegType to, x86MMXRegType from )
88361 -{
88362 - write16( 0x760F );
88363 - ModRM( 3, to, from );
88364 -}
88365 -
88366 -void PCMPEQDMtoR( x86MMXRegType to, uptr from )
88367 -{
88368 - write16( 0x760F );
88369 - ModRM( 0, to, DISP32 );
88370 - write32( MEMADDR(from, 4) );
88371 -}
88372 -
88373 -void PCMPGTBRtoR( x86MMXRegType to, x86MMXRegType from )
88374 -{
88375 - write16( 0x640F );
88376 - ModRM( 3, to, from );
88377 -}
88378 -
88379 -void PCMPGTWRtoR( x86MMXRegType to, x86MMXRegType from )
88380 -{
88381 - write16( 0x650F );
88382 - ModRM( 3, to, from );
88383 -}
88384 -
88385 -void PCMPGTDRtoR( x86MMXRegType to, x86MMXRegType from )
88386 -{
88387 - write16( 0x660F );
88388 - ModRM( 3, to, from );
88389 -}
88390 -
88391 -void PCMPGTDMtoR( x86MMXRegType to, uptr from )
88392 -{
88393 - write16( 0x660F );
88394 - ModRM( 0, to, DISP32 );
88395 - write32( MEMADDR(from, 4) );
88396 -}
88397 -
88398 -void PSRLWItoR( x86MMXRegType to, u8 from )
88399 -{
88400 - write16( 0x710F );
88401 - ModRM( 3, 2 , to );
88402 - write8( from );
88403 -}
88404 -
88405 -void PSRLDItoR( x86MMXRegType to, u8 from )
88406 -{
88407 - write16( 0x720F );
88408 - ModRM( 3, 2 , to );
88409 - write8( from );
88410 -}
88411 -
88412 -void PSRLDRtoR( x86MMXRegType to, x86MMXRegType from )
88413 -{
88414 - write16( 0xD20F );
88415 - ModRM( 3, to, from );
88416 -}
88417 -
88418 -void PSLLWItoR( x86MMXRegType to, u8 from )
88419 -{
88420 - write16( 0x710F );
88421 - ModRM( 3, 6 , to );
88422 - write8( from );
88423 -}
88424 -
88425 -void PSLLDItoR( x86MMXRegType to, u8 from )
88426 -{
88427 - write16( 0x720F );
88428 - ModRM( 3, 6 , to );
88429 - write8( from );
88430 -}
88431 -
88432 -void PSLLDRtoR( x86MMXRegType to, x86MMXRegType from )
88433 -{
88434 - write16( 0xF20F );
88435 - ModRM( 3, to, from );
88436 -}
88437 -
88438 -void PSRAWItoR( x86MMXRegType to, u8 from )
88439 -{
88440 - write16( 0x710F );
88441 - ModRM( 3, 4 , to );
88442 - write8( from );
88443 -}
88444 -
88445 -void PSRADItoR( x86MMXRegType to, u8 from )
88446 -{
88447 - write16( 0x720F );
88448 - ModRM( 3, 4 , to );
88449 - write8( from );
88450 -}
88451 -
88452 -void PSRADRtoR( x86MMXRegType to, x86MMXRegType from )
88453 -{
88454 - write16( 0xE20F );
88455 - ModRM( 3, to, from );
88456 -}
88457 -
88458 -/* por m64 to r64 */
88459 -void PORMtoR( x86MMXRegType to, uptr from )
88460 -{
88461 - write16( 0xEB0F );
88462 - ModRM( 0, to, DISP32 );
88463 - write32( MEMADDR(from, 4) );
88464 -}
88465 -
88466 -/* pxor m64 to r64 */
88467 -void PXORMtoR( x86MMXRegType to, uptr from )
88468 -{
88469 - write16( 0xEF0F );
88470 - ModRM( 0, to, DISP32 );
88471 - write32( MEMADDR(from, 4) );
88472 -}
88473 -
88474 -/* pand m64 to r64 */
88475 -void PANDMtoR( x86MMXRegType to, uptr from )
88476 -{
88477 - //u64 rip = (u64)x86Ptr + 7;
88478 - write16( 0xDB0F );
88479 - ModRM( 0, to, DISP32 );
88480 - write32( MEMADDR(from, 4) );
88481 -}
88482 -
88483 -void PANDNMtoR( x86MMXRegType to, uptr from )
88484 -{
88485 - write16( 0xDF0F );
88486 - ModRM( 0, to, DISP32 );
88487 - write32( MEMADDR(from, 4) );
88488 -}
88489 -
88490 -void PUNPCKHDQRtoR( x86MMXRegType to, x86MMXRegType from )
88491 -{
88492 - write16( 0x6A0F );
88493 - ModRM( 3, to, from );
88494 -}
88495 -
88496 -void PUNPCKHDQMtoR( x86MMXRegType to, uptr from )
88497 -{
88498 - write16( 0x6A0F );
88499 - ModRM( 0, to, DISP32 );
88500 - write32( MEMADDR(from, 4) );
88501 -}
88502 -
88503 -void PUNPCKLDQRtoR( x86MMXRegType to, x86MMXRegType from )
88504 -{
88505 - write16( 0x620F );
88506 - ModRM( 3, to, from );
88507 -}
88508 -
88509 -void PUNPCKLDQMtoR( x86MMXRegType to, uptr from )
88510 -{
88511 - write16( 0x620F );
88512 - ModRM( 0, to, DISP32 );
88513 - write32( MEMADDR(from, 4) );
88514 -}
88515 -
88516 -void MOVQ64ItoR( x86MMXRegType reg, u64 i )
88517 -{
88518 - MOVQMtoR( reg, ( u32 )(x86Ptr) + 2 + 7 );
88519 - JMP8( 8 );
88520 - write64( i );
88521 -}
88522 -
88523 -void MOVQRtoR( x86MMXRegType to, x86MMXRegType from )
88524 -{
88525 - write16( 0x6F0F );
88526 - ModRM( 3, to, from );
88527 -}
88528 -
88529 -void MOVQRmtoROffset( x86MMXRegType to, x86IntRegType from, u32 offset )
88530 -{
88531 - write16( 0x6F0F );
88532 -
88533 - if( offset < 128 ) {
88534 - ModRM( 1, to, from );
88535 - write8(offset);
88536 - }
88537 - else {
88538 - ModRM( 2, to, from );
88539 - write32(offset);
88540 - }
88541 -}
88542 -
88543 -void MOVQRtoRmOffset( x86IntRegType to, x86MMXRegType from, u32 offset )
88544 -{
88545 - write16( 0x7F0F );
88546 -
88547 - if( offset < 128 ) {
88548 - ModRM( 1, from , to );
88549 - write8(offset);
88550 - }
88551 - else {
88552 - ModRM( 2, from, to );
88553 - write32(offset);
88554 - }
88555 -}
88556 -
88557 -/* movd m32 to r64 */
88558 -void MOVDMtoMMX( x86MMXRegType to, uptr from )
88559 -{
88560 - write16( 0x6E0F );
88561 - ModRM( 0, to, DISP32 );
88562 - write32( MEMADDR(from, 4) );
88563 -}
88564 -
88565 -/* movd r64 to m32 */
88566 -void MOVDMMXtoM( uptr to, x86MMXRegType from )
88567 -{
88568 - write16( 0x7E0F );
88569 - ModRM( 0, from, DISP32 );
88570 - write32( MEMADDR(to, 4) );
88571 -}
88572 -
88573 -void MOVD32RtoMMX( x86MMXRegType to, x86IntRegType from )
88574 -{
88575 - write16( 0x6E0F );
88576 - ModRM( 3, to, from );
88577 -}
88578 -
88579 -void MOVD32RmtoMMX( x86MMXRegType to, x86IntRegType from )
88580 -{
88581 - write16( 0x6E0F );
88582 - ModRM( 0, to, from );
88583 -}
88584 -
88585 -void MOVD32RmOffsettoMMX( x86MMXRegType to, x86IntRegType from, u32 offset )
88586 -{
88587 - write16( 0x6E0F );
88588 -
88589 - if( offset < 128 ) {
88590 - ModRM( 1, to, from );
88591 - write8(offset);
88592 - }
88593 - else {
88594 - ModRM( 2, to, from );
88595 - write32(offset);
88596 - }
88597 -}
88598 -
88599 -void MOVD32MMXtoR( x86IntRegType to, x86MMXRegType from )
88600 -{
88601 - write16( 0x7E0F );
88602 - ModRM( 3, from, to );
88603 -}
88604 -
88605 -void MOVD32MMXtoRm( x86IntRegType to, x86MMXRegType from )
88606 -{
88607 - write16( 0x7E0F );
88608 - ModRM( 0, from, to );
88609 - if( to >= 4 ) {
88610 - // no idea why
88611 - assert( to == ESP );
88612 - write8(0x24);
88613 - }
88614 -
88615 -}
88616 -
88617 -void MOVD32MMXtoRmOffset( x86IntRegType to, x86MMXRegType from, u32 offset )
88618 -{
88619 - write16( 0x7E0F );
88620 -
88621 - if( offset < 128 ) {
88622 - ModRM( 1, from, to );
88623 - write8(offset);
88624 - }
88625 - else {
88626 - ModRM( 2, from, to );
88627 - write32(offset);
88628 - }
88629 -}
88630 -
88631 -///* movd r32 to r64 */
88632 -//void MOVD32MMXtoMMX( x86MMXRegType to, x86MMXRegType from )
88633 -//{
88634 -// write16( 0x6E0F );
88635 -// ModRM( 3, to, from );
88636 -//}
88637 -//
88638 -///* movq r64 to r32 */
88639 -//void MOVD64MMXtoMMX( x86MMXRegType to, x86MMXRegType from )
88640 -//{
88641 -// write16( 0x7E0F );
88642 -// ModRM( 3, from, to );
88643 -//}
88644 -
88645 -// untested
88646 -void PACKSSWBMMXtoMMX(x86MMXRegType to, x86MMXRegType from)
88647 -{
88648 - write16( 0x630F );
88649 - ModRM( 3, to, from );
88650 -}
88651 -
88652 -void PACKSSDWMMXtoMMX(x86MMXRegType to, x86MMXRegType from)
88653 -{
88654 - write16( 0x6B0F );
88655 - ModRM( 3, to, from );
88656 -}
88657 -
88658 -void PMOVMSKBMMXtoR(x86IntRegType to, x86MMXRegType from)
88659 -{
88660 - write16( 0xD70F );
88661 - ModRM( 3, to, from );
88662 -}
88663 -
88664 -void PINSRWRtoMMX( x86MMXRegType to, x86SSERegType from, u8 imm8 )
88665 -{
88666 - if (to > 7 || from > 7) Rex(1, to >> 3, 0, from >> 3);
88667 - write16( 0xc40f );
88668 - ModRM( 3, to, from );
88669 - write8( imm8 );
88670 -}
88671 -
88672 -void PSHUFWRtoR(x86MMXRegType to, x86MMXRegType from, u8 imm8)
88673 -{
88674 - write16(0x700f);
88675 - ModRM( 3, to, from );
88676 - write8(imm8);
88677 -}
88678 -
88679 -void PSHUFWMtoR(x86MMXRegType to, uptr from, u8 imm8)
88680 -{
88681 - write16( 0x700f );
88682 - ModRM( 0, to, DISP32 );
88683 - write32( MEMADDR(from, 4) );
88684 - write8(imm8);
88685 -}
88686 -
88687 -void MASKMOVQRtoR(x86MMXRegType to, x86MMXRegType from)
88688 -{
88689 - write16(0xf70f);
88690 - ModRM( 3, to, from );
88691 -}
88692 -
88693 -#endif
88694 diff -rupN original/libpcsxcore/libpcsxcore/ix86_64/ix86_sse.c new/libpcsxcore/libpcsxcore/ix86_64/ix86_sse.c
88695 --- original/libpcsxcore/libpcsxcore/ix86_64/ix86_sse.c 2007-10-08 17:13:28.000000000 -0400
88696 +++ new/libpcsxcore/libpcsxcore/ix86_64/ix86_sse.c 1969-12-31 20:00:00.000000000 -0400
88697 @@ -1,1477 +0,0 @@
88698 -// stop compiling if NORECBUILD build (only for Visual Studio)
88699 -#if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
88700 -
88701 -#include <assert.h>
88702 -#include "ix86-64.h"
88703 -
88704 -PCSX2_ALIGNED16(static unsigned int p[4]);
88705 -PCSX2_ALIGNED16(static unsigned int p2[4]);
88706 -PCSX2_ALIGNED16(static float f[4]);
88707 -
88708 -
88709 -XMMSSEType g_xmmtypes[XMMREGS] = {0};
88710 -
88711 -/********************/
88712 -/* SSE instructions */
88713 -/********************/
88714 -
88715 -#define SSEMtoR( code, overb ) \
88716 - assert( cpucaps.hasStreamingSIMDExtensions ); \
88717 - assert( to < XMMREGS ) ; \
88718 - RexR(0, to); \
88719 - write16( code ); \
88720 - ModRM( 0, to, DISP32 ); \
88721 - write32( MEMADDR(from, 4 + overb) ); \
88722 -
88723 -#define SSERtoM( code, overb ) \
88724 - assert( cpucaps.hasStreamingSIMDExtensions ); \
88725 - assert( from < XMMREGS) ; \
88726 - RexR(0, from); \
88727 - write16( code ); \
88728 - ModRM( 0, from, DISP32 ); \
88729 - write32( MEMADDR(to, 4 + overb) ); \
88730 -
88731 -#define SSE_SS_MtoR( code, overb ) \
88732 - assert( cpucaps.hasStreamingSIMDExtensions ); \
88733 - assert( to < XMMREGS ) ; \
88734 - write8( 0xf3 ); \
88735 - RexR(0, to); \
88736 - write16( code ); \
88737 - ModRM( 0, to, DISP32 ); \
88738 - write32( MEMADDR(from, 4 + overb) ); \
88739 -
88740 -#define SSE_SS_RtoM( code, overb ) \
88741 - assert( cpucaps.hasStreamingSIMDExtensions ); \
88742 - assert( from < XMMREGS) ; \
88743 - write8( 0xf3 ); \
88744 - RexR(0, from); \
88745 - write16( code ); \
88746 - ModRM( 0, from, DISP32 ); \
88747 - write32( MEMADDR(to, 4 + overb) ); \
88748 -
88749 -#define SSERtoR( code ) \
88750 - assert( cpucaps.hasStreamingSIMDExtensions ); \
88751 - assert( to < XMMREGS && from < XMMREGS) ; \
88752 - RexRB(0, to, from); \
88753 - write16( code ); \
88754 - ModRM( 3, to, from );
88755 -
88756 -#define SSEMtoR66( code ) \
88757 - write8( 0x66 ); \
88758 - SSEMtoR( code, 0 );
88759 -
88760 -#define SSERtoM66( code ) \
88761 - write8( 0x66 ); \
88762 - SSERtoM( code, 0 );
88763 -
88764 -#define SSERtoR66( code ) \
88765 - write8( 0x66 ); \
88766 - SSERtoR( code );
88767 -
88768 -#define _SSERtoR66( code ) \
88769 - assert( cpucaps.hasStreamingSIMDExtensions ); \
88770 - assert( to < XMMREGS && from < XMMREGS) ; \
88771 - write8( 0x66 ); \
88772 - RexRB(0, from, to); \
88773 - write16( code ); \
88774 - ModRM( 3, from, to );
88775 -
88776 -#define SSE_SS_RtoR( code ) \
88777 - assert( cpucaps.hasStreamingSIMDExtensions ); \
88778 - assert( to < XMMREGS && from < XMMREGS) ; \
88779 - write8( 0xf3 ); \
88780 - RexRB(0, to, from); \
88781 - write16( code ); \
88782 - ModRM( 3, to, from );
88783 -
88784 -#define CMPPSMtoR( op ) \
88785 - SSEMtoR( 0xc20f, 1 ); \
88786 - write8( op );
88787 -
88788 -#define CMPPSRtoR( op ) \
88789 - SSERtoR( 0xc20f ); \
88790 - write8( op );
88791 -
88792 -#define CMPSSMtoR( op ) \
88793 - SSE_SS_MtoR( 0xc20f, 1 ); \
88794 - write8( op );
88795 -
88796 -#define CMPSSRtoR( op ) \
88797 - SSE_SS_RtoR( 0xc20f ); \
88798 - write8( op );
88799 -
88800 -
88801 -
88802 -void WriteRmOffset(x86IntRegType to, int offset);
88803 -void WriteRmOffsetFrom(x86IntRegType to, x86IntRegType from, int offset);
88804 -
88805 -/* movups [r32][r32*scale] to xmm1 */
88806 -void SSE_MOVUPSRmStoR( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale )
88807 -{
88808 - assert( cpucaps.hasStreamingSIMDExtensions );
88809 - RexRXB(0, to, from2, from);
88810 - write16( 0x100f );
88811 - ModRM( 0, to, 0x4 );
88812 - SibSB( scale, from2, from );
88813 -}
88814 -
88815 -/* movups xmm1 to [r32][r32*scale] */
88816 -void SSE_MOVUPSRtoRmS( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale )
88817 -{
88818 - assert( cpucaps.hasStreamingSIMDExtensions );
88819 - RexRXB(1, to, from2, from);
88820 - write16( 0x110f );
88821 - ModRM( 0, to, 0x4 );
88822 - SibSB( scale, from2, from );
88823 -}
88824 -
88825 -/* movups [r32] to r32 */
88826 -void SSE_MOVUPSRmtoR( x86IntRegType to, x86IntRegType from )
88827 -{
88828 - assert( cpucaps.hasStreamingSIMDExtensions );
88829 - RexRB(0, to, from);
88830 - write16( 0x100f );
88831 - ModRM( 0, to, from );
88832 -}
88833 -
88834 -/* movups r32 to [r32] */
88835 -void SSE_MOVUPSRtoRm( x86IntRegType to, x86IntRegType from )
88836 -{
88837 - assert( cpucaps.hasStreamingSIMDExtensions );
88838 - RexRB(0, from, to);
88839 - write16( 0x110f );
88840 - ModRM( 0, from, to );
88841 -}
88842 -
88843 -/* movlps [r32] to r32 */
88844 -void SSE_MOVLPSRmtoR( x86SSERegType to, x86IntRegType from )
88845 -{
88846 - assert( cpucaps.hasStreamingSIMDExtensions );
88847 - RexRB(1, to, from);
88848 - write16( 0x120f );
88849 - ModRM( 0, to, from );
88850 -}
88851 -
88852 -void SSE_MOVLPSRmtoROffset( x86SSERegType to, x86IntRegType from, int offset )
88853 -{
88854 - assert( cpucaps.hasStreamingSIMDExtensions );
88855 - RexRB(0, to, from);
88856 - write16( 0x120f );
88857 - WriteRmOffsetFrom(to, from, offset);
88858 -}
88859 -
88860 -/* movaps r32 to [r32] */
88861 -void SSE_MOVLPSRtoRm( x86IntRegType to, x86IntRegType from )
88862 -{
88863 - assert( cpucaps.hasStreamingSIMDExtensions );
88864 - RexRB(0, from, to);
88865 - write16( 0x130f );
88866 - ModRM( 0, from, to );
88867 -}
88868 -
88869 -void SSE_MOVLPSRtoRmOffset( x86SSERegType to, x86IntRegType from, int offset )
88870 -{
88871 - assert( cpucaps.hasStreamingSIMDExtensions );
88872 - RexRB(0, from, to);
88873 - write16( 0x130f );
88874 - WriteRmOffsetFrom(from, to, offset);
88875 -}
88876 -
88877 -/* movaps [r32][r32*scale] to xmm1 */
88878 -void SSE_MOVAPSRmStoR( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale )
88879 -{
88880 - assert( cpucaps.hasStreamingSIMDExtensions && from != EBP );
88881 - RexRXB(0, to, from2, from);
88882 - write16( 0x280f );
88883 - ModRM( 0, to, 0x4 );
88884 - SibSB( scale, from2, from );
88885 -}
88886 -
88887 -/* movaps xmm1 to [r32][r32*scale] */
88888 -void SSE_MOVAPSRtoRmS( x86SSERegType to, x86IntRegType from, x86IntRegType from2, int scale )
88889 -{
88890 - assert( cpucaps.hasStreamingSIMDExtensions && from != EBP );
88891 - RexRXB(0, to, from2, from);
88892 - write16( 0x290f );
88893 - ModRM( 0, to, 0x4 );
88894 - SibSB( scale, from2, from );
88895 -}
88896 -
88897 -// movaps [r32+offset] to r32
88898 -void SSE_MOVAPSRmtoROffset( x86SSERegType to, x86IntRegType from, int offset )
88899 -{
88900 - assert( cpucaps.hasStreamingSIMDExtensions );
88901 - RexRB(0, to, from);
88902 - write16( 0x280f );
88903 - WriteRmOffsetFrom(to, from, offset);
88904 -}
88905 -
88906 -// movaps r32 to [r32+offset]
88907 -void SSE_MOVAPSRtoRmOffset( x86IntRegType to, x86SSERegType from, int offset )
88908 -{
88909 - assert( cpucaps.hasStreamingSIMDExtensions );
88910 - RexRB(0, from, to);
88911 - write16( 0x290f );
88912 - WriteRmOffsetFrom(from, to, offset);
88913 -}
88914 -
88915 -// movdqa [r32+offset] to r32
88916 -void SSE2_MOVDQARmtoROffset( x86SSERegType to, x86IntRegType from, int offset )
88917 -{
88918 - assert( cpucaps.hasStreamingSIMDExtensions );
88919 - write8(0x66);
88920 - RexRB(0, to, from);
88921 - write16( 0x6f0f );
88922 - WriteRmOffsetFrom(to, from, offset);
88923 -}
88924 -
88925 -// movdqa r32 to [r32+offset]
88926 -void SSE2_MOVDQARtoRmOffset( x86IntRegType to, x86SSERegType from, int offset )
88927 -{
88928 - assert( cpucaps.hasStreamingSIMDExtensions );
88929 - write8(0x66);
88930 - RexRB(0, from, to);
88931 - write16( 0x7f0f );
88932 - WriteRmOffsetFrom(from, to, offset);
88933 -}
88934 -
88935 -// movups [r32+offset] to r32
88936 -void SSE_MOVUPSRmtoROffset( x86SSERegType to, x86IntRegType from, int offset )
88937 -{
88938 - RexRB(0, to, from);
88939 - write16( 0x100f );
88940 - WriteRmOffsetFrom(to, from, offset);
88941 -}
88942 -
88943 -// movups r32 to [r32+offset]
88944 -void SSE_MOVUPSRtoRmOffset( x86SSERegType to, x86IntRegType from, int offset )
88945 -{
88946 - assert( cpucaps.hasStreamingSIMDExtensions );
88947 - RexRB(0, from, to);
88948 - write16( 0x110f );
88949 - WriteRmOffsetFrom(from, to, offset);
88950 -}
88951 -
88952 -//**********************************************************************************/
88953 -//MOVAPS: Move aligned Packed Single Precision FP values *
88954 -//**********************************************************************************
88955 -void SSE_MOVAPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x280f, 0 ); }
88956 -void SSE_MOVAPS_XMM_to_M128( uptr to, x86SSERegType from ) { SSERtoM( 0x290f, 0 ); }
88957 -void SSE_MOVAPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x280f ); }
88958 -
88959 -void SSE_MOVUPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x100f, 0 ); }
88960 -void SSE_MOVUPS_XMM_to_M128( uptr to, x86SSERegType from ) { SSERtoM( 0x110f, 0 ); }
88961 -
88962 -void SSE2_MOVSD_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
88963 -{
88964 - if( !cpucaps.hasStreamingSIMD2Extensions ) SSE2EMU_MOVSD_XMM_to_XMM(to, from);
88965 - else {
88966 - write8(0xf2);
88967 - SSERtoR( 0x100f);
88968 - }
88969 -}
88970 -
88971 -void SSE2_MOVQ_M64_to_XMM( x86SSERegType to, uptr from )
88972 -{
88973 - if( !cpucaps.hasStreamingSIMD2Extensions ) SSE2EMU_MOVQ_M64_to_XMM(to, from);
88974 - else {
88975 - write8(0xf3); SSEMtoR( 0x7e0f, 0);
88976 - }
88977 -}
88978 -
88979 -void SSE2_MOVQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
88980 -{
88981 - if( !cpucaps.hasStreamingSIMD2Extensions ) SSE2EMU_MOVQ_XMM_to_XMM(to, from);
88982 - else {
88983 - write8(0xf3); SSERtoR( 0x7e0f);
88984 - }
88985 -}
88986 -
88987 -void SSE2_MOVQ_XMM_to_M64( u32 to, x86SSERegType from )
88988 -{
88989 - if( !cpucaps.hasStreamingSIMD2Extensions ) SSE_MOVLPS_XMM_to_M64(to, from);
88990 - else {
88991 - SSERtoM66(0xd60f);
88992 - }
88993 -}
88994 -
88995 -#ifndef __x86_64__
88996 -void SSE2_MOVDQ2Q_XMM_to_MM( x86MMXRegType to, x86SSERegType from)
88997 -{
88998 - if( !cpucaps.hasStreamingSIMD2Extensions ) SSE2EMU_MOVDQ2Q_XMM_to_MM(to, from);
88999 - else {
89000 - write8(0xf2);
89001 - SSERtoR( 0xd60f);
89002 - }
89003 -}
89004 -void SSE2_MOVQ2DQ_MM_to_XMM( x86SSERegType to, x86MMXRegType from)
89005 -{
89006 - if( !cpucaps.hasStreamingSIMD2Extensions ) SSE2EMU_MOVQ2DQ_MM_to_XMM(to, from);
89007 - else {
89008 - write8(0xf3);
89009 - SSERtoR( 0xd60f);
89010 - }
89011 -}
89012 -#endif
89013 -
89014 -//**********************************************************************************/
89015 -//MOVSS: Move Scalar Single-Precision FP value *
89016 -//**********************************************************************************
89017 -void SSE_MOVSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x100f, 0 ); }
89018 -void SSE_MOVSS_XMM_to_M32( u32 to, x86SSERegType from ) { SSE_SS_RtoM( 0x110f, 0 ); }
89019 -void SSE_MOVSS_XMM_to_Rm( x86IntRegType to, x86SSERegType from )
89020 -{
89021 - write8(0xf3);
89022 - RexRB(0, from, to);
89023 - write16(0x110f);
89024 - ModRM(0, from, to);
89025 -}
89026 -
89027 -void SSE_MOVSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR( 0x100f ); }
89028 -
89029 -void SSE_MOVSS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset )
89030 -{
89031 - write8(0xf3);
89032 - RexRB(0, to, from);
89033 - write16( 0x100f );
89034 - WriteRmOffsetFrom(to, from, offset);
89035 -}
89036 -
89037 -void SSE_MOVSS_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset )
89038 -{
89039 - write8(0xf3);
89040 - RexRB(0, from, to);
89041 - write16(0x110f);
89042 - WriteRmOffsetFrom(from, to, offset);
89043 -}
89044 -
89045 -void SSE_MASKMOVDQU_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xf70f ); }
89046 -//**********************************************************************************/
89047 -//MOVLPS: Move low Packed Single-Precision FP *
89048 -//**********************************************************************************
89049 -void SSE_MOVLPS_M64_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x120f, 0 ); }
89050 -void SSE_MOVLPS_XMM_to_M64( u32 to, x86SSERegType from ) { SSERtoM( 0x130f, 0 ); }
89051 -
89052 -void SSE_MOVLPS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset )
89053 -{
89054 - assert( cpucaps.hasStreamingSIMDExtensions );
89055 - RexRB(0, to, from);
89056 - write16( 0x120f );
89057 - WriteRmOffsetFrom(to, from, offset);
89058 -}
89059 -
89060 -void SSE_MOVLPS_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset )
89061 -{
89062 - RexRB(0, from, to);
89063 - write16(0x130f);
89064 - WriteRmOffsetFrom(from, to, offset);
89065 -}
89066 -
89067 -/////////////////////////////////////////////////////////////////////////////////////
89068 -//**********************************************************************************/
89069 -//MOVHPS: Move High Packed Single-Precision FP *
89070 -//**********************************************************************************
89071 -void SSE_MOVHPS_M64_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x160f, 0 ); }
89072 -void SSE_MOVHPS_XMM_to_M64( u32 to, x86SSERegType from ) { SSERtoM( 0x170f, 0 ); }
89073 -
89074 -void SSE_MOVHPS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset )
89075 -{
89076 - assert( cpucaps.hasStreamingSIMDExtensions );
89077 - RexRB(0, to, from);
89078 - write16( 0x160f );
89079 - WriteRmOffsetFrom(to, from, offset);
89080 -}
89081 -
89082 -void SSE_MOVHPS_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset )
89083 -{
89084 - assert( cpucaps.hasStreamingSIMDExtensions );
89085 - RexRB(0, from, to);
89086 - write16(0x170f);
89087 - WriteRmOffsetFrom(from, to, offset);
89088 -}
89089 -
89090 -/////////////////////////////////////////////////////////////////////////////////////
89091 -//**********************************************************************************/
89092 -//MOVLHPS: Moved packed Single-Precision FP low to high *
89093 -//**********************************************************************************
89094 -void SSE_MOVLHPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x160f ); }
89095 -
89096 -//////////////////////////////////////////////////////////////////////////////////////
89097 -//**********************************************************************************/
89098 -//MOVHLPS: Moved packed Single-Precision FP High to Low *
89099 -//**********************************************************************************
89100 -void SSE_MOVHLPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x120f ); }
89101 -
89102 -///////////////////////////////////////////////////////////////////////////////////
89103 -//**********************************************************************************/
89104 -//ANDPS: Logical Bit-wise AND for Single FP *
89105 -//**********************************************************************************
89106 -void SSE_ANDPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x540f, 0 ); }
89107 -void SSE_ANDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x540f ); }
89108 -
89109 -///////////////////////////////////////////////////////////////////////////////////////
89110 -//**********************************************************************************/
89111 -//ANDNPS : Logical Bit-wise AND NOT of Single-precision FP values *
89112 -//**********************************************************************************
89113 -void SSE_ANDNPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x550f, 0 ); }
89114 -void SSE_ANDNPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR( 0x550f ); }
89115 -
89116 -/////////////////////////////////////////////////////////////////////////////////////
89117 -//**********************************************************************************/
89118 -//RCPPS : Packed Single-Precision FP Reciprocal *
89119 -//**********************************************************************************
89120 -void SSE_RCPPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x530f ); }
89121 -void SSE_RCPPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x530f, 0 ); }
89122 -
89123 -void SSE_RCPSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR(0x530f); }
89124 -void SSE_RCPSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR(0x530f, 0); }
89125 -
89126 -//////////////////////////////////////////////////////////////////////////////////////
89127 -//**********************************************************************************/
89128 -//ORPS : Bit-wise Logical OR of Single-Precision FP Data *
89129 -//**********************************************************************************
89130 -void SSE_ORPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x560f, 0 ); }
89131 -void SSE_ORPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x560f ); }
89132 -
89133 -/////////////////////////////////////////////////////////////////////////////////////
89134 -//**********************************************************************************/
89135 -//XORPS : Bitwise Logical XOR of Single-Precision FP Values *
89136 -//**********************************************************************************
89137 -void SSE_XORPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x570f, 0 ); }
89138 -void SSE_XORPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x570f ); }
89139 -
89140 -///////////////////////////////////////////////////////////////////////////////////////
89141 -//**********************************************************************************/
89142 -//ADDPS : ADD Packed Single-Precision FP Values *
89143 -//**********************************************************************************
89144 -void SSE_ADDPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x580f, 0 ); }
89145 -void SSE_ADDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x580f ); }
89146 -
89147 -////////////////////////////////////////////////////////////////////////////////////
89148 -//**********************************************************************************/
89149 -//ADDSS : ADD Scalar Single-Precision FP Values *
89150 -//**********************************************************************************
89151 -void SSE_ADDSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x580f, 0 ); }
89152 -void SSE_ADDSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR( 0x580f ); }
89153 -
89154 -/////////////////////////////////////////////////////////////////////////////////////////
89155 -//**********************************************************************************/
89156 -//SUBPS: Packed Single-Precision FP Subtract *
89157 -//**********************************************************************************
89158 -void SSE_SUBPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x5c0f, 0 ); }
89159 -void SSE_SUBPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x5c0f ); }
89160 -
89161 -///////////////////////////////////////////////////////////////////////////////////////
89162 -//**********************************************************************************/
89163 -//SUBSS : Scalar Single-Precision FP Subtract *
89164 -//**********************************************************************************
89165 -void SSE_SUBSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x5c0f, 0 ); }
89166 -void SSE_SUBSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR( 0x5c0f ); }
89167 -
89168 -/////////////////////////////////////////////////////////////////////////////////////////
89169 -//**********************************************************************************/
89170 -//MULPS : Packed Single-Precision FP Multiply *
89171 -//**********************************************************************************
89172 -void SSE_MULPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x590f, 0 ); }
89173 -void SSE_MULPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x590f ); }
89174 -
89175 -////////////////////////////////////////////////////////////////////////////////////////
89176 -//**********************************************************************************/
89177 -//MULSS : Scalar Single-Precision FP Multiply *
89178 -//**********************************************************************************
89179 -void SSE_MULSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x590f, 0 ); }
89180 -void SSE_MULSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR( 0x590f ); }
89181 -
89182 -////////////////////////////////////////////////////////////////////////////////////////////
89183 -//**********************************************************************************/
89184 -//Packed Single-Precission FP compare (CMPccPS) *
89185 -//**********************************************************************************
89186 -//missing SSE_CMPPS_I8_to_XMM
89187 -// SSE_CMPPS_M32_to_XMM
89188 -// SSE_CMPPS_XMM_to_XMM
89189 -void SSE_CMPEQPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 0 ); }
89190 -void SSE_CMPEQPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 0 ); }
89191 -void SSE_CMPLTPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 1 ); }
89192 -void SSE_CMPLTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 1 ); }
89193 -void SSE_CMPLEPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 2 ); }
89194 -void SSE_CMPLEPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 2 ); }
89195 -void SSE_CMPUNORDPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 3 ); }
89196 -void SSE_CMPUNORDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 3 ); }
89197 -void SSE_CMPNEPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 4 ); }
89198 -void SSE_CMPNEPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 4 ); }
89199 -void SSE_CMPNLTPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 5 ); }
89200 -void SSE_CMPNLTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 5 ); }
89201 -void SSE_CMPNLEPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 6 ); }
89202 -void SSE_CMPNLEPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 6 ); }
89203 -void SSE_CMPORDPS_M128_to_XMM( x86SSERegType to, uptr from ) { CMPPSMtoR( 7 ); }
89204 -void SSE_CMPORDPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPPSRtoR( 7 ); }
89205 -
89206 -///////////////////////////////////////////////////////////////////////////////////////////
89207 -//**********************************************************************************/
89208 -//Scalar Single-Precission FP compare (CMPccSS) *
89209 -//**********************************************************************************
89210 -//missing SSE_CMPSS_I8_to_XMM
89211 -// SSE_CMPSS_M32_to_XMM
89212 -// SSE_CMPSS_XMM_to_XMM
89213 -void SSE_CMPEQSS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 0 ); }
89214 -void SSE_CMPEQSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 0 ); }
89215 -void SSE_CMPLTSS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 1 ); }
89216 -void SSE_CMPLTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 1 ); }
89217 -void SSE_CMPLESS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 2 ); }
89218 -void SSE_CMPLESS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 2 ); }
89219 -void SSE_CMPUNORDSS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 3 ); }
89220 -void SSE_CMPUNORDSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 3 ); }
89221 -void SSE_CMPNESS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 4 ); }
89222 -void SSE_CMPNESS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 4 ); }
89223 -void SSE_CMPNLTSS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 5 ); }
89224 -void SSE_CMPNLTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 5 ); }
89225 -void SSE_CMPNLESS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 6 ); }
89226 -void SSE_CMPNLESS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 6 ); }
89227 -void SSE_CMPORDSS_M32_to_XMM( x86SSERegType to, uptr from ) { CMPSSMtoR( 7 ); }
89228 -void SSE_CMPORDSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { CMPSSRtoR( 7 ); }
89229 -
89230 -void SSE_UCOMISS_M32_to_XMM( x86SSERegType to, uptr from )
89231 -{
89232 - RexR(0, to);
89233 - write16( 0x2e0f );
89234 - ModRM( 0, to, DISP32 );
89235 - write32( MEMADDR(from, 4) );
89236 -}
89237 -
89238 -void SSE_UCOMISS_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
89239 -{
89240 - RexRB(0, to, from);
89241 - write16( 0x2e0f );
89242 - ModRM( 3, to, from );
89243 -}
89244 -
89245 -//////////////////////////////////////////////////////////////////////////////////////////
89246 -//**********************************************************************************/
89247 -//RSQRTPS : Packed Single-Precision FP Square Root Reciprocal *
89248 -//**********************************************************************************
89249 -void SSE_RSQRTPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x520f, 0 ); }
89250 -void SSE_RSQRTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR( 0x520f ); }
89251 -
89252 -/////////////////////////////////////////////////////////////////////////////////////
89253 -//**********************************************************************************/
89254 -//RSQRTSS : Scalar Single-Precision FP Square Root Reciprocal *
89255 -//**********************************************************************************
89256 -void SSE_RSQRTSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x520f, 0 ); }
89257 -void SSE_RSQRTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSE_SS_RtoR( 0x520f ); }
89258 -
89259 -////////////////////////////////////////////////////////////////////////////////////
89260 -//**********************************************************************************/
89261 -//SQRTPS : Packed Single-Precision FP Square Root *
89262 -//**********************************************************************************
89263 -void SSE_SQRTPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x510f, 0 ); }
89264 -void SSE_SQRTPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR( 0x510f ); }
89265 -
89266 -//////////////////////////////////////////////////////////////////////////////////////
89267 -//**********************************************************************************/
89268 -//SQRTSS : Scalar Single-Precision FP Square Root *
89269 -//**********************************************************************************
89270 -void SSE_SQRTSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x510f, 0 ); }
89271 -void SSE_SQRTSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSE_SS_RtoR( 0x510f ); }
89272 -
89273 -////////////////////////////////////////////////////////////////////////////////////////
89274 -//**********************************************************************************/
89275 -//MAXPS: Return Packed Single-Precision FP Maximum *
89276 -//**********************************************************************************
89277 -void SSE_MAXPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x5f0f, 0 ); }
89278 -void SSE_MAXPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x5f0f ); }
89279 -
89280 -/////////////////////////////////////////////////////////////////////////////////////////
89281 -//**********************************************************************************/
89282 -//MAXSS: Return Scalar Single-Precision FP Maximum *
89283 -//**********************************************************************************
89284 -void SSE_MAXSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x5f0f, 0 ); }
89285 -void SSE_MAXSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR( 0x5f0f ); }
89286 -
89287 -#ifndef __x86_64__
89288 -/////////////////////////////////////////////////////////////////////////////////////////
89289 -//**********************************************************************************/
89290 -//CVTPI2PS: Packed Signed INT32 to Packed Single FP Conversion *
89291 -//**********************************************************************************
89292 -void SSE_CVTPI2PS_M64_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x2a0f, 0 ); }
89293 -void SSE_CVTPI2PS_MM_to_XMM( x86SSERegType to, x86MMXRegType from ) { SSERtoR( 0x2a0f ); }
89294 -
89295 -///////////////////////////////////////////////////////////////////////////////////////////
89296 -//**********************************************************************************/
89297 -//CVTPS2PI: Packed Single FP to Packed Signed INT32 Conversion *
89298 -//**********************************************************************************
89299 -void SSE_CVTPS2PI_M64_to_MM( x86MMXRegType to, uptr from ) { SSEMtoR( 0x2d0f, 0 ); }
89300 -void SSE_CVTPS2PI_XMM_to_MM( x86MMXRegType to, x86SSERegType from ) { SSERtoR( 0x2d0f ); }
89301 -#endif
89302 -
89303 -void SSE_CVTTSS2SI_M32_to_R32(x86IntRegType to, uptr from) { write8(0xf3); SSEMtoR(0x2c0f, 0); }
89304 -void SSE_CVTTSS2SI_XMM_to_R32(x86IntRegType to, x86SSERegType from)
89305 -{
89306 - write8(0xf3);
89307 - RexRB(0, to, from);
89308 - write16(0x2c0f);
89309 - ModRM(3, to, from);
89310 -}
89311 -
89312 -void SSE_CVTSI2SS_M32_to_XMM(x86SSERegType to, uptr from) { write8(0xf3); SSEMtoR(0x2a0f, 0); }
89313 -void SSE_CVTSI2SS_R_to_XMM(x86SSERegType to, x86IntRegType from)
89314 -{
89315 - write8(0xf3);
89316 - RexRB(0, to, from);
89317 - write16(0x2a0f);
89318 - ModRM(3, to, from);
89319 -}
89320 -
89321 -///////////////////////////////////////////////////////////////////////////////////////////
89322 -//**********************************************************************************/
89323 -//CVTDQ2PS: Packed Signed INT32 to Packed Single Precision FP Conversion *
89324 -//**********************************************************************************
89325 -void SSE2_CVTDQ2PS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x5b0f, 0 ); }
89326 -void SSE2_CVTDQ2PS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x5b0f ); }
89327 -
89328 -//**********************************************************************************/
89329 -//CVTPS2DQ: Packed Single Precision FP to Packed Signed INT32 Conversion *
89330 -//**********************************************************************************
89331 -void SSE2_CVTPS2DQ_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0x5b0f ); }
89332 -void SSE2_CVTPS2DQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0x5b0f ); }
89333 -
89334 -void SSE2_CVTTPS2DQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { write8(0xf3); SSERtoR(0x5b0f); }
89335 -/////////////////////////////////////////////////////////////////////////////////////
89336 -//**********************************************************************************/
89337 -//MINPS: Return Packed Single-Precision FP Minimum *
89338 -//**********************************************************************************
89339 -void SSE_MINPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x5d0f, 0 ); }
89340 -void SSE_MINPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x5d0f ); }
89341 -
89342 -//////////////////////////////////////////////////////////////////////////////////////////
89343 -//**********************************************************************************/
89344 -//MINSS: Return Scalar Single-Precision FP Minimum *
89345 -//**********************************************************************************
89346 -void SSE_MINSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x5d0f, 0 ); }
89347 -void SSE_MINSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR( 0x5d0f ); }
89348 -
89349 -#ifndef __x86_64__
89350 -///////////////////////////////////////////////////////////////////////////////////////////
89351 -//**********************************************************************************/
89352 -//PMAXSW: Packed Signed Integer Word Maximum *
89353 -//**********************************************************************************
89354 -//missing
89355 - // SSE_PMAXSW_M64_to_MM
89356 -// SSE2_PMAXSW_M128_to_XMM
89357 -// SSE2_PMAXSW_XMM_to_XMM
89358 -void SSE_PMAXSW_MM_to_MM( x86MMXRegType to, x86MMXRegType from ){ SSERtoR( 0xEE0F ); }
89359 -
89360 -///////////////////////////////////////////////////////////////////////////////////////
89361 -//**********************************************************************************/
89362 -//PMINSW: Packed Signed Integer Word Minimum *
89363 -//**********************************************************************************
89364 -//missing
89365 - // SSE_PMINSW_M64_to_MM
89366 -// SSE2_PMINSW_M128_to_XMM
89367 -// SSE2_PMINSW_XMM_to_XMM
89368 -void SSE_PMINSW_MM_to_MM( x86MMXRegType to, x86MMXRegType from ){ SSERtoR( 0xEA0F ); }
89369 -#endif
89370 -
89371 -//////////////////////////////////////////////////////////////////////////////////////
89372 -//**********************************************************************************/
89373 -//SHUFPS: Shuffle Packed Single-Precision FP Values *
89374 -//**********************************************************************************
89375 -void SSE_SHUFPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 ) { SSERtoR( 0xC60F ); write8( imm8 ); }
89376 -void SSE_SHUFPS_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 ) { SSEMtoR( 0xC60F, 1 ); write8( imm8 ); }
89377 -
89378 -void SSE_SHUFPS_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset, u8 imm8 )
89379 -{
89380 - RexRB(0, to, from);
89381 - write16(0xc60f);
89382 - WriteRmOffsetFrom(to, from, offset);
89383 - write8(imm8);
89384 -}
89385 -
89386 -////////////////////////////////////////////////////////////////////////////////////
89387 -//**********************************************************************************/
89388 -//PSHUFD: Shuffle Packed DoubleWords *
89389 -//**********************************************************************************
89390 -void SSE2_PSHUFD_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 )
89391 -{
89392 - if( !cpucaps.hasStreamingSIMD2Extensions ) {
89393 - SSE2EMU_PSHUFD_XMM_to_XMM(to, from, imm8);
89394 - }
89395 - else {
89396 - SSERtoR66( 0x700F );
89397 - write8( imm8 );
89398 - }
89399 -}
89400 -void SSE2_PSHUFD_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 ) { SSEMtoR66( 0x700F ); write8( imm8 ); }
89401 -
89402 -void SSE2_PSHUFLW_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 ) { write8(0xF2); SSERtoR(0x700F); write8(imm8); }
89403 -void SSE2_PSHUFLW_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 ) { write8(0xF2); SSEMtoR(0x700F, 1); write8(imm8); }
89404 -void SSE2_PSHUFHW_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 ) { write8(0xF3); SSERtoR(0x700F); write8(imm8); }
89405 -void SSE2_PSHUFHW_M128_to_XMM( x86SSERegType to, uptr from, u8 imm8 ) { write8(0xF3); SSEMtoR(0x700F, 1); write8(imm8); }
89406 -
89407 -///////////////////////////////////////////////////////////////////////////////////
89408 -//**********************************************************************************/
89409 -//UNPCKLPS: Unpack and Interleave low Packed Single-Precision FP Data *
89410 -//**********************************************************************************
89411 -void SSE_UNPCKLPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR(0x140f, 0); }
89412 -void SSE_UNPCKLPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x140F ); }
89413 -
89414 -////////////////////////////////////////////////////////////////////////////////////////
89415 -//**********************************************************************************/
89416 -//UNPCKHPS: Unpack and Interleave High Packed Single-Precision FP Data *
89417 -//**********************************************************************************
89418 -void SSE_UNPCKHPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR(0x150f, 0); }
89419 -void SSE_UNPCKHPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x150F ); }
89420 -
89421 -////////////////////////////////////////////////////////////////////////////////////////
89422 -//**********************************************************************************/
89423 -//DIVPS : Packed Single-Precision FP Divide *
89424 -//**********************************************************************************
89425 -void SSE_DIVPS_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR( 0x5e0F, 0 ); }
89426 -void SSE_DIVPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR( 0x5e0F ); }
89427 -
89428 -//////////////////////////////////////////////////////////////////////////////////////
89429 -//**********************************************************************************/
89430 -//DIVSS : Scalar Single-Precision FP Divide *
89431 -//**********************************************************************************
89432 -void SSE_DIVSS_M32_to_XMM( x86SSERegType to, uptr from ) { SSE_SS_MtoR( 0x5e0F, 0 ); }
89433 -void SSE_DIVSS_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSE_SS_RtoR( 0x5e0F ); }
89434 -
89435 -/////////////////////////////////////////////////////////////////////////////////////////
89436 -//**********************************************************************************/
89437 -//STMXCSR : Store Streaming SIMD Extension Control/Status *
89438 -//**********************************************************************************
89439 -void SSE_STMXCSR( uptr from ) {
89440 - write16( 0xAE0F );
89441 - ModRM( 0, 0x3, DISP32 );
89442 - write32( MEMADDR(from, 4) );
89443 -}
89444 -
89445 -/////////////////////////////////////////////////////////////////////////////////////
89446 -//**********************************************************************************/
89447 -//LDMXCSR : Load Streaming SIMD Extension Control/Status *
89448 -//**********************************************************************************
89449 -void SSE_LDMXCSR( uptr from ) {
89450 - write16( 0xAE0F );
89451 - ModRM( 0, 0x2, DISP32 );
89452 - write32( MEMADDR(from, 4) );
89453 -}
89454 -
89455 -/////////////////////////////////////////////////////////////////////////////////////
89456 -//**********************************************************************************/
89457 -//PADDB,PADDW,PADDD : Add Packed Integers *
89458 -//**********************************************************************************
89459 -void SSE2_PADDB_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xFC0F ); }
89460 -void SSE2_PADDB_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0xFC0F ); }
89461 -void SSE2_PADDW_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xFD0F ); }
89462 -void SSE2_PADDW_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0xFD0F ); }
89463 -void SSE2_PADDD_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xFE0F ); }
89464 -void SSE2_PADDD_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0xFE0F ); }
89465 -
89466 -void SSE2_PADDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xD40F ); }
89467 -void SSE2_PADDQ_M128_to_XMM(x86SSERegType to, uptr from ) { SSEMtoR66( 0xD40F ); }
89468 -
89469 -///////////////////////////////////////////////////////////////////////////////////
89470 -//**********************************************************************************/
89471 -//PCMPxx: Compare Packed Integers *
89472 -//**********************************************************************************
89473 -void SSE2_PCMPGTB_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0x640F ); }
89474 -void SSE2_PCMPGTB_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0x640F ); }
89475 -void SSE2_PCMPGTW_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0x650F ); }
89476 -void SSE2_PCMPGTW_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0x650F ); }
89477 -void SSE2_PCMPGTD_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0x660F ); }
89478 -void SSE2_PCMPGTD_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0x660F ); }
89479 -void SSE2_PCMPEQB_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0x740F ); }
89480 -void SSE2_PCMPEQB_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0x740F ); }
89481 -void SSE2_PCMPEQW_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0x750F ); }
89482 -void SSE2_PCMPEQW_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0x750F ); }
89483 -void SSE2_PCMPEQD_XMM_to_XMM(x86SSERegType to, x86SSERegType from )
89484 -{
89485 - if( !cpucaps.hasStreamingSIMD2Extensions ) {
89486 - SSE_CMPEQPS_XMM_to_XMM(to, from);
89487 - }
89488 - else {
89489 - SSERtoR66( 0x760F );
89490 - }
89491 -}
89492 -
89493 -void SSE2_PCMPEQD_M128_to_XMM(x86SSERegType to, uptr from )
89494 -{
89495 - if( !cpucaps.hasStreamingSIMD2Extensions ) {
89496 - SSE_CMPEQPS_M128_to_XMM(to, from);
89497 - }
89498 - else {
89499 - SSEMtoR66( 0x760F );
89500 - }
89501 -}
89502 -
89503 -////////////////////////////////////////////////////////////////////////////////////////////
89504 -//**********************************************************************************/
89505 -//PEXTRW,PINSRW: Packed Extract/Insert Word *
89506 -//**********************************************************************************
89507 -void SSE_PEXTRW_XMM_to_R32(x86IntRegType to, x86SSERegType from, u8 imm8 ){ SSERtoR66(0xC50F); write8( imm8 ); }
89508 -void SSE_PINSRW_R32_to_XMM(x86SSERegType to, x86IntRegType from, u8 imm8 ){ SSERtoR66(0xC40F); write8( imm8 ); }
89509 -
89510 -////////////////////////////////////////////////////////////////////////////////////////////
89511 -//**********************************************************************************/
89512 -//PSUBx: Subtract Packed Integers *
89513 -//**********************************************************************************
89514 -void SSE2_PSUBB_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xF80F ); }
89515 -void SSE2_PSUBB_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0xF80F ); }
89516 -void SSE2_PSUBW_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xF90F ); }
89517 -void SSE2_PSUBW_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0xF90F ); }
89518 -void SSE2_PSUBD_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xFA0F ); }
89519 -void SSE2_PSUBD_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0xFA0F ); }
89520 -void SSE2_PSUBQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xFB0F ); }
89521 -void SSE2_PSUBQ_M128_to_XMM(x86SSERegType to, uptr from ){ SSEMtoR66( 0xFB0F ); }
89522 -
89523 -///////////////////////////////////////////////////////////////////////////////////////
89524 -//**********************************************************************************/
89525 -//MOVD: Move Dword(32bit) to /from XMM reg *
89526 -//**********************************************************************************
89527 -void SSE2_MOVD_M32_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66(0x6E0F); }
89528 -void SSE2_MOVD_R_to_XMM( x86SSERegType to, x86IntRegType from )
89529 -{
89530 - if( !cpucaps.hasStreamingSIMD2Extensions ) {
89531 - SSE2EMU_MOVD_R_to_XMM(to, from);
89532 - }
89533 - else {
89534 - SSERtoR66(0x6E0F);
89535 - }
89536 -}
89537 -
89538 -void SSE2_MOVD_Rm_to_XMM( x86SSERegType to, x86IntRegType from )
89539 -{
89540 - write8(0x66);
89541 - RexRB(0, to, from);
89542 - write16( 0x6e0f );
89543 - ModRM( 0, to, from);
89544 -}
89545 -
89546 -void SSE2_MOVD_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset )
89547 -{
89548 - write8(0x66);
89549 - RexRB(0, to, from);
89550 - write16( 0x6e0f );
89551 - WriteRmOffsetFrom(to, from, offset);
89552 -}
89553 -
89554 -void SSE2_MOVD_XMM_to_M32( u32 to, x86SSERegType from ) { SSERtoM66(0x7E0F); }
89555 -void SSE2_MOVD_XMM_to_R( x86IntRegType to, x86SSERegType from ) {
89556 - if( !cpucaps.hasStreamingSIMD2Extensions ) {
89557 - SSE2EMU_MOVD_XMM_to_R(to, from);
89558 - }
89559 - else {
89560 - _SSERtoR66(0x7E0F);
89561 - }
89562 -}
89563 -
89564 -void SSE2_MOVD_XMM_to_Rm( x86IntRegType to, x86SSERegType from )
89565 -{
89566 - write8(0x66);
89567 - RexRB(0, from, to);
89568 - write16( 0x7e0f );
89569 - ModRM( 0, from, to );
89570 -}
89571 -
89572 -void SSE2_MOVD_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset )
89573 -{
89574 - if( !cpucaps.hasStreamingSIMD2Extensions ) {
89575 - SSE2EMU_MOVD_XMM_to_RmOffset(to, from, offset);
89576 - }
89577 - else {
89578 - write8(0x66);
89579 - RexRB(0, from, to);
89580 - write16( 0x7e0f );
89581 - WriteRmOffsetFrom(from, to, offset);
89582 - }
89583 -}
89584 -
89585 -#ifdef __x86_64__
89586 -void SSE2_MOVQ_XMM_to_R( x86IntRegType to, x86SSERegType from )
89587 -{
89588 - assert( from < XMMREGS);
89589 - write8( 0x66 );
89590 - RexRB(1, from, to);
89591 - write16( 0x7e0f );
89592 - ModRM( 3, from, to );
89593 -}
89594 -
89595 -void SSE2_MOVQ_R_to_XMM( x86SSERegType to, x86IntRegType from )
89596 -{
89597 - assert( to < XMMREGS);
89598 - write8(0x66);
89599 - RexRB(1, to, from);
89600 - write16( 0x6e0f );
89601 - ModRM( 3, to, from );
89602 -}
89603 -
89604 -#endif
89605 -
89606 -////////////////////////////////////////////////////////////////////////////////////
89607 -//**********************************************************************************/
89608 -//POR : SSE Bitwise OR *
89609 -//**********************************************************************************
89610 -void SSE2_POR_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xEB0F ); }
89611 -void SSE2_POR_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0xEB0F ); }
89612 -
89613 -// logical and to &= from
89614 -void SSE2_PAND_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xDB0F ); }
89615 -void SSE2_PAND_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0xDB0F ); }
89616 -
89617 -// to = (~to) & from
89618 -void SSE2_PANDN_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xDF0F ); }
89619 -void SSE2_PANDN_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0xDF0F ); }
89620 -
89621 -/////////////////////////////////////////////////////////////////////////////////////
89622 -//**********************************************************************************/
89623 -//PXOR : SSE Bitwise XOR *
89624 -//**********************************************************************************
89625 -void SSE2_PXOR_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xEF0F ); }
89626 -void SSE2_PXOR_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xEF0F ) };
89627 -///////////////////////////////////////////////////////////////////////////////////////
89628 -
89629 -void SSE2_MOVDQA_M128_to_XMM(x86SSERegType to, uptr from) {SSEMtoR66(0x6F0F); }
89630 -void SSE2_MOVDQA_XMM_to_M128( uptr to, x86SSERegType from ){SSERtoM66(0x7F0F);}
89631 -void SSE2_MOVDQA_XMM_to_XMM( x86SSERegType to, x86SSERegType from) { SSERtoR66(0x6F0F); }
89632 -
89633 -void SSE2_MOVDQU_M128_to_XMM(x86SSERegType to, uptr from) { write8(0xF3); SSEMtoR(0x6F0F, 0); }
89634 -void SSE2_MOVDQU_XMM_to_M128( uptr to, x86SSERegType from) { write8(0xF3); SSERtoM(0x7F0F, 0); }
89635 -void SSE2_MOVDQU_XMM_to_XMM( x86SSERegType to, x86SSERegType from) { write8(0xF3); SSERtoR(0x6F0F); }
89636 -
89637 -// shift right logical
89638 -
89639 -void SSE2_PSRLW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xD10F); }
89640 -void SSE2_PSRLW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xD10F); }
89641 -void SSE2_PSRLW_I8_to_XMM(x86SSERegType to, u8 imm8)
89642 -{
89643 - write8( 0x66 );
89644 - RexB(0, to);
89645 - write16( 0x710F );
89646 - ModRM( 3, 2 , to );
89647 - write8( imm8 );
89648 -}
89649 -
89650 -void SSE2_PSRLD_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xD20F); }
89651 -void SSE2_PSRLD_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xD20F); }
89652 -void SSE2_PSRLD_I8_to_XMM(x86SSERegType to, u8 imm8)
89653 -{
89654 - write8( 0x66 );
89655 - RexB(0, to);
89656 - write16( 0x720F );
89657 - ModRM( 3, 2 , to );
89658 - write8( imm8 );
89659 -}
89660 -
89661 -void SSE2_PSRLQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xD30F); }
89662 -void SSE2_PSRLQ_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xD30F); }
89663 -void SSE2_PSRLQ_I8_to_XMM(x86SSERegType to, u8 imm8)
89664 -{
89665 - write8( 0x66 );
89666 - RexB(0, to);
89667 - write16( 0x730F );
89668 - ModRM( 3, 2 , to );
89669 - write8( imm8 );
89670 -}
89671 -
89672 -void SSE2_PSRLDQ_I8_to_XMM(x86SSERegType to, u8 imm8)
89673 -{
89674 - write8( 0x66 );
89675 - RexB(0, to);
89676 - write16( 0x730F );
89677 - ModRM( 3, 3 , to );
89678 - write8( imm8 );
89679 -}
89680 -
89681 -// shift right arithmetic
89682 -
89683 -void SSE2_PSRAW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xE10F); }
89684 -void SSE2_PSRAW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xE10F); }
89685 -void SSE2_PSRAW_I8_to_XMM(x86SSERegType to, u8 imm8)
89686 -{
89687 - write8( 0x66 );
89688 - RexB(0, to);
89689 - write16( 0x710F );
89690 - ModRM( 3, 4 , to );
89691 - write8( imm8 );
89692 -}
89693 -
89694 -void SSE2_PSRAD_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xE20F); }
89695 -void SSE2_PSRAD_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xE20F); }
89696 -void SSE2_PSRAD_I8_to_XMM(x86SSERegType to, u8 imm8)
89697 -{
89698 - write8( 0x66 );
89699 - RexB(0, to);
89700 - write16( 0x720F );
89701 - ModRM( 3, 4 , to );
89702 - write8( imm8 );
89703 -}
89704 -
89705 -// shift left logical
89706 -
89707 -void SSE2_PSLLW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xF10F); }
89708 -void SSE2_PSLLW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xF10F); }
89709 -void SSE2_PSLLW_I8_to_XMM(x86SSERegType to, u8 imm8)
89710 -{
89711 - write8( 0x66 );
89712 - RexB(0, to);
89713 - write16( 0x710F );
89714 - ModRM( 3, 6 , to );
89715 - write8( imm8 );
89716 -}
89717 -
89718 -void SSE2_PSLLD_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xF20F); }
89719 -void SSE2_PSLLD_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xF20F); }
89720 -void SSE2_PSLLD_I8_to_XMM(x86SSERegType to, u8 imm8)
89721 -{
89722 - write8( 0x66 );
89723 - RexB(0, to);
89724 - write16( 0x720F );
89725 - ModRM( 3, 6 , to );
89726 - write8( imm8 );
89727 -}
89728 -
89729 -void SSE2_PSLLQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66(0xF30F); }
89730 -void SSE2_PSLLQ_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66(0xF30F); }
89731 -void SSE2_PSLLQ_I8_to_XMM(x86SSERegType to, u8 imm8)
89732 -{
89733 - write8( 0x66 );
89734 - RexB(0, to);
89735 - write16( 0x730F );
89736 - ModRM( 3, 6 , to );
89737 - write8( imm8 );
89738 -}
89739 -
89740 -void SSE2_PSLLDQ_I8_to_XMM(x86SSERegType to, u8 imm8)
89741 -{
89742 - write8( 0x66 );
89743 - RexB(0, to);
89744 - write16( 0x730F );
89745 - ModRM( 3, 7 , to );
89746 - write8( imm8 );
89747 -}
89748 -
89749 -
89750 -void SSE2_PMAXSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xEE0F ); }
89751 -void SSE2_PMAXSW_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xEE0F ); }
89752 -
89753 -void SSE2_PMAXUB_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xDE0F ); }
89754 -void SSE2_PMAXUB_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xDE0F ); }
89755 -
89756 -void SSE2_PMINSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xEA0F ); }
89757 -void SSE2_PMINSW_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xEA0F ); }
89758 -
89759 -void SSE2_PMINUB_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xDA0F ); }
89760 -void SSE2_PMINUB_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xDA0F ); }
89761 -
89762 -//
89763 -
89764 -void SSE2_PADDSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xEC0F ); }
89765 -void SSE2_PADDSB_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xEC0F ); }
89766 -
89767 -void SSE2_PADDSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xED0F ); }
89768 -void SSE2_PADDSW_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xED0F ); }
89769 -
89770 -void SSE2_PSUBSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xE80F ); }
89771 -void SSE2_PSUBSB_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xE80F ); }
89772 -
89773 -void SSE2_PSUBSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from ){ SSERtoR66( 0xE90F ); }
89774 -void SSE2_PSUBSW_M128_to_XMM( x86SSERegType to, uptr from ){ SSEMtoR66( 0xE90F ); }
89775 -
89776 -void SSE2_PSUBUSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xD80F ); }
89777 -void SSE2_PSUBUSB_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0xD80F ); }
89778 -void SSE2_PSUBUSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xD90F ); }
89779 -void SSE2_PSUBUSW_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0xD90F ); }
89780 -
89781 -void SSE2_PADDUSB_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xDC0F ); }
89782 -void SSE2_PADDUSB_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0xDC0F ); }
89783 -void SSE2_PADDUSW_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) { SSERtoR66( 0xDD0F ); }
89784 -void SSE2_PADDUSW_M128_to_XMM( x86SSERegType to, uptr from ) { SSEMtoR66( 0xDD0F ); }
89785 -
89786 -//**********************************************************************************/
89787 -//PACKSSWB,PACKSSDW: Pack Saturate Signed Word
89788 -//**********************************************************************************
89789 -void SSE2_PACKSSWB_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x630F ); }
89790 -void SSE2_PACKSSWB_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x630F ); }
89791 -void SSE2_PACKSSDW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x6B0F ); }
89792 -void SSE2_PACKSSDW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x6B0F ); }
89793 -
89794 -void SSE2_PACKUSWB_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x670F ); }
89795 -void SSE2_PACKUSWB_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x670F ); }
89796 -
89797 -//**********************************************************************************/
89798 -//PUNPCKHWD: Unpack 16bit high
89799 -//**********************************************************************************
89800 -void SSE2_PUNPCKLBW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x600F ); }
89801 -void SSE2_PUNPCKLBW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x600F ); }
89802 -
89803 -void SSE2_PUNPCKHBW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x680F ); }
89804 -void SSE2_PUNPCKHBW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x680F ); }
89805 -
89806 -void SSE2_PUNPCKLWD_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x610F ); }
89807 -void SSE2_PUNPCKLWD_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x610F ); }
89808 -void SSE2_PUNPCKHWD_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x690F ); }
89809 -void SSE2_PUNPCKHWD_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x690F ); }
89810 -
89811 -void SSE2_PUNPCKLDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x620F ); }
89812 -void SSE2_PUNPCKLDQ_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x620F ); }
89813 -void SSE2_PUNPCKHDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x6A0F ); }
89814 -void SSE2_PUNPCKHDQ_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x6A0F ); }
89815 -
89816 -void SSE2_PUNPCKLQDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x6C0F ); }
89817 -void SSE2_PUNPCKLQDQ_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x6C0F ); }
89818 -
89819 -void SSE2_PUNPCKHQDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0x6D0F ); }
89820 -void SSE2_PUNPCKHQDQ_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0x6D0F ); }
89821 -
89822 -void SSE2_PMULLW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0xD50F ); }
89823 -void SSE2_PMULLW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0xD50F ); }
89824 -void SSE2_PMULHW_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0xE50F ); }
89825 -void SSE2_PMULHW_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0xE50F ); }
89826 -
89827 -void SSE2_PMULUDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { SSERtoR66( 0xF40F ); }
89828 -void SSE2_PMULUDQ_M128_to_XMM(x86SSERegType to, uptr from) { SSEMtoR66( 0xF40F ); }
89829 -
89830 -void SSE2_PMOVMSKB_XMM_to_R32(x86IntRegType to, x86SSERegType from) { SSERtoR66(0xD70F); }
89831 -
89832 -void SSE_MOVMSKPS_XMM_to_R32(x86IntRegType to, x86SSERegType from) { SSERtoR(0x500F); }
89833 -void SSE2_MOVMSKPD_XMM_to_R32(x86IntRegType to, x86SSERegType from) { SSERtoR66(0x500F); }
89834 -
89835 -void SSE3_HADDPS_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { write8(0xf2); SSERtoR( 0x7c0f ); }
89836 -void SSE3_HADDPS_M128_to_XMM(x86SSERegType to, uptr from){ write8(0xf2); SSEMtoR( 0x7c0f, 0 ); }
89837 -
89838 -void SSE3_MOVSLDUP_XMM_to_XMM(x86SSERegType to, x86SSERegType from) {
89839 - write8(0xf3);
89840 - RexRB(0, to, from);
89841 - write16( 0x120f);
89842 - ModRM( 3, to, from );
89843 -}
89844 -
89845 -void SSE3_MOVSLDUP_M128_to_XMM(x86SSERegType to, uptr from) { write8(0xf3); SSEMtoR(0x120f, 0); }
89846 -void SSE3_MOVSHDUP_XMM_to_XMM(x86SSERegType to, x86SSERegType from) { write8(0xf3); SSERtoR(0x160f); }
89847 -void SSE3_MOVSHDUP_M128_to_XMM(x86SSERegType to, uptr from) { write8(0xf3); SSEMtoR(0x160f, 0); }
89848 -
89849 -// SSE-X
89850 -void SSEX_MOVDQA_M128_to_XMM( x86SSERegType to, uptr from )
89851 -{
89852 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_MOVDQA_M128_to_XMM(to, from);
89853 - else SSE_MOVAPS_M128_to_XMM(to, from);
89854 -}
89855 -
89856 -void SSEX_MOVDQA_XMM_to_M128( uptr to, x86SSERegType from )
89857 -{
89858 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVDQA_XMM_to_M128(to, from);
89859 - else SSE_MOVAPS_XMM_to_M128(to, from);
89860 -}
89861 -
89862 -void SSEX_MOVDQA_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
89863 -{
89864 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVDQA_XMM_to_XMM(to, from);
89865 - else SSE_MOVAPS_XMM_to_XMM(to, from);
89866 -}
89867 -
89868 -void SSEX_MOVDQARmtoROffset( x86SSERegType to, x86IntRegType from, int offset )
89869 -{
89870 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_MOVDQARmtoROffset(to, from, offset);
89871 - else SSE_MOVAPSRmtoROffset(to, from, offset);
89872 -}
89873 -
89874 -void SSEX_MOVDQARtoRmOffset( x86IntRegType to, x86SSERegType from, int offset )
89875 -{
89876 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVDQARtoRmOffset(to, from, offset);
89877 - else SSE_MOVAPSRtoRmOffset(to, from, offset);
89878 -}
89879 -
89880 -void SSEX_MOVDQU_M128_to_XMM( x86SSERegType to, uptr from )
89881 -{
89882 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_MOVDQU_M128_to_XMM(to, from);
89883 - else SSE_MOVAPS_M128_to_XMM(to, from);
89884 -}
89885 -
89886 -void SSEX_MOVDQU_XMM_to_M128( uptr to, x86SSERegType from )
89887 -{
89888 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVDQU_XMM_to_M128(to, from);
89889 - else SSE_MOVAPS_XMM_to_M128(to, from);
89890 -}
89891 -
89892 -void SSEX_MOVDQU_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
89893 -{
89894 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVDQU_XMM_to_XMM(to, from);
89895 - else SSE_MOVAPS_XMM_to_XMM(to, from);
89896 -}
89897 -
89898 -void SSEX_MOVD_M32_to_XMM( x86SSERegType to, uptr from )
89899 -{
89900 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_MOVD_M32_to_XMM(to, from);
89901 - else SSE_MOVSS_M32_to_XMM(to, from);
89902 -}
89903 -
89904 -void SSEX_MOVD_XMM_to_M32( u32 to, x86SSERegType from )
89905 -{
89906 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVD_XMM_to_M32(to, from);
89907 - else SSE_MOVSS_XMM_to_M32(to, from);
89908 -}
89909 -
89910 -void SSEX_MOVD_XMM_to_Rm( x86IntRegType to, x86SSERegType from )
89911 -{
89912 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVD_XMM_to_Rm(to, from);
89913 - else SSE_MOVSS_XMM_to_Rm(to, from);
89914 -}
89915 -
89916 -void SSEX_MOVD_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset )
89917 -{
89918 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_MOVD_RmOffset_to_XMM(to, from, offset);
89919 - else SSE_MOVSS_RmOffset_to_XMM(to, from, offset);
89920 -}
89921 -
89922 -void SSEX_MOVD_XMM_to_RmOffset( x86IntRegType to, x86SSERegType from, int offset )
89923 -{
89924 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_MOVD_XMM_to_RmOffset(to, from, offset);
89925 - else SSE_MOVSS_XMM_to_RmOffset(to, from, offset);
89926 -}
89927 -
89928 -void SSEX_POR_M128_to_XMM( x86SSERegType to, uptr from )
89929 -{
89930 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_POR_M128_to_XMM(to, from);
89931 - else SSE_ORPS_M128_to_XMM(to, from);
89932 -}
89933 -
89934 -void SSEX_POR_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
89935 -{
89936 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_POR_XMM_to_XMM(to, from);
89937 - else SSE_ORPS_XMM_to_XMM(to, from);
89938 -}
89939 -
89940 -void SSEX_PXOR_M128_to_XMM( x86SSERegType to, uptr from )
89941 -{
89942 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_PXOR_M128_to_XMM(to, from);
89943 - else SSE_XORPS_M128_to_XMM(to, from);
89944 -}
89945 -
89946 -void SSEX_PXOR_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
89947 -{
89948 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_PXOR_XMM_to_XMM(to, from);
89949 - else SSE_XORPS_XMM_to_XMM(to, from);
89950 -}
89951 -
89952 -void SSEX_PAND_M128_to_XMM( x86SSERegType to, uptr from )
89953 -{
89954 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_PAND_M128_to_XMM(to, from);
89955 - else SSE_ANDPS_M128_to_XMM(to, from);
89956 -}
89957 -
89958 -void SSEX_PAND_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
89959 -{
89960 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_PAND_XMM_to_XMM(to, from);
89961 - else SSE_ANDPS_XMM_to_XMM(to, from);
89962 -}
89963 -
89964 -void SSEX_PANDN_M128_to_XMM( x86SSERegType to, uptr from )
89965 -{
89966 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_PANDN_M128_to_XMM(to, from);
89967 - else SSE_ANDNPS_M128_to_XMM(to, from);
89968 -}
89969 -
89970 -void SSEX_PANDN_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
89971 -{
89972 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_PANDN_XMM_to_XMM(to, from);
89973 - else SSE_ANDNPS_XMM_to_XMM(to, from);
89974 -}
89975 -
89976 -void SSEX_PUNPCKLDQ_M128_to_XMM(x86SSERegType to, uptr from)
89977 -{
89978 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_PUNPCKLDQ_M128_to_XMM(to, from);
89979 - else SSE_UNPCKLPS_M128_to_XMM(to, from);
89980 -}
89981 -
89982 -void SSEX_PUNPCKLDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from)
89983 -{
89984 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_PUNPCKLDQ_XMM_to_XMM(to, from);
89985 - else SSE_UNPCKLPS_XMM_to_XMM(to, from);
89986 -}
89987 -
89988 -void SSEX_PUNPCKHDQ_M128_to_XMM(x86SSERegType to, uptr from)
89989 -{
89990 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[to] == XMMT_INT ) SSE2_PUNPCKHDQ_M128_to_XMM(to, from);
89991 - else SSE_UNPCKHPS_M128_to_XMM(to, from);
89992 -}
89993 -
89994 -void SSEX_PUNPCKHDQ_XMM_to_XMM(x86SSERegType to, x86SSERegType from)
89995 -{
89996 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) SSE2_PUNPCKHDQ_XMM_to_XMM(to, from);
89997 - else SSE_UNPCKHPS_XMM_to_XMM(to, from);
89998 -}
89999 -
90000 -void SSEX_MOVHLPS_XMM_to_XMM( x86SSERegType to, x86SSERegType from )
90001 -{
90002 - if( cpucaps.hasStreamingSIMD2Extensions && g_xmmtypes[from] == XMMT_INT ) {
90003 - SSE2_PUNPCKHQDQ_XMM_to_XMM(to, from);
90004 - if( to != from ) SSE2_PSHUFD_XMM_to_XMM(to, to, 0x4e);
90005 - }
90006 - else {
90007 - SSE_MOVHLPS_XMM_to_XMM(to, from);
90008 - }
90009 -}
90010 -
90011 -// SSE2 emulation
90012 -void SSE2EMU_MOVSD_XMM_to_XMM( x86SSERegType to, x86SSERegType from)
90013 -{
90014 - SSE_SHUFPS_XMM_to_XMM(to, from, 0x4e);
90015 - SSE_SHUFPS_XMM_to_XMM(to, to, 0x4e);
90016 -}
90017 -
90018 -void SSE2EMU_MOVQ_M64_to_XMM( x86SSERegType to, uptr from)
90019 -{
90020 - SSE_XORPS_XMM_to_XMM(to, to);
90021 - SSE_MOVLPS_M64_to_XMM(to, from);
90022 -}
90023 -
90024 -void SSE2EMU_MOVQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from)
90025 -{
90026 - SSE_XORPS_XMM_to_XMM(to, to);
90027 - SSE2EMU_MOVSD_XMM_to_XMM(to, from);
90028 -}
90029 -
90030 -void SSE2EMU_MOVD_RmOffset_to_XMM( x86SSERegType to, x86IntRegType from, int offset )
90031 -{
90032 - MOV32RmtoROffset(EAX, from, offset);
90033 - MOV32ItoM((u32)p+4, 0);
90034 - MOV32ItoM((u32)p+8, 0);
90035 - MOV32RtoM((u32)p, EAX);
90036 - MOV32ItoM((u32)p+12, 0);
90037 - SSE_MOVAPS_M128_to_XMM(to, (u32)p);
90038 -}
90039 -
90040 -void SSE2EMU_MOVD_XMM_to_RmOffset(x86IntRegType to, x86SSERegType from, int offset )
90041 -{
90042 - SSE_MOVSS_XMM_to_M32((u32)p, from);
90043 - MOV32MtoR(EAX, (u32)p);
90044 - MOV32RtoRmOffset(to, EAX, offset);
90045 -}
90046 -
90047 -#ifndef __x86_64__
90048 -extern void SetMMXstate();
90049 -
90050 -void SSE2EMU_MOVDQ2Q_XMM_to_MM( x86MMXRegType to, x86SSERegType from)
90051 -{
90052 - SSE_MOVLPS_XMM_to_M64((u32)p, from);
90053 - MOVQMtoR(to, (u32)p);
90054 - SetMMXstate();
90055 -}
90056 -
90057 -void SSE2EMU_MOVQ2DQ_MM_to_XMM( x86SSERegType to, x86MMXRegType from)
90058 -{
90059 - MOVQRtoM((u32)p, from);
90060 - SSE_MOVLPS_M64_to_XMM(to, (u32)p);
90061 - SetMMXstate();
90062 -}
90063 -#endif
90064 -
90065 -/****************************************************************************/
90066 -/* SSE2 Emulated functions for SSE CPU's by kekko */
90067 -/****************************************************************************/
90068 -void SSE2EMU_PSHUFD_XMM_to_XMM( x86SSERegType to, x86SSERegType from, u8 imm8 ) {
90069 - MOV32ItoR(EAX, (u32)&p);
90070 - MOV32ItoR(EBX, (u32)&p2);
90071 - SSE_MOVUPSRtoRm(EAX, from);
90072 -
90073 - MOV32ItoR(ECX, (u32)imm8);
90074 - AND32ItoR(ECX, 3);
90075 - SHL32ItoR(ECX, 2);
90076 - ADD32RtoR(ECX, EAX);
90077 - MOV32RmtoR(ECX, ECX);
90078 - MOV32RtoRm(EBX, ECX);
90079 -
90080 - ADD32ItoR(EBX, 4);
90081 - MOV32ItoR(ECX, (u32)imm8);
90082 - SHR32ItoR(ECX, 2);
90083 - AND32ItoR(ECX, 3);
90084 - SHL32ItoR(ECX, 2);
90085 - ADD32RtoR(ECX, EAX);
90086 - MOV32RmtoR(ECX, ECX);
90087 - MOV32RtoRm(EBX, ECX);
90088 -
90089 - ADD32ItoR(EBX, 4);
90090 - MOV32ItoR(ECX, (u32)imm8);
90091 - SHR32ItoR(ECX, 4);
90092 - AND32ItoR(ECX, 3);
90093 - SHL32ItoR(ECX, 2);
90094 - ADD32RtoR(ECX, EAX);
90095 - MOV32RmtoR(ECX, ECX);
90096 - MOV32RtoRm(EBX, ECX);
90097 -
90098 - ADD32ItoR(EBX, 4);
90099 - MOV32ItoR(ECX, (u32)imm8);
90100 - SHR32ItoR(ECX, 6);
90101 - AND32ItoR(ECX, 3);
90102 - SHL32ItoR(ECX, 2);
90103 - ADD32RtoR(ECX, EAX);
90104 - MOV32RmtoR(ECX, ECX);
90105 - MOV32RtoRm(EBX, ECX);
90106 -
90107 - SUB32ItoR(EBX, 12);
90108 -
90109 - SSE_MOVUPSRmtoR(to, EBX);
90110 -}
90111 -
90112 -void SSE2EMU_MOVD_XMM_to_R( x86IntRegType to, x86SSERegType from ) {
90113 - MOV32ItoR(to, (u32)&p);
90114 - SSE_MOVUPSRtoRm(to, from);
90115 - MOV32RmtoR(to, to);
90116 -}
90117 -
90118 -#ifndef __x86_64__
90119 -extern void SetFPUstate();
90120 -extern void _freeMMXreg(int mmxreg);
90121 -#endif
90122 -
90123 -void SSE2EMU_CVTPS2DQ_XMM_to_XMM( x86SSERegType to, x86SSERegType from ) {
90124 -#ifndef __x86_64__
90125 - SetFPUstate();
90126 - _freeMMXreg(7);
90127 -#endif
90128 - SSE_MOVAPS_XMM_to_M128((u32)f, from);
90129 -
90130 - FLD32((u32)&f[0]);
90131 - FISTP32((u32)&p2[0]);
90132 - FLD32((u32)&f[1]);
90133 - FISTP32((u32)&p2[1]);
90134 - FLD32((u32)&f[2]);
90135 - FISTP32((u32)&p2[2]);
90136 - FLD32((u32)&f[3]);
90137 - FISTP32((u32)&p2[3]);
90138 -
90139 - SSE_MOVAPS_M128_to_XMM(to, (u32)p2);
90140 -}
90141 -
90142 -void SSE2EMU_CVTDQ2PS_M128_to_XMM( x86SSERegType to, uptr from ) {
90143 -#ifndef __x86_64__
90144 - SetFPUstate();
90145 - _freeMMXreg(7);
90146 -#endif
90147 - FILD32((u32)from);
90148 - FSTP32((u32)&f[0]);
90149 - FILD32((u32)from+4);
90150 - FSTP32((u32)&f[1]);
90151 - FILD32((u32)from+8);
90152 - FSTP32((u32)&f[2]);
90153 - FILD32((u32)from+12);
90154 - FSTP32((u32)&f[3]);
90155 -
90156 - SSE_MOVAPS_M128_to_XMM(to, (u32)f);
90157 -}
90158 -
90159 -void SSE2EMU_MOVD_XMM_to_M32( u32 to, x86SSERegType from ) {
90160 - MOV32ItoR(EAX, (u32)&p);
90161 - SSE_MOVUPSRtoRm(EAX, from);
90162 - MOV32RmtoR(EAX, EAX);
90163 - MOV32RtoM(to, EAX);
90164 -}
90165 -
90166 -void SSE2EMU_MOVD_R_to_XMM( x86SSERegType to, x86IntRegType from ) {
90167 - MOV32ItoM((u32)p+4, 0);
90168 - MOV32ItoM((u32)p+8, 0);
90169 - MOV32RtoM((u32)p, from);
90170 - MOV32ItoM((u32)p+12, 0);
90171 - SSE_MOVAPS_M128_to_XMM(to, (u32)p);
90172 -}
90173 -
90174 -#endif
90175 diff -rupN original/libpcsxcore/libpcsxcore/libpcsxcore.la new/libpcsxcore/libpcsxcore/libpcsxcore.la
90176 --- original/libpcsxcore/libpcsxcore/libpcsxcore.la 2009-03-28 22:35:12.000000000 -0430
90177 +++ new/libpcsxcore/libpcsxcore/libpcsxcore.la 1969-12-31 20:00:00.000000000 -0400
90178 @@ -1,35 +0,0 @@
90179 -# libpcsxcore.la - a libtool library file
90180 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
90181 -#
90182 -# Please DO NOT delete this file!
90183 -# It is necessary for linking the library.
90184 -
90185 -# The name that we can dlopen(3).
90186 -dlname='libpcsxcore.so.0'
90187 -
90188 -# Names of this library.
90189 -library_names='libpcsxcore.so.0.0.0 libpcsxcore.so.0 libpcsxcore.so'
90190 -
90191 -# The name of the static archive.
90192 -old_library='libpcsxcore.a'
90193 -
90194 -# Libraries that this one depends upon.
90195 -dependency_libs=' /usr/lib/libglib-2.0.la'
90196 -
90197 -# Version information for libpcsxcore.
90198 -current=0
90199 -age=0
90200 -revision=0
90201 -
90202 -# Is this an already installed library?
90203 -installed=no
90204 -
90205 -# Should we warn about portability when linking against -modules?
90206 -shouldnotlink=no
90207 -
90208 -# Files to dlopen/dlpreopen
90209 -dlopen=''
90210 -dlpreopen=''
90211 -
90212 -# Directory that this library needs to be installed in:
90213 -libdir='/usr/local/lib'
90214 diff -rupN original/libpcsxcore/libpcsxcore/mdec.c new/libpcsxcore/libpcsxcore/mdec.c
90215 --- original/libpcsxcore/libpcsxcore/mdec.c 2008-05-06 13:24:17.000000000 -0430
90216 +++ new/libpcsxcore/libpcsxcore/mdec.c 1969-12-31 20:00:00.000000000 -0400
90217 @@ -1,541 +0,0 @@
90218 -/***************************************************************************
90219 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
90220 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
90221 - * *
90222 - * This program is free software; you can redistribute it and/or modify *
90223 - * it under the terms of the GNU General Public License as published by *
90224 - * the Free Software Foundation; either version 2 of the License, or *
90225 - * (at your option) any later version. *
90226 - * *
90227 - * This program is distributed in the hope that it will be useful, *
90228 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
90229 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
90230 - * GNU General Public License for more details. *
90231 - * *
90232 - * You should have received a copy of the GNU General Public License *
90233 - * along with this program; if not, write to the *
90234 - * Free Software Foundation, Inc., *
90235 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
90236 - ***************************************************************************/
90237 -
90238 -/*
90239 -* Movie decoder. Based on the FPSE v0.08 Mdec decoder.
90240 -*/
90241 -
90242 -#include "mdec.h"
90243 -
90244 -#define FIXED
90245 -
90246 -#define CONST_BITS 8
90247 -#define PASS1_BITS 2
90248 -
90249 -#define FIX_1_082392200 (277)
90250 -#define FIX_1_414213562 (362)
90251 -#define FIX_1_847759065 (473)
90252 -#define FIX_2_613125930 (669)
90253 -
90254 -#define MULTIPLY(var,const) (DESCALE((var) * (const), CONST_BITS))
90255 -
90256 -#define DEQUANTIZE(coef,quantval) (coef)
90257 -
90258 -#define DESCALE(x,n) ((x)>>(n))
90259 -#define RANGE(n) (n)
90260 -
90261 -#define DCTSIZE 8
90262 -#define DCTSIZE2 64
90263 -
90264 -static void idct1(int *block)
90265 -{
90266 - int val = RANGE(DESCALE(block[0], PASS1_BITS+3));
90267 - int i;
90268 - for(i=0;i<DCTSIZE2;i++) block[i]=val;
90269 -}
90270 -
90271 -void idct(int *block,int k)
90272 -{
90273 - int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
90274 - int z5, z10, z11, z12, z13;
90275 - int *ptr;
90276 - int i;
90277 -
90278 - if (!k) { idct1(block); return; }
90279 -
90280 - ptr = block;
90281 - for (i = 0; i< DCTSIZE; i++,ptr++) {
90282 -
90283 - if ((ptr[DCTSIZE*1] | ptr[DCTSIZE*2] | ptr[DCTSIZE*3] |
90284 - ptr[DCTSIZE*4] | ptr[DCTSIZE*5] | ptr[DCTSIZE*6] |
90285 - ptr[DCTSIZE*7]) == 0) {
90286 - ptr[DCTSIZE*0] =
90287 - ptr[DCTSIZE*1] =
90288 - ptr[DCTSIZE*2] =
90289 - ptr[DCTSIZE*3] =
90290 - ptr[DCTSIZE*4] =
90291 - ptr[DCTSIZE*5] =
90292 - ptr[DCTSIZE*6] =
90293 - ptr[DCTSIZE*7] =
90294 - ptr[DCTSIZE*0];
90295 -
90296 - continue;
90297 - }
90298 -
90299 - z10 = ptr[DCTSIZE*0] + ptr[DCTSIZE*4];
90300 - z11 = ptr[DCTSIZE*0] - ptr[DCTSIZE*4];
90301 - z13 = ptr[DCTSIZE*2] + ptr[DCTSIZE*6];
90302 - z12 = MULTIPLY(ptr[DCTSIZE*2] - ptr[DCTSIZE*6], FIX_1_414213562) - z13;
90303 -
90304 - tmp0 = z10 + z13;
90305 - tmp3 = z10 - z13;
90306 - tmp1 = z11 + z12;
90307 - tmp2 = z11 - z12;
90308 -
90309 - z13 = ptr[DCTSIZE*3] + ptr[DCTSIZE*5];
90310 - z10 = ptr[DCTSIZE*3] - ptr[DCTSIZE*5];
90311 - z11 = ptr[DCTSIZE*1] + ptr[DCTSIZE*7];
90312 - z12 = ptr[DCTSIZE*1] - ptr[DCTSIZE*7];
90313 -
90314 - z5 = MULTIPLY(z12 - z10, FIX_1_847759065);
90315 - tmp7 = z11 + z13;
90316 - tmp6 = MULTIPLY(z10, FIX_2_613125930) + z5 - tmp7;
90317 - tmp5 = MULTIPLY(z11 - z13, FIX_1_414213562) - tmp6;
90318 - tmp4 = MULTIPLY(z12, FIX_1_082392200) - z5 + tmp5;
90319 -
90320 - ptr[DCTSIZE*0] = (tmp0 + tmp7);
90321 - ptr[DCTSIZE*7] = (tmp0 - tmp7);
90322 - ptr[DCTSIZE*1] = (tmp1 + tmp6);
90323 - ptr[DCTSIZE*6] = (tmp1 - tmp6);
90324 - ptr[DCTSIZE*2] = (tmp2 + tmp5);
90325 - ptr[DCTSIZE*5] = (tmp2 - tmp5);
90326 - ptr[DCTSIZE*4] = (tmp3 + tmp4);
90327 - ptr[DCTSIZE*3] = (tmp3 - tmp4);
90328 -
90329 - }
90330 -
90331 - ptr = block;
90332 - for (i = 0; i < DCTSIZE; i++ ,ptr+=DCTSIZE) {
90333 -
90334 - if ((ptr[1] | ptr[2] | ptr[3] | ptr[4] | ptr[5] | ptr[6] |
90335 - ptr[7]) == 0) {
90336 - ptr[0] =
90337 - ptr[1] =
90338 - ptr[2] =
90339 - ptr[3] =
90340 - ptr[4] =
90341 - ptr[5] =
90342 - ptr[6] =
90343 - ptr[7] =
90344 - RANGE(DESCALE(ptr[0], PASS1_BITS+3));;
90345 -
90346 - continue;
90347 - }
90348 -
90349 - z10 = ptr[0] + ptr[4];
90350 - z11 = ptr[0] - ptr[4];
90351 - z13 = ptr[2] + ptr[6];
90352 - z12 = MULTIPLY(ptr[2] - ptr[6], FIX_1_414213562) - z13;
90353 -
90354 - tmp0 = z10 + z13;
90355 - tmp3 = z10 - z13;
90356 - tmp1 = z11 + z12;
90357 - tmp2 = z11 - z12;
90358 -
90359 - z13 = ptr[3] + ptr[5];
90360 - z10 = ptr[3] - ptr[5];
90361 - z11 = ptr[1] + ptr[7];
90362 - z12 = ptr[1] - ptr[7];
90363 -
90364 - z5 = MULTIPLY(z12 - z10, FIX_1_847759065);
90365 - tmp7 = z11 + z13;
90366 - tmp6 = MULTIPLY(z10, FIX_2_613125930) + z5 - tmp7;
90367 - tmp5 = MULTIPLY(z11 - z13, FIX_1_414213562) - tmp6;
90368 - tmp4 = MULTIPLY(z12, FIX_1_082392200) - z5 + tmp5;
90369 -
90370 - ptr[0] = RANGE(DESCALE(tmp0 + tmp7, PASS1_BITS+3));;
90371 - ptr[7] = RANGE(DESCALE(tmp0 - tmp7, PASS1_BITS+3));;
90372 - ptr[1] = RANGE(DESCALE(tmp1 + tmp6, PASS1_BITS+3));;
90373 - ptr[6] = RANGE(DESCALE(tmp1 - tmp6, PASS1_BITS+3));;
90374 - ptr[2] = RANGE(DESCALE(tmp2 + tmp5, PASS1_BITS+3));;
90375 - ptr[5] = RANGE(DESCALE(tmp2 - tmp5, PASS1_BITS+3));;
90376 - ptr[4] = RANGE(DESCALE(tmp3 + tmp4, PASS1_BITS+3));;
90377 - ptr[3] = RANGE(DESCALE(tmp3 - tmp4, PASS1_BITS+3));;
90378 -
90379 - }
90380 -}
90381 -
90382 -unsigned short* rl2blk(int *blk,unsigned short *mdec_rl);
90383 -void iqtab_init(int *iqtab,unsigned char *iq_y);
90384 -void round_init(void);
90385 -void yuv2rgb24(int *blk,unsigned char *image);
90386 -void yuv2rgb15(int *blk,unsigned short *image);
90387 -
90388 -struct {
90389 - u32 command;
90390 - u32 status;
90391 - unsigned short *rl;
90392 - int rlsize;
90393 -} mdec;
90394 -
90395 -int iq_y[DCTSIZE2],iq_uv[DCTSIZE2];
90396 -
90397 -void mdecInit(void) {
90398 - mdec.rl = (u16*)&psxM[0x100000];
90399 - mdec.command = 0;
90400 - mdec.status = 0;
90401 - round_init();
90402 -}
90403 -
90404 -
90405 -void mdecWrite0(u32 data) {
90406 -#ifdef CDR_LOG
90407 - CDR_LOG("mdec0 write %lx\n", data);
90408 -#endif
90409 - mdec.command = data;
90410 - if ((data&0xf5ff0000)==0x30000000) {
90411 - mdec.rlsize = data&0xffff;
90412 - }
90413 -}
90414 -
90415 -void mdecWrite1(u32 data) {
90416 -#ifdef CDR_LOG
90417 - CDR_LOG("mdec1 write %lx\n", data);
90418 -#endif
90419 - if (data&0x80000000) { // mdec reset
90420 - mdec.command = 0;
90421 - mdec.status = 0;
90422 - }
90423 -}
90424 -
90425 -u32 mdecRead0(void) {
90426 -#ifdef CDR_LOG
90427 - CDR_LOG("mdec0 read %lx\n", mdec.command);
90428 -#endif
90429 - return mdec.command;
90430 -}
90431 -
90432 -// mdec status:
90433 -#define MDEC_BUSY 0x20000000
90434 -#define MDEC_DREQ 0x18000000
90435 -#define MDEC_FIFO 0xc0000000
90436 -#define MDEC_RGB24 0x02000000
90437 -#define MDEC_STP 0x00800000
90438 -
90439 -u32 mdecRead1(void) {
90440 -#ifdef CDR_LOG
90441 - CDR_LOG("mdec1 read %lx\n", mdec.status);
90442 -#endif
90443 - return mdec.status;
90444 -}
90445 -
90446 -void psxDma0(u32 adr, u32 bcr, u32 chcr) {
90447 - int cmd = mdec.command;
90448 - int size;
90449 -
90450 -#ifdef CDR_LOG
90451 - CDR_LOG("DMA0 %lx %lx %lx\n", adr, bcr, chcr);
90452 -#endif
90453 -
90454 - if (chcr!=0x01000201) return;
90455 -
90456 - size = (bcr>>16)*(bcr&0xffff);
90457 -
90458 - if (cmd==0x60000000) {
90459 - } else
90460 - if (cmd==0x40000001) {
90461 - u8 *p = (u8*)PSXM(adr);
90462 - iqtab_init(iq_y,p);
90463 - iqtab_init(iq_uv,p+64);
90464 - } else
90465 - if ((cmd&0xf5ff0000)==0x30000000) {
90466 - mdec.rl = (u16*)PSXM(adr);
90467 - }
90468 - else {
90469 - }
90470 -
90471 - HW_DMA0_CHCR &= SWAP32(~0x01000000);
90472 - DMA_INTERRUPT(0);
90473 -}
90474 -
90475 -void psxDma1(u32 adr, u32 bcr, u32 chcr) {
90476 - int blk[DCTSIZE2*6];
90477 - unsigned short *image;
90478 - int size;
90479 -
90480 -#ifdef CDR_LOG
90481 - CDR_LOG("DMA1 %lx %lx %lx (cmd = %lx)\n", adr, bcr, chcr, mdec.command);
90482 -#endif
90483 -
90484 - if (chcr!=0x01000200) return;
90485 -
90486 - size = (bcr>>16)*(bcr&0xffff);
90487 -
90488 - image = (u16*)PSXM(adr);
90489 - if (mdec.command&0x08000000) {
90490 -// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS);
90491 - MDECOUTDMA_INT((size / 4) / BIAS);
90492 - size = size / ((16*16)/2);
90493 - for (;size>0;size--,image+=(16*16)) {
90494 - mdec.rl = rl2blk(blk,mdec.rl);
90495 - yuv2rgb15(blk,image);
90496 - }
90497 - } else {
90498 -// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS);
90499 - MDECOUTDMA_INT((size / 4) / BIAS);
90500 - size = size / ((24*16)/2);
90501 - for (;size>0;size--,image+=(24*16)) {
90502 - mdec.rl = rl2blk(blk,mdec.rl);
90503 - yuv2rgb24(blk,(u8 *)image);
90504 - }
90505 - }
90506 - mdec.status|= MDEC_BUSY;
90507 -}
90508 -
90509 -void mdec1Interrupt() {
90510 -#ifdef CDR_LOG
90511 - CDR_LOG("mdec1Interrupt\n");
90512 -#endif
90513 - if (HW_DMA1_CHCR & SWAP32(0x01000000)) {
90514 - // Set a fixed value totaly arbitrarie
90515 - // another sound value is PSXCLK / 60 or
90516 - // PSXCLK / 50 since the bug happend
90517 - // at end of frame. PSXCLK / 1000 seems
90518 - // good for FF9.
90519 - // (for FF9 need < ~28000)
90520 - // CAUTION: commented interrupt-handling may lead to problems, keep an eye ;-)
90521 - MDECOUTDMA_INT(PSXCLK / 1000);
90522 - //psxRegs.interrupt|= 0x02000000;
90523 - //psxRegs.intCycle[5+24+1] *= 8;
90524 - //psxRegs.intCycle[5+24] = psxRegs.cycle;
90525 - HW_DMA1_CHCR&= SWAP32(~0x01000000);
90526 - DMA_INTERRUPT(1);
90527 - } else {
90528 - mdec.status&= ~MDEC_BUSY;
90529 - }
90530 -}
90531 -
90532 -#define RUNOF(a) ((a)>>10)
90533 -#define VALOF(a) (((int)(a)<<(32-10))>>(32-10))
90534 -
90535 -static int zscan[DCTSIZE2] = {
90536 - 0 ,1 ,8 ,16,9 ,2 ,3 ,10,
90537 - 17,24,32,25,18,11,4 ,5 ,
90538 - 12,19,26,33,40,48,41,34,
90539 - 27,20,13,6 ,7 ,14,21,28,
90540 - 35,42,49,56,57,50,43,36,
90541 - 29,22,15,23,30,37,44,51,
90542 - 58,59,52,45,38,31,39,46,
90543 - 53,60,61,54,47,55,62,63
90544 -};
90545 -
90546 -static int aanscales[DCTSIZE2] = {
90547 - 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
90548 - 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270,
90549 - 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906,
90550 - 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315,
90551 - 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
90552 - 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552,
90553 - 8867, 12299, 11585, 10426, 8867, 6967, 4799, 2446,
90554 - 4520, 6270, 5906, 5315, 4520, 3552, 2446, 1247
90555 -};
90556 -
90557 -void iqtab_init(int *iqtab,unsigned char *iq_y) {
90558 -#define CONST_BITS14 14
90559 -#define IFAST_SCALE_BITS 2
90560 - int i;
90561 -
90562 - for(i=0;i<DCTSIZE2;i++) {
90563 - iqtab[i] =iq_y[i] *aanscales[zscan[i]]>>(CONST_BITS14-IFAST_SCALE_BITS);
90564 - }
90565 -}
90566 -
90567 -#define NOP 0xfe00
90568 -unsigned short* rl2blk(int *blk,unsigned short *mdec_rl) {
90569 - int i,k,q_scale,rl;
90570 - int *iqtab;
90571 -
90572 - memset (blk, 0, 6*DCTSIZE2*4);
90573 - iqtab = iq_uv;
90574 - for(i=0;i<6;i++) { // decode blocks (Cr,Cb,Y1,Y2,Y3,Y4)
90575 - if (i>1) iqtab = iq_y;
90576 -
90577 - // zigzag transformation
90578 - rl = SWAP16(*mdec_rl); mdec_rl++;
90579 - q_scale = RUNOF(rl);
90580 - blk[0] = iqtab[0]*VALOF(rl);
90581 - for(k = 0;;) {
90582 - rl = SWAP16(*mdec_rl); mdec_rl++;
90583 - if (rl==NOP) break;
90584 - k += RUNOF(rl)+1; // skip level zero-coefficients
90585 - if (k > 63) break;
90586 - blk[zscan[k]] = (VALOF(rl) * iqtab[k] * q_scale) / 8; // / 16;
90587 - }
90588 -// blk[0] = (blk[0] * iq_t[0] * 8) / 16;
90589 -// for(int j=1;j<64;j++)
90590 -// blk[j] = blk[j] * iq_t[j] * q_scale;
90591 -
90592 - // idct
90593 - idct(blk,k+1);
90594 -
90595 - blk+=DCTSIZE2;
90596 - }
90597 - return mdec_rl;
90598 -}
90599 -
90600 -#ifdef FIXED
90601 -#define MULR(a) ((((int)0x0000059B) * (a)) >> 10)
90602 -#define MULG(a) ((((int)0xFFFFFEA1) * (a)) >> 10)
90603 -#define MULG2(a) ((((int)0xFFFFFD25) * (a)) >> 10)
90604 -#define MULB(a) ((((int)0x00000716) * (a)) >> 10)
90605 -#else
90606 -#define MULR(a) ((int)((float)1.40200 * (a)))
90607 -#define MULG(a) ((int)((float)-0.3437 * (a)))
90608 -#define MULG2(a) ((int)((float)-0.7143 * (a)))
90609 -#define MULB(a) ((int)((float)1.77200 * (a)))
90610 -#endif
90611 -
90612 -#define MAKERGB15(r,g,b) ( SWAP16((((r)>>3)<<10)|(((g)>>3)<<5)|((b)>>3)) )
90613 -#define ROUND(c) roundtbl[((c)+128+256)]//&0x3ff]
90614 -/*#define ROUND(c) round(c+128)
90615 -int round(int r) {
90616 - if (r<0) return 0;
90617 - if (r>255) return 255;
90618 - return r;
90619 -}*/
90620 -
90621 -#define RGB15(n, Y) \
90622 - image[n] = MAKERGB15(ROUND(Y + R),ROUND(Y + G),ROUND(Y + B));
90623 -
90624 -#define RGB15BW(n, Y) \
90625 - image[n] = MAKERGB15(ROUND(Y),ROUND(Y),ROUND(Y));
90626 -
90627 -#define RGB24(n, Y) \
90628 - image[n+2] = ROUND(Y + R); \
90629 - image[n+1] = ROUND(Y + G); \
90630 - image[n+0] = ROUND(Y + B);
90631 -
90632 -#define RGB24BW(n, Y) \
90633 - image[n+2] = ROUND(Y); \
90634 - image[n+1] = ROUND(Y); \
90635 - image[n+0] = ROUND(Y);
90636 -
90637 -unsigned char roundtbl[256*3];
90638 -
90639 -void round_init(void) {
90640 - int i;
90641 - for(i=0;i<256;i++) {
90642 - roundtbl[i]=0;
90643 - roundtbl[i+256]=i;
90644 - roundtbl[i+512]=255;
90645 - }
90646 -}
90647 -
90648 -void yuv2rgb15(int *blk,unsigned short *image) {
90649 - int x,y;
90650 - int *Yblk = blk+DCTSIZE2*2;
90651 - int Cb,Cr,R,G,B;
90652 - int *Cbblk = blk;
90653 - int *Crblk = blk+DCTSIZE2;
90654 -
90655 - if (!Config.Mdec)
90656 - for (y=0;y<16;y+=2,Crblk+=4,Cbblk+=4,Yblk+=8,image+=24) {
90657 - if (y==8) Yblk+=DCTSIZE2;
90658 - for (x=0;x<4;x++,image+=2,Crblk++,Cbblk++,Yblk+=2) {
90659 - Cr = *Crblk;
90660 - Cb = *Cbblk;
90661 - R = MULR(Cr);
90662 - G = MULG(Cb) + MULG2(Cr);
90663 - B = MULB(Cb);
90664 -
90665 - RGB15(0, Yblk[0]);
90666 - RGB15(1, Yblk[1]);
90667 - RGB15(16, Yblk[8]);
90668 - RGB15(17, Yblk[9]);
90669 -
90670 - Cr = *(Crblk+4);
90671 - Cb = *(Cbblk+4);
90672 - R = MULR(Cr);
90673 - G = MULG(Cb) + MULG2(Cr);
90674 - B = MULB(Cb);
90675 -
90676 - RGB15(8, Yblk[DCTSIZE2+0]);
90677 - RGB15(9, Yblk[DCTSIZE2+1]);
90678 - RGB15(24, Yblk[DCTSIZE2+8]);
90679 - RGB15(25, Yblk[DCTSIZE2+9]);
90680 - }
90681 - } else
90682 - for (y=0;y<16;y+=2,Yblk+=8,image+=24) {
90683 - if (y==8) Yblk+=DCTSIZE2;
90684 - for (x=0;x<4;x++,image+=2,Yblk+=2) {
90685 - RGB15BW(0, Yblk[0]);
90686 - RGB15BW(1, Yblk[1]);
90687 - RGB15BW(16, Yblk[8]);
90688 - RGB15BW(17, Yblk[9]);
90689 -
90690 - RGB15BW(8, Yblk[DCTSIZE2+0]);
90691 - RGB15BW(9, Yblk[DCTSIZE2+1]);
90692 - RGB15BW(24, Yblk[DCTSIZE2+8]);
90693 - RGB15BW(25, Yblk[DCTSIZE2+9]);
90694 - }
90695 - }
90696 -}
90697 -
90698 -void yuv2rgb24(int *blk,unsigned char *image) {
90699 - int x,y;
90700 - int *Yblk = blk+DCTSIZE2*2;
90701 - int Cb,Cr,R,G,B;
90702 - int *Cbblk = blk;
90703 - int *Crblk = blk+DCTSIZE2;
90704 -
90705 - if (!Config.Mdec)
90706 - for (y=0;y<16;y+=2,Crblk+=4,Cbblk+=4,Yblk+=8,image+=24*3) {
90707 - if (y==8) Yblk+=DCTSIZE2;
90708 - for (x=0;x<4;x++,image+=6,Crblk++,Cbblk++,Yblk+=2) {
90709 - Cr = *Crblk;
90710 - Cb = *Cbblk;
90711 - R = MULR(Cr);
90712 - G = MULG(Cb) + MULG2(Cr);
90713 - B = MULB(Cb);
90714 -
90715 - RGB24(0, Yblk[0]);
90716 - RGB24(1*3, Yblk[1]);
90717 - RGB24(16*3, Yblk[8]);
90718 - RGB24(17*3, Yblk[9]);
90719 -
90720 - Cr = *(Crblk+4);
90721 - Cb = *(Cbblk+4);
90722 - R = MULR(Cr);
90723 - G = MULG(Cb) + MULG2(Cr);
90724 - B = MULB(Cb);
90725 -
90726 - RGB24(8*3, Yblk[DCTSIZE2+0]);
90727 - RGB24(9*3, Yblk[DCTSIZE2+1]);
90728 - RGB24(24*3, Yblk[DCTSIZE2+8]);
90729 - RGB24(25*3, Yblk[DCTSIZE2+9]);
90730 - }
90731 - } else
90732 - for (y=0;y<16;y+=2,Yblk+=8,image+=24*3) {
90733 - if (y==8) Yblk+=DCTSIZE2;
90734 - for (x=0;x<4;x++,image+=6,Yblk+=2) {
90735 - RGB24BW(0, Yblk[0]);
90736 - RGB24BW(1*3, Yblk[1]);
90737 - RGB24BW(16*3, Yblk[8]);
90738 - RGB24BW(17*3, Yblk[9]);
90739 -
90740 - RGB24BW(8*3, Yblk[DCTSIZE2+0]);
90741 - RGB24BW(9*3, Yblk[DCTSIZE2+1]);
90742 - RGB24BW(24*3, Yblk[DCTSIZE2+8]);
90743 - RGB24BW(25*3, Yblk[DCTSIZE2+9]);
90744 - }
90745 - }
90746 -}
90747 -
90748 -int mdecFreeze(gzFile f, int Mode) {
90749 - char Unused[4096];
90750 -
90751 - gzfreeze(&mdec, sizeof(mdec));
90752 - gzfreezel(iq_y);
90753 - gzfreezel(iq_uv);
90754 - gzfreezel(Unused);
90755 -
90756 - return 0;
90757 -}
90758 -
90759 diff -rupN original/libpcsxcore/libpcsxcore/mdec.h new/libpcsxcore/libpcsxcore/mdec.h
90760 --- original/libpcsxcore/libpcsxcore/mdec.h 2007-10-08 17:13:28.000000000 -0400
90761 +++ new/libpcsxcore/libpcsxcore/mdec.h 1969-12-31 20:00:00.000000000 -0400
90762 @@ -1,39 +0,0 @@
90763 -/***************************************************************************
90764 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
90765 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
90766 - * *
90767 - * This program is free software; you can redistribute it and/or modify *
90768 - * it under the terms of the GNU General Public License as published by *
90769 - * the Free Software Foundation; either version 2 of the License, or *
90770 - * (at your option) any later version. *
90771 - * *
90772 - * This program is distributed in the hope that it will be useful, *
90773 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
90774 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
90775 - * GNU General Public License for more details. *
90776 - * *
90777 - * You should have received a copy of the GNU General Public License *
90778 - * along with this program; if not, write to the *
90779 - * Free Software Foundation, Inc., *
90780 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
90781 - ***************************************************************************/
90782 -
90783 -#ifndef __MDEC_H__
90784 -#define __MDEC_H__
90785 -
90786 -#include "psxcommon.h"
90787 -#include "r3000a.h"
90788 -#include "psxhw.h"
90789 -#include "psxdma.h"
90790 -
90791 -void mdecInit();
90792 -void mdecWrite0(u32 data);
90793 -void mdecWrite1(u32 data);
90794 -u32 mdecRead0();
90795 -u32 mdecRead1();
90796 -void psxDma0(u32 madr, u32 bcr, u32 chcr);
90797 -void psxDma1(u32 madr, u32 bcr, u32 chcr);
90798 -void mdec1Interrupt();
90799 -int mdecFreeze(gzFile f, int Mode);
90800 -
90801 -#endif /* __MDEC_H__ */
90802 diff -rupN original/libpcsxcore/libpcsxcore/mdec.lo new/libpcsxcore/libpcsxcore/mdec.lo
90803 --- original/libpcsxcore/libpcsxcore/mdec.lo 2009-03-28 22:34:50.000000000 -0430
90804 +++ new/libpcsxcore/libpcsxcore/mdec.lo 1969-12-31 20:00:00.000000000 -0400
90805 @@ -1,12 +0,0 @@
90806 -# mdec.lo - a libtool object file
90807 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
90808 -#
90809 -# Please DO NOT delete this file!
90810 -# It is necessary for linking the library.
90811 -
90812 -# Name of the PIC object.
90813 -pic_object='.libs/mdec.o'
90814 -
90815 -# Name of the non-PIC object.
90816 -non_pic_object='mdec.o'
90817 -
90818 Los ficheros binarios original/libpcsxcore/libpcsxcore/mdec.o y new/libpcsxcore/libpcsxcore/mdec.o son distintos
90819 diff -rupN original/libpcsxcore/libpcsxcore/misc.c new/libpcsxcore/libpcsxcore/misc.c
90820 --- original/libpcsxcore/libpcsxcore/misc.c 2008-01-16 18:53:06.000000000 -0430
90821 +++ new/libpcsxcore/libpcsxcore/misc.c 1969-12-31 20:00:00.000000000 -0400
90822 @@ -1,601 +0,0 @@
90823 -/***************************************************************************
90824 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
90825 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
90826 - * *
90827 - * This program is free software; you can redistribute it and/or modify *
90828 - * it under the terms of the GNU General Public License as published by *
90829 - * the Free Software Foundation; either version 2 of the License, or *
90830 - * (at your option) any later version. *
90831 - * *
90832 - * This program is distributed in the hope that it will be useful, *
90833 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
90834 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
90835 - * GNU General Public License for more details. *
90836 - * *
90837 - * You should have received a copy of the GNU General Public License *
90838 - * along with this program; if not, write to the *
90839 - * Free Software Foundation, Inc., *
90840 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
90841 - ***************************************************************************/
90842 -
90843 -/*
90844 -* Miscellaneous functions, including savesates and CD-ROM loading.
90845 -*/
90846 -
90847 -#include "misc.h"
90848 -
90849 -int Log = 0;
90850 -
90851 -/* PSX Executable types */
90852 -#define PSX_EXE 1
90853 -#define CPE_EXE 2
90854 -#define COFF_EXE 3
90855 -#define INVALID_EXE 4
90856 -
90857 -#define ISODCL(from, to) (to - from + 1)
90858 -
90859 -struct iso_directory_record {
90860 - char length [ISODCL (1, 1)]; /* 711 */
90861 - char ext_attr_length [ISODCL (2, 2)]; /* 711 */
90862 - char extent [ISODCL (3, 10)]; /* 733 */
90863 - char size [ISODCL (11, 18)]; /* 733 */
90864 - char date [ISODCL (19, 25)]; /* 7 by 711 */
90865 - char flags [ISODCL (26, 26)];
90866 - char file_unit_size [ISODCL (27, 27)]; /* 711 */
90867 - char interleave [ISODCL (28, 28)]; /* 711 */
90868 - char volume_sequence_number [ISODCL (29, 32)]; /* 723 */
90869 - unsigned char name_len [ISODCL (33, 33)]; /* 711 */
90870 - char name [1];
90871 -};
90872 -
90873 -#define btoi(b) ((b)/16*10 + (b)%16) /* BCD to u_char */
90874 -#define itob(i) ((i)/10*16 + (i)%10) /* u_char to BCD */
90875 -
90876 -void mmssdd( char *b, char *p )
90877 - {
90878 - int m, s, d;
90879 -#if defined(__BIGENDIAN__)
90880 - int block = (b[0]&0xff) | ((b[1]&0xff)<<8) | ((b[2]&0xff)<<16) | (b[3]<<24);
90881 -#else
90882 - int block = *((int*)b);
90883 -#endif
90884 -
90885 - block += 150;
90886 - m = block / 4500; // minuten
90887 - block = block - m * 4500; // minuten rest
90888 - s = block / 75; // sekunden
90889 - d = block - s * 75; // sekunden rest
90890 -
90891 - m = ( ( m / 10 ) << 4 ) | m % 10;
90892 - s = ( ( s / 10 ) << 4 ) | s % 10;
90893 - d = ( ( d / 10 ) << 4 ) | d % 10;
90894 -
90895 - p[0] = m;
90896 - p[1] = s;
90897 - p[2] = d;
90898 -}
90899 -
90900 -#define incTime() \
90901 - time[0] = btoi(time[0]); time[1] = btoi(time[1]); time[2] = btoi(time[2]); \
90902 - time[2]++; \
90903 - if(time[2] == 75) { \
90904 - time[2] = 0; \
90905 - time[1]++; \
90906 - if (time[1] == 60) { \
90907 - time[1] = 0; \
90908 - time[0]++; \
90909 - } \
90910 - } \
90911 - time[0] = itob(time[0]); time[1] = itob(time[1]); time[2] = itob(time[2]);
90912 -
90913 -#define READTRACK() \
90914 - if (CDR_readTrack(time) == -1) return -1; \
90915 - buf = CDR_getBuffer(); if (buf == NULL) return -1;
90916 -
90917 -#define READDIR(_dir) \
90918 - READTRACK(); \
90919 - memcpy(_dir, buf+12, 2048); \
90920 - \
90921 - incTime(); \
90922 - READTRACK(); \
90923 - memcpy(_dir+2048, buf+12, 2048);
90924 -
90925 -int GetCdromFile(u8 *mdir, u8 *time, s8 *filename) {
90926 - struct iso_directory_record *dir;
90927 - char ddir[4096];
90928 - u8 *buf;
90929 - int i;
90930 -
90931 - // only try to scan if a filename is given
90932 - if(!strlen(filename)) return -1;
90933 -
90934 - i = 0;
90935 - while (i < 4096) {
90936 - dir = (struct iso_directory_record*) &mdir[i];
90937 - if (dir->length[0] == 0) {
90938 - return -1;
90939 - }
90940 - i += dir->length[0];
90941 -
90942 - if (dir->flags[0] & 0x2) { // it's a dir
90943 - if (!strnicmp((char*)&dir->name[0], filename, dir->name_len[0])) {
90944 - if (filename[dir->name_len[0]] != '\\') continue;
90945 -
90946 - filename+= dir->name_len[0] + 1;
90947 -
90948 - mmssdd(dir->extent, (char*)time);
90949 - READDIR(ddir);
90950 - i = 0;
90951 - }
90952 - } else {
90953 - if (!strnicmp((char*)&dir->name[0], filename, strlen(filename))) {
90954 - mmssdd(dir->extent, (char*)time);
90955 - break;
90956 - }
90957 - }
90958 - }
90959 - return 0;
90960 -}
90961 -
90962 -int LoadCdrom() {
90963 - EXE_HEADER tmpHead;
90964 - struct iso_directory_record *dir;
90965 - u8 time[4],*buf;
90966 - u8 mdir[4096];
90967 - s8 exename[256];
90968 - int i;
90969 -
90970 - if (!Config.HLE) {
90971 - psxRegs.pc = psxRegs.GPR.n.ra;
90972 - return 0;
90973 - }
90974 -
90975 - time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
90976 -
90977 - READTRACK();
90978 -
90979 - // skip head and sub, and go to the root directory record
90980 - dir = (struct iso_directory_record*) &buf[12+156];
90981 -
90982 - mmssdd(dir->extent, (char*)time);
90983 -
90984 - READDIR(mdir);
90985 -
90986 - // Load SYSTEM.CNF and scan for the main executable
90987 - if (GetCdromFile(mdir, time, "SYSTEM.CNF;1") == -1) {
90988 - // if SYSTEM.CNF is missing, start an existing PSX.EXE
90989 - if (GetCdromFile(mdir, time, "PSX.EXE;1") == -1) return -1;
90990 -
90991 - READTRACK();
90992 - }
90993 - else {
90994 - // read the SYSTEM.CNF
90995 - READTRACK();
90996 -
90997 - sscanf((char*)buf+12, "BOOT = cdrom:\\%256s", exename);
90998 - if (GetCdromFile(mdir, time, exename) == -1) {
90999 - sscanf((char*)buf+12, "BOOT = cdrom:%256s", exename);
91000 - if (GetCdromFile(mdir, time, exename) == -1) {
91001 - char *ptr = strstr(buf+12, "cdrom:");
91002 - if(ptr) {
91003 - strncpy(exename, ptr, 256);
91004 - if (GetCdromFile(mdir, time, exename) == -1)
91005 - return -1;
91006 - }
91007 - }
91008 - }
91009 -
91010 - // Read the EXE-Header
91011 - READTRACK();
91012 - }
91013 -
91014 -
91015 - memcpy(&tmpHead, buf+12, sizeof(EXE_HEADER));
91016 -
91017 - psxRegs.pc = SWAP32(tmpHead.pc0);
91018 - psxRegs.GPR.n.gp = SWAP32(tmpHead.gp0);
91019 - psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr);
91020 - if (psxRegs.GPR.n.sp == 0) psxRegs.GPR.n.sp = 0x801fff00;
91021 -
91022 - tmpHead.t_size = SWAP32(tmpHead.t_size);
91023 - tmpHead.t_addr = SWAP32(tmpHead.t_addr);
91024 -
91025 - // Read the rest of the main executable
91026 - while (tmpHead.t_size) {
91027 - void *ptr = (void *)PSXM(tmpHead.t_addr);
91028 -
91029 - incTime();
91030 - READTRACK();
91031 -
91032 - if (ptr != NULL) memcpy(ptr, buf+12, 2048);
91033 -
91034 - tmpHead.t_size -= 2048;
91035 - tmpHead.t_addr += 2048;
91036 - }
91037 -
91038 - return 0;
91039 -}
91040 -
91041 -int LoadCdromFile(char *filename, EXE_HEADER *head) {
91042 - struct iso_directory_record *dir;
91043 - u8 time[4],*buf;
91044 - u8 mdir[4096], exename[256];
91045 - u32 size, addr;
91046 -
91047 - sscanf(filename, "cdrom:\\%256s", exename);
91048 -
91049 - time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
91050 -
91051 - READTRACK();
91052 -
91053 - // skip head and sub, and go to the root directory record
91054 - dir = (struct iso_directory_record*) &buf[12+156];
91055 -
91056 - mmssdd(dir->extent, (char*)time);
91057 -
91058 - READDIR(mdir);
91059 -
91060 - if (GetCdromFile(mdir, time, exename) == -1) return -1;
91061 -
91062 - READTRACK();
91063 -
91064 - memcpy(head, buf+12, sizeof(EXE_HEADER));
91065 - size = head->t_size;
91066 - addr = head->t_addr;
91067 -
91068 - while (size) {
91069 - incTime();
91070 - READTRACK();
91071 -
91072 - memcpy((void *)PSXM(addr), buf+12, 2048);
91073 -
91074 - size -= 2048;
91075 - addr += 2048;
91076 - }
91077 -
91078 - return 0;
91079 -}
91080 -
91081 -int CheckCdrom() {
91082 - struct iso_directory_record *dir;
91083 - unsigned char time[4],*buf;
91084 - unsigned char mdir[4096];
91085 - char exename[256];
91086 - int i, c;
91087 -
91088 - time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
91089 -
91090 - READTRACK();
91091 -
91092 - CdromLabel[32]=0;
91093 - CdromId[9]=0;
91094 -
91095 - strncpy(CdromLabel, buf+52, 32);
91096 -
91097 - // skip head and sub, and go to the root directory record
91098 - dir = (struct iso_directory_record*) &buf[12+156];
91099 -
91100 - mmssdd(dir->extent, (char*)time);
91101 -
91102 - READDIR(mdir);
91103 -
91104 - if (GetCdromFile(mdir, time, "SYSTEM.CNF;1") != -1) {
91105 - READTRACK();
91106 -
91107 - sscanf((char*)buf+12, "BOOT = cdrom:\\%256s", exename);
91108 - if (GetCdromFile(mdir, time, exename) == -1) {
91109 - sscanf((char*)buf+12, "BOOT = cdrom:%256s", exename);
91110 - if (GetCdromFile(mdir, time, exename) == -1) {
91111 - char *ptr = strstr(buf+12, "cdrom:"); // possibly the executable is in some subdir
91112 - for (i=0; i<32; i++) {
91113 - if (ptr[i] == ' ') continue;
91114 - if (ptr[i] == '\\') continue;
91115 - }
91116 - if(ptr) {
91117 - strncpy(exename, ptr, 256);
91118 - if (GetCdromFile(mdir, time, exename) == -1)
91119 - return -1; // main executable not found
91120 - }
91121 - }
91122 - }
91123 - } else
91124 - return -1; // SYSTEM.CNF not found
91125 -
91126 - i = strlen(exename);
91127 - if (i >= 2) {
91128 - if (exename[i - 2] == ';') i-= 2;
91129 - c = 8; i--;
91130 - while (i >= 0 && c >= 0) {
91131 - if (isalnum(exename[i])) CdromId[c--] = exename[i];
91132 - i--;
91133 - }
91134 - }
91135 -
91136 - if (Config.PsxAuto) { // autodetect system (pal or ntsc)
91137 - if (strstr(exename, "ES") != NULL)
91138 - Config.PsxType = 1; // pal
91139 - else Config.PsxType = 0; // ntsc
91140 - }
91141 - psxUpdateVSyncRate();
91142 - if (CdromLabel[0] == ' ') {
91143 - strncpy(CdromLabel, CdromId, 9);
91144 - }
91145 - SysPrintf("CD-ROM Label: %.32s\n", CdromLabel);
91146 - SysPrintf("CD-ROM ID: %.9s\n", CdromId);
91147 -
91148 - return 0;
91149 -}
91150 -
91151 -static int PSXGetFileType(FILE *f) {
91152 - unsigned long current;
91153 - u32 mybuf[2048];
91154 - EXE_HEADER *exe_hdr;
91155 - FILHDR *coff_hdr;
91156 -
91157 - current = ftell(f);
91158 - fseek(f,0L,SEEK_SET);
91159 - fread(mybuf,2048,1,f);
91160 - fseek(f,current,SEEK_SET);
91161 -
91162 - exe_hdr = (EXE_HEADER *)mybuf;
91163 - if (memcmp(exe_hdr->id,"PS-X EXE",8)==0)
91164 - return PSX_EXE;
91165 -
91166 - if (mybuf[0]=='C' && mybuf[1]=='P' && mybuf[2]=='E')
91167 - return CPE_EXE;
91168 -
91169 - coff_hdr = (FILHDR *)mybuf;
91170 - if (coff_hdr->f_magic == 0x0162)
91171 - return COFF_EXE;
91172 -
91173 - return INVALID_EXE;
91174 -}
91175 -
91176 -/* TODO Error handling - return integer for each error case below, defined in an enum. Pass variable on return */
91177 -int Load(char *ExePath) {
91178 - FILE *tmpFile;
91179 - EXE_HEADER tmpHead;
91180 - int type;
91181 - int retval = 0;
91182 -
91183 - strncpy(CdromId, "SLUS99999", 9);
91184 - strncpy(CdromLabel, "SLUS_999.99", 11);
91185 -
91186 - tmpFile = fopen(ExePath,"rb");
91187 - if (tmpFile == NULL) {
91188 - SysMessage(_("Error opening file: %s"), ExePath);
91189 - retval = 0;
91190 - } else {
91191 - type = PSXGetFileType(tmpFile);
91192 - switch (type) {
91193 - case PSX_EXE:
91194 - fread(&tmpHead,sizeof(EXE_HEADER),1,tmpFile);
91195 - fseek(tmpFile, 0x800, SEEK_SET);
91196 - fread((void *)PSXM(SWAP32(tmpHead.t_addr)), SWAP32(tmpHead.t_size),1,tmpFile);
91197 - fclose(tmpFile);
91198 - psxRegs.pc = SWAP32(tmpHead.pc0);
91199 - psxRegs.GPR.n.gp = SWAP32(tmpHead.gp0);
91200 - psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr);
91201 - if (psxRegs.GPR.n.sp == 0)
91202 - psxRegs.GPR.n.sp = 0x801fff00;
91203 - retval = 0;
91204 - break;
91205 - case CPE_EXE:
91206 - SysMessage(_("CPE files not supported."));
91207 - retval = -1;
91208 - break;
91209 - case COFF_EXE:
91210 - SysMessage(_("COFF files not supported."));
91211 - retval = -1;
91212 - break;
91213 - case INVALID_EXE:
91214 - SysMessage(_("This file does not appear to be a valid PSX file."));
91215 - retval = -1;
91216 - break;
91217 - }
91218 - }
91219 - return retval;
91220 -}
91221 -
91222 -// STATES
91223 -
91224 -const char PcsxHeader[32] = "STv3 PCSX v" PACKAGE_VERSION;
91225 -
91226 -int SaveState(char *file) {
91227 - gzFile f;
91228 - GPUFreeze_t *gpufP;
91229 - SPUFreeze_t *spufP;
91230 - int Size;
91231 - unsigned char *pMem;
91232 -
91233 - f = gzopen(file, "wb");
91234 - if (f == NULL) return -1;
91235 -
91236 - gzwrite(f, (void*)PcsxHeader, 32);
91237 -
91238 - pMem = (unsigned char *) malloc(128*96*3);
91239 - if (pMem == NULL) return -1;
91240 - GPU_getScreenPic(pMem);
91241 - gzwrite(f, pMem, 128*96*3);
91242 - free(pMem);
91243 -
91244 - if (Config.HLE)
91245 - psxBiosFreeze(1);
91246 -
91247 - gzwrite(f, psxM, 0x00200000);
91248 - gzwrite(f, psxR, 0x00080000);
91249 - gzwrite(f, psxH, 0x00010000);
91250 - gzwrite(f, (void*)&psxRegs, sizeof(psxRegs));
91251 -
91252 - // gpu
91253 - gpufP = (GPUFreeze_t *) malloc(sizeof(GPUFreeze_t));
91254 - gpufP->ulFreezeVersion = 1;
91255 - GPU_freeze(1, gpufP);
91256 - gzwrite(f, gpufP, sizeof(GPUFreeze_t));
91257 - free(gpufP);
91258 -
91259 - // spu
91260 - spufP = (SPUFreeze_t *) malloc(16);
91261 - SPU_freeze(2, spufP);
91262 - Size = spufP->Size; gzwrite(f, &Size, 4);
91263 - free(spufP);
91264 - spufP = (SPUFreeze_t *) malloc(Size);
91265 - SPU_freeze(1, spufP);
91266 - gzwrite(f, spufP, Size);
91267 - free(spufP);
91268 -
91269 - sioFreeze(f, 1);
91270 - cdrFreeze(f, 1);
91271 - psxHwFreeze(f, 1);
91272 - psxRcntFreeze(f, 1);
91273 - mdecFreeze(f, 1);
91274 -
91275 - gzclose(f);
91276 -
91277 - return 0;
91278 -}
91279 -
91280 -int LoadState(char *file) {
91281 - gzFile f;
91282 - GPUFreeze_t *gpufP;
91283 - SPUFreeze_t *spufP;
91284 - int Size;
91285 - char header[32];
91286 -
91287 - f = gzopen(file, "rb");
91288 - if (f == NULL) return -1;
91289 -
91290 - psxCpu->Reset();
91291 -
91292 - gzread(f, header, 32);
91293 -
91294 - if (strncmp("STv3 PCSX", header, 9)) { gzclose(f); return -1; }
91295 -
91296 - gzseek(f, 128*96*3, SEEK_CUR);
91297 -
91298 - gzread(f, psxM, 0x00200000);
91299 - gzread(f, psxR, 0x00080000);
91300 - gzread(f, psxH, 0x00010000);
91301 - gzread(f, (void*)&psxRegs, sizeof(psxRegs));
91302 -
91303 - if (Config.HLE)
91304 - psxBiosFreeze(0);
91305 -
91306 - // gpu
91307 - gpufP = (GPUFreeze_t *) malloc (sizeof(GPUFreeze_t));
91308 - gzread(f, gpufP, sizeof(GPUFreeze_t));
91309 - GPU_freeze(0, gpufP);
91310 - free(gpufP);
91311 -
91312 - // spu
91313 - gzread(f, &Size, 4);
91314 - spufP = (SPUFreeze_t *) malloc (Size);
91315 - gzread(f, spufP, Size);
91316 - SPU_freeze(0, spufP);
91317 - free(spufP);
91318 -
91319 - sioFreeze(f, 0);
91320 - cdrFreeze(f, 0);
91321 - psxHwFreeze(f, 0);
91322 - psxRcntFreeze(f, 0);
91323 - mdecFreeze(f, 0);
91324 -
91325 - gzclose(f);
91326 -
91327 - return 0;
91328 -}
91329 -
91330 -int CheckState(char *file) {
91331 - gzFile f;
91332 - char header[32];
91333 -
91334 - f = gzopen(file, "rb");
91335 - if (f == NULL) return -1;
91336 -
91337 - psxCpu->Reset();
91338 -
91339 - gzread(f, header, 32);
91340 -
91341 - gzclose(f);
91342 -
91343 - if (strncmp("STv3 PCSX", header, 9)) return -1;
91344 -
91345 - return 0;
91346 -}
91347 -
91348 -// NET Function Helpers
91349 -
91350 -int SendPcsxInfo() {
91351 - if (NET_recvData == NULL || NET_sendData == NULL)
91352 - return 0;
91353 -
91354 -// SysPrintf("SendPcsxInfo\n");
91355 -
91356 - NET_sendData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
91357 - NET_sendData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
91358 - NET_sendData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
91359 - NET_sendData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
91360 - NET_sendData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
91361 - NET_sendData(&Config.Cpu, sizeof(Config.Cpu), PSE_NET_BLOCKING);
91362 -
91363 -// SysPrintf("Send OK\n");
91364 -
91365 - return 0;
91366 -}
91367 -
91368 -int RecvPcsxInfo() {
91369 - int tmp;
91370 -
91371 - if (NET_recvData == NULL || NET_sendData == NULL)
91372 - return 0;
91373 -
91374 -// SysPrintf("RecvPcsxInfo\n");
91375 -
91376 - NET_recvData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
91377 - NET_recvData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
91378 - NET_recvData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
91379 - NET_recvData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
91380 - NET_recvData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
91381 - psxUpdateVSyncRate();
91382 -
91383 - SysUpdate();
91384 -
91385 - tmp = Config.Cpu;
91386 - NET_recvData(&Config.Cpu, sizeof(Config.Cpu), PSE_NET_BLOCKING);
91387 - if (tmp != Config.Cpu) {
91388 - psxCpu->Shutdown();
91389 -#ifdef PSXREC
91390 - if (Config.Cpu)
91391 - psxCpu = &psxInt;
91392 - else psxCpu = &psxRec;
91393 -#else
91394 - psxCpu = &psxInt;
91395 -#endif
91396 - if (psxCpu->Init() == -1) {
91397 - SysClose(); return -1;
91398 - }
91399 - psxCpu->Reset();
91400 - }
91401 -
91402 -// SysPrintf("Recv OK\n");
91403 -
91404 - return 0;
91405 -}
91406 -
91407 -
91408 -void __Log(char *fmt, ...) {
91409 - va_list list;
91410 -#ifdef LOG_STDOUT
91411 - char tmp[1024];
91412 -#endif
91413 -
91414 - va_start(list, fmt);
91415 -#ifndef LOG_STDOUT
91416 - vfprintf(emuLog, fmt, list);
91417 -#else
91418 - vsprintf(tmp, fmt, list);
91419 - SysPrintf(tmp);
91420 -#endif
91421 - va_end(list);
91422 -}
91423 -
91424 diff -rupN original/libpcsxcore/libpcsxcore/misc.h new/libpcsxcore/libpcsxcore/misc.h
91425 --- original/libpcsxcore/libpcsxcore/misc.h 2007-12-29 17:48:00.000000000 -0430
91426 +++ new/libpcsxcore/libpcsxcore/misc.h 1969-12-31 20:00:00.000000000 -0400
91427 @@ -1,71 +0,0 @@
91428 -/***************************************************************************
91429 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
91430 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
91431 - * *
91432 - * This program is free software; you can redistribute it and/or modify *
91433 - * it under the terms of the GNU General Public License as published by *
91434 - * the Free Software Foundation; either version 2 of the License, or *
91435 - * (at your option) any later version. *
91436 - * *
91437 - * This program is distributed in the hope that it will be useful, *
91438 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
91439 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
91440 - * GNU General Public License for more details. *
91441 - * *
91442 - * You should have received a copy of the GNU General Public License *
91443 - * along with this program; if not, write to the *
91444 - * Free Software Foundation, Inc., *
91445 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
91446 - ***************************************************************************/
91447 -
91448 -#ifndef __MISC_H__
91449 -#define __MISC_H__
91450 -
91451 -#include "psxcommon.h"
91452 -#include "coff.h"
91453 -#include "plugins.h"
91454 -#include "r3000a.h"
91455 -#include "psxmem.h"
91456 -
91457 -#undef s_addr
91458 -
91459 -typedef struct {
91460 - unsigned char id[8];
91461 - u32 text;
91462 - u32 data;
91463 - u32 pc0;
91464 - u32 gp0;
91465 - u32 t_addr;
91466 - u32 t_size;
91467 - u32 d_addr;
91468 - u32 d_size;
91469 - u32 b_addr;
91470 - u32 b_size;
91471 - u32 s_addr;
91472 - u32 s_size;
91473 - u32 SavedSP;
91474 - u32 SavedFP;
91475 - u32 SavedGP;
91476 - u32 SavedRA;
91477 - u32 SavedS0;
91478 -} EXE_HEADER;
91479 -
91480 -char CdromId[10];
91481 -char CdromLabel[33];
91482 -
91483 -int LoadCdrom();
91484 -int LoadCdromFile(char *filename, EXE_HEADER *head);
91485 -int CheckCdrom();
91486 -int Load(char *ExePath);
91487 -
91488 -int SaveState(char *file);
91489 -int LoadState(char *file);
91490 -int CheckState(char *file);
91491 -
91492 -int SendPcsxInfo();
91493 -int RecvPcsxInfo();
91494 -
91495 -extern char *LabelAuthors;
91496 -extern char *LabelGreets;
91497 -
91498 -#endif /* __MISC_H__ */
91499 diff -rupN original/libpcsxcore/libpcsxcore/misc.lo new/libpcsxcore/libpcsxcore/misc.lo
91500 --- original/libpcsxcore/libpcsxcore/misc.lo 2009-03-28 22:34:52.000000000 -0430
91501 +++ new/libpcsxcore/libpcsxcore/misc.lo 1969-12-31 20:00:00.000000000 -0400
91502 @@ -1,12 +0,0 @@
91503 -# misc.lo - a libtool object file
91504 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
91505 -#
91506 -# Please DO NOT delete this file!
91507 -# It is necessary for linking the library.
91508 -
91509 -# Name of the PIC object.
91510 -pic_object='.libs/misc.o'
91511 -
91512 -# Name of the non-PIC object.
91513 -non_pic_object='misc.o'
91514 -
91515 Los ficheros binarios original/libpcsxcore/libpcsxcore/misc.o y new/libpcsxcore/libpcsxcore/misc.o son distintos
91516 diff -rupN original/libpcsxcore/libpcsxcore/plugins.c new/libpcsxcore/libpcsxcore/plugins.c
91517 --- original/libpcsxcore/libpcsxcore/plugins.c 2009-03-09 07:50:58.000000000 -0430
91518 +++ new/libpcsxcore/libpcsxcore/plugins.c 1969-12-31 20:00:00.000000000 -0400
91519 @@ -1,806 +0,0 @@
91520 -/***************************************************************************
91521 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
91522 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
91523 - * *
91524 - * This program is free software; you can redistribute it and/or modify *
91525 - * it under the terms of the GNU General Public License as published by *
91526 - * the Free Software Foundation; either version 2 of the License, or *
91527 - * (at your option) any later version. *
91528 - * *
91529 - * This program is distributed in the hope that it will be useful, *
91530 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
91531 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
91532 - * GNU General Public License for more details. *
91533 - * *
91534 - * You should have received a copy of the GNU General Public License *
91535 - * along with this program; if not, write to the *
91536 - * Free Software Foundation, Inc., *
91537 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
91538 - ***************************************************************************/
91539 -
91540 -/*
91541 -* Plugin library callback/access functions.
91542 -*/
91543 -
91544 -#include "plugins.h"
91545 -
91546 -#define CheckErr(func) \
91547 - err = SysLibError(); \
91548 - if (err != NULL) { SysMessage(_("Error loading %s: %s"), func, err); return -1; }
91549 -
91550 -#if defined (__MACOSX__)
91551 -#define LoadSym(dest, src, name, checkerr) \
91552 - dest = (src) SysLoadSym(drv, "_" name); \
91553 - if(!checkerr) { SysLibError(); /*clean error*/ } \
91554 - if (checkerr == 1) CheckErr(name); \
91555 - if (checkerr == 2) { err = SysLibError(); if (err != NULL) errval = 1; }
91556 -#else
91557 -#define LoadSym(dest, src, name, checkerr) \
91558 - dest = (src) SysLoadSym(drv, name); if (checkerr == 1) CheckErr(name); \
91559 - if (checkerr == 2) { err = SysLibError(); if (err != NULL) errval = 1; }
91560 -#endif
91561 -
91562 -static const char *err;
91563 -static int errval;
91564 -
91565 -void *hGPUDriver;
91566 -
91567 -void CALLBACK GPU__readDataMem(uint32_t *pMem, int iSize) {
91568 - while (iSize > 0) {
91569 - *pMem = SWAP32(GPU_readData());
91570 - iSize--;
91571 - pMem++;
91572 - }
91573 -}
91574 -
91575 -void CALLBACK GPU__writeDataMem(uint32_t *pMem, int iSize) {
91576 - while (iSize > 0) {
91577 - GPU_writeData(SWAP32(*pMem));
91578 - iSize--;
91579 - pMem++;
91580 - }
91581 -}
91582 -
91583 -void CALLBACK GPU__displayText(char *pText) {
91584 - SysPrintf("%s\n", pText);
91585 -}
91586 -
91587 -extern int StatesC;
91588 -long CALLBACK GPU__freeze(uint32_t ulGetFreezeData, GPUFreeze_t *pF) {
91589 - pF->ulFreezeVersion = 1;
91590 - if (ulGetFreezeData == 0) {
91591 - int val;
91592 -
91593 - val = GPU_readStatus();
91594 - val = 0x04000000 | ((val >> 29) & 0x3);
91595 - GPU_writeStatus(0x04000003);
91596 - GPU_writeStatus(0x01000000);
91597 - GPU_writeData(0xa0000000);
91598 - GPU_writeData(0x00000000);
91599 - GPU_writeData(0x02000400);
91600 - GPU_writeDataMem((uint32_t*)pF->psxVRam, 0x100000/4);
91601 - GPU_writeStatus(val);
91602 -
91603 - val = pF->ulStatus;
91604 - GPU_writeStatus(0x00000000);
91605 - GPU_writeData(0x01000000);
91606 - GPU_writeStatus(0x01000000);
91607 - GPU_writeStatus(0x03000000 | ((val>>24)&0x1));
91608 - GPU_writeStatus(0x04000000 | ((val>>29)&0x3));
91609 - GPU_writeStatus(0x08000000 | ((val>>17)&0x3f) | ((val>>10)&0x40));
91610 - GPU_writeData(0xe1000000 | (val&0x7ff));
91611 - GPU_writeData(0xe6000000 | ((val>>11)&3));
91612 -
91613 -/* GPU_writeData(0xe3000000 | pF->ulControl[0] & 0xffffff);
91614 - GPU_writeData(0xe4000000 | pF->ulControl[1] & 0xffffff);
91615 - GPU_writeData(0xe5000000 | pF->ulControl[2] & 0xffffff);*/
91616 - return 1;
91617 - }
91618 - if (ulGetFreezeData == 1) {
91619 - int val;
91620 -
91621 - val = GPU_readStatus();
91622 - val = 0x04000000 | ((val >> 29) & 0x3);
91623 - GPU_writeStatus(0x04000003);
91624 - GPU_writeStatus(0x01000000);
91625 - GPU_writeData(0xc0000000);
91626 - GPU_writeData(0x00000000);
91627 - GPU_writeData(0x02000400);
91628 - GPU_readDataMem((uint32_t*)pF->psxVRam, 0x100000/4);
91629 - GPU_writeStatus(val);
91630 -
91631 - pF->ulStatus = GPU_readStatus();
91632 -
91633 -/* GPU_writeStatus(0x10000003);
91634 - pF->ulControl[0] = GPU_readData();
91635 - GPU_writeStatus(0x10000004);
91636 - pF->ulControl[1] = GPU_readData();
91637 - GPU_writeStatus(0x10000005);
91638 - pF->ulControl[2] = GPU_readData();*/
91639 - return 1;
91640 - }
91641 - if(ulGetFreezeData==2) {
91642 - long lSlotNum=*((long *)pF);
91643 - char Text[32];
91644 -
91645 - sprintf (Text, "Selected state %ld", lSlotNum+1);
91646 - GPU_displayText(Text);
91647 - return 1;
91648 - }
91649 - return 0;
91650 -}
91651 -
91652 -long CALLBACK GPU__configure(void) { return 0; }
91653 -long CALLBACK GPU__test(void) { return 0; }
91654 -void CALLBACK GPU__about(void) {}
91655 -void CALLBACK GPU__makeSnapshot(void) {}
91656 -void CALLBACK GPU__keypressed(int key) {}
91657 -long CALLBACK GPU__getScreenPic(unsigned char *pMem) { return -1; }
91658 -long CALLBACK GPU__showScreenPic(unsigned char *pMem) { return -1; }
91659 -void CALLBACK GPU__clearDynarec(void (CALLBACK *callback)(void)) { }
91660 -
91661 -#define LoadGpuSym1(dest, name) \
91662 - LoadSym(GPU_##dest, GPU##dest, name, 1);
91663 -
91664 -#define LoadGpuSym0(dest, name) \
91665 - LoadSym(GPU_##dest, GPU##dest, name, 0); \
91666 - if (GPU_##dest == NULL) GPU_##dest = (GPU##dest) GPU__##dest;
91667 -
91668 -#define LoadGpuSymN(dest, name) \
91669 - LoadSym(GPU_##dest, GPU##dest, name, 0);
91670 -
91671 -int LoadGPUplugin(char *GPUdll) {
91672 - void *drv;
91673 -
91674 - hGPUDriver = SysLoadLibrary(GPUdll);
91675 - if (hGPUDriver == NULL) {
91676 - GPU_configure = NULL;
91677 - SysMessage (_("Could not load GPU plugin %s!"), GPUdll); return -1;
91678 - }
91679 - drv = hGPUDriver;
91680 - LoadGpuSym1(init, "GPUinit");
91681 - LoadGpuSym1(shutdown, "GPUshutdown");
91682 - LoadGpuSym1(open, "GPUopen");
91683 - LoadGpuSym1(close, "GPUclose");
91684 - LoadGpuSym1(readData, "GPUreadData");
91685 - LoadGpuSym0(readDataMem, "GPUreadDataMem");
91686 - LoadGpuSym1(readStatus, "GPUreadStatus");
91687 - LoadGpuSym1(writeData, "GPUwriteData");
91688 - LoadGpuSym0(writeDataMem, "GPUwriteDataMem");
91689 - LoadGpuSym1(writeStatus, "GPUwriteStatus");
91690 - LoadGpuSym1(dmaChain, "GPUdmaChain");
91691 - LoadGpuSym1(updateLace, "GPUupdateLace");
91692 - LoadGpuSym0(keypressed, "GPUkeypressed");
91693 - LoadGpuSym0(displayText, "GPUdisplayText");
91694 - LoadGpuSym0(makeSnapshot, "GPUmakeSnapshot");
91695 - LoadGpuSym0(freeze, "GPUfreeze");
91696 - LoadGpuSym0(getScreenPic, "GPUgetScreenPic");
91697 - LoadGpuSym0(showScreenPic, "GPUshowScreenPic");
91698 - LoadGpuSym0(clearDynarec, "GPUclearDynarec");
91699 - LoadGpuSym0(configure, "GPUconfigure");
91700 - LoadGpuSym0(test, "GPUtest");
91701 - LoadGpuSym0(about, "GPUabout");
91702 -
91703 - return 0;
91704 -}
91705 -
91706 -void *hCDRDriver;
91707 -
91708 -long CALLBACK CDR__play(unsigned char *sector) { return 0; }
91709 -long CALLBACK CDR__stop(void) { return 0; }
91710 -
91711 -long CALLBACK CDR__getStatus(struct CdrStat *stat) {
91712 - if (cdOpenCase) stat->Status = 0x10;
91713 - else stat->Status = 0;
91714 - return 0;
91715 -}
91716 -
91717 -char* CALLBACK CDR__getDriveLetter(void) { return NULL; }
91718 -unsigned char* CALLBACK CDR__getBufferSub(void) { return NULL; }
91719 -long CALLBACK CDR__configure(void) { return 0; }
91720 -long CALLBACK CDR__test(void) { return 0; }
91721 -void CALLBACK CDR__about(void) {}
91722 -long CALLBACK CDR__setfilename(char*filename) { return 0; }
91723 -
91724 -#define LoadCdrSym1(dest, name) \
91725 - LoadSym(CDR_##dest, CDR##dest, name, 1);
91726 -
91727 -#define LoadCdrSym0(dest, name) \
91728 - LoadSym(CDR_##dest, CDR##dest, name, 0); \
91729 - if (CDR_##dest == NULL) CDR_##dest = (CDR##dest) CDR__##dest;
91730 -
91731 -#define LoadCdrSymN(dest, name) \
91732 - LoadSym(CDR_##dest, CDR##dest, name, 0);
91733 -
91734 -int LoadCDRplugin(char *CDRdll) {
91735 - void *drv;
91736 -
91737 - hCDRDriver = SysLoadLibrary(CDRdll);
91738 - if (hCDRDriver == NULL) {
91739 - CDR_configure = NULL;
91740 - SysMessage (_("Could not load CD-ROM plugin %s!"), CDRdll); return -1;
91741 - }
91742 - drv = hCDRDriver;
91743 - LoadCdrSym1(init, "CDRinit");
91744 - LoadCdrSym1(shutdown, "CDRshutdown");
91745 - LoadCdrSym1(open, "CDRopen");
91746 - LoadCdrSym1(close, "CDRclose");
91747 - LoadCdrSym1(getTN, "CDRgetTN");
91748 - LoadCdrSym1(getTD, "CDRgetTD");
91749 - LoadCdrSym1(readTrack, "CDRreadTrack");
91750 - LoadCdrSym1(getBuffer, "CDRgetBuffer");
91751 - LoadCdrSym0(play, "CDRplay");
91752 - LoadCdrSym0(stop, "CDRstop");
91753 - LoadCdrSym0(getStatus, "CDRgetStatus");
91754 - LoadCdrSym0(getDriveLetter, "CDRgetDriveLetter");
91755 - LoadCdrSym0(getBufferSub, "CDRgetBufferSub");
91756 - LoadCdrSym0(configure, "CDRconfigure");
91757 - LoadCdrSym0(test, "CDRtest");
91758 - LoadCdrSym0(about, "CDRabout");
91759 - LoadCdrSym0(setfilename, "CDRsetfilename");
91760 -
91761 - return 0;
91762 -}
91763 -
91764 -void *hSPUDriver;
91765 -
91766 -long CALLBACK SPU__configure(void) { return 0; }
91767 -void CALLBACK SPU__about(void) {}
91768 -long CALLBACK SPU__test(void) { return 0; }
91769 -
91770 -unsigned short regArea[10000];
91771 -unsigned short spuCtrl,spuStat,spuIrq;
91772 -unsigned long spuAddr;
91773 -
91774 -void CALLBACK SPU__writeRegister(uint32_t add,unsigned short value) { // Old Interface
91775 - uint32_t r=add&0xfff;
91776 - regArea[(r-0xc00)/2] = value;
91777 -
91778 - if(r>=0x0c00 && r<0x0d80) {
91779 - unsigned char ch=(r>>4)-0xc0;
91780 - switch(r&0x0f) {//switch voices
91781 - case 0: //left volume
91782 - SPU_setVolumeL(ch,value);
91783 - return;
91784 - case 2: //right volume
91785 - SPU_setVolumeR(ch,value);
91786 - return;
91787 - case 4: //frequency
91788 - SPU_setPitch(ch,value);
91789 - return;
91790 - case 6://start address
91791 - SPU_setAddr(ch,value);
91792 - return;
91793 - //------------------------------------------------// level
91794 -// case 8:
91795 -// s_chan[ch].ADSRX.AttackModeExp = (val&0x8000)?TRUE:FALSE;
91796 -// s_chan[ch].ADSRX.AttackRate = (float)((val>>8) & 0x007f)*1000.0f/240.0f;
91797 -// s_chan[ch].ADSRX.DecayRate = (float)((val>>4) & 0x000f)*1000.0f/240.0f;
91798 -// s_chan[ch].ADSRX.SustainLevel = (float)((val) & 0x000f);
91799 -
91800 -// return;
91801 -// case 10:
91802 -// s_chan[ch].ADSRX.SustainModeExp = (val&0x8000)?TRUE:FALSE;
91803 -// s_chan[ch].ADSRX.ReleaseModeExp = (val&0x0020)?TRUE:FALSE;
91804 -// s_chan[ch].ADSRX.SustainRate = ((float)((val>>6) & 0x007f))*R_SUSTAIN;
91805 -// s_chan[ch].ADSRX.ReleaseRate = ((float)((val) & 0x001f))*R_RELEASE;
91806 -// if(val & 0x4000) s_chan[ch].ADSRX.SustainModeDec=-1.0f;
91807 -// else s_chan[ch].ADSRX.SustainModeDec=1.0f;
91808 -// return;
91809 -// case 12:
91810 -// return;
91811 -// case 14:
91812 -// s_chan[ch].pRepeat=spuMemC+((unsigned long) val<<3);
91813 -// return;
91814 - }
91815 - return;
91816 - }
91817 -
91818 - switch(r) {
91819 - case H_SPUaddr://SPU-memory address
91820 - spuAddr = (uint32_t) value<<3;
91821 - // spuAddr=value * 8;
91822 - return;
91823 - case H_SPUdata://DATA to SPU
91824 -// spuMem[spuAddr/2] = value;
91825 -// spuAddr+=2;
91826 -// if(spuAddr>0x7ffff) spuAddr=0;
91827 - SPU_putOne(spuAddr,value);
91828 - spuAddr+=2;
91829 - return;
91830 - case H_SPUctrl://SPU control 1
91831 - spuCtrl=value;
91832 - return;
91833 - case H_SPUstat://SPU status
91834 - spuStat=value & 0xf800;
91835 - return;
91836 - case H_SPUirqAddr://SPU irq
91837 - spuIrq = value;
91838 - return;
91839 - case H_SPUon1://start sound play channels 0-16
91840 - SPU_startChannels1(value);
91841 - return;
91842 - case H_SPUon2://start sound play channels 16-24
91843 - SPU_startChannels2(value);
91844 - return;
91845 - case H_SPUoff1://stop sound play channels 0-16
91846 - SPU_stopChannels1(value);
91847 - return;
91848 - case H_SPUoff2://stop sound play channels 16-24
91849 - SPU_stopChannels2(value);
91850 - return;
91851 - }
91852 -}
91853 -
91854 -unsigned short CALLBACK SPU__readRegister(uint32_t add) {
91855 - switch(add&0xfff) {// Old Interface
91856 - case H_SPUctrl://spu control
91857 - return spuCtrl;
91858 - case H_SPUstat://spu status
91859 - return spuStat;
91860 - case H_SPUaddr://SPU-memory address
91861 - return (unsigned short)(spuAddr>>3);
91862 - case H_SPUdata://DATA to SPU
91863 - spuAddr+=2;
91864 -// if(spuAddr>0x7ffff) spuAddr=0;
91865 -// return spuMem[spuAddr/2];
91866 - return SPU_getOne(spuAddr);
91867 - case H_SPUirqAddr://spu irq
91868 - return spuIrq;
91869 - //case H_SPUIsOn1:
91870 - //return IsSoundOn(0,16);
91871 - //case H_SPUIsOn2:
91872 - //return IsSoundOn(16,24);
91873 - }
91874 - return regArea[((add&0xfff)-0xc00)/2];
91875 -}
91876 -
91877 -void CALLBACK SPU__writeDMA(unsigned short val) {
91878 - SPU_putOne(spuAddr, val);
91879 - spuAddr += 2;
91880 - if (spuAddr > 0x7ffff) spuAddr = 0;
91881 -}
91882 -
91883 -unsigned short CALLBACK SPU__readDMA(void) {
91884 - unsigned short tmp = SPU_getOne(spuAddr);
91885 - spuAddr += 2;
91886 - if (spuAddr > 0x7ffff) spuAddr = 0;
91887 - return tmp;
91888 -}
91889 -
91890 -void CALLBACK SPU__writeDMAMem(unsigned short *pMem, int iSize) {
91891 - while (iSize > 0) {
91892 - SPU_writeDMA(*pMem);
91893 - iSize--;
91894 - pMem++;
91895 - }
91896 -}
91897 -
91898 -void CALLBACK SPU__readDMAMem(unsigned short *pMem, int iSize) {
91899 - while (iSize > 0) {
91900 - *pMem = SPU_readDMA();
91901 - iSize--;
91902 - pMem++;
91903 - }
91904 -}
91905 -
91906 -void CALLBACK SPU__playADPCMchannel(xa_decode_t *xap) {}
91907 -
91908 -long CALLBACK SPU__freeze(uint32_t ulFreezeMode, SPUFreeze_t *pF) {
91909 - if (ulFreezeMode == 2) {
91910 - memset(pF, 0, 16);
91911 - strcpy((char *)pF->PluginName, "Pcsx");
91912 - pF->PluginVersion = 1;
91913 - pF->Size = 0x200 + 0x80000 + 16 + sizeof(xa_decode_t);
91914 -
91915 - return 1;
91916 - }
91917 - if (ulFreezeMode == 1) {
91918 - uint32_t addr;
91919 - unsigned short val;
91920 -
91921 - val = SPU_readRegister(0x1f801da6);
91922 - SPU_writeRegister(0x1f801da6, 0);
91923 - SPU_readDMAMem((unsigned short *)pF->SPURam, 0x80000/2);
91924 - SPU_writeRegister(0x1f801da6, val);
91925 -
91926 - for (addr = 0x1f801c00; addr < 0x1f801e00; addr+=2) {
91927 - if (addr == 0x1f801da8) { pF->SPUPorts[addr - 0x1f801c00] = 0; continue; }
91928 - pF->SPUPorts[addr - 0x1f801c00] = SPU_readRegister(addr);
91929 - }
91930 -
91931 - return 1;
91932 - }
91933 - if (ulFreezeMode == 0) {
91934 - uint32_t addr;
91935 - unsigned short val;
91936 - unsigned short *regs = (unsigned short *)pF->SPUPorts;
91937 -
91938 - val = SPU_readRegister(0x1f801da6);
91939 - SPU_writeRegister(0x1f801da6, 0);
91940 - SPU_writeDMAMem((unsigned short *)pF->SPURam, 0x80000/2);
91941 - SPU_writeRegister(0x1f801da6, val);
91942 -
91943 - for (addr = 0x1f801c00; addr < 0x1f801e00; addr+=2) {
91944 - if (addr == 0x1f801da8) { regs++; continue; }
91945 - SPU_writeRegister(addr, *(regs++));
91946 - }
91947 -
91948 - return 1;
91949 - }
91950 -
91951 - return 0;
91952 -}
91953 -
91954 -void CALLBACK SPU__registerCallback(void (CALLBACK *callback)(void)) {}
91955 -
91956 -#define LoadSpuSym1(dest, name) \
91957 - LoadSym(SPU_##dest, SPU##dest, name, 1);
91958 -
91959 -#define LoadSpuSym2(dest, name) \
91960 - LoadSym(SPU_##dest, SPU##dest, name, 2);
91961 -
91962 -#define LoadSpuSym0(dest, name) \
91963 - LoadSym(SPU_##dest, SPU##dest, name, 0); \
91964 - if (SPU_##dest == NULL) SPU_##dest = (SPU##dest) SPU__##dest;
91965 -
91966 -#define LoadSpuSymE(dest, name) \
91967 - LoadSym(SPU_##dest, SPU##dest, name, errval); \
91968 - if (SPU_##dest == NULL) SPU_##dest = (SPU##dest) SPU__##dest;
91969 -
91970 -#define LoadSpuSymN(dest, name) \
91971 - LoadSym(SPU_##dest, SPU##dest, name, 0); \
91972 -
91973 -int LoadSPUplugin(char *SPUdll) {
91974 - void *drv;
91975 -
91976 - hSPUDriver = SysLoadLibrary(SPUdll);
91977 - if (hSPUDriver == NULL) {
91978 - SPU_configure = NULL;
91979 - SysMessage (_("Could not load SPU plugin %s!"), SPUdll); return -1;
91980 - }
91981 - drv = hSPUDriver;
91982 - LoadSpuSym1(init, "SPUinit");
91983 - LoadSpuSym1(shutdown, "SPUshutdown");
91984 - LoadSpuSym1(open, "SPUopen");
91985 - LoadSpuSym1(close, "SPUclose");
91986 - LoadSpuSym0(configure, "SPUconfigure");
91987 - LoadSpuSym0(about, "SPUabout");
91988 - LoadSpuSym0(test, "SPUtest");
91989 - errval = 0;
91990 - LoadSpuSym2(startChannels1, "SPUstartChannels1");
91991 - LoadSpuSym2(startChannels2, "SPUstartChannels2");
91992 - LoadSpuSym2(stopChannels1, "SPUstopChannels1");
91993 - LoadSpuSym2(stopChannels2, "SPUstopChannels2");
91994 - LoadSpuSym2(putOne, "SPUputOne");
91995 - LoadSpuSym2(getOne, "SPUgetOne");
91996 - LoadSpuSym2(setAddr, "SPUsetAddr");
91997 - LoadSpuSym2(setPitch, "SPUsetPitch");
91998 - LoadSpuSym2(setVolumeL, "SPUsetVolumeL");
91999 - LoadSpuSym2(setVolumeR, "SPUsetVolumeR");
92000 - LoadSpuSymE(writeRegister, "SPUwriteRegister");
92001 - LoadSpuSymE(readRegister, "SPUreadRegister");
92002 - LoadSpuSymE(writeDMA, "SPUwriteDMA");
92003 - LoadSpuSymE(readDMA, "SPUreadDMA");
92004 - LoadSpuSym0(writeDMAMem, "SPUwriteDMAMem");
92005 - LoadSpuSym0(readDMAMem, "SPUreadDMAMem");
92006 - LoadSpuSym0(playADPCMchannel, "SPUplayADPCMchannel");
92007 - LoadSpuSym0(freeze, "SPUfreeze");
92008 - LoadSpuSym0(registerCallback, "SPUregisterCallback");
92009 - LoadSpuSymN(async, "SPUasync");
92010 -
92011 - return 0;
92012 -}
92013 -
92014 -
92015 -void *hPAD1Driver;
92016 -void *hPAD2Driver;
92017 -
92018 -static unsigned char buf[256];
92019 -unsigned char stdpar[10] = { 0x00, 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
92020 -unsigned char mousepar[8] = { 0x00, 0x12, 0x5a, 0xff, 0xff, 0xff, 0xff };
92021 -unsigned char analogpar[9] = { 0x00, 0xff, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
92022 -
92023 -static int bufcount, bufc;
92024 -
92025 -PadDataS padd1, padd2;
92026 -
92027 -unsigned char _PADstartPoll(PadDataS *pad) {
92028 - bufc = 0;
92029 -
92030 - switch (pad->controllerType) {
92031 - case PSE_PAD_TYPE_MOUSE:
92032 - mousepar[3] = pad->buttonStatus & 0xff;
92033 - mousepar[4] = pad->buttonStatus >> 8;
92034 - mousepar[5] = pad->moveX;
92035 - mousepar[6] = pad->moveY;
92036 -
92037 - memcpy(buf, mousepar, 7);
92038 - bufcount = 6;
92039 - break;
92040 - case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
92041 - analogpar[1] = 0x23;
92042 - analogpar[3] = pad->buttonStatus & 0xff;
92043 - analogpar[4] = pad->buttonStatus >> 8;
92044 - analogpar[5] = pad->rightJoyX;
92045 - analogpar[6] = pad->rightJoyY;
92046 - analogpar[7] = pad->leftJoyX;
92047 - analogpar[8] = pad->leftJoyY;
92048 -
92049 - memcpy(buf, analogpar, 9);
92050 - bufcount = 8;
92051 - break;
92052 - case PSE_PAD_TYPE_ANALOGPAD: // scph1150
92053 - analogpar[1] = 0x73;
92054 - analogpar[3] = pad->buttonStatus & 0xff;
92055 - analogpar[4] = pad->buttonStatus >> 8;
92056 - analogpar[5] = pad->rightJoyX;
92057 - analogpar[6] = pad->rightJoyY;
92058 - analogpar[7] = pad->leftJoyX;
92059 - analogpar[8] = pad->leftJoyY;
92060 -
92061 - memcpy(buf, analogpar, 9);
92062 - bufcount = 8;
92063 - break;
92064 - case PSE_PAD_TYPE_ANALOGJOY: // scph1110
92065 - analogpar[1] = 0x53;
92066 - analogpar[3] = pad->buttonStatus & 0xff;
92067 - analogpar[4] = pad->buttonStatus >> 8;
92068 - analogpar[5] = pad->rightJoyX;
92069 - analogpar[6] = pad->rightJoyY;
92070 - analogpar[7] = pad->leftJoyX;
92071 - analogpar[8] = pad->leftJoyY;
92072 -
92073 - memcpy(buf, analogpar, 9);
92074 - bufcount = 8;
92075 - break;
92076 - case PSE_PAD_TYPE_STANDARD:
92077 - default:
92078 - stdpar[3] = pad->buttonStatus & 0xff;
92079 - stdpar[4] = pad->buttonStatus >> 8;
92080 -
92081 - memcpy(buf, stdpar, 5);
92082 - bufcount = 4;
92083 - }
92084 -
92085 - return buf[bufc++];
92086 -}
92087 -
92088 -unsigned char _PADpoll(unsigned char value) {
92089 - if (bufc > bufcount) return 0;
92090 - return buf[bufc++];
92091 -}
92092 -
92093 -unsigned char CALLBACK PAD1__startPoll(int pad) {
92094 - PadDataS padd;
92095 -
92096 - PAD1_readPort1(&padd);
92097 -
92098 - return _PADstartPoll(&padd);
92099 -}
92100 -
92101 -unsigned char CALLBACK PAD1__poll(unsigned char value) {
92102 - return _PADpoll(value);
92103 -}
92104 -
92105 -long CALLBACK PAD1__configure(void) { return 0; }
92106 -void CALLBACK PAD1__about(void) {}
92107 -long CALLBACK PAD1__test(void) { return 0; }
92108 -long CALLBACK PAD1__query(void) { return 3; }
92109 -long CALLBACK PAD1__keypressed() { return 0; }
92110 -
92111 -#define LoadPad1Sym1(dest, name) \
92112 - LoadSym(PAD1_##dest, PAD##dest, name, 1);
92113 -
92114 -#define LoadPad1SymN(dest, name) \
92115 - LoadSym(PAD1_##dest, PAD##dest, name, 0);
92116 -
92117 -#define LoadPad1Sym0(dest, name) \
92118 - LoadSym(PAD1_##dest, PAD##dest, name, 0); \
92119 - if (PAD1_##dest == NULL) PAD1_##dest = (PAD##dest) PAD1__##dest;
92120 -
92121 -int LoadPAD1plugin(char *PAD1dll) {
92122 - void *drv;
92123 -
92124 - hPAD1Driver = SysLoadLibrary(PAD1dll);
92125 - if (hPAD1Driver == NULL) {
92126 - PAD1_configure = NULL;
92127 - SysMessage (_("Could not load Controller 1 plugin %s!"), PAD1dll); return -1;
92128 - }
92129 - drv = hPAD1Driver;
92130 - LoadPad1Sym1(init, "PADinit");
92131 - LoadPad1Sym1(shutdown, "PADshutdown");
92132 - LoadPad1Sym1(open, "PADopen");
92133 - LoadPad1Sym1(close, "PADclose");
92134 - LoadPad1Sym0(query, "PADquery");
92135 - LoadPad1Sym1(readPort1, "PADreadPort1");
92136 - LoadPad1Sym0(configure, "PADconfigure");
92137 - LoadPad1Sym0(test, "PADtest");
92138 - LoadPad1Sym0(about, "PADabout");
92139 - LoadPad1Sym0(keypressed, "PADkeypressed");
92140 - LoadPad1Sym0(startPoll, "PADstartPoll");
92141 - LoadPad1Sym0(poll, "PADpoll");
92142 - LoadPad1SymN(setSensitive, "PADsetSensitive");
92143 -
92144 - return 0;
92145 -}
92146 -
92147 -unsigned char CALLBACK PAD2__startPoll(int pad) {
92148 - PadDataS padd;
92149 -
92150 - PAD2_readPort2(&padd);
92151 -
92152 - return _PADstartPoll(&padd);
92153 -}
92154 -
92155 -unsigned char CALLBACK PAD2__poll(unsigned char value) {
92156 - return _PADpoll(value);
92157 -}
92158 -
92159 -long CALLBACK PAD2__configure(void) { return 0; }
92160 -void CALLBACK PAD2__about(void) {}
92161 -long CALLBACK PAD2__test(void) { return 0; }
92162 -long CALLBACK PAD2__query(void) { return 3; }
92163 -long CALLBACK PAD2__keypressed() { return 0; }
92164 -
92165 -#define LoadPad2Sym1(dest, name) \
92166 - LoadSym(PAD2_##dest, PAD##dest, name, 1);
92167 -
92168 -#define LoadPad2Sym0(dest, name) \
92169 - LoadSym(PAD2_##dest, PAD##dest, name, 0); \
92170 - if (PAD2_##dest == NULL) PAD2_##dest = (PAD##dest) PAD2__##dest;
92171 -
92172 -#define LoadPad2SymN(dest, name) \
92173 - LoadSym(PAD2_##dest, PAD##dest, name, 0);
92174 -
92175 -int LoadPAD2plugin(char *PAD2dll) {
92176 - void *drv;
92177 -
92178 - hPAD2Driver = SysLoadLibrary(PAD2dll);
92179 - if (hPAD2Driver == NULL) {
92180 - PAD2_configure = NULL;
92181 - SysMessage (_("Could not load Controller 2 plugin %s!"), PAD2dll); return -1;
92182 - }
92183 - drv = hPAD2Driver;
92184 - LoadPad2Sym1(init, "PADinit");
92185 - LoadPad2Sym1(shutdown, "PADshutdown");
92186 - LoadPad2Sym1(open, "PADopen");
92187 - LoadPad2Sym1(close, "PADclose");
92188 - LoadPad2Sym0(query, "PADquery");
92189 - LoadPad2Sym1(readPort2, "PADreadPort2");
92190 - LoadPad2Sym0(configure, "PADconfigure");
92191 - LoadPad2Sym0(test, "PADtest");
92192 - LoadPad2Sym0(about, "PADabout");
92193 - LoadPad2Sym0(keypressed, "PADkeypressed");
92194 - LoadPad2Sym0(startPoll, "PADstartPoll");
92195 - LoadPad2Sym0(poll, "PADpoll");
92196 - LoadPad2SymN(setSensitive, "PADsetSensitive");
92197 -
92198 - return 0;
92199 -}
92200 -
92201 -void *hNETDriver;
92202 -
92203 -void CALLBACK NET__setInfo(netInfo *info) {}
92204 -void CALLBACK NET__keypressed(int key) {}
92205 -long CALLBACK NET__configure(void) { return 0; }
92206 -long CALLBACK NET__test(void) { return 0; }
92207 -void CALLBACK NET__about(void) {}
92208 -
92209 -#define LoadNetSym1(dest, name) \
92210 - LoadSym(NET_##dest, NET##dest, name, 1);
92211 -
92212 -#define LoadNetSymN(dest, name) \
92213 - LoadSym(NET_##dest, NET##dest, name, 0);
92214 -
92215 -#define LoadNetSym0(dest, name) \
92216 - LoadSym(NET_##dest, NET##dest, name, 0); \
92217 - if (NET_##dest == NULL) NET_##dest = (NET##dest) NET__##dest;
92218 -
92219 -int LoadNETplugin(char *NETdll) {
92220 - void *drv;
92221 -
92222 - hNETDriver = SysLoadLibrary(NETdll);
92223 - if (hNETDriver == NULL) {
92224 - SysMessage (_("Could not load NetPlay plugin %s!"), NETdll); return -1;
92225 - }
92226 - drv = hNETDriver;
92227 - LoadNetSym1(init, "NETinit");
92228 - LoadNetSym1(shutdown, "NETshutdown");
92229 - LoadNetSym1(open, "NETopen");
92230 - LoadNetSym1(close, "NETclose");
92231 - LoadNetSymN(sendData, "NETsendData");
92232 - LoadNetSymN(recvData, "NETrecvData");
92233 - LoadNetSym1(sendPadData, "NETsendPadData");
92234 - LoadNetSym1(recvPadData, "NETrecvPadData");
92235 - LoadNetSym1(queryPlayer, "NETqueryPlayer");
92236 - LoadNetSym1(pause, "NETpause");
92237 - LoadNetSym1(resume, "NETresume");
92238 - LoadNetSym0(setInfo, "NETsetInfo");
92239 - LoadNetSym0(keypressed, "NETkeypressed");
92240 - LoadNetSym0(configure, "NETconfigure");
92241 - LoadNetSym0(test, "NETtest");
92242 - LoadNetSym0(about, "NETabout");
92243 -
92244 - return 0;
92245 -}
92246 -
92247 -void CALLBACK clearDynarec(void) {
92248 - psxCpu->Reset();
92249 -}
92250 -
92251 -/* TODO If there's an error, need to notify user which plugin failed, rather than silently fail */
92252 -int LoadPlugins() {
92253 - int ret;
92254 - gchar *Plugin;
92255 -
92256 - Plugin = g_build_filename (Config.PluginsDir, Config.Cdr, NULL);
92257 - if (LoadCDRplugin (Plugin) == -1) return -1;
92258 - Plugin = g_build_filename (Config.PluginsDir, Config.Gpu, NULL);
92259 - if (LoadGPUplugin(Plugin) == -1) return -1;
92260 - Plugin = g_build_filename (Config.PluginsDir, Config.Spu, NULL);
92261 - if (LoadSPUplugin(Plugin) == -1) return -1;
92262 - Plugin = g_build_filename (Config.PluginsDir, Config.Pad1, NULL);
92263 - if (LoadPAD1plugin(Plugin) == -1) return -1;
92264 - Plugin = g_build_filename (Config.PluginsDir, Config.Pad2, NULL);
92265 - if (LoadPAD2plugin(Plugin) == -1) return -1;
92266 -
92267 - g_free (Plugin);
92268 -
92269 -#ifdef NETWORKING_ENABLED
92270 - if (!strcmp("Disabled", Config.Net)) Config.UseNet = 0;
92271 - else {
92272 - Config.UseNet = 1;
92273 - sprintf(Plugin, "%s%s", dotdir, Config.Net);
92274 - if (LoadNETplugin(Plugin) == -1) return -1;
92275 - }
92276 -#endif /* NETWORKING_ENABLED */
92277 - /* TODO Proper error code handling - report the appropriate error */
92278 - ret = CDR_init();
92279 - if (ret < 0) { SysMessage (_("Error initializing CD-ROM plugin: %d"), ret); return -1; }
92280 - ret = GPU_init();
92281 - if (ret < 0) { SysMessage (_("Error initializing GPU plugin: %d"), ret); return -1; }
92282 - ret = SPU_init();
92283 - if (ret < 0) { SysMessage (_("Error initializing SPU plugin: %d"), ret); return -1; }
92284 - ret = PAD1_init(1);
92285 - if (ret < 0) { SysMessage (_("Error initializing Controller 1 plugin: %d"), ret); return -1; }
92286 - ret = PAD2_init(2);
92287 - if (ret < 0) { SysMessage (_("Error initializing Controller 2 plugin: %d"), ret); return -1; }
92288 -#ifdef NETWORKING_ENABLED
92289 - if (Config.UseNet) {
92290 - ret = NET_init();
92291 - if (ret < 0) { SysMessage (_("Error initializing NetPlay plugin: %d"), ret); return -1; }
92292 - }
92293 -#endif /* NETWORKING_ENABLED */
92294 - return 0;
92295 -}
92296 -
92297 -void ReleasePlugins() {
92298 - if (hCDRDriver == NULL || hGPUDriver == NULL || hSPUDriver == NULL ||
92299 - hPAD1Driver == NULL || hPAD2Driver == NULL) return;
92300 -#ifdef NETWORKING_ENABLED
92301 - if (Config.UseNet) {
92302 - int ret = NET_close();
92303 - if (ret < 0) Config.UseNet = 0;
92304 - NetOpened = 0;
92305 - }
92306 -#endif /* NETWORKING_ENABLED */
92307 - CDR_shutdown();
92308 - GPU_shutdown();
92309 - SPU_shutdown();
92310 - PAD1_shutdown();
92311 - PAD2_shutdown();
92312 -#ifdef NETWORKING_ENABLED
92313 - if (Config.UseNet && hNETDriver != NULL) NET_shutdown();
92314 -#endif /* NETWORKING_ENABLED */
92315 - SysCloseLibrary(hCDRDriver); hCDRDriver = NULL;
92316 - SysCloseLibrary(hGPUDriver); hGPUDriver = NULL;
92317 - SysCloseLibrary(hSPUDriver); hSPUDriver = NULL;
92318 - SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL;
92319 - SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL;
92320 -#ifdef NETWORKING_ENABLED
92321 - if (Config.UseNet && hNETDriver != NULL) {
92322 - SysCloseLibrary(hNETDriver); hNETDriver = NULL;
92323 - }
92324 -#endif /* NETWORKING_ENABLED */
92325 -}
92326 diff -rupN original/libpcsxcore/libpcsxcore/plugins.h new/libpcsxcore/libpcsxcore/plugins.h
92327 --- original/libpcsxcore/libpcsxcore/plugins.h 2008-11-29 01:59:36.000000000 -0430
92328 +++ new/libpcsxcore/libpcsxcore/plugins.h 1969-12-31 20:00:00.000000000 -0400
92329 @@ -1,338 +0,0 @@
92330 -/***************************************************************************
92331 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
92332 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
92333 - * *
92334 - * This program is free software; you can redistribute it and/or modify *
92335 - * it under the terms of the GNU General Public License as published by *
92336 - * the Free Software Foundation; either version 2 of the License, or *
92337 - * (at your option) any later version. *
92338 - * *
92339 - * This program is distributed in the hope that it will be useful, *
92340 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
92341 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
92342 - * GNU General Public License for more details. *
92343 - * *
92344 - * You should have received a copy of the GNU General Public License *
92345 - * along with this program; if not, write to the *
92346 - * Free Software Foundation, Inc., *
92347 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
92348 - ***************************************************************************/
92349 -
92350 -#ifndef __PLUGINS_H__
92351 -#define __PLUGINS_H__
92352 -
92353 -#include "psxcommon.h"
92354 -#include "spu.h"
92355 -
92356 -typedef void* HWND;
92357 -#define CALLBACK
92358 -typedef long (* GPUopen)(unsigned long *, char *, char *);
92359 -long GPU__open(void);
92360 -typedef long (* SPUopen)(void);
92361 -long SPU__open(void);
92362 -typedef long (* PADopen)(unsigned long *);
92363 -long PAD1__open(void);
92364 -long PAD2__open(void);
92365 -typedef long (* NETopen)(unsigned long *);
92366 -
92367 -#include "psemu_plugin_defs.h"
92368 -#include "decode_xa.h"
92369 -
92370 -int LoadPlugins();
92371 -void ReleasePlugins();
92372 -int OpenPlugins();
92373 -void ClosePlugins();
92374 -
92375 -
92376 -typedef unsigned long (CALLBACK* PSEgetLibType)(void);
92377 -typedef unsigned long (CALLBACK* PSEgetLibVersion)(void);
92378 -typedef char *(CALLBACK* PSEgetLibName)(void);
92379 -
92380 -///GPU PLUGIN STUFF
92381 -typedef long (CALLBACK* GPUinit)(void);
92382 -typedef long (CALLBACK* GPUshutdown)(void);
92383 -typedef long (CALLBACK* GPUclose)(void);
92384 -typedef void (CALLBACK* GPUwriteStatus)(uint32_t);
92385 -typedef void (CALLBACK* GPUwriteData)(uint32_t);
92386 -typedef void (CALLBACK* GPUwriteDataMem)(uint32_t *, int);
92387 -typedef uint32_t (CALLBACK* GPUreadStatus)(void);
92388 -typedef uint32_t (CALLBACK* GPUreadData)(void);
92389 -typedef void (CALLBACK* GPUreadDataMem)(uint32_t *, int);
92390 -typedef long (CALLBACK* GPUdmaChain)(uint32_t *,uint32_t);
92391 -typedef void (CALLBACK* GPUupdateLace)(void);
92392 -typedef long (CALLBACK* GPUconfigure)(void);
92393 -typedef long (CALLBACK* GPUtest)(void);
92394 -typedef void (CALLBACK* GPUabout)(void);
92395 -typedef void (CALLBACK* GPUmakeSnapshot)(void);
92396 -typedef void (CALLBACK* GPUkeypressed)(int);
92397 -typedef void (CALLBACK* GPUdisplayText)(char *);
92398 -typedef struct {
92399 - uint32_t ulFreezeVersion;
92400 - uint32_t ulStatus;
92401 - uint32_t ulControl[256];
92402 - unsigned char psxVRam[1024*512*2];
92403 -} GPUFreeze_t;
92404 -typedef long (CALLBACK* GPUfreeze)(uint32_t, GPUFreeze_t *);
92405 -typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);
92406 -typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);
92407 -typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));
92408 -
92409 -//plugin stuff From Shadow
92410 -// *** walking in the valley of your darking soul i realize that i was alone
92411 -//Gpu function pointers
92412 -GPUupdateLace GPU_updateLace;
92413 -GPUinit GPU_init;
92414 -GPUshutdown GPU_shutdown;
92415 -GPUconfigure GPU_configure;
92416 -GPUtest GPU_test;
92417 -GPUabout GPU_about;
92418 -GPUopen GPU_open;
92419 -GPUclose GPU_close;
92420 -GPUreadStatus GPU_readStatus;
92421 -GPUreadData GPU_readData;
92422 -GPUreadDataMem GPU_readDataMem;
92423 -GPUwriteStatus GPU_writeStatus;
92424 -GPUwriteData GPU_writeData;
92425 -GPUwriteDataMem GPU_writeDataMem;
92426 -GPUdmaChain GPU_dmaChain;
92427 -GPUkeypressed GPU_keypressed;
92428 -GPUdisplayText GPU_displayText;
92429 -GPUmakeSnapshot GPU_makeSnapshot;
92430 -GPUfreeze GPU_freeze;
92431 -GPUgetScreenPic GPU_getScreenPic;
92432 -GPUshowScreenPic GPU_showScreenPic;
92433 -GPUclearDynarec GPU_clearDynarec;
92434 -
92435 -//cd rom plugin ;)
92436 -typedef long (CALLBACK* CDRinit)(void);
92437 -typedef long (CALLBACK* CDRshutdown)(void);
92438 -typedef long (CALLBACK* CDRopen)(void);
92439 -typedef long (CALLBACK* CDRclose)(void);
92440 -typedef long (CALLBACK* CDRgetTN)(unsigned char *);
92441 -typedef long (CALLBACK* CDRgetTD)(unsigned char , unsigned char *);
92442 -typedef long (CALLBACK* CDRreadTrack)(unsigned char *);
92443 -typedef unsigned char * (CALLBACK* CDRgetBuffer)(void);
92444 -typedef long (CALLBACK* CDRconfigure)(void);
92445 -typedef long (CALLBACK* CDRtest)(void);
92446 -typedef void (CALLBACK* CDRabout)(void);
92447 -typedef long (CALLBACK* CDRplay)(unsigned char *);
92448 -typedef long (CALLBACK* CDRstop)(void);
92449 -typedef long (CALLBACK* CDRsetfilename)(char *);
92450 -struct CdrStat {
92451 - uint32_t Type;
92452 - uint32_t Status;
92453 - unsigned char Time[3];
92454 -};
92455 -typedef long (CALLBACK* CDRgetStatus)(struct CdrStat *);
92456 -typedef char* (CALLBACK* CDRgetDriveLetter)(void);
92457 -struct SubQ {
92458 - char res0[11];
92459 - unsigned char ControlAndADR;
92460 - unsigned char TrackNumber;
92461 - unsigned char IndexNumber;
92462 - unsigned char TrackRelativeAddress[3];
92463 - unsigned char Filler;
92464 - unsigned char AbsoluteAddress[3];
92465 - char res1[72];
92466 -};
92467 -typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);
92468 -
92469 -//cd rom function pointers
92470 -CDRinit CDR_init;
92471 -CDRshutdown CDR_shutdown;
92472 -CDRopen CDR_open;
92473 -CDRclose CDR_close;
92474 -CDRtest CDR_test;
92475 -CDRgetTN CDR_getTN;
92476 -CDRgetTD CDR_getTD;
92477 -CDRreadTrack CDR_readTrack;
92478 -CDRgetBuffer CDR_getBuffer;
92479 -CDRplay CDR_play;
92480 -CDRstop CDR_stop;
92481 -CDRgetStatus CDR_getStatus;
92482 -CDRgetDriveLetter CDR_getDriveLetter;
92483 -CDRgetBufferSub CDR_getBufferSub;
92484 -CDRconfigure CDR_configure;
92485 -CDRabout CDR_about;
92486 -CDRsetfilename CDR_setfilename;
92487 -
92488 -// spu plugin
92489 -typedef long (CALLBACK* SPUinit)(void);
92490 -typedef long (CALLBACK* SPUshutdown)(void);
92491 -typedef long (CALLBACK* SPUclose)(void);
92492 -typedef void (CALLBACK* SPUplaySample)(unsigned char);
92493 -typedef void (CALLBACK* SPUstartChannels1)(unsigned short);
92494 -typedef void (CALLBACK* SPUstartChannels2)(unsigned short);
92495 -typedef void (CALLBACK* SPUstopChannels1)(unsigned short);
92496 -typedef void (CALLBACK* SPUstopChannels2)(unsigned short);
92497 -typedef void (CALLBACK* SPUputOne)(uint32_t,unsigned short);
92498 -typedef unsigned short (CALLBACK* SPUgetOne)(uint32_t);
92499 -typedef void (CALLBACK* SPUsetAddr)(unsigned char, unsigned short);
92500 -typedef void (CALLBACK* SPUsetPitch)(unsigned char, unsigned short);
92501 -typedef void (CALLBACK* SPUsetVolumeL)(unsigned char, short );
92502 -typedef void (CALLBACK* SPUsetVolumeR)(unsigned char, short );
92503 -//psemu pro 2 functions from now..
92504 -typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short);
92505 -typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);
92506 -typedef void (CALLBACK* SPUwriteDMA)(unsigned short);
92507 -typedef unsigned short (CALLBACK* SPUreadDMA)(void);
92508 -typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int);
92509 -typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int);
92510 -typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *);
92511 -typedef void (CALLBACK* SPUregisterCallback)(void (CALLBACK *callback)(void));
92512 -typedef long (CALLBACK* SPUconfigure)(void);
92513 -typedef long (CALLBACK* SPUtest)(void);
92514 -typedef void (CALLBACK* SPUabout)(void);
92515 -typedef struct {
92516 - unsigned char PluginName[8];
92517 - uint32_t PluginVersion;
92518 - uint32_t Size;
92519 - unsigned char SPUPorts[0x200];
92520 - unsigned char SPURam[0x80000];
92521 - xa_decode_t xa;
92522 - unsigned char *SPUInfo;
92523 -} SPUFreeze_t;
92524 -typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *);
92525 -typedef void (CALLBACK* SPUasync)(uint32_t);
92526 -
92527 -//SPU POINTERS
92528 -SPUconfigure SPU_configure;
92529 -SPUabout SPU_about;
92530 -SPUinit SPU_init;
92531 -SPUshutdown SPU_shutdown;
92532 -SPUtest SPU_test;
92533 -SPUopen SPU_open;
92534 -SPUclose SPU_close;
92535 -SPUplaySample SPU_playSample;
92536 -SPUstartChannels1 SPU_startChannels1;
92537 -SPUstartChannels2 SPU_startChannels2;
92538 -SPUstopChannels1 SPU_stopChannels1;
92539 -SPUstopChannels2 SPU_stopChannels2;
92540 -SPUputOne SPU_putOne;
92541 -SPUgetOne SPU_getOne;
92542 -SPUsetAddr SPU_setAddr;
92543 -SPUsetPitch SPU_setPitch;
92544 -SPUsetVolumeL SPU_setVolumeL;
92545 -SPUsetVolumeR SPU_setVolumeR;
92546 -SPUwriteRegister SPU_writeRegister;
92547 -SPUreadRegister SPU_readRegister;
92548 -SPUwriteDMA SPU_writeDMA;
92549 -SPUreadDMA SPU_readDMA;
92550 -SPUwriteDMAMem SPU_writeDMAMem;
92551 -SPUreadDMAMem SPU_readDMAMem;
92552 -SPUplayADPCMchannel SPU_playADPCMchannel;
92553 -SPUfreeze SPU_freeze;
92554 -SPUregisterCallback SPU_registerCallback;
92555 -SPUasync SPU_async;
92556 -
92557 -// PAD Functions
92558 -
92559 -typedef long (CALLBACK* PADconfigure)(void);
92560 -typedef void (CALLBACK* PADabout)(void);
92561 -typedef long (CALLBACK* PADinit)(long);
92562 -typedef long (CALLBACK* PADshutdown)(void);
92563 -typedef long (CALLBACK* PADtest)(void);
92564 -typedef long (CALLBACK* PADclose)(void);
92565 -typedef long (CALLBACK* PADquery)(void);
92566 -typedef long (CALLBACK* PADreadPort1)(PadDataS*);
92567 -typedef long (CALLBACK* PADreadPort2)(PadDataS*);
92568 -typedef long (CALLBACK* PADkeypressed)(void);
92569 -typedef unsigned char (CALLBACK* PADstartPoll)(int);
92570 -typedef unsigned char (CALLBACK* PADpoll)(unsigned char);
92571 -typedef void (CALLBACK* PADsetSensitive)(int);
92572 -
92573 -//PAD POINTERS
92574 -PADconfigure PAD1_configure;
92575 -PADabout PAD1_about;
92576 -PADinit PAD1_init;
92577 -PADshutdown PAD1_shutdown;
92578 -PADtest PAD1_test;
92579 -PADopen PAD1_open;
92580 -PADclose PAD1_close;
92581 -PADquery PAD1_query;
92582 -PADreadPort1 PAD1_readPort1;
92583 -PADkeypressed PAD1_keypressed;
92584 -PADstartPoll PAD1_startPoll;
92585 -PADpoll PAD1_poll;
92586 -PADsetSensitive PAD1_setSensitive;
92587 -
92588 -PADconfigure PAD2_configure;
92589 -PADabout PAD2_about;
92590 -PADinit PAD2_init;
92591 -PADshutdown PAD2_shutdown;
92592 -PADtest PAD2_test;
92593 -PADopen PAD2_open;
92594 -PADclose PAD2_close;
92595 -PADquery PAD2_query;
92596 -PADreadPort2 PAD2_readPort2;
92597 -PADkeypressed PAD2_keypressed;
92598 -PADstartPoll PAD2_startPoll;
92599 -PADpoll PAD2_poll;
92600 -PADsetSensitive PAD2_setSensitive;
92601 -
92602 -// NET plugin
92603 -
92604 -typedef long (CALLBACK* NETinit)(void);
92605 -typedef long (CALLBACK* NETshutdown)(void);
92606 -typedef long (CALLBACK* NETclose)(void);
92607 -typedef long (CALLBACK* NETconfigure)(void);
92608 -typedef long (CALLBACK* NETtest)(void);
92609 -typedef void (CALLBACK* NETabout)(void);
92610 -typedef void (CALLBACK* NETpause)(void);
92611 -typedef void (CALLBACK* NETresume)(void);
92612 -typedef long (CALLBACK* NETqueryPlayer)(void);
92613 -typedef long (CALLBACK* NETsendData)(void *, int, int);
92614 -typedef long (CALLBACK* NETrecvData)(void *, int, int);
92615 -typedef long (CALLBACK* NETsendPadData)(void *, int);
92616 -typedef long (CALLBACK* NETrecvPadData)(void *, int);
92617 -
92618 -typedef struct {
92619 - char EmuName[32];
92620 - char CdromID[9]; // ie. 'SCPH12345', no \0 trailing character
92621 - char CdromLabel[11];
92622 - void *psxMem;
92623 - GPUshowScreenPic GPU_showScreenPic;
92624 - GPUdisplayText GPU_displayText;
92625 - PADsetSensitive PAD_setSensitive;
92626 - char GPUpath[256]; // paths must be absolute
92627 - char SPUpath[256];
92628 - char CDRpath[256];
92629 - char MCD1path[256];
92630 - char MCD2path[256];
92631 - char BIOSpath[256]; // 'HLE' for internal bios
92632 - char Unused[1024];
92633 -} netInfo;
92634 -
92635 -typedef long (CALLBACK* NETsetInfo)(netInfo *);
92636 -typedef long (CALLBACK* NETkeypressed)(int)
92637 -;
92638 -
92639 -
92640 -// NET function pointers
92641 -NETinit NET_init;
92642 -NETshutdown NET_shutdown;
92643 -NETopen NET_open;
92644 -NETclose NET_close;
92645 -NETtest NET_test;
92646 -NETconfigure NET_configure;
92647 -NETabout NET_about;
92648 -NETpause NET_pause;
92649 -NETresume NET_resume;
92650 -NETqueryPlayer NET_queryPlayer;
92651 -NETsendData NET_sendData;
92652 -NETrecvData NET_recvData;
92653 -NETsendPadData NET_sendPadData;
92654 -NETrecvPadData NET_recvPadData;
92655 -NETsetInfo NET_setInfo;
92656 -NETkeypressed NET_keypressed;
92657 -
92658 -int LoadCDRplugin(char *CDRdll);
92659 -int LoadGPUplugin(char *GPUdll);
92660 -int LoadSPUplugin(char *SPUdll);
92661 -int LoadPAD1plugin(char *PAD1dll);
92662 -int LoadPAD2plugin(char *PAD2dll);
92663 -int LoadNETplugin(char *NETdll);
92664 -
92665 -void CALLBACK clearDynarec(void);
92666 -
92667 -#endif /* __PLUGINS_H__ */
92668 diff -rupN original/libpcsxcore/libpcsxcore/plugins.lo new/libpcsxcore/libpcsxcore/plugins.lo
92669 --- original/libpcsxcore/libpcsxcore/plugins.lo 2009-03-28 22:34:54.000000000 -0430
92670 +++ new/libpcsxcore/libpcsxcore/plugins.lo 1969-12-31 20:00:00.000000000 -0400
92671 @@ -1,12 +0,0 @@
92672 -# plugins.lo - a libtool object file
92673 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
92674 -#
92675 -# Please DO NOT delete this file!
92676 -# It is necessary for linking the library.
92677 -
92678 -# Name of the PIC object.
92679 -pic_object='.libs/plugins.o'
92680 -
92681 -# Name of the non-PIC object.
92682 -non_pic_object='plugins.o'
92683 -
92684 Los ficheros binarios original/libpcsxcore/libpcsxcore/plugins.o y new/libpcsxcore/libpcsxcore/plugins.o son distintos
92685 diff -rupN original/libpcsxcore/libpcsxcore/ppc/CVS/Entries new/libpcsxcore/libpcsxcore/ppc/CVS/Entries
92686 --- original/libpcsxcore/libpcsxcore/ppc/CVS/Entries 2009-03-28 22:23:59.000000000 -0430
92687 +++ new/libpcsxcore/libpcsxcore/ppc/CVS/Entries 1969-12-31 20:00:00.000000000 -0400
92688 @@ -1,9 +0,0 @@
92689 -/pGte.h/1.2/Mon Feb 23 10:17:23 2009//
92690 -/pR3000A.c/1.2/Mon Feb 23 10:17:23 2009//
92691 -/pasm.s/1.1.1.1/Mon Oct 8 21:13:28 2007//
92692 -/ppc.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
92693 -/ppc.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
92694 -/ppc_mnemonics.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
92695 -/reguse.c/1.1.1.1/Mon Oct 8 21:13:28 2007//
92696 -/reguse.h/1.1.1.1/Mon Oct 8 21:13:28 2007//
92697 -D
92698 diff -rupN original/libpcsxcore/libpcsxcore/ppc/CVS/Repository new/libpcsxcore/libpcsxcore/ppc/CVS/Repository
92699 --- original/libpcsxcore/libpcsxcore/ppc/CVS/Repository 2009-03-28 22:23:37.000000000 -0430
92700 +++ new/libpcsxcore/libpcsxcore/ppc/CVS/Repository 1969-12-31 20:00:00.000000000 -0400
92701 @@ -1 +0,0 @@
92702 -pcsx-df/libpcsxcore/ppc
92703 diff -rupN original/libpcsxcore/libpcsxcore/ppc/CVS/Root new/libpcsxcore/libpcsxcore/ppc/CVS/Root
92704 --- original/libpcsxcore/libpcsxcore/ppc/CVS/Root 2009-03-28 22:23:37.000000000 -0430
92705 +++ new/libpcsxcore/libpcsxcore/ppc/CVS/Root 1969-12-31 20:00:00.000000000 -0400
92706 @@ -1 +0,0 @@
92707 -:pserver:anonymous@pcsx-df.cvs.sourceforge.net:/cvsroot/pcsx-df
92708 diff -rupN original/libpcsxcore/libpcsxcore/ppc/pGte.h new/libpcsxcore/libpcsxcore/ppc/pGte.h
92709 --- original/libpcsxcore/libpcsxcore/ppc/pGte.h 2009-02-23 05:47:23.000000000 -0430
92710 +++ new/libpcsxcore/libpcsxcore/ppc/pGte.h 1969-12-31 20:00:00.000000000 -0400
92711 @@ -1,670 +0,0 @@
92712 -/* Pcsx - Pc Psx Emulator
92713 - * Copyright (C) 1999-2003 Pcsx Team
92714 - *
92715 - * This program is free software; you can redistribute it and/or modify
92716 - * it under the terms of the GNU General Public License as published by
92717 - * the Free Software Foundation; either version 2 of the License, or
92718 - * (at your option) any later version.
92719 - *
92720 - * This program is distributed in the hope that it will be useful,
92721 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
92722 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
92723 - * GNU General Public License for more details.
92724 - *
92725 - * You should have received a copy of the GNU General Public License
92726 - * along with this program; if not, write to the Free Software
92727 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
92728 - */
92729 -
92730 -int psxCP2time[64] = {
92731 - 2, 16 , 1 , 1, 1, 1 , 8, 1, // 00
92732 - 1 , 1 , 1 , 1, 6 , 1 , 1 , 1, // 08
92733 - 8 , 8, 8, 19, 13 , 1 , 44 , 1, // 10
92734 - 1 , 1 , 1 , 17, 11 , 1 , 14 , 1, // 18
92735 - 30 , 1 , 1 , 1, 1, 1 , 1 , 1, // 20
92736 - 5 , 8 , 17 , 1, 1, 5, 6, 1, // 28
92737 - 23 , 1 , 1 , 1, 1, 1 , 1 , 1, // 30
92738 - 1 , 1 , 1 , 1, 1, 6 , 5 , 39 // 38
92739 -};
92740 -
92741 -#define CP2_FUNC(f) \
92742 -void gte##f(); \
92743 -static void rec##f() { \
92744 - if (pc < cop2readypc) idlecyclecount += (cop2readypc - pc)>>2; \
92745 - iFlushRegs(0); \
92746 - LIW(0, (u32)psxRegs.code); \
92747 - STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS)); \
92748 - FlushAllHWReg(); \
92749 - CALLFunc ((u32)gte##f); \
92750 - cop2readypc = pc + psxCP2time[_fFunct_(psxRegs.code)]<<2; \
92751 -}
92752 -
92753 -#define CP2_FUNCNC(f) \
92754 -void gte##f(); \
92755 -static void rec##f() { \
92756 - if (pc < cop2readypc) idlecyclecount += (cop2readypc - pc)>>2; \
92757 - iFlushRegs(0); \
92758 - CALLFunc ((u32)gte##f); \
92759 -/* branch = 2; */\
92760 - cop2readypc = pc + psxCP2time[_fFunct_(psxRegs.code)]; \
92761 -}
92762 -
92763 -CP2_FUNC(MFC2);
92764 -CP2_FUNC(MTC2);
92765 -CP2_FUNC(CFC2);
92766 -CP2_FUNC(CTC2);
92767 -CP2_FUNC(LWC2);
92768 -CP2_FUNC(SWC2);
92769 -
92770 -#if 0
92771 -void gteMFC2();
92772 -static void recMFC2() {
92773 -// Rt = Cop2D->Rd
92774 - if (!_Rt_) return;
92775 -
92776 - iRegs[_Rt_].state = ST_UNK;
92777 -
92778 - switch (_Rd_) {
92779 - case 29:
92780 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
92781 - CALLFunc ((u32)gteMFC2);
92782 - break;
92783 -
92784 - default:
92785 - MOV32MtoR(EAX, (u32)&psxRegs.CP2D.r[_Rd_]);
92786 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
92787 - break;
92788 - }
92789 -}
92790 -
92791 -void gteMTC2();
92792 -static void recMTC2() {
92793 -// Cop2D->Rd = Rt
92794 - int fixt = 0;
92795 -
92796 -// iFlushRegs();
92797 -
92798 - switch (_Rd_) {
92799 - case 8: case 9: case 10: case 11:
92800 - fixt = 1; break;
92801 -
92802 - case 16: case 17: case 18: case 19:
92803 - fixt = 2; break;
92804 -
92805 - case 15:
92806 - case 28:
92807 - case 30:
92808 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
92809 - CALLFunc ((u32)gteMTC2);
92810 - break;
92811 - }
92812 -
92813 - if (IsConst(_Rt_)) {
92814 - if (fixt == 1) MOV32ItoM((u32)&psxRegs.CP2D.r[_Rd_], (s16)iRegs[_Rt_].k);
92815 - else if (fixt == 2) MOV32ItoM((u32)&psxRegs.CP2D.r[_Rd_], iRegs[_Rt_].k & 0xffff);
92816 - else MOV32ItoM((u32)&psxRegs.CP2D.r[_Rd_], iRegs[_Rt_].k);
92817 - } else {
92818 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
92819 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
92820 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
92821 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rd_], EAX);
92822 - }
92823 -}
92824 -
92825 -void gteLWC2();
92826 -static void recLWC2() {
92827 -// Cop2D->Rt = mem[Rs + Im] (unsigned)
92828 - int fixt = 0;
92829 -
92830 - switch (_Rt_) {
92831 - case 8: case 9: case 10: case 11:
92832 - fixt = 1; break;
92833 -
92834 - case 16: case 17: case 18: case 19:
92835 - fixt = 2; break;
92836 -
92837 - case 15:
92838 - case 28:
92839 - case 30:
92840 - iFlushRegs();
92841 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
92842 - CALLFunc ((u32)gteLWC2);
92843 - return;
92844 - }
92845 -
92846 - if (IsConst(_Rs_)) {
92847 - u32 addr = iRegs[_Rs_].k + _Imm_;
92848 - int t = addr >> 16;
92849 -
92850 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
92851 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1fffff]);
92852 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
92853 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
92854 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rt_], EAX);
92855 - return;
92856 - }
92857 - if (t == 0x1f80 && addr < 0x1f801000) {
92858 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xfff]);
92859 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
92860 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
92861 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rt_], EAX);
92862 - return;
92863 - }
92864 - }
92865 -
92866 - iPushOfB();
92867 - CALLFunc((u32)psxMemRead32);
92868 - if (fixt == 1) MOVSX32R16toR(EAX, EAX);
92869 - else if (fixt == 2) AND32ItoR(EAX, 0xffff);
92870 - MOV32RtoM((u32)&psxRegs.CP2D.r[_Rt_], EAX);
92871 -// ADD32ItoR(ESP, 4);
92872 - resp+= 4;
92873 -}
92874 -
92875 -void gteSWC2();
92876 -static void recSWC2() {
92877 -// mem[Rs + Im] = Rt
92878 -
92879 - switch (_Rt_) {
92880 - case 29:
92881 - iFlushRegs();
92882 - MOV32ItoM((u32)&psxRegs.code, (u32)psxRegs.code);
92883 - CALLFunc ((u32)gteSWC2);
92884 - return;
92885 - }
92886 -
92887 - if (IsConst(_Rs_)) {
92888 - u32 addr = iRegs[_Rs_].k + _Imm_;
92889 - int t = addr >> 16;
92890 -
92891 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
92892 - MOV32MtoR(EAX, (u32)&psxRegs.CP2D.r[_Rt_]);
92893 - MOV32RtoM((u32)&psxM[addr & 0x1fffff], EAX);
92894 - return;
92895 - }
92896 - if (t == 0x1f80 && addr < 0x1f801000) {
92897 - MOV32MtoR(EAX, (u32)&psxRegs.CP2D.r[_Rt_]);
92898 - MOV32RtoM((u32)&psxH[addr & 0xfff], EAX);
92899 - return;
92900 - }
92901 - }
92902 -
92903 - PUSH32M ((u32)&psxRegs.CP2D.r[_Rt_]);
92904 - iPushOfB();
92905 - CALLFunc((u32)psxMemWrite32);
92906 -// ADD32ItoR(ESP, 8);
92907 - resp+= 8;
92908 -}
92909 -
92910 -static void recCFC2() {
92911 -// Rt = Cop2C->Rd
92912 - if (!_Rt_) return;
92913 -
92914 - iRegs[_Rt_].state = ST_UNK;
92915 - MOV32MtoR(EAX, (u32)&psxRegs.CP2C.r[_Rd_]);
92916 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
92917 -}
92918 -
92919 -static void recCTC2() {
92920 -// Cop2C->Rd = Rt
92921 -
92922 - if (IsConst(_Rt_)) {
92923 - MOV32ItoM((u32)&psxRegs.CP2C.r[_Rd_], iRegs[_Rt_].k);
92924 - } else {
92925 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
92926 - MOV32RtoM((u32)&psxRegs.CP2C.r[_Rd_], EAX);
92927 - }
92928 -}
92929 -#endif
92930 -
92931 -CP2_FUNCNC(RTPS);
92932 -CP2_FUNC(OP);
92933 -CP2_FUNCNC(NCLIP);
92934 -CP2_FUNCNC(DPCS);
92935 -CP2_FUNCNC(INTPL);
92936 -CP2_FUNC(MVMVA);
92937 -CP2_FUNCNC(NCDS);
92938 -CP2_FUNCNC(NCDT);
92939 -CP2_FUNCNC(CDP);
92940 -CP2_FUNCNC(NCCS);
92941 -CP2_FUNCNC(CC);
92942 -CP2_FUNCNC(NCS);
92943 -CP2_FUNCNC(NCT);
92944 -CP2_FUNC(SQR);
92945 -CP2_FUNCNC(DCPL);
92946 -CP2_FUNCNC(DPCT);
92947 -CP2_FUNCNC(AVSZ3);
92948 -CP2_FUNCNC(AVSZ4);
92949 -CP2_FUNCNC(RTPT);
92950 -CP2_FUNC(GPF);
92951 -CP2_FUNC(GPL);
92952 -CP2_FUNCNC(NCCT);
92953 -
92954 -#if 0
92955 -
92956 -#define gteVX0 ((s16*)psxRegs.CP2D.r)[0]
92957 -#define gteVY0 ((s16*)psxRegs.CP2D.r)[1]
92958 -#define gteVZ0 ((s16*)psxRegs.CP2D.r)[2]
92959 -#define gteVX1 ((s16*)psxRegs.CP2D.r)[4]
92960 -#define gteVY1 ((s16*)psxRegs.CP2D.r)[5]
92961 -#define gteVZ1 ((s16*)psxRegs.CP2D.r)[6]
92962 -#define gteVX2 ((s16*)psxRegs.CP2D.r)[8]
92963 -#define gteVY2 ((s16*)psxRegs.CP2D.r)[9]
92964 -#define gteVZ2 ((s16*)psxRegs.CP2D.r)[10]
92965 -#define gteRGB psxRegs.CP2D.r[6]
92966 -#define gteOTZ ((s16*)psxRegs.CP2D.r)[7*2]
92967 -#define gteIR0 ((s32*)psxRegs.CP2D.r)[8]
92968 -#define gteIR1 ((s32*)psxRegs.CP2D.r)[9]
92969 -#define gteIR2 ((s32*)psxRegs.CP2D.r)[10]
92970 -#define gteIR3 ((s32*)psxRegs.CP2D.r)[11]
92971 -#define gteSX0 ((s16*)psxRegs.CP2D.r)[12*2]
92972 -#define gteSY0 ((s16*)psxRegs.CP2D.r)[12*2+1]
92973 -#define gteSX1 ((s16*)psxRegs.CP2D.r)[13*2]
92974 -#define gteSY1 ((s16*)psxRegs.CP2D.r)[13*2+1]
92975 -#define gteSX2 ((s16*)psxRegs.CP2D.r)[14*2]
92976 -#define gteSY2 ((s16*)psxRegs.CP2D.r)[14*2+1]
92977 -#define gteSXP ((s16*)psxRegs.CP2D.r)[15*2]
92978 -#define gteSYP ((s16*)psxRegs.CP2D.r)[15*2+1]
92979 -#define gteSZx ((u16*)psxRegs.CP2D.r)[16*2]
92980 -#define gteSZ0 ((u16*)psxRegs.CP2D.r)[17*2]
92981 -#define gteSZ1 ((u16*)psxRegs.CP2D.r)[18*2]
92982 -#define gteSZ2 ((u16*)psxRegs.CP2D.r)[19*2]
92983 -#define gteRGB0 psxRegs.CP2D.r[20]
92984 -#define gteRGB1 psxRegs.CP2D.r[21]
92985 -#define gteRGB2 psxRegs.CP2D.r[22]
92986 -#define gteMAC0 psxRegs.CP2D.r[24]
92987 -#define gteMAC1 ((s32*)psxRegs.CP2D.r)[25]
92988 -#define gteMAC2 ((s32*)psxRegs.CP2D.r)[26]
92989 -#define gteMAC3 ((s32*)psxRegs.CP2D.r)[27]
92990 -#define gteIRGB psxRegs.CP2D.r[28]
92991 -#define gteORGB psxRegs.CP2D.r[29]
92992 -#define gteLZCS psxRegs.CP2D.r[30]
92993 -#define gteLZCR psxRegs.CP2D.r[31]
92994 -
92995 -#define gteR ((u8 *)psxRegs.CP2D.r)[6*4]
92996 -#define gteG ((u8 *)psxRegs.CP2D.r)[6*4+1]
92997 -#define gteB ((u8 *)psxRegs.CP2D.r)[6*4+2]
92998 -#define gteCODE ((u8 *)psxRegs.CP2D.r)[6*4+3]
92999 -#define gteC gteCODE
93000 -
93001 -#define gteR0 ((u8 *)psxRegs.CP2D.r)[20*4]
93002 -#define gteG0 ((u8 *)psxRegs.CP2D.r)[20*4+1]
93003 -#define gteB0 ((u8 *)psxRegs.CP2D.r)[20*4+2]
93004 -#define gteCODE0 ((u8 *)psxRegs.CP2D.r)[20*4+3]
93005 -#define gteC0 gteCODE0
93006 -
93007 -#define gteR1 ((u8 *)psxRegs.CP2D.r)[21*4]
93008 -#define gteG1 ((u8 *)psxRegs.CP2D.r)[21*4+1]
93009 -#define gteB1 ((u8 *)psxRegs.CP2D.r)[21*4+2]
93010 -#define gteCODE1 ((u8 *)psxRegs.CP2D.r)[21*4+3]
93011 -#define gteC1 gteCODE1
93012 -
93013 -#define gteR2 ((u8 *)psxRegs.CP2D.r)[22*4]
93014 -#define gteG2 ((u8 *)psxRegs.CP2D.r)[22*4+1]
93015 -#define gteB2 ((u8 *)psxRegs.CP2D.r)[22*4+2]
93016 -#define gteCODE2 ((u8 *)psxRegs.CP2D.r)[22*4+3]
93017 -#define gteC2 gteCODE2
93018 -
93019 -
93020 -
93021 -#define gteR11 ((s16*)psxRegs.CP2C.r)[0]
93022 -#define gteR12 ((s16*)psxRegs.CP2C.r)[1]
93023 -#define gteR13 ((s16*)psxRegs.CP2C.r)[2]
93024 -#define gteR21 ((s16*)psxRegs.CP2C.r)[3]
93025 -#define gteR22 ((s16*)psxRegs.CP2C.r)[4]
93026 -#define gteR23 ((s16*)psxRegs.CP2C.r)[5]
93027 -#define gteR31 ((s16*)psxRegs.CP2C.r)[6]
93028 -#define gteR32 ((s16*)psxRegs.CP2C.r)[7]
93029 -#define gteR33 ((s16*)psxRegs.CP2C.r)[8]
93030 -#define gteTRX ((s32*)psxRegs.CP2C.r)[5]
93031 -#define gteTRY ((s32*)psxRegs.CP2C.r)[6]
93032 -#define gteTRZ ((s32*)psxRegs.CP2C.r)[7]
93033 -#define gteL11 ((s16*)psxRegs.CP2C.r)[16]
93034 -#define gteL12 ((s16*)psxRegs.CP2C.r)[17]
93035 -#define gteL13 ((s16*)psxRegs.CP2C.r)[18]
93036 -#define gteL21 ((s16*)psxRegs.CP2C.r)[19]
93037 -#define gteL22 ((s16*)psxRegs.CP2C.r)[20]
93038 -#define gteL23 ((s16*)psxRegs.CP2C.r)[21]
93039 -#define gteL31 ((s16*)psxRegs.CP2C.r)[22]
93040 -#define gteL32 ((s16*)psxRegs.CP2C.r)[23]
93041 -#define gteL33 ((s16*)psxRegs.CP2C.r)[24]
93042 -#define gteRBK ((s32*)psxRegs.CP2C.r)[13]
93043 -#define gteGBK ((s32*)psxRegs.CP2C.r)[14]
93044 -#define gteBBK ((s32*)psxRegs.CP2C.r)[15]
93045 -#define gteLR1 ((s16*)psxRegs.CP2C.r)[32]
93046 -#define gteLR2 ((s16*)psxRegs.CP2C.r)[33]
93047 -#define gteLR3 ((s16*)psxRegs.CP2C.r)[34]
93048 -#define gteLG1 ((s16*)psxRegs.CP2C.r)[35]
93049 -#define gteLG2 ((s16*)psxRegs.CP2C.r)[36]
93050 -#define gteLG3 ((s16*)psxRegs.CP2C.r)[37]
93051 -#define gteLB1 ((s16*)psxRegs.CP2C.r)[38]
93052 -#define gteLB2 ((s16*)psxRegs.CP2C.r)[39]
93053 -#define gteLB3 ((s16*)psxRegs.CP2C.r)[40]
93054 -#define gteRFC ((s32*)psxRegs.CP2C.r)[21]
93055 -#define gteGFC ((s32*)psxRegs.CP2C.r)[22]
93056 -#define gteBFC ((s32*)psxRegs.CP2C.r)[23]
93057 -#define gteOFX ((s32*)psxRegs.CP2C.r)[24]
93058 -#define gteOFY ((s32*)psxRegs.CP2C.r)[25]
93059 -#define gteH ((u16*)psxRegs.CP2C.r)[52]
93060 -#define gteDQA ((s16*)psxRegs.CP2C.r)[54]
93061 -#define gteDQB ((s32*)psxRegs.CP2C.r)[28]
93062 -#define gteZSF3 ((s16*)psxRegs.CP2C.r)[58]
93063 -#define gteZSF4 ((s16*)psxRegs.CP2C.r)[60]
93064 -#define gteFLAG psxRegs.CP2C.r[31]
93065 -
93066 -//#define SUM_FLAG if(gteFLAG & 0x7F87E000) gteFLAG |= 0x80000000;
93067 -
93068 -#define SUM_FLAG() { \
93069 - TEST32ItoM((u32)&gteFLAG, 0x7F87E000); \
93070 - j8Ptr[0] = JZ8(0); \
93071 - OR32ItoM((u32)&gteFLAG, 0x80000000); \
93072 - \
93073 - x86SetJ8(j8Ptr[0]); \
93074 -}
93075 -
93076 -#define LIM32X8(reg, gteout, negv, posv, flagb) { \
93077 - CMP32ItoR(reg, negv); \
93078 - j8Ptr[0] = JL8(0); \
93079 - CMP32ItoR(reg, posv); \
93080 - j8Ptr[1] = JG8(0); \
93081 - \
93082 - MOV8RtoM((u32)&gteout, reg); \
93083 - j8Ptr[2] = JMP8(0); \
93084 - \
93085 - x86SetJ8(j8Ptr[0]); \
93086 - MOV8ItoM((u32)&gteout, negv); \
93087 - j8Ptr[3] = JMP8(0); \
93088 - \
93089 - x86SetJ8(j8Ptr[1]); \
93090 - MOV8ItoM((u32)&gteout, posv); \
93091 - \
93092 - x86SetJ8(j8Ptr[3]); \
93093 - OR32ItoM((u32)&gteFLAG, 1<<flagb); \
93094 - \
93095 - x86SetJ8(j8Ptr[2]); \
93096 -}
93097 -
93098 -#define _LIM_B1(reg, gteout) LIM32X8(reg, gteout, 0, 255, 21);
93099 -#define _LIM_B2(reg, gteout) LIM32X8(reg, gteout, 0, 255, 20);
93100 -#define _LIM_B3(reg, gteout) LIM32X8(reg, gteout, 0, 255, 19);
93101 -
93102 -#define MAC2IRn(reg, ir, flagb, negv, posv) { \
93103 -/* CMP32ItoR(reg, negv);*/ \
93104 -/* j8Ptr[0] = JL8(0); */\
93105 -/* CMP32ItoR(reg, posv);*/ \
93106 -/* j8Ptr[1] = JG8(0);*/ \
93107 - \
93108 - MOV32RtoM((u32)&ir, reg); \
93109 -/* j8Ptr[2] = JMP8(0);*/ \
93110 - \
93111 -/* x86SetJ8(j8Ptr[0]);*/ \
93112 -/* MOV32ItoM((u32)&ir, negv);*/ \
93113 -/* j8Ptr[3] = JMP8(0);*/ \
93114 - \
93115 -/* x86SetJ8(j8Ptr[1]);*/ \
93116 -/* MOV32ItoM((u32)&ir, posv);*/ \
93117 - \
93118 -/* x86SetJ8(j8Ptr[3]);*/ \
93119 -/* OR32ItoR((u32)&gteFLAG, 1<<flagb);*/ \
93120 - \
93121 -/* x86SetJ8(j8Ptr[2]);*/ \
93122 -}
93123 -
93124 -
93125 -
93126 -#define gte_C11 gteLR1
93127 -#define gte_C12 gteLR2
93128 -#define gte_C13 gteLR3
93129 -#define gte_C21 gteLG1
93130 -#define gte_C22 gteLG2
93131 -#define gte_C23 gteLG3
93132 -#define gte_C31 gteLB1
93133 -#define gte_C32 gteLB2
93134 -#define gte_C33 gteLB3
93135 -
93136 -
93137 -#define _MVMVA_FUNC(vn, mx) { \
93138 - MOVSX32M16toR(EAX, (u32)&mx##vn##1); \
93139 - IMUL32R(EBX); \
93140 -/* j8Ptr[0] = JO8(0);*/ \
93141 - MOV32RtoR(ECX, EAX); \
93142 - \
93143 - MOVSX32M16toR(EAX, (u32)&mx##vn##2); \
93144 - IMUL32R(EDI); \
93145 -/* j8Ptr[1] = JO8(0);*/ \
93146 - ADD32RtoR(ECX, EAX); \
93147 -/* j8Ptr[2] = JO8(0);*/ \
93148 - \
93149 - MOVSX32M16toR(EAX, (u32)&mx##vn##3); \
93150 - IMUL32R(ESI); \
93151 -/* j8Ptr[3] = JO8(0);*/ \
93152 - ADD32RtoR(ECX, EAX); \
93153 -/* j8Ptr[4] = JO8(0);*/ \
93154 -}
93155 -
93156 -/* SSX = (_v0) * mx##11 + (_v1) * mx##12 + (_v2) * mx##13;
93157 - SSY = (_v0) * mx##21 + (_v1) * mx##22 + (_v2) * mx##23;
93158 - SSZ = (_v0) * mx##31 + (_v1) * mx##32 + (_v2) * mx##33; */
93159 -
93160 -#define _MVMVA_ADD(_vx, jn) { \
93161 - ADD32MtoR(ECX, (u32)&_vx); \
93162 -/* j8Ptr[jn] = JO8(0);*/ \
93163 -}
93164 -/* SSX+= gteRFC;
93165 - SSY+= gteGFC;
93166 - SSZ+= gteBFC;*/
93167 -
93168 -#define _MVMVA1(vn) { \
93169 - switch (psxRegs.code & 0x60000) { \
93170 - case 0x00000: /* R */ \
93171 - _MVMVA_FUNC(vn, gteR); break; \
93172 - case 0x20000: /* L */ \
93173 - _MVMVA_FUNC(vn, gteL); break; \
93174 - case 0x40000: /* C */ \
93175 - _MVMVA_FUNC(vn, gte_C); break; \
93176 - default: \
93177 - return; \
93178 - } \
93179 -}
93180 -
93181 -#define _MVMVA_LOAD(_v0, _v1, _v2) { \
93182 - MOVSX32M16toR(EBX, (u32)&_v0); \
93183 - MOVSX32M16toR(EDI, (u32)&_v1); \
93184 - MOVSX32M16toR(ESI, (u32)&_v2); \
93185 -}
93186 -
93187 -static void recMVMVA() {
93188 - int i;
93189 -
93190 -// SysPrintf("GTE_MVMVA %lx\n", psxRegs.code & 0x1ffffff);
93191 -
93192 -/* PUSH32R(ESI);
93193 - PUSH32R(EDI);
93194 - PUSH32R(EBX);
93195 -*/
93196 - XOR32RtoR(EAX, EAX); /* gteFLAG = 0 */
93197 - MOV32RtoM((u32)&gteFLAG, EAX);
93198 -
93199 - switch (psxRegs.code & 0x18000) {
93200 - case 0x00000: /* V0 */
93201 - _MVMVA_LOAD(gteVX0, gteVY0, gteVZ0); break;
93202 - case 0x08000: /* V1 */
93203 - _MVMVA_LOAD(gteVX1, gteVY1, gteVZ1); break;
93204 - case 0x10000: /* V2 */
93205 - _MVMVA_LOAD(gteVX2, gteVY2, gteVZ2); break;
93206 - case 0x18000: /* IR */
93207 - _MVMVA_LOAD(gteIR1, gteIR2, gteIR3); break;
93208 - }
93209 -
93210 -// MAC1
93211 - for (i=5; i<8; i++) j8Ptr[i] = 0;
93212 - _MVMVA1(1);
93213 -
93214 - if (psxRegs.code & 0x80000) {
93215 - SAR32ItoR(ECX, 12);
93216 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
93217 - }
93218 -
93219 - switch (psxRegs.code & 0x6000) {
93220 - case 0x0000: // Add TR
93221 - _MVMVA_ADD(gteTRX, 5); break;
93222 - case 0x2000: // Add BK
93223 - _MVMVA_ADD(gteRBK, 6); break;
93224 - case 0x4000: // Add FC
93225 - _MVMVA_ADD(gteRFC, 7); break;
93226 - }
93227 -/*
93228 - j8Ptr[9] = JMP8(0);
93229 - for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
93230 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);
93231 -
93232 -// TEST32ItoR(EDX, 0x80000000);
93233 - OR32ItoM((u32)&gteFLAG, 1<<29);
93234 - x86SetJ8(j8Ptr[9]);*/
93235 - MOV32RtoM((u32)&gteMAC1, ECX);
93236 -
93237 - if (psxRegs.code & 0x400) {
93238 - MAC2IRn(ECX, gteIR1, 24, 0, 32767);
93239 - } else {
93240 - MAC2IRn(ECX, gteIR1, 24, -32768, 32767);
93241 - }
93242 -
93243 -// MAC2
93244 - _MVMVA1(2);
93245 -
93246 - if (psxRegs.code & 0x80000) {
93247 - SAR32ItoR(ECX, 12);
93248 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
93249 - }
93250 -
93251 - switch (psxRegs.code & 0x6000) {
93252 - case 0x0000: // Add TR
93253 - _MVMVA_ADD(gteTRY, 5); break;
93254 - case 0x2000: // Add BK
93255 - _MVMVA_ADD(gteGBK, 6); break;
93256 - case 0x4000: // Add FC
93257 - _MVMVA_ADD(gteGFC, 7); break;
93258 - }
93259 -
93260 -/* for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
93261 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);*/
93262 - MOV32RtoM((u32)&gteMAC2, ECX);
93263 -
93264 - if (psxRegs.code & 0x400) {
93265 - MAC2IRn(ECX, gteIR2, 23, 0, 32767);
93266 - } else {
93267 - MAC2IRn(ECX, gteIR2, 23, -32768, 32767);
93268 - }
93269 -
93270 -// MAC3
93271 - _MVMVA1(3);
93272 -
93273 - if (psxRegs.code & 0x80000) {
93274 - SAR32ItoR(ECX, 12);
93275 -// SSX /= 4096.0; SSY /= 4096.0; SSZ /= 4096.0;
93276 - }
93277 -
93278 - switch (psxRegs.code & 0x6000) {
93279 - case 0x0000: // Add TR
93280 - _MVMVA_ADD(gteTRZ, 5); break;
93281 - case 0x2000: // Add BK
93282 - _MVMVA_ADD(gteBBK, 6); break;
93283 - case 0x4000: // Add FC
93284 - _MVMVA_ADD(gteBFC, 7); break;
93285 - }
93286 -
93287 -/* for (i=0; i<5; i++) x86SetJ8(j8Ptr[i]);
93288 - for (i=5; i<8; i++) if (j8Ptr[i]) x86SetJ8(j8Ptr[i]);*/
93289 - MOV32RtoM((u32)&gteMAC3, ECX);
93290 -
93291 - if (psxRegs.code & 0x400) {
93292 - MAC2IRn(ECX, gteIR3, 22, 0, 32767);
93293 - } else {
93294 - MAC2IRn(ECX, gteIR3, 22, -32768, 32767);
93295 - }
93296 -/* MAC2IR1()
93297 - else MAC2IR()*/
93298 -
93299 -// SUM_FLAG();
93300 -
93301 -/* POP32R(EBX);
93302 - POP32R(EDI);
93303 - POP32R(ESI);*/
93304 -}
93305 -
93306 -#if 0
93307 -
93308 -#define _GPF1(vn) { \
93309 - MOV32MtoR(EAX, (u32)&gteIR##vn); \
93310 - IMUL32R(ECX); \
93311 -/* MOV32RtoR(ECX, EAX); */\
93312 -}
93313 -
93314 -static void recGPF() {
93315 -// SysPrintf("GTE_GPF %lx\n", psxRegs.code & 0x1ffffff);
93316 -
93317 - PUSH32R(EBX);
93318 -
93319 - XOR32RtoR(EBX, EBX); /* gteFLAG = 0 */
93320 -
93321 -/* gteMAC1 = NC_OVERFLOW1(gteIR0 * gteIR1);
93322 - gteMAC2 = NC_OVERFLOW2(gteIR0 * gteIR2);
93323 - gteMAC3 = NC_OVERFLOW3(gteIR0 * gteIR3);*/
93324 - MOV32MtoR(ECX, (u32)&gteIR0);
93325 -// MAC1
93326 - _GPF1(1);
93327 -
93328 - if (psxRegs.code & 0x80000) {
93329 - SAR32ItoR(EAX, 12);
93330 - }
93331 - MAC2IRn(EAX, gteIR1, 24, -32768, 32767);
93332 - PUSH32R(EAX);
93333 -
93334 -// MAC2
93335 - _GPF1(2);
93336 -
93337 - if (psxRegs.code & 0x80000) {
93338 - SAR32ItoR(EAX, 12);
93339 - }
93340 - MAC2IRn(EAX, gteIR2, 23, -32768, 32767);
93341 - PUSH32R(EAX);
93342 -
93343 -// MAC3
93344 - _GPF1(3);
93345 -
93346 - if (psxRegs.code & 0x80000) {
93347 - SAR32ItoR(EAX, 12);
93348 - }
93349 - MAC2IRn(EAX, gteIR3, 22, -32768, 32767);
93350 -// MAC2IR();
93351 -
93352 -// gteRGB0 = gteRGB1;
93353 -// gteRGB1 = gteRGB2;
93354 - MOV32MtoR(EDX, (u32)&gteRGB1);
93355 - MOV32MtoR(ECX, (u32)&gteRGB2);
93356 - MOV32RtoM((u32)&gteRGB0, EDX);
93357 - MOV32RtoM((u32)&gteRGB1, ECX);
93358 -
93359 - POP32R(EDX);
93360 - POP32R(ECX);
93361 - SAR32ItoR(ECX, 4);
93362 - SAR32ItoR(EDX, 4);
93363 - SAR32ItoR(EAX, 4);
93364 -
93365 - _LIM_B1(ECX, gteR2);
93366 - _LIM_B2(EDX, gteG2);
93367 - _LIM_B3(EAX, gteB2);
93368 - MOV8MtoR(EAX, (u32)&gteCODE);
93369 - MOV8RtoM((u32)&gteCODE2, EAX);
93370 -
93371 -/* gteR2 = limB1(gteMAC1 / 16.0f);
93372 - gteG2 = limB2(gteMAC2 / 16.0f);
93373 - gteB2 = limB3(gteMAC3 / 16.0f); gteCODE2 = gteCODE;*/
93374 -
93375 - SUM_FLAG();
93376 - MOV32RtoM((u32)&gteFLAG, EBX);
93377 -
93378 -// POP32R(EBX);
93379 -}
93380 -#endif
93381 -#endif
93382 diff -rupN original/libpcsxcore/libpcsxcore/ppc/pR3000A.c new/libpcsxcore/libpcsxcore/ppc/pR3000A.c
93383 --- original/libpcsxcore/libpcsxcore/ppc/pR3000A.c 2009-02-23 05:47:23.000000000 -0430
93384 +++ new/libpcsxcore/libpcsxcore/ppc/pR3000A.c 1969-12-31 20:00:00.000000000 -0400
93385 @@ -1,3524 +0,0 @@
93386 -/* Pcsx - Pc Psx Emulator
93387 - * Copyright (C) 1999-2003 Pcsx Team
93388 - *
93389 - * This program is free software; you can redistribute it and/or modify
93390 - * it under the terms of the GNU General Public License as published by
93391 - * the Free Software Foundation; either version 2 of the License, or
93392 - * (at your option) any later version.
93393 - *
93394 - * This program is distributed in the hope that it will be useful,
93395 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
93396 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
93397 - * GNU General Public License for more details.
93398 - *
93399 - * You should have received a copy of the GNU General Public License
93400 - * along with this program; if not, write to the Free Software
93401 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
93402 - */
93403 -
93404 -#ifdef _MSC_VER_
93405 -#pragma warning(disable:4244)
93406 -#pragma warning(disable:4761)
93407 -#endif
93408 -#include <stdlib.h>
93409 -#include <string.h>
93410 -#include <time.h>
93411 -#include <sys/types.h>
93412 -#include <sys/mman.h>
93413 -
93414 -#include "../psxcommon.h"
93415 -#include "ppc.h"
93416 -#include "reguse.h"
93417 -#include "../r3000a.h"
93418 -#include "../psxhle.h"
93419 -
93420 -//#define NO_CONSTANT
93421 -
93422 -u32 *psxRecLUT;
93423 -
93424 -#undef _Op_
93425 -#define _Op_ _fOp_(psxRegs.code)
93426 -#undef _Funct_
93427 -#define _Funct_ _fFunct_(psxRegs.code)
93428 -#undef _Rd_
93429 -#define _Rd_ _fRd_(psxRegs.code)
93430 -#undef _Rt_
93431 -#define _Rt_ _fRt_(psxRegs.code)
93432 -#undef _Rs_
93433 -#define _Rs_ _fRs_(psxRegs.code)
93434 -#undef _Sa_
93435 -#define _Sa_ _fSa_(psxRegs.code)
93436 -#undef _Im_
93437 -#define _Im_ _fIm_(psxRegs.code)
93438 -#undef _Target_
93439 -#define _Target_ _fTarget_(psxRegs.code)
93440 -
93441 -#undef _Imm_
93442 -#define _Imm_ _fImm_(psxRegs.code)
93443 -#undef _ImmU_
93444 -#define _ImmU_ _fImmU_(psxRegs.code)
93445 -
93446 -#undef PC_REC
93447 -#undef PC_REC8
93448 -#undef PC_REC16
93449 -#undef PC_REC32
93450 -#define PC_REC(x) (psxRecLUT[x >> 16] + (x & 0xffff))
93451 -#define PC_REC8(x) (*(u8 *)PC_REC(x))
93452 -#define PC_REC16(x) (*(u16*)PC_REC(x))
93453 -#define PC_REC32(x) (*(u32*)PC_REC(x))
93454 -
93455 -#define OFFSET(X,Y) ((u32)(Y)-(u32)(X))
93456 -
93457 -#define RECMEM_SIZE (12*1024*1024)
93458 -
93459 -static char *recMem; /* the recompiled blocks will be here */
93460 -static char *recRAM; /* and the ptr to the blocks here */
93461 -static char *recROM; /* and here */
93462 -
93463 -static u32 pc; /* recompiler pc */
93464 -static u32 pcold; /* recompiler oldpc */
93465 -static int count; /* recompiler intruction count */
93466 -static int branch; /* set for branch */
93467 -static u32 target; /* branch target */
93468 -static u32 resp;
93469 -
93470 -u32 cop2readypc = 0;
93471 -u32 idlecyclecount = 0;
93472 -
93473 -#define NUM_REGISTERS 34
93474 -typedef struct {
93475 - int state;
93476 - u32 k;
93477 - int reg;
93478 -} iRegisters;
93479 -
93480 -static iRegisters iRegs[34];
93481 -
93482 -#define ST_UNK 0x00
93483 -#define ST_CONST 0x01
93484 -#define ST_MAPPED 0x02
93485 -
93486 -#ifdef NO_CONSTANT
93487 -#define IsConst(reg) 0
93488 -#else
93489 -#define IsConst(reg) (iRegs[reg].state & ST_CONST)
93490 -#endif
93491 -#define IsMapped(reg) (iRegs[reg].state & ST_MAPPED)
93492 -
93493 -static void (*recBSC[64])();
93494 -static void (*recSPC[64])();
93495 -static void (*recREG[32])();
93496 -static void (*recCP0[32])();
93497 -static void (*recCP2[64])();
93498 -static void (*recCP2BSC[32])();
93499 -
93500 -#define REG_LO 32
93501 -#define REG_HI 33
93502 -
93503 -// Hardware register usage
93504 -#define HWUSAGE_NONE 0x00
93505 -
93506 -#define HWUSAGE_READ 0x01
93507 -#define HWUSAGE_WRITE 0x02
93508 -#define HWUSAGE_CONST 0x04
93509 -#define HWUSAGE_ARG 0x08 /* used as an argument for a function call */
93510 -
93511 -#define HWUSAGE_RESERVED 0x10 /* won't get flushed when flushing all regs */
93512 -#define HWUSAGE_SPECIAL 0x20 /* special purpose register */
93513 -#define HWUSAGE_HARDWIRED 0x40 /* specific hardware register mapping that is never disposed */
93514 -#define HWUSAGE_INITED 0x80
93515 -#define HWUSAGE_PSXREG 0x100
93516 -
93517 -// Remember to invalidate the special registers if they are modified by compiler
93518 -enum {
93519 - ARG1 = 3,
93520 - ARG2 = 4,
93521 - ARG3 = 5,
93522 - PSXREGS, // ptr
93523 - PSXMEM, // ptr
93524 - CYCLECOUNT, // ptr
93525 - PSXPC, // ptr
93526 - TARGETPTR, // ptr
93527 - TARGET, // ptr
93528 - RETVAL,
93529 - REG_RZERO,
93530 - REG_WZERO
93531 -};
93532 -
93533 -typedef struct {
93534 - int code;
93535 - u32 k;
93536 - int usage;
93537 - int lastUsed;
93538 -
93539 - void (*flush)(int hwreg);
93540 - int private;
93541 -} HWRegister;
93542 -static HWRegister HWRegisters[NUM_HW_REGISTERS];
93543 -static int HWRegUseCount;
93544 -static int DstCPUReg;
93545 -static int UniqueRegAlloc;
93546 -
93547 -static int GetFreeHWReg();
93548 -static void InvalidateCPURegs();
93549 -static void DisposeHWReg(int index);
93550 -static void FlushHWReg(int index);
93551 -static void FlushAllHWReg();
93552 -static void MapPsxReg32(int reg);
93553 -static void FlushPsxReg32(int hwreg);
93554 -static int UpdateHWRegUsage(int hwreg, int usage);
93555 -static int GetHWReg32(int reg);
93556 -static int PutHWReg32(int reg);
93557 -static int GetSpecialIndexFromHWRegs(int which);
93558 -static int GetHWRegFromCPUReg(int cpureg);
93559 -static int MapRegSpecial(int which);
93560 -static void FlushRegSpecial(int hwreg);
93561 -static int GetHWRegSpecial(int which);
93562 -static int PutHWRegSpecial(int which);
93563 -static void recRecompile();
93564 -static void recError();
93565 -
93566 -#pragma mark --- Generic register mapping ---
93567 -
93568 -static int GetFreeHWReg()
93569 -{
93570 - int i, least, index;
93571 -
93572 - if (DstCPUReg != -1) {
93573 - index = GetHWRegFromCPUReg(DstCPUReg);
93574 - DstCPUReg = -1;
93575 - } else {
93576 - // LRU algorith with a twist ;)
93577 - for (i=0; i<NUM_HW_REGISTERS; i++) {
93578 - if (!(HWRegisters[i].usage & HWUSAGE_RESERVED)) {
93579 - break;
93580 - }
93581 - }
93582 -
93583 - least = HWRegisters[i].lastUsed; index = i;
93584 - for (; i<NUM_HW_REGISTERS; i++) {
93585 - if (!(HWRegisters[i].usage & HWUSAGE_RESERVED)) {
93586 - if (HWRegisters[i].usage == HWUSAGE_NONE && HWRegisters[i].code >= 13) {
93587 - index = i;
93588 - break;
93589 - }
93590 - else if (HWRegisters[i].lastUsed < least) {
93591 - least = HWRegisters[i].lastUsed;
93592 - index = i;
93593 - }
93594 - }
93595 - }
93596 -
93597 - // Cycle the registers
93598 - if (HWRegisters[index].usage == HWUSAGE_NONE) {
93599 - for (; i<NUM_HW_REGISTERS; i++) {
93600 - if (!(HWRegisters[i].usage & HWUSAGE_RESERVED)) {
93601 - if (HWRegisters[i].usage == HWUSAGE_NONE &&
93602 - HWRegisters[i].code >= 13 &&
93603 - HWRegisters[i].lastUsed < least) {
93604 - least = HWRegisters[i].lastUsed;
93605 - index = i;
93606 - break;
93607 - }
93608 - }
93609 - }
93610 - }
93611 - }
93612 -
93613 -/* if (HWRegisters[index].code < 13 && HWRegisters[index].code > 3) {
93614 - SysPrintf("Allocating volatile register %i\n", HWRegisters[index].code);
93615 - }
93616 - if (HWRegisters[index].usage != HWUSAGE_NONE) {
93617 - SysPrintf("RegUse too big. Flushing %i\n", HWRegisters[index].code);
93618 - }*/
93619 - if (HWRegisters[index].usage & (HWUSAGE_RESERVED | HWUSAGE_HARDWIRED)) {
93620 - if (HWRegisters[index].usage & HWUSAGE_RESERVED) {
93621 - SysPrintf("Error! Trying to map a new register to a reserved register (r%i)",
93622 - HWRegisters[index].code);
93623 - }
93624 - if (HWRegisters[index].usage & HWUSAGE_HARDWIRED) {
93625 - SysPrintf("Error! Trying to map a new register to a hardwired register (r%i)",
93626 - HWRegisters[index].code);
93627 - }
93628 - }
93629 -
93630 - if (HWRegisters[index].lastUsed != 0) {
93631 - UniqueRegAlloc = 0;
93632 - }
93633 -
93634 - // Make sure the register is really flushed!
93635 - FlushHWReg(index);
93636 - HWRegisters[index].usage = HWUSAGE_NONE;
93637 - HWRegisters[index].flush = NULL;
93638 -
93639 - return index;
93640 -}
93641 -
93642 -static void FlushHWReg(int index)
93643 -{
93644 - if (index < 0) return;
93645 - if (HWRegisters[index].usage == HWUSAGE_NONE) return;
93646 -
93647 - if (HWRegisters[index].flush) {
93648 - HWRegisters[index].usage |= HWUSAGE_RESERVED;
93649 - HWRegisters[index].flush(index);
93650 - HWRegisters[index].flush = NULL;
93651 - }
93652 -
93653 - if (HWRegisters[index].usage & HWUSAGE_HARDWIRED) {
93654 - HWRegisters[index].usage &= ~(HWUSAGE_READ | HWUSAGE_WRITE);
93655 - } else {
93656 - HWRegisters[index].usage = HWUSAGE_NONE;
93657 - }
93658 -}
93659 -
93660 -// get rid of a mapped register without flushing the contents to the memory
93661 -static void DisposeHWReg(int index)
93662 -{
93663 - if (index < 0) return;
93664 - if (HWRegisters[index].usage == HWUSAGE_NONE) return;
93665 -
93666 - HWRegisters[index].usage &= ~(HWUSAGE_READ | HWUSAGE_WRITE);
93667 - if (HWRegisters[index].usage == HWUSAGE_NONE) {
93668 - SysPrintf("Error! not correctly disposing register (r%i)", HWRegisters[index].code);
93669 - }
93670 -
93671 - FlushHWReg(index);
93672 -}
93673 -
93674 -// operated on cpu registers
93675 -__inline static void FlushCPURegRange(int start, int end)
93676 -{
93677 - int i;
93678 -
93679 - if (end <= 0) end = 31;
93680 - if (start <= 0) start = 0;
93681 -
93682 - for (i=0; i<NUM_HW_REGISTERS; i++) {
93683 - if (HWRegisters[i].code >= start && HWRegisters[i].code <= end)
93684 - if (HWRegisters[i].flush)
93685 - FlushHWReg(i);
93686 - }
93687 -
93688 - for (i=0; i<NUM_HW_REGISTERS; i++) {
93689 - if (HWRegisters[i].code >= start && HWRegisters[i].code <= end)
93690 - FlushHWReg(i);
93691 - }
93692 -}
93693 -
93694 -static void FlushAllHWReg()
93695 -{
93696 - FlushCPURegRange(0,31);
93697 -}
93698 -
93699 -static void InvalidateCPURegs()
93700 -{
93701 - FlushCPURegRange(0,12);
93702 -}
93703 -
93704 -#pragma mark --- Mapping utility functions ---
93705 -
93706 -static void MoveHWRegToCPUReg(int cpureg, int hwreg)
93707 -{
93708 - int dstreg;
93709 -
93710 - if (HWRegisters[hwreg].code == cpureg)
93711 - return;
93712 -
93713 - dstreg = GetHWRegFromCPUReg(cpureg);
93714 -
93715 - HWRegisters[dstreg].usage &= ~(HWUSAGE_HARDWIRED | HWUSAGE_ARG);
93716 - if (HWRegisters[hwreg].usage & (HWUSAGE_READ | HWUSAGE_WRITE)) {
93717 - FlushHWReg(dstreg);
93718 - MR(HWRegisters[dstreg].code, HWRegisters[hwreg].code);
93719 - } else {
93720 - if (HWRegisters[dstreg].usage & (HWUSAGE_READ | HWUSAGE_WRITE)) {
93721 - MR(HWRegisters[hwreg].code, HWRegisters[dstreg].code);
93722 - }
93723 - else if (HWRegisters[dstreg].usage != HWUSAGE_NONE) {
93724 - FlushHWReg(dstreg);
93725 - }
93726 - }
93727 -
93728 - HWRegisters[dstreg].code = HWRegisters[hwreg].code;
93729 - HWRegisters[hwreg].code = cpureg;
93730 -}
93731 -
93732 -static int UpdateHWRegUsage(int hwreg, int usage)
93733 -{
93734 - HWRegisters[hwreg].lastUsed = ++HWRegUseCount;
93735 - if (usage & HWUSAGE_WRITE) {
93736 - HWRegisters[hwreg].usage &= ~HWUSAGE_CONST;
93737 - }
93738 - if (!(usage & HWUSAGE_INITED)) {
93739 - HWRegisters[hwreg].usage &= ~HWUSAGE_INITED;
93740 - }
93741 - HWRegisters[hwreg].usage |= usage;
93742 -
93743 - return HWRegisters[hwreg].code;
93744 -}
93745 -
93746 -static int GetHWRegFromCPUReg(int cpureg)
93747 -{
93748 - int i;
93749 - for (i=0; i<NUM_HW_REGISTERS; i++) {
93750 - if (HWRegisters[i].code == cpureg) {
93751 - return i;
93752 - }
93753 - }
93754 -
93755 - SysPrintf("Error! Register location failure (r%i)", cpureg);
93756 - return 0;
93757 -}
93758 -
93759 -// this function operates on cpu registers
93760 -void SetDstCPUReg(int cpureg)
93761 -{
93762 - DstCPUReg = cpureg;
93763 -}
93764 -
93765 -static void ReserveArgs(int args)
93766 -{
93767 - int index, i;
93768 -
93769 - for (i=0; i<args; i++) {
93770 - index = GetHWRegFromCPUReg(3+i);
93771 - HWRegisters[index].usage |= HWUSAGE_RESERVED | HWUSAGE_HARDWIRED | HWUSAGE_ARG;
93772 - }
93773 -}
93774 -
93775 -static void ReleaseArgs()
93776 -{
93777 - int i;
93778 -
93779 - for (i=0; i<NUM_HW_REGISTERS; i++) {
93780 - if (HWRegisters[i].usage & HWUSAGE_ARG) {
93781 - //HWRegisters[i].usage = HWUSAGE_NONE;
93782 - //HWRegisters[i].flush = NULL;
93783 - HWRegisters[i].usage &= ~(HWUSAGE_RESERVED | HWUSAGE_HARDWIRED | HWUSAGE_ARG);
93784 - FlushHWReg(i);
93785 - }
93786 - }
93787 -}
93788 -
93789 -#pragma mark --- Psx register mapping ---
93790 -
93791 -static void MapPsxReg32(int reg)
93792 -{
93793 - int hwreg = GetFreeHWReg();
93794 - HWRegisters[hwreg].flush = FlushPsxReg32;
93795 - HWRegisters[hwreg].private = reg;
93796 -
93797 - if (iRegs[reg].reg != -1) {
93798 - SysPrintf("error: double mapped psx register");
93799 - }
93800 -
93801 - iRegs[reg].reg = hwreg;
93802 - iRegs[reg].state |= ST_MAPPED;
93803 -}
93804 -
93805 -static void FlushPsxReg32(int hwreg)
93806 -{
93807 - int reg = HWRegisters[hwreg].private;
93808 -
93809 - if (iRegs[reg].reg == -1) {
93810 - SysPrintf("error: flushing unmapped psx register");
93811 - }
93812 -
93813 - if (HWRegisters[hwreg].usage & HWUSAGE_WRITE) {
93814 - if (branch) {
93815 - /*int reguse = nextPsxRegUse(pc-8, reg);
93816 - if (reguse == REGUSE_NONE || (reguse & REGUSE_READ))*/ {
93817 - STW(HWRegisters[hwreg].code, OFFSET(&psxRegs, &psxRegs.GPR.r[reg]), GetHWRegSpecial(PSXREGS));
93818 - }
93819 - } else {
93820 - int reguse = nextPsxRegUse(pc-4, reg);
93821 - if (reguse == REGUSE_NONE || (reguse & REGUSE_READ)) {
93822 - STW(HWRegisters[hwreg].code, OFFSET(&psxRegs, &psxRegs.GPR.r[reg]), GetHWRegSpecial(PSXREGS));
93823 - }
93824 - }
93825 - }
93826 -
93827 - iRegs[reg].reg = -1;
93828 - iRegs[reg].state = ST_UNK;
93829 -}
93830 -
93831 -static int GetHWReg32(int reg)
93832 -{
93833 - int usage = HWUSAGE_PSXREG | HWUSAGE_READ;
93834 -
93835 - if (reg == 0) {
93836 - return GetHWRegSpecial(REG_RZERO);
93837 - }
93838 - if (!IsMapped(reg)) {
93839 - usage |= HWUSAGE_INITED;
93840 - MapPsxReg32(reg);
93841 -
93842 - HWRegisters[iRegs[reg].reg].usage |= HWUSAGE_RESERVED;
93843 - if (IsConst(reg)) {
93844 - LIW(HWRegisters[iRegs[reg].reg].code, iRegs[reg].k);
93845 - usage |= HWUSAGE_WRITE | HWUSAGE_CONST;
93846 - //iRegs[reg].state &= ~ST_CONST;
93847 - }
93848 - else {
93849 - LWZ(HWRegisters[iRegs[reg].reg].code, OFFSET(&psxRegs, &psxRegs.GPR.r[reg]), GetHWRegSpecial(PSXREGS));
93850 - }
93851 - HWRegisters[iRegs[reg].reg].usage &= ~HWUSAGE_RESERVED;
93852 - }
93853 - else if (DstCPUReg != -1) {
93854 - int dst = DstCPUReg;
93855 - DstCPUReg = -1;
93856 -
93857 - if (HWRegisters[iRegs[reg].reg].code < 13) {
93858 - MoveHWRegToCPUReg(dst, iRegs[reg].reg);
93859 - } else {
93860 - MR(DstCPUReg, HWRegisters[iRegs[reg].reg].code);
93861 - }
93862 - }
93863 -
93864 - DstCPUReg = -1;
93865 -
93866 - return UpdateHWRegUsage(iRegs[reg].reg, usage);
93867 -}
93868 -
93869 -static int PutHWReg32(int reg)
93870 -{
93871 - int usage = HWUSAGE_PSXREG | HWUSAGE_WRITE;
93872 - if (reg == 0) {
93873 - return PutHWRegSpecial(REG_WZERO);
93874 - }
93875 -
93876 - if (DstCPUReg != -1 && IsMapped(reg)) {
93877 - if (HWRegisters[iRegs[reg].reg].code != DstCPUReg) {
93878 - int tmp = DstCPUReg;
93879 - DstCPUReg = -1;
93880 - DisposeHWReg(iRegs[reg].reg);
93881 - DstCPUReg = tmp;
93882 - }
93883 - }
93884 - if (!IsMapped(reg)) {
93885 - usage |= HWUSAGE_INITED;
93886 - MapPsxReg32(reg);
93887 - }
93888 -
93889 - DstCPUReg = -1;
93890 - iRegs[reg].state &= ~ST_CONST;
93891 -
93892 - return UpdateHWRegUsage(iRegs[reg].reg, usage);
93893 -}
93894 -
93895 -#pragma mark --- Special register mapping ---
93896 -
93897 -static int GetSpecialIndexFromHWRegs(int which)
93898 -{
93899 - int i;
93900 - for (i=0; i<NUM_HW_REGISTERS; i++) {
93901 - if (HWRegisters[i].usage & HWUSAGE_SPECIAL) {
93902 - if (HWRegisters[i].private == which) {
93903 - return i;
93904 - }
93905 - }
93906 - }
93907 - return -1;
93908 -}
93909 -
93910 -static int MapRegSpecial(int which)
93911 -{
93912 - int hwreg = GetFreeHWReg();
93913 - HWRegisters[hwreg].flush = FlushRegSpecial;
93914 - HWRegisters[hwreg].private = which;
93915 -
93916 - return hwreg;
93917 -}
93918 -
93919 -static void FlushRegSpecial(int hwreg)
93920 -{
93921 - int which = HWRegisters[hwreg].private;
93922 -
93923 - if (!(HWRegisters[hwreg].usage & HWUSAGE_WRITE))
93924 - return;
93925 -
93926 - switch (which) {
93927 - case CYCLECOUNT:
93928 - STW(HWRegisters[hwreg].code, OFFSET(&psxRegs, &psxRegs.cycle), GetHWRegSpecial(PSXREGS));
93929 - break;
93930 - case PSXPC:
93931 - STW(HWRegisters[hwreg].code, OFFSET(&psxRegs, &psxRegs.pc), GetHWRegSpecial(PSXREGS));
93932 - break;
93933 - case TARGET:
93934 - STW(HWRegisters[hwreg].code, 0, GetHWRegSpecial(TARGETPTR));
93935 - break;
93936 - }
93937 -}
93938 -
93939 -static int GetHWRegSpecial(int which)
93940 -{
93941 - int index = GetSpecialIndexFromHWRegs(which);
93942 - int usage = HWUSAGE_READ | HWUSAGE_SPECIAL;
93943 -
93944 - if (index == -1) {
93945 - usage |= HWUSAGE_INITED;
93946 - index = MapRegSpecial(which);
93947 -
93948 - HWRegisters[index].usage |= HWUSAGE_RESERVED;
93949 - switch (which) {
93950 - case PSXREGS:
93951 - case PSXMEM:
93952 - SysPrintf("error! shouldn't be here!\n");
93953 - //HWRegisters[index].flush = NULL;
93954 - //LIW(HWRegisters[index].code, (u32)&psxRegs);
93955 - break;
93956 - case TARGETPTR:
93957 - HWRegisters[index].flush = NULL;
93958 - LIW(HWRegisters[index].code, (u32)&target);
93959 - break;
93960 - case REG_RZERO:
93961 - HWRegisters[index].flush = NULL;
93962 - LIW(HWRegisters[index].code, 0);
93963 - break;
93964 - case RETVAL:
93965 - MoveHWRegToCPUReg(3, index);
93966 - /*reg = GetHWRegFromCPUReg(3);
93967 - HWRegisters[reg].code = HWRegisters[index].code;
93968 - HWRegisters[index].code = 3;*/
93969 - HWRegisters[index].flush = NULL;
93970 -
93971 - usage |= HWUSAGE_RESERVED;
93972 - break;
93973 -
93974 - case CYCLECOUNT:
93975 - LWZ(HWRegisters[index].code, OFFSET(&psxRegs, &psxRegs.cycle), GetHWRegSpecial(PSXREGS));
93976 - break;
93977 - case PSXPC:
93978 - LWZ(HWRegisters[index].code, OFFSET(&psxRegs, &psxRegs.pc), GetHWRegSpecial(PSXREGS));
93979 - break;
93980 - case TARGET:
93981 - LWZ(HWRegisters[index].code, 0, GetHWRegSpecial(TARGETPTR));
93982 - break;
93983 - default:
93984 - SysPrintf("Error: Unknown special register in GetHWRegSpecial()\n");
93985 - break;
93986 - }
93987 - HWRegisters[index].usage &= ~HWUSAGE_RESERVED;
93988 - }
93989 - else if (DstCPUReg != -1) {
93990 - int dst = DstCPUReg;
93991 - DstCPUReg = -1;
93992 -
93993 - MoveHWRegToCPUReg(dst, index);
93994 - }
93995 -
93996 - return UpdateHWRegUsage(index, usage);
93997 -}
93998 -
93999 -static int PutHWRegSpecial(int which)
94000 -{
94001 - int index = GetSpecialIndexFromHWRegs(which);
94002 - int usage = HWUSAGE_WRITE | HWUSAGE_SPECIAL;
94003 -
94004 - if (DstCPUReg != -1 && index != -1) {
94005 - if (HWRegisters[index].code != DstCPUReg) {
94006 - int tmp = DstCPUReg;
94007 - DstCPUReg = -1;
94008 - DisposeHWReg(index);
94009 - DstCPUReg = tmp;
94010 - }
94011 - }
94012 - switch (which) {
94013 - case PSXREGS:
94014 - case TARGETPTR:
94015 - SysPrintf("Error: Read-only special register in PutHWRegSpecial()\n");
94016 - case REG_WZERO:
94017 - if (index >= 0) {
94018 - if (HWRegisters[index].usage & HWUSAGE_WRITE)
94019 - break;
94020 - }
94021 - index = MapRegSpecial(which);
94022 - HWRegisters[index].flush = NULL;
94023 - break;
94024 - default:
94025 - if (index == -1) {
94026 - usage |= HWUSAGE_INITED;
94027 - index = MapRegSpecial(which);
94028 -
94029 - HWRegisters[index].usage |= HWUSAGE_RESERVED;
94030 - switch (which) {
94031 - case ARG1:
94032 - case ARG2:
94033 - case ARG3:
94034 - MoveHWRegToCPUReg(3+(which-ARG1), index);
94035 - /*reg = GetHWRegFromCPUReg(3+(which-ARG1));
94036 -
94037 - if (HWRegisters[reg].usage != HWUSAGE_NONE) {
94038 - HWRegisters[reg].usage &= ~(HWUSAGE_HARDWIRED | HWUSAGE_ARG);
94039 - if (HWRegisters[reg].flush != NULL && HWRegisters[reg].usage & (HWUSAGE_WRITE | HWUSAGE_READ)) {
94040 - MR(HWRegisters[index].code, HWRegisters[reg].code);
94041 - } else {
94042 - FlushHWReg(reg);
94043 - }
94044 - }
94045 - HWRegisters[reg].code = HWRegisters[index].code;
94046 - if (!(HWRegisters[index].code >= 3 && HWRegisters[index].code <=31))
94047 - SysPrintf("Error! Register allocation");
94048 - HWRegisters[index].code = 3+(which-ARG1);*/
94049 - HWRegisters[index].flush = NULL;
94050 -
94051 - usage |= HWUSAGE_RESERVED | HWUSAGE_HARDWIRED | HWUSAGE_ARG;
94052 - break;
94053 - }
94054 - }
94055 - HWRegisters[index].usage &= ~HWUSAGE_RESERVED;
94056 - break;
94057 - }
94058 -
94059 - DstCPUReg = -1;
94060 -
94061 - return UpdateHWRegUsage(index, usage);
94062 -}
94063 -
94064 -#pragma mark --- ---
94065 -
94066 -static void MapConst(int reg, u32 _const) {
94067 - if (reg == 0)
94068 - return;
94069 - if (IsConst(reg) && iRegs[reg].k == _const)
94070 - return;
94071 -
94072 - DisposeHWReg(iRegs[reg].reg);
94073 - iRegs[reg].k = _const;
94074 - iRegs[reg].state = ST_CONST;
94075 -}
94076 -
94077 -static void MapCopy(int dst, int src)
94078 -{
94079 - // do it the lazy way for now
94080 - MR(PutHWReg32(dst), GetHWReg32(src));
94081 -}
94082 -
94083 -static void iFlushReg(u32 nextpc, int reg) {
94084 - if (!IsMapped(reg) && IsConst(reg)) {
94085 - GetHWReg32(reg);
94086 - }
94087 - if (IsMapped(reg)) {
94088 - if (nextpc) {
94089 - int use = nextPsxRegUse(nextpc, reg);
94090 - if ((use & REGUSE_RW) == REGUSE_WRITE) {
94091 - DisposeHWReg(iRegs[reg].reg);
94092 - } else {
94093 - FlushHWReg(iRegs[reg].reg);
94094 - }
94095 - } else {
94096 - FlushHWReg(iRegs[reg].reg);
94097 - }
94098 - }
94099 -}
94100 -
94101 -static void iFlushRegs(u32 nextpc) {
94102 - int i;
94103 -
94104 - for (i=1; i<NUM_REGISTERS; i++) {
94105 - iFlushReg(nextpc, i);
94106 - }
94107 -}
94108 -
94109 -static void Return()
94110 -{
94111 - iFlushRegs(0);
94112 - FlushAllHWReg();
94113 - if (((u32)returnPC & 0x1fffffc) == (u32)returnPC) {
94114 - BA((u32)returnPC);
94115 - }
94116 - else {
94117 - LIW(0, (u32)returnPC);
94118 - MTLR(0);
94119 - BLR();
94120 - }
94121 -}
94122 -
94123 -static void iRet() {
94124 - /* store cycle */
94125 - count = idlecyclecount + (pc - pcold)/4;
94126 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
94127 - Return();
94128 -}
94129 -
94130 -static int iLoadTest() {
94131 - u32 tmp;
94132 -
94133 - // check for load delay
94134 - tmp = psxRegs.code >> 26;
94135 - switch (tmp) {
94136 - case 0x10: // COP0
94137 - switch (_Rs_) {
94138 - case 0x00: // MFC0
94139 - case 0x02: // CFC0
94140 - return 1;
94141 - }
94142 - break;
94143 - case 0x12: // COP2
94144 - switch (_Funct_) {
94145 - case 0x00:
94146 - switch (_Rs_) {
94147 - case 0x00: // MFC2
94148 - case 0x02: // CFC2
94149 - return 1;
94150 - }
94151 - break;
94152 - }
94153 - break;
94154 - case 0x32: // LWC2
94155 - return 1;
94156 - default:
94157 - if (tmp >= 0x20 && tmp <= 0x26) { // LB/LH/LWL/LW/LBU/LHU/LWR
94158 - return 1;
94159 - }
94160 - break;
94161 - }
94162 - return 0;
94163 -}
94164 -
94165 -/* set a pending branch */
94166 -static void SetBranch() {
94167 - int treg;
94168 - branch = 1;
94169 - psxRegs.code = PSXMu32(pc);
94170 - pc+=4;
94171 -
94172 - if (iLoadTest() == 1) {
94173 - iFlushRegs(0);
94174 - LIW(0, psxRegs.code);
94175 - STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
94176 - /* store cycle */
94177 - count = idlecyclecount + (pc - pcold)/4;
94178 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
94179 -
94180 - treg = GetHWRegSpecial(TARGET);
94181 - MR(PutHWRegSpecial(ARG2), treg);
94182 - DisposeHWReg(GetHWRegFromCPUReg(treg));
94183 - LIW(PutHWRegSpecial(ARG1), _Rt_);
94184 - LIW(GetHWRegSpecial(PSXPC), pc);
94185 - FlushAllHWReg();
94186 - CALLFunc((u32)psxDelayTest);
94187 -
94188 - Return();
94189 - return;
94190 - }
94191 -
94192 - recBSC[psxRegs.code>>26]();
94193 -
94194 - iFlushRegs(0);
94195 - treg = GetHWRegSpecial(TARGET);
94196 - MR(PutHWRegSpecial(PSXPC), GetHWRegSpecial(TARGET)); // FIXME: this line should not be needed
94197 - DisposeHWReg(GetHWRegFromCPUReg(treg));
94198 - FlushAllHWReg();
94199 -
94200 - count = idlecyclecount + (pc - pcold)/4;
94201 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
94202 - FlushAllHWReg();
94203 - CALLFunc((u32)psxBranchTest);
94204 -
94205 - // TODO: don't return if target is compiled
94206 - Return();
94207 -}
94208 -
94209 -static void iJump(u32 branchPC) {
94210 - u32 *b1, *b2;
94211 - branch = 1;
94212 - psxRegs.code = PSXMu32(pc);
94213 - pc+=4;
94214 -
94215 - if (iLoadTest() == 1) {
94216 - iFlushRegs(0);
94217 - LIW(0, psxRegs.code);
94218 - STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
94219 - /* store cycle */
94220 - count = idlecyclecount + (pc - pcold)/4;
94221 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
94222 -
94223 - LIW(PutHWRegSpecial(ARG2), branchPC);
94224 - LIW(PutHWRegSpecial(ARG1), _Rt_);
94225 - LIW(GetHWRegSpecial(PSXPC), pc);
94226 - FlushAllHWReg();
94227 - CALLFunc((u32)psxDelayTest);
94228 -
94229 - Return();
94230 - return;
94231 - }
94232 -
94233 - recBSC[psxRegs.code>>26]();
94234 -
94235 - iFlushRegs(branchPC);
94236 - LIW(PutHWRegSpecial(PSXPC), branchPC);
94237 - FlushAllHWReg();
94238 -
94239 - count = idlecyclecount + (pc - pcold)/4;
94240 - //if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
94241 - // LIW(PutHWRegSpecial(CYCLECOUNT), 0);
94242 - //} else {
94243 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
94244 - //}
94245 - FlushAllHWReg();
94246 - CALLFunc((u32)psxBranchTest);
94247 -
94248 - if (!Config.HLE && Config.PsxOut &&
94249 - ((branchPC & 0x1fffff) == 0xa0 ||
94250 - (branchPC & 0x1fffff) == 0xb0 ||
94251 - (branchPC & 0x1fffff) == 0xc0))
94252 - CALLFunc((u32)psxJumpTest);
94253 -
94254 - // always return for now...
94255 - //Return();
94256 -
94257 - // maybe just happened an interruption, check so
94258 - LIW(0, branchPC);
94259 - CMPLW(GetHWRegSpecial(PSXPC), 0);
94260 - BNE_L(b1);
94261 -
94262 - LIW(3, PC_REC(branchPC));
94263 - LWZ(3, 0, 3);
94264 - CMPLWI(3, 0);
94265 - BNE_L(b2);
94266 -
94267 - B_DST(b1);
94268 - Return();
94269 -
94270 - // next bit is already compiled - jump right to it
94271 - B_DST(b2);
94272 - MTCTR(3);
94273 - BCTR();
94274 -}
94275 -
94276 -static void iBranch(u32 branchPC, int savectx) {
94277 - HWRegister HWRegistersS[NUM_HW_REGISTERS];
94278 - iRegisters iRegsS[NUM_REGISTERS];
94279 - int HWRegUseCountS = 0;
94280 - u32 respold=0;
94281 - u32 *b1, *b2;
94282 -
94283 - if (savectx) {
94284 - respold = resp;
94285 - memcpy(iRegsS, iRegs, sizeof(iRegs));
94286 - memcpy(HWRegistersS, HWRegisters, sizeof(HWRegisters));
94287 - HWRegUseCountS = HWRegUseCount;
94288 - }
94289 -
94290 - branch = 1;
94291 - psxRegs.code = PSXMu32(pc);
94292 -
94293 - // the delay test is only made when the branch is taken
94294 - // savectx == 0 will mean that :)
94295 - if (savectx == 0 && iLoadTest() == 1) {
94296 - iFlushRegs(0);
94297 - LIW(0, psxRegs.code);
94298 - STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
94299 - /* store cycle */
94300 - count = idlecyclecount + ((pc+4) - pcold)/4;
94301 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
94302 -
94303 - LIW(PutHWRegSpecial(ARG2), branchPC);
94304 - LIW(PutHWRegSpecial(ARG1), _Rt_);
94305 - LIW(GetHWRegSpecial(PSXPC), pc);
94306 - FlushAllHWReg();
94307 - CALLFunc((u32)psxDelayTest);
94308 -
94309 - Return();
94310 - return;
94311 - }
94312 -
94313 - pc+= 4;
94314 - recBSC[psxRegs.code>>26]();
94315 -
94316 - iFlushRegs(branchPC);
94317 - LIW(PutHWRegSpecial(PSXPC), branchPC);
94318 - FlushAllHWReg();
94319 -
94320 - /* store cycle */
94321 - count = idlecyclecount + (pc - pcold)/4;
94322 - //if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
94323 - // LIW(PutHWRegSpecial(CYCLECOUNT), 0);
94324 - //} else {
94325 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
94326 - //}
94327 - FlushAllHWReg();
94328 - CALLFunc((u32)psxBranchTest);
94329 -
94330 - // always return for now...
94331 - //Return();
94332 -
94333 - LIW(0, branchPC);
94334 - CMPLW(GetHWRegSpecial(PSXPC), 0);
94335 - BNE_L(b1);
94336 -
94337 - LIW(3, PC_REC(branchPC));
94338 - LWZ(3, 0, 3);
94339 - CMPLWI(3, 0);
94340 - BNE_L(b2);
94341 -
94342 - B_DST(b1);
94343 - Return();
94344 -
94345 - B_DST(b2);
94346 - MTCTR(3);
94347 - BCTR();
94348 -
94349 - // maybe just happened an interruption, check so
94350 -/* CMP32ItoM((u32)&psxRegs.pc, branchPC);
94351 - j8Ptr[1] = JE8(0);
94352 - RET();
94353 -
94354 - x86SetJ8(j8Ptr[1]);
94355 - MOV32MtoR(EAX, PC_REC(branchPC));
94356 - TEST32RtoR(EAX, EAX);
94357 - j8Ptr[2] = JNE8(0);
94358 - RET();
94359 -
94360 - x86SetJ8(j8Ptr[2]);
94361 - JMP32R(EAX);*/
94362 -
94363 - pc-= 4;
94364 - if (savectx) {
94365 - resp = respold;
94366 - memcpy(iRegs, iRegsS, sizeof(iRegs));
94367 - memcpy(HWRegisters, HWRegistersS, sizeof(HWRegisters));
94368 - HWRegUseCount = HWRegUseCountS;
94369 - }
94370 -}
94371 -
94372 -
94373 -static void iDumpRegs() {
94374 - int i, j;
94375 -
94376 - printf("%lx %lx\n", psxRegs.pc, psxRegs.cycle);
94377 - for (i=0; i<4; i++) {
94378 - for (j=0; j<8; j++)
94379 - printf("%lx ", psxRegs.GPR.r[j*i]);
94380 - printf("\n");
94381 - }
94382 -}
94383 -
94384 -void iDumpBlock(char *ptr) {
94385 -/* FILE *f;
94386 - u32 i;
94387 -
94388 - SysPrintf("dump1 %x:%x, %x\n", psxRegs.pc, pc, psxCurrentCycle);
94389 -
94390 - for (i = psxRegs.pc; i < pc; i+=4)
94391 - SysPrintf("%s\n", disR3000AF(PSXMu32(i), i));
94392 -
94393 - fflush(stdout);
94394 - f = fopen("dump1", "w");
94395 - fwrite(ptr, 1, (u32)x86Ptr - (u32)ptr, f);
94396 - fclose(f);
94397 - system("ndisasmw -u dump1");
94398 - fflush(stdout);*/
94399 -}
94400 -
94401 -#define REC_FUNC(f) \
94402 -void psx##f(); \
94403 -static void rec##f() { \
94404 - iFlushRegs(0); \
94405 - LIW(PutHWRegSpecial(ARG1), (u32)psxRegs.code); \
94406 - STW(GetHWRegSpecial(ARG1), OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS)); \
94407 - LIW(PutHWRegSpecial(PSXPC), (u32)pc); \
94408 - FlushAllHWReg(); \
94409 - CALLFunc((u32)psx##f); \
94410 -/* branch = 2; */\
94411 -}
94412 -
94413 -#define REC_SYS(f) \
94414 -void psx##f(); \
94415 -static void rec##f() { \
94416 - iFlushRegs(0); \
94417 - LIW(PutHWRegSpecial(ARG1), (u32)psxRegs.code); \
94418 - STW(GetHWRegSpecial(ARG1), OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS)); \
94419 - LIW(PutHWRegSpecial(PSXPC), (u32)pc); \
94420 - FlushAllHWReg(); \
94421 - CALLFunc((u32)psx##f); \
94422 - branch = 2; \
94423 - iRet(); \
94424 -}
94425 -
94426 -#define REC_BRANCH(f) \
94427 -void psx##f(); \
94428 -static void rec##f() { \
94429 - iFlushRegs(0); \
94430 - LIW(PutHWRegSpecial(ARG1), (u32)psxRegs.code); \
94431 - STW(GetHWRegSpecial(ARG1), OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS)); \
94432 - LIW(PutHWRegSpecial(PSXPC), (u32)pc); \
94433 - FlushAllHWReg(); \
94434 - CALLFunc((u32)psx##f); \
94435 - branch = 2; \
94436 - iRet(); \
94437 -}
94438 -
94439 -static void freeMem(int all)
94440 -{
94441 - if (recMem) free(recMem);
94442 - if (recRAM) free(recRAM);
94443 - if (recROM) free(recROM);
94444 - recMem = recRAM = recROM = 0;
94445 -
94446 - if (all && psxRecLUT) {
94447 - free(psxRecLUT); psxRecLUT = NULL;
94448 - }
94449 -}
94450 -
94451 -static int allocMem() {
94452 - int i;
94453 -
94454 - freeMem(0);
94455 -
94456 - if (psxRecLUT==NULL)
94457 - psxRecLUT = (u32*) malloc(0x010000 * 4);
94458 -
94459 - recMem = (char*) malloc(RECMEM_SIZE);
94460 - //recMem = mmap(NULL, RECMEM_SIZE, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0);
94461 - recRAM = (char*) malloc(0x200000);
94462 - recROM = (char*) malloc(0x080000);
94463 - if (recRAM == NULL || recROM == NULL || recMem == NULL/*(void *)-1*/ || psxRecLUT == NULL) {
94464 - freeMem(1);
94465 - SysMessage("Error allocating memory"); return -1;
94466 - }
94467 -
94468 - for (i=0; i<0x80; i++) psxRecLUT[i + 0x0000] = (u32)&recRAM[(i & 0x1f) << 16];
94469 - memcpy(psxRecLUT + 0x8000, psxRecLUT, 0x80 * 4);
94470 - memcpy(psxRecLUT + 0xa000, psxRecLUT, 0x80 * 4);
94471 -
94472 - for (i=0; i<0x08; i++) psxRecLUT[i + 0xbfc0] = (u32)&recROM[i << 16];
94473 -
94474 - return 0;
94475 -}
94476 -
94477 -static int recInit() {
94478 - return allocMem();
94479 -}
94480 -
94481 -static void recReset() {
94482 - memset(recRAM, 0, 0x200000);
94483 - memset(recROM, 0, 0x080000);
94484 -
94485 - ppcInit();
94486 - ppcSetPtr((u32 *)recMem);
94487 -
94488 - branch = 0;
94489 - memset(iRegs, 0, sizeof(iRegs));
94490 - iRegs[0].state = ST_CONST;
94491 - iRegs[0].k = 0;
94492 -}
94493 -
94494 -static void recShutdown() {
94495 - freeMem(1);
94496 - ppcShutdown();
94497 -}
94498 -
94499 -static void recError() {
94500 - SysReset();
94501 - ClosePlugins();
94502 - SysMessage("Unrecoverable error while running recompiler\n");
94503 - SysRunGui();
94504 -}
94505 -
94506 -__inline static void execute() {
94507 - void (**recFunc)();
94508 - char *p;
94509 -
94510 - p = (char*)PC_REC(psxRegs.pc);
94511 - /*if (p != NULL)*/ recFunc = (void (**)()) (u32)p;
94512 - /*else { recError(); return; }*/
94513 -
94514 - if (*recFunc == 0) {
94515 - recRecompile();
94516 - }
94517 - recRun(*recFunc, (u32)&psxRegs, (u32)&psxM);
94518 -}
94519 -
94520 -static void recExecute() {
94521 - for (;;) execute();
94522 -}
94523 -
94524 -static void recExecuteBlock() {
94525 - execute();
94526 -}
94527 -
94528 -static void recClear(u32 Addr, u32 Size) {
94529 - memset((void*)PC_REC(Addr), 0, Size * 4);
94530 -}
94531 -
94532 -static void recNULL() {
94533 -// SysMessage("recUNK: %8.8x\n", psxRegs.code);
94534 -}
94535 -
94536 -/*********************************************************
94537 -* goes to opcodes tables... *
94538 -* Format: table[something....] *
94539 -*********************************************************/
94540 -
94541 -//REC_SYS(SPECIAL);
94542 -static void recSPECIAL() {
94543 - recSPC[_Funct_]();
94544 -}
94545 -
94546 -static void recREGIMM() {
94547 - recREG[_Rt_]();
94548 -}
94549 -
94550 -static void recCOP0() {
94551 - recCP0[_Rs_]();
94552 -}
94553 -
94554 -//REC_SYS(COP2);
94555 -static void recCOP2() {
94556 - recCP2[_Funct_]();
94557 -}
94558 -
94559 -static void recBASIC() {
94560 - recCP2BSC[_Rs_]();
94561 -}
94562 -
94563 -//end of Tables opcodes...
94564 -
94565 -#pragma mark - Arithmetic with immediate operand -
94566 -/*********************************************************
94567 -* Arithmetic with immediate operand *
94568 -* Format: OP rt, rs, immediate *
94569 -*********************************************************/
94570 -
94571 -#if 0
94572 -/*REC_FUNC(ADDI);
94573 -REC_FUNC(ADDIU);
94574 -REC_FUNC(ANDI);
94575 -REC_FUNC(ORI);
94576 -REC_FUNC(XORI);
94577 -REC_FUNC(SLTI);
94578 -REC_FUNC(SLTIU);*/
94579 -#else
94580 -static void recADDIU() {
94581 -// Rt = Rs + Im
94582 - if (!_Rt_) return;
94583 -
94584 - if (IsConst(_Rs_)) {
94585 - MapConst(_Rt_, iRegs[_Rs_].k + _Imm_);
94586 - } else {
94587 - if (_Imm_ == 0) {
94588 - MapCopy(_Rt_, _Rs_);
94589 - } else {
94590 - ADDI(PutHWReg32(_Rt_), GetHWReg32(_Rs_), _Imm_);
94591 - }
94592 - }
94593 -}
94594 -
94595 -static void recADDI() {
94596 -// Rt = Rs + Im
94597 - recADDIU();
94598 -}
94599 -
94600 -//REC_FUNC(SLTI);
94601 -//REC_FUNC(SLTIU);
94602 -//CR0: SIGN | POSITIVE | ZERO | SOVERFLOW | SOVERFLOW | OVERFLOW | CARRY
94603 -static void recSLTI() {
94604 -// Rt = Rs < Im (signed)
94605 - if (!_Rt_) return;
94606 -
94607 - if (IsConst(_Rs_)) {
94608 - MapConst(_Rt_, (s32)iRegs[_Rs_].k < _Imm_);
94609 - } else {
94610 - if (_Imm_ == 0) {
94611 - SRWI(PutHWReg32(_Rt_), GetHWReg32(_Rs_), 31);
94612 - } else {
94613 - int reg;
94614 - CMPWI(GetHWReg32(_Rs_), _Imm_);
94615 - reg = PutHWReg32(_Rt_);
94616 - LI(reg, 1);
94617 - BLT(1);
94618 - LI(reg, 0);
94619 - }
94620 - }
94621 -}
94622 -
94623 -static void recSLTIU() {
94624 -// Rt = Rs < Im (unsigned)
94625 - if (!_Rt_) return;
94626 -
94627 - if (IsConst(_Rs_)) {
94628 - MapConst(_Rt_, iRegs[_Rs_].k < _ImmU_);
94629 - } else {
94630 - int reg;
94631 - CMPLWI(GetHWReg32(_Rs_), _Imm_);
94632 - reg = PutHWReg32(_Rt_);
94633 - LI(reg, 1);
94634 - BLT(1);
94635 - LI(reg, 0);
94636 - }
94637 -}
94638 -
94639 -static void recANDI() {
94640 -// Rt = Rs And Im
94641 - if (!_Rt_) return;
94642 -
94643 - if (IsConst(_Rs_)) {
94644 - MapConst(_Rt_, iRegs[_Rs_].k & _ImmU_);
94645 - } else {
94646 - ANDI_(PutHWReg32(_Rt_), GetHWReg32(_Rs_), _ImmU_);
94647 - }
94648 -}
94649 -
94650 -static void recORI() {
94651 -// Rt = Rs Or Im
94652 - if (!_Rt_) return;
94653 -
94654 - if (IsConst(_Rs_)) {
94655 - MapConst(_Rt_, iRegs[_Rs_].k | _ImmU_);
94656 - } else {
94657 - if (_Imm_ == 0) {
94658 - MapCopy(_Rt_, _Rs_);
94659 - } else {
94660 - ORI(PutHWReg32(_Rt_), GetHWReg32(_Rs_), _ImmU_);
94661 - }
94662 - }
94663 -}
94664 -
94665 -static void recXORI() {
94666 -// Rt = Rs Xor Im
94667 - if (!_Rt_) return;
94668 -
94669 - if (IsConst(_Rs_)) {
94670 - MapConst(_Rt_, iRegs[_Rs_].k ^ _ImmU_);
94671 - } else {
94672 - XORI(PutHWReg32(_Rt_), GetHWReg32(_Rs_), _ImmU_);
94673 - }
94674 -}
94675 -#endif
94676 -//end of * Arithmetic with immediate operand
94677 -
94678 -/*********************************************************
94679 -* Load higher 16 bits of the first word in GPR with imm *
94680 -* Format: OP rt, immediate *
94681 -*********************************************************/
94682 -//REC_FUNC(LUI);
94683 -//#if 0*/
94684 -static void recLUI() {
94685 -// Rt = Imm << 16
94686 - if (!_Rt_) return;
94687 -
94688 - MapConst(_Rt_, psxRegs.code << 16);
94689 -}
94690 -//#endif
94691 -//End of Load Higher .....
94692 -
94693 -#pragma mark - Register arithmetic -
94694 -/*********************************************************
94695 -* Register arithmetic *
94696 -* Format: OP rd, rs, rt *
94697 -*********************************************************/
94698 -
94699 -#if 0
94700 -/*REC_FUNC(ADD);
94701 -REC_FUNC(ADDU);
94702 -REC_FUNC(SUB);
94703 -REC_FUNC(SUBU);
94704 -REC_FUNC(AND);
94705 -REC_FUNC(OR);
94706 -REC_FUNC(XOR);
94707 -REC_FUNC(NOR);
94708 -REC_FUNC(SLT);
94709 -REC_FUNC(SLTU);*/
94710 -#else
94711 -static void recADDU() {
94712 -// Rd = Rs + Rt
94713 - if (!_Rd_) return;
94714 -
94715 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94716 - MapConst(_Rd_, iRegs[_Rs_].k + iRegs[_Rt_].k);
94717 - } else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
94718 - if ((s32)(s16)iRegs[_Rs_].k == (s32)iRegs[_Rs_].k) {
94719 - ADDI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), (s16)iRegs[_Rs_].k);
94720 - } else if ((iRegs[_Rs_].k & 0xffff) == 0) {
94721 - ADDIS(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k>>16);
94722 - } else {
94723 - ADD(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94724 - }
94725 - } else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
94726 - if ((s32)(s16)iRegs[_Rt_].k == (s32)iRegs[_Rt_].k) {
94727 - ADDI(PutHWReg32(_Rd_), GetHWReg32(_Rs_), (s16)iRegs[_Rt_].k);
94728 - } else if ((iRegs[_Rt_].k & 0xffff) == 0) {
94729 - ADDIS(PutHWReg32(_Rd_), GetHWReg32(_Rs_), iRegs[_Rt_].k>>16);
94730 - } else {
94731 - ADD(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94732 - }
94733 - } else {
94734 - ADD(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94735 - }
94736 -}
94737 -
94738 -static void recADD() {
94739 -// Rd = Rs + Rt
94740 - recADDU();
94741 -}
94742 -
94743 -static void recSUBU() {
94744 -// Rd = Rs - Rt
94745 - if (!_Rd_) return;
94746 -
94747 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94748 - MapConst(_Rd_, iRegs[_Rs_].k - iRegs[_Rt_].k);
94749 - } else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
94750 - if ((s32)(s16)(-iRegs[_Rt_].k) == (s32)(-iRegs[_Rt_].k)) {
94751 - ADDI(PutHWReg32(_Rd_), GetHWReg32(_Rs_), -iRegs[_Rt_].k);
94752 - } else if (((-iRegs[_Rt_].k) & 0xffff) == 0) {
94753 - ADDIS(PutHWReg32(_Rd_), GetHWReg32(_Rs_), (-iRegs[_Rt_].k)>>16);
94754 - } else {
94755 - SUB(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94756 - }
94757 - } else {
94758 - SUB(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94759 - }
94760 -}
94761 -
94762 -static void recSUB() {
94763 -// Rd = Rs - Rt
94764 - recSUBU();
94765 -}
94766 -
94767 -static void recAND() {
94768 -// Rd = Rs And Rt
94769 - if (!_Rd_) return;
94770 -
94771 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94772 - MapConst(_Rd_, iRegs[_Rs_].k & iRegs[_Rt_].k);
94773 - } else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
94774 - // TODO: implement shifted (ANDIS) versions of these
94775 - if ((iRegs[_Rs_].k & 0xffff) == iRegs[_Rs_].k) {
94776 - ANDI_(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k);
94777 - } else {
94778 - AND(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94779 - }
94780 - } else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
94781 - if ((iRegs[_Rt_].k & 0xffff) == iRegs[_Rt_].k) {
94782 - ANDI_(PutHWReg32(_Rd_), GetHWReg32(_Rs_), iRegs[_Rt_].k);
94783 - } else {
94784 - AND(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94785 - }
94786 - } else {
94787 - AND(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94788 - }
94789 -}
94790 -
94791 -static void recOR() {
94792 -// Rd = Rs Or Rt
94793 - if (!_Rd_) return;
94794 -
94795 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94796 - MapConst(_Rd_, iRegs[_Rs_].k | iRegs[_Rt_].k);
94797 - }
94798 - else {
94799 - if (_Rs_ == _Rt_) {
94800 - MapCopy(_Rd_, _Rs_);
94801 - }
94802 - else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
94803 - if ((iRegs[_Rs_].k & 0xffff) == iRegs[_Rs_].k) {
94804 - ORI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k);
94805 - } else {
94806 - OR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94807 - }
94808 - }
94809 - else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
94810 - if ((iRegs[_Rt_].k & 0xffff) == iRegs[_Rt_].k) {
94811 - ORI(PutHWReg32(_Rd_), GetHWReg32(_Rs_), iRegs[_Rt_].k);
94812 - } else {
94813 - OR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94814 - }
94815 - } else {
94816 - OR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94817 - }
94818 - }
94819 -}
94820 -
94821 -static void recXOR() {
94822 -// Rd = Rs Xor Rt
94823 - if (!_Rd_) return;
94824 -
94825 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94826 - MapConst(_Rd_, iRegs[_Rs_].k ^ iRegs[_Rt_].k);
94827 - } else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
94828 - if ((iRegs[_Rs_].k & 0xffff) == iRegs[_Rs_].k) {
94829 - XORI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k);
94830 - } else {
94831 - XOR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94832 - }
94833 - } else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
94834 - if ((iRegs[_Rt_].k & 0xffff) == iRegs[_Rt_].k) {
94835 - XORI(PutHWReg32(_Rd_), GetHWReg32(_Rs_), iRegs[_Rt_].k);
94836 - } else {
94837 - XOR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94838 - }
94839 - } else {
94840 - XOR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94841 - }
94842 -}
94843 -
94844 -static void recNOR() {
94845 -// Rd = Rs Nor Rt
94846 - if (!_Rd_) return;
94847 -
94848 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94849 - MapConst(_Rd_, ~(iRegs[_Rs_].k | iRegs[_Rt_].k));
94850 - } /*else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
94851 - if ((iRegs[_Rs_].k & 0xffff) == iRegs[_Rs_].k) {
94852 - NORI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k);
94853 - } else {
94854 - NOR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94855 - }
94856 - } else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
94857 - if ((iRegs[_Rt_].k & 0xffff) == iRegs[_Rt_].k) {
94858 - NORI(PutHWReg32(_Rd_), GetHWReg32(_Rs_), iRegs[_Rt_].k);
94859 - } else {
94860 - NOR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94861 - }
94862 - } */else {
94863 - NOR(PutHWReg32(_Rd_), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94864 - }
94865 -}
94866 -
94867 -static void recSLT() {
94868 -// Rd = Rs < Rt (signed)
94869 - if (!_Rd_) return;
94870 -
94871 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94872 - MapConst(_Rd_, (s32)iRegs[_Rs_].k < (s32)iRegs[_Rt_].k);
94873 - } else { // TODO: add immidiate cases
94874 - int reg;
94875 - CMPW(GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94876 - reg = PutHWReg32(_Rd_);
94877 - LI(reg, 1);
94878 - BLT(1);
94879 - LI(reg, 0);
94880 - }
94881 -}
94882 -
94883 -static void recSLTU() {
94884 -// Rd = Rs < Rt (unsigned)
94885 - if (!_Rd_) return;
94886 -
94887 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94888 - MapConst(_Rd_, iRegs[_Rs_].k < iRegs[_Rt_].k);
94889 - } else { // TODO: add immidiate cases
94890 - SUBFC(PutHWReg32(_Rd_), GetHWReg32(_Rt_), GetHWReg32(_Rs_));
94891 - SUBFE(PutHWReg32(_Rd_), GetHWReg32(_Rd_), GetHWReg32(_Rd_));
94892 - NEG(PutHWReg32(_Rd_), GetHWReg32(_Rd_));
94893 - }
94894 -}
94895 -#endif
94896 -//End of * Register arithmetic
94897 -
94898 -#pragma mark - mult/div & Register trap logic -
94899 -/*********************************************************
94900 -* Register mult/div & Register trap logic *
94901 -* Format: OP rs, rt *
94902 -*********************************************************/
94903 -
94904 -#if 0
94905 -REC_FUNC(MULT);
94906 -REC_FUNC(MULTU);
94907 -REC_FUNC(DIV);
94908 -REC_FUNC(DIVU);
94909 -#else
94910 -
94911 -int DoShift(u32 k)
94912 -{
94913 - u32 i;
94914 - for (i=0; i<30; i++) {
94915 - if (k == (1ul << i))
94916 - return i;
94917 - }
94918 - return -1;
94919 -}
94920 -
94921 -//REC_FUNC(MULT);
94922 -
94923 -// FIXME: doesn't work in GT - wrong way marker
94924 -static void recMULT() {
94925 -// Lo/Hi = Rs * Rt (signed)
94926 - s32 k; int r;
94927 - int usehi, uselo;
94928 -
94929 - if ((IsConst(_Rs_) && iRegs[_Rs_].k == 0) ||
94930 - (IsConst(_Rt_) && iRegs[_Rt_].k == 0)) {
94931 - MapConst(REG_LO, 0);
94932 - MapConst(REG_HI, 0);
94933 - return;
94934 - }
94935 -
94936 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
94937 - u64 res = (s64)((s64)(s32)iRegs[_Rs_].k * (s64)(s32)iRegs[_Rt_].k);
94938 - MapConst(REG_LO, (res & 0xffffffff));
94939 - MapConst(REG_HI, ((res >> 32) & 0xffffffff));
94940 - return;
94941 - }
94942 -
94943 - if (IsConst(_Rs_)) {
94944 - k = (s32)iRegs[_Rs_].k;
94945 - r = _Rt_;
94946 - } else if (IsConst(_Rt_)) {
94947 - k = (s32)iRegs[_Rt_].k;
94948 - r = _Rs_;
94949 - } else {
94950 - r = -1;
94951 - k = 0;
94952 - }
94953 -
94954 - // FIXME: this should not be needed!!!
94955 -// uselo = isPsxRegUsed(pc, REG_LO);
94956 -// usehi = isPsxRegUsed(pc, REG_HI);
94957 - uselo = 1; //isPsxRegUsed(pc, REG_LO);
94958 - usehi = 1; //isPsxRegUsed(pc, REG_HI);
94959 -
94960 -
94961 - if (r != -1) {
94962 - int shift = DoShift(k);
94963 - if (shift != -1) {
94964 - if (uselo) {
94965 - SLWI(PutHWReg32(REG_LO), GetHWReg32(r), shift)
94966 - }
94967 - if (usehi) {
94968 - SRAWI(PutHWReg32(REG_HI), GetHWReg32(r), 31-shift);
94969 - }
94970 - } else {
94971 - //if ((s32)(s16)k == k) {
94972 - // MULLWI(PutHWReg32(REG_LO), GetHWReg32(r), k);
94973 - // MULHWI(PutHWReg32(REG_HI), GetHWReg32(r), k);
94974 - //} else
94975 - {
94976 - if (uselo) {
94977 - MULLW(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94978 - }
94979 - if (usehi) {
94980 - MULHW(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94981 - }
94982 - }
94983 - }
94984 - } else {
94985 - if (uselo) {
94986 - MULLW(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94987 - }
94988 - if (usehi) {
94989 - MULHW(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
94990 - }
94991 - }
94992 -}
94993 -
94994 -static void recMULTU() {
94995 -// Lo/Hi = Rs * Rt (unsigned)
94996 - u32 k; int r;
94997 - int usehi, uselo;
94998 -
94999 - if ((IsConst(_Rs_) && iRegs[_Rs_].k == 0) ||
95000 - (IsConst(_Rt_) && iRegs[_Rt_].k == 0)) {
95001 - MapConst(REG_LO, 0);
95002 - MapConst(REG_HI, 0);
95003 - return;
95004 - }
95005 -
95006 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
95007 - u64 res = (u64)((u64)(u32)iRegs[_Rs_].k * (u64)(u32)iRegs[_Rt_].k);
95008 - MapConst(REG_LO, (res & 0xffffffff));
95009 - MapConst(REG_HI, ((res >> 32) & 0xffffffff));
95010 - return;
95011 - }
95012 -
95013 - if (IsConst(_Rs_)) {
95014 - k = (s32)iRegs[_Rs_].k;
95015 - r = _Rt_;
95016 - } else if (IsConst(_Rt_)) {
95017 - k = (s32)iRegs[_Rt_].k;
95018 - r = _Rs_;
95019 - } else {
95020 - r = -1;
95021 - k = 0;
95022 - }
95023 -
95024 - uselo = isPsxRegUsed(pc, REG_LO);
95025 - usehi = isPsxRegUsed(pc, REG_HI);
95026 -
95027 - if (r != -1) {
95028 - int shift = DoShift(k);
95029 - if (shift != -1) {
95030 - if (uselo) {
95031 - SLWI(PutHWReg32(REG_LO), GetHWReg32(r), shift);
95032 - }
95033 - if (usehi) {
95034 - SRWI(PutHWReg32(REG_HI), GetHWReg32(r), 31-shift);
95035 - }
95036 - } else {
95037 - {
95038 - if (uselo) {
95039 - MULLW(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95040 - }
95041 - if (usehi) {
95042 - MULHWU(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95043 - }
95044 - }
95045 - }
95046 - } else {
95047 - if (uselo) {
95048 - MULLW(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95049 - }
95050 - if (usehi) {
95051 - MULHWU(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95052 - }
95053 - }
95054 -}
95055 -
95056 -static void recDIV() {
95057 -// Lo/Hi = Rs / Rt (signed)
95058 - int usehi;
95059 -
95060 - if (IsConst(_Rs_) && iRegs[_Rs_].k == 0) {
95061 - MapConst(REG_LO, 0);
95062 - MapConst(REG_HI, 0);
95063 - return;
95064 - }
95065 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
95066 - MapConst(REG_LO, (s32)iRegs[_Rs_].k / (s32)iRegs[_Rt_].k);
95067 - MapConst(REG_HI, (s32)iRegs[_Rs_].k % (s32)iRegs[_Rt_].k);
95068 - return;
95069 - }
95070 -
95071 - usehi = isPsxRegUsed(pc, REG_HI);
95072 -
95073 - if (IsConst(_Rt_)) {
95074 - int shift = DoShift(iRegs[_Rt_].k);
95075 - if (shift != -1) {
95076 - SRAWI(PutHWReg32(REG_LO), GetHWReg32(_Rs_), shift);
95077 - ADDZE(PutHWReg32(REG_LO), GetHWReg32(REG_LO));
95078 - if (usehi) {
95079 - RLWINM(PutHWReg32(REG_HI), GetHWReg32(_Rs_), 0, 31-shift, 31);
95080 - }
95081 - } else if (iRegs[_Rt_].k == 3) {
95082 - // http://the.wall.riscom.net/books/proc/ppc/cwg/code2.html
95083 - LIS(PutHWReg32(REG_HI), 0x5555);
95084 - ADDI(PutHWReg32(REG_HI), GetHWReg32(REG_HI), 0x5556);
95085 - MULHW(PutHWReg32(REG_LO), GetHWReg32(REG_HI), GetHWReg32(_Rs_));
95086 - SRWI(PutHWReg32(REG_HI), GetHWReg32(_Rs_), 31);
95087 - ADD(PutHWReg32(REG_LO), GetHWReg32(REG_LO), GetHWReg32(REG_HI));
95088 - if (usehi) {
95089 - MULLI(PutHWReg32(REG_HI), GetHWReg32(REG_LO), 3);
95090 - SUB(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(REG_HI));
95091 - }
95092 - } else {
95093 - DIVW(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95094 - if (usehi) {
95095 - if ((iRegs[_Rt_].k & 0x7fff) == iRegs[_Rt_].k) {
95096 - MULLI(PutHWReg32(REG_HI), GetHWReg32(REG_LO), iRegs[_Rt_].k);
95097 - } else {
95098 - MULLW(PutHWReg32(REG_HI), GetHWReg32(REG_LO), GetHWReg32(_Rt_));
95099 - }
95100 - SUB(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(REG_HI));
95101 - }
95102 - }
95103 - } else {
95104 - DIVW(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95105 - if (usehi) {
95106 - MULLW(PutHWReg32(REG_HI), GetHWReg32(REG_LO), GetHWReg32(_Rt_));
95107 - SUB(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(REG_HI));
95108 - }
95109 - }
95110 -}
95111 -
95112 -static void recDIVU() {
95113 -// Lo/Hi = Rs / Rt (unsigned)
95114 - int usehi;
95115 -
95116 - if (IsConst(_Rs_) && iRegs[_Rs_].k == 0) {
95117 - MapConst(REG_LO, 0);
95118 - MapConst(REG_HI, 0);
95119 - return;
95120 - }
95121 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
95122 - MapConst(REG_LO, (u32)iRegs[_Rs_].k / (u32)iRegs[_Rt_].k);
95123 - MapConst(REG_HI, (u32)iRegs[_Rs_].k % (u32)iRegs[_Rt_].k);
95124 - return;
95125 - }
95126 -
95127 - usehi = isPsxRegUsed(pc, REG_HI);
95128 -
95129 - if (IsConst(_Rt_)) {
95130 - int shift = DoShift(iRegs[_Rt_].k);
95131 - if (shift != -1) {
95132 - SRWI(PutHWReg32(REG_LO), GetHWReg32(_Rs_), shift);
95133 - if (usehi) {
95134 - RLWINM(PutHWReg32(REG_HI), GetHWReg32(_Rs_), 0, 31-shift, 31);
95135 - }
95136 - } else {
95137 - DIVWU(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95138 - if (usehi) {
95139 - MULLW(PutHWReg32(REG_HI), GetHWReg32(_Rt_), GetHWReg32(REG_LO));
95140 - SUB(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(REG_HI));
95141 - }
95142 - }
95143 - } else {
95144 - DIVWU(PutHWReg32(REG_LO), GetHWReg32(_Rs_), GetHWReg32(_Rt_));
95145 - if (usehi) {
95146 - MULLW(PutHWReg32(REG_HI), GetHWReg32(_Rt_), GetHWReg32(REG_LO));
95147 - SUB(PutHWReg32(REG_HI), GetHWReg32(_Rs_), GetHWReg32(REG_HI));
95148 - }
95149 - }
95150 -}
95151 -#endif
95152 -//End of * Register mult/div & Register trap logic
95153 -
95154 -#pragma mark - memory access -
95155 -
95156 -#if 0
95157 -REC_FUNC(LB);
95158 -REC_FUNC(LBU);
95159 -REC_FUNC(LH);
95160 -REC_FUNC(LHU);
95161 -REC_FUNC(LW);
95162 -
95163 -REC_FUNC(SB);
95164 -REC_FUNC(SH);
95165 -REC_FUNC(SW);
95166 -
95167 -REC_FUNC(LWL);
95168 -REC_FUNC(LWR);
95169 -REC_FUNC(SWL);
95170 -REC_FUNC(SWR);
95171 -#else
95172 -static void preMemRead()
95173 -{
95174 - int rs;
95175 -
95176 - ReserveArgs(1);
95177 - if (_Rs_ != _Rt_) {
95178 - DisposeHWReg(iRegs[_Rt_].reg);
95179 - }
95180 - rs = GetHWReg32(_Rs_);
95181 - if (rs != 3 || _Imm_ != 0) {
95182 - ADDI(PutHWRegSpecial(ARG1), rs, _Imm_);
95183 - }
95184 - if (_Rs_ == _Rt_) {
95185 - DisposeHWReg(iRegs[_Rt_].reg);
95186 - }
95187 - InvalidateCPURegs();
95188 - //FlushAllHWReg();
95189 -}
95190 -
95191 -static void preMemWrite(int size)
95192 -{
95193 - int rs;
95194 -
95195 - ReserveArgs(2);
95196 - rs = GetHWReg32(_Rs_);
95197 - if (rs != 3 || _Imm_ != 0) {
95198 - ADDI(PutHWRegSpecial(ARG1), rs, _Imm_);
95199 - }
95200 - if (size == 1) {
95201 - RLWINM(PutHWRegSpecial(ARG2), GetHWReg32(_Rt_), 0, 24, 31);
95202 - //ANDI_(PutHWRegSpecial(ARG2), GetHWReg32(_Rt_), 0xff);
95203 - } else if (size == 2) {
95204 - RLWINM(PutHWRegSpecial(ARG2), GetHWReg32(_Rt_), 0, 16, 31);
95205 - //ANDI_(PutHWRegSpecial(ARG2), GetHWReg32(_Rt_), 0xffff);
95206 - } else {
95207 - MR(PutHWRegSpecial(ARG2), GetHWReg32(_Rt_));
95208 - }
95209 -
95210 - InvalidateCPURegs();
95211 - //FlushAllHWReg();
95212 -}
95213 -
95214 -static void recLB() {
95215 -// Rt = mem[Rs + Im] (signed)
95216 -
95217 - /*if (IsConst(_Rs_)) {
95218 - u32 addr = iRegs[_Rs_].k + _Imm_;
95219 - int t = addr >> 16;
95220 -
95221 - if ((t & 0xfff0) == 0xbfc0) {
95222 - if (!_Rt_) return;
95223 - // since bios is readonly it won't change
95224 - MapConst(_Rt_, psxRs8(addr));
95225 - return;
95226 - }
95227 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95228 - if (!_Rt_) return;
95229 -
95230 - addr = (u32)&psxM[addr & 0x1fffff];
95231 - LIW(PutHWReg32(_Rt_), ((addr>>16)<<16)+(addr&0x8000<<1)); // FIXME: is this correct?
95232 - LBZ(PutHWReg32(_Rt_), addr&0xffff, GetHWReg32(_Rt_));
95233 - EXTSB(PutHWReg32(_Rt_), GetHWReg32(_Rt_));
95234 - return;
95235 - }
95236 - if (t == 0x1f80 && addr < 0x1f801000) {
95237 - if (!_Rt_) return;
95238 -
95239 - addr = (u32)&psxH[addr & 0xfff];
95240 - LIW(PutHWReg32(_Rt_), ((addr>>16)<<16)+(addr&0x8000<<1)); // FIXME: is this correct?
95241 - LBZ(PutHWReg32(_Rt_), addr&0xffff, GetHWReg32(_Rt_));
95242 - EXTSB(PutHWReg32(_Rt_), GetHWReg32(_Rt_));
95243 - return;
95244 - }
95245 - // SysPrintf("unhandled r8 %x\n", addr);
95246 - }*/
95247 -
95248 - preMemRead();
95249 - CALLFunc((u32)psxMemRead8);
95250 - if (_Rt_) {
95251 - EXTSB(PutHWReg32(_Rt_), GetHWRegSpecial(RETVAL));
95252 - DisposeHWReg(GetSpecialIndexFromHWRegs(RETVAL));
95253 - }
95254 -}
95255 -
95256 -static void recLBU() {
95257 -// Rt = mem[Rs + Im] (unsigned)
95258 -
95259 - /*if (IsConst(_Rs_)) {
95260 - u32 addr = iRegs[_Rs_].k + _Imm_;
95261 - int t = addr >> 16;
95262 -
95263 - if ((t & 0xfff0) == 0xbfc0) {
95264 - if (!_Rt_) return;
95265 - // since bios is readonly it won't change
95266 - MapConst(_Rt_, psxRu8(addr));
95267 - return;
95268 - }
95269 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95270 - if (!_Rt_) return;
95271 -
95272 - addr = (u32)&psxM[addr & 0x1fffff];
95273 - LIW(PutHWReg32(_Rt_), ((addr>>16)<<16)+(addr&0x8000<<1)); // FIXME: is this correct?
95274 - LBZ(PutHWReg32(_Rt_), addr&0xffff, GetHWReg32(_Rt_));
95275 - return;
95276 - }
95277 - if (t == 0x1f80 && addr < 0x1f801000) {
95278 - if (!_Rt_) return;
95279 -
95280 - addr = (u32)&psxH[addr & 0xfff];
95281 - LIW(PutHWReg32(_Rt_), ((addr>>16)<<16)+(addr&0x8000<<1)); // FIXME: is this correct?
95282 - LBZ(PutHWReg32(_Rt_), addr&0xffff, GetHWReg32(_Rt_));
95283 - return;
95284 - }
95285 - // SysPrintf("unhandled r8 %x\n", addr);
95286 - }*/
95287 -
95288 - preMemRead();
95289 - CALLFunc((u32)psxMemRead8);
95290 -
95291 - if (_Rt_) {
95292 - SetDstCPUReg(3);
95293 - PutHWReg32(_Rt_);
95294 - }
95295 -}
95296 -
95297 -static void recLH() {
95298 -// Rt = mem[Rs + Im] (signed)
95299 -
95300 - if (IsConst(_Rs_)) {
95301 - u32 addr = iRegs[_Rs_].k + _Imm_;
95302 - int t = addr >> 16;
95303 -
95304 - if ((t & 0xfff0) == 0xbfc0) {
95305 - if (!_Rt_) return;
95306 - // since bios is readonly it won't change
95307 - MapConst(_Rt_, psxRs16(addr));
95308 - return;
95309 - }
95310 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95311 - if (!_Rt_) return;
95312 -
95313 - LIW(PutHWReg32(_Rt_), (u32)&psxM[addr & 0x1fffff]);
95314 - LHBRX(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95315 - EXTSH(PutHWReg32(_Rt_), GetHWReg32(_Rt_));
95316 - return;
95317 - }
95318 - if (t == 0x1f80 && addr < 0x1f801000) {
95319 - if (!_Rt_) return;
95320 -
95321 - LIW(PutHWReg32(_Rt_), (u32)&psxH[addr & 0xfff]);
95322 - LHBRX(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95323 - EXTSH(PutHWReg32(_Rt_), GetHWReg32(_Rt_));
95324 - return;
95325 - }
95326 - // SysPrintf("unhandled r16 %x\n", addr);
95327 - }
95328 -
95329 - preMemRead();
95330 - CALLFunc((u32)psxMemRead16);
95331 - if (_Rt_) {
95332 - EXTSH(PutHWReg32(_Rt_), GetHWRegSpecial(RETVAL));
95333 - DisposeHWReg(GetSpecialIndexFromHWRegs(RETVAL));
95334 - }
95335 -}
95336 -
95337 -static void recLHU() {
95338 -// Rt = mem[Rs + Im] (unsigned)
95339 -
95340 - if (IsConst(_Rs_)) {
95341 - u32 addr = iRegs[_Rs_].k + _Imm_;
95342 - int t = addr >> 16;
95343 -
95344 - if ((t & 0xfff0) == 0xbfc0) {
95345 - if (!_Rt_) return;
95346 - // since bios is readonly it won't change
95347 - MapConst(_Rt_, psxRu16(addr));
95348 - return;
95349 - }
95350 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95351 - if (!_Rt_) return;
95352 -
95353 - LIW(PutHWReg32(_Rt_), (u32)&psxM[addr & 0x1fffff]);
95354 - LHBRX(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95355 - return;
95356 - }
95357 - if (t == 0x1f80 && addr < 0x1f801000) {
95358 - if (!_Rt_) return;
95359 -
95360 - LIW(PutHWReg32(_Rt_), (u32)&psxH[addr & 0xfff]);
95361 - LHBRX(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95362 - return;
95363 - }
95364 - if (t == 0x1f80) {
95365 - if (addr >= 0x1f801c00 && addr < 0x1f801e00) {
95366 - if (!_Rt_) return;
95367 -
95368 - ReserveArgs(1);
95369 - LIW(PutHWRegSpecial(ARG1), addr);
95370 - DisposeHWReg(iRegs[_Rt_].reg);
95371 - InvalidateCPURegs();
95372 - CALLFunc((u32)SPU_readRegister);
95373 -
95374 - SetDstCPUReg(3);
95375 - PutHWReg32(_Rt_);
95376 - return;
95377 - }
95378 - switch (addr) {
95379 - case 0x1f801100: case 0x1f801110: case 0x1f801120:
95380 - if (!_Rt_) return;
95381 -
95382 - ReserveArgs(1);
95383 - LIW(PutHWRegSpecial(ARG1), (addr >> 4) & 0x3);
95384 - DisposeHWReg(iRegs[_Rt_].reg);
95385 - InvalidateCPURegs();
95386 - CALLFunc((u32)psxRcntRcount);
95387 -
95388 - SetDstCPUReg(3);
95389 - PutHWReg32(_Rt_);
95390 - return;
95391 -
95392 - case 0x1f801104: case 0x1f801114: case 0x1f801124:
95393 - if (!_Rt_) return;
95394 -
95395 - LIW(PutHWReg32(_Rt_), (u32)&psxCounters[(addr >> 4) & 0x3].mode);
95396 - LWZ(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95397 - return;
95398 -
95399 - case 0x1f801108: case 0x1f801118: case 0x1f801128:
95400 - if (!_Rt_) return;
95401 -
95402 - LIW(PutHWReg32(_Rt_), (u32)&psxCounters[(addr >> 4) & 0x3].target);
95403 - LWZ(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95404 - return;
95405 - }
95406 - }
95407 - // SysPrintf("unhandled r16u %x\n", addr);
95408 - }
95409 -
95410 - preMemRead();
95411 - CALLFunc((u32)psxMemRead16);
95412 - if (_Rt_) {
95413 - SetDstCPUReg(3);
95414 - PutHWReg32(_Rt_);
95415 - }
95416 -}
95417 -
95418 -static void recLW() {
95419 -// Rt = mem[Rs + Im] (unsigned)
95420 -
95421 - if (IsConst(_Rs_)) {
95422 - u32 addr = iRegs[_Rs_].k + _Imm_;
95423 - int t = addr >> 16;
95424 -
95425 - if ((t & 0xfff0) == 0xbfc0) {
95426 - if (!_Rt_) return;
95427 - // since bios is readonly it won't change
95428 - MapConst(_Rt_, psxRu32(addr));
95429 - return;
95430 - }
95431 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95432 - if (!_Rt_) return;
95433 -
95434 - LIW(PutHWReg32(_Rt_), (u32)&psxM[addr & 0x1fffff]);
95435 - LWBRX(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95436 - return;
95437 - }
95438 - if (t == 0x1f80 && addr < 0x1f801000) {
95439 - if (!_Rt_) return;
95440 -
95441 - LIW(PutHWReg32(_Rt_), (u32)&psxH[addr & 0xfff]);
95442 - LWBRX(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95443 - return;
95444 - }
95445 - if (t == 0x1f80) {
95446 - switch (addr) {
95447 - case 0x1f801080: case 0x1f801084: case 0x1f801088:
95448 - case 0x1f801090: case 0x1f801094: case 0x1f801098:
95449 - case 0x1f8010a0: case 0x1f8010a4: case 0x1f8010a8:
95450 - case 0x1f8010b0: case 0x1f8010b4: case 0x1f8010b8:
95451 - case 0x1f8010c0: case 0x1f8010c4: case 0x1f8010c8:
95452 - case 0x1f8010d0: case 0x1f8010d4: case 0x1f8010d8:
95453 - case 0x1f8010e0: case 0x1f8010e4: case 0x1f8010e8:
95454 - case 0x1f801070: case 0x1f801074:
95455 - case 0x1f8010f0: case 0x1f8010f4:
95456 - if (!_Rt_) return;
95457 -
95458 - LIW(PutHWReg32(_Rt_), (u32)&psxH[addr & 0xffff]);
95459 - LWBRX(PutHWReg32(_Rt_), 0, GetHWReg32(_Rt_));
95460 - return;
95461 -
95462 - case 0x1f801810:
95463 - if (!_Rt_) return;
95464 -
95465 - DisposeHWReg(iRegs[_Rt_].reg);
95466 - InvalidateCPURegs();
95467 - CALLFunc((u32)GPU_readData);
95468 -
95469 - SetDstCPUReg(3);
95470 - PutHWReg32(_Rt_);
95471 - return;
95472 -
95473 - case 0x1f801814:
95474 - if (!_Rt_) return;
95475 -
95476 - DisposeHWReg(iRegs[_Rt_].reg);
95477 - InvalidateCPURegs();
95478 - CALLFunc((u32)GPU_readStatus);
95479 -
95480 - SetDstCPUReg(3);
95481 - PutHWReg32(_Rt_);
95482 - return;
95483 - }
95484 - }
95485 -// SysPrintf("unhandled r32 %x\n", addr);
95486 - }
95487 -
95488 - preMemRead();
95489 - CALLFunc((u32)psxMemRead32);
95490 - if (_Rt_) {
95491 - SetDstCPUReg(3);
95492 - PutHWReg32(_Rt_);
95493 - }
95494 -}
95495 -
95496 -REC_FUNC(LWL);
95497 -REC_FUNC(LWR);
95498 -REC_FUNC(SWL);
95499 -REC_FUNC(SWR);
95500 -/*extern u32 LWL_MASK[4];
95501 -extern u32 LWL_SHIFT[4];
95502 -
95503 -void iLWLk(u32 shift) {
95504 - if (IsConst(_Rt_)) {
95505 - MOV32ItoR(ECX, iRegs[_Rt_].k);
95506 - } else {
95507 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
95508 - }
95509 - AND32ItoR(ECX, LWL_MASK[shift]);
95510 - SHL32ItoR(EAX, LWL_SHIFT[shift]);
95511 - OR32RtoR (EAX, ECX);
95512 -}
95513 -
95514 -void recLWL() {
95515 -// Rt = Rt Merge mem[Rs + Im]
95516 -
95517 - if (IsConst(_Rs_)) {
95518 - u32 addr = iRegs[_Rs_].k + _Imm_;
95519 - int t = addr >> 16;
95520 -
95521 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95522 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
95523 - iLWLk(addr & 3);
95524 -
95525 - iRegs[_Rt_].state = ST_UNK;
95526 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
95527 - return;
95528 - }
95529 - if (t == 0x1f80 && addr < 0x1f801000) {
95530 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
95531 - iLWLk(addr & 3);
95532 -
95533 - iRegs[_Rt_].state = ST_UNK;
95534 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
95535 - return;
95536 - }
95537 - }
95538 -
95539 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
95540 - else {
95541 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
95542 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
95543 - }
95544 - PUSH32R (EAX);
95545 - AND32ItoR(EAX, ~3);
95546 - PUSH32R (EAX);
95547 - CALLFunc((u32)psxMemRead32);
95548 -
95549 - if (_Rt_) {
95550 - ADD32ItoR(ESP, 4);
95551 - POP32R (EDX);
95552 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
95553 -
95554 - MOV32ItoR(ECX, (u32)LWL_SHIFT);
95555 - MOV32RmStoR(ECX, ECX, EDX, 2);
95556 - SHL32CLtoR(EAX); // mem(EAX) << LWL_SHIFT[shift]
95557 -
95558 - MOV32ItoR(ECX, (u32)LWL_MASK);
95559 - MOV32RmStoR(ECX, ECX, EDX, 2);
95560 - if (IsConst(_Rt_)) {
95561 - MOV32ItoR(EDX, iRegs[_Rt_].k);
95562 - } else {
95563 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
95564 - }
95565 - AND32RtoR(EDX, ECX); // _rRt_ & LWL_MASK[shift]
95566 -
95567 - OR32RtoR(EAX, EDX);
95568 -
95569 - iRegs[_Rt_].state = ST_UNK;
95570 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
95571 - } else {
95572 -// ADD32ItoR(ESP, 8);
95573 - resp+= 8;
95574 - }
95575 -}
95576 -
95577 -static void recLWBlock(int count) {
95578 - u32 *code = PSXM(pc);
95579 - int i, respsave;
95580 -// Rt = mem[Rs + Im] (unsigned)
95581 -
95582 -// iFlushRegs(0);
95583 -
95584 - if (IsConst(_Rs_)) {
95585 - u32 addr = iRegs[_Rs_].k + _Imm_;
95586 - int t = addr >> 16;
95587 -
95588 - if ((t & 0xfff0) == 0xbfc0) {
95589 - // since bios is readonly it won't change
95590 - for (i=0; i<count; i++, code++, addr+=4) {
95591 - if (_fRt_(*code)) {
95592 - MapConst(_fRt_(*code), psxRu32(addr));
95593 - }
95594 - }
95595 - return;
95596 - }
95597 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95598 - for (i=0; i<count; i++, code++, addr+=4) {
95599 - if (!_fRt_(*code)) return;
95600 - iRegs[_fRt_(*code)].state = ST_UNK;
95601 -
95602 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1fffff]);
95603 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EAX);
95604 - }
95605 - return;
95606 - }
95607 - if (t == 0x1f80 && addr < 0x1f801000) {
95608 - for (i=0; i<count; i++, code++, addr+=4) {
95609 - if (!_fRt_(*code)) return;
95610 - iRegs[_fRt_(*code)].state = ST_UNK;
95611 -
95612 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xfff]);
95613 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EAX);
95614 - }
95615 - return;
95616 - }
95617 - }
95618 -
95619 - SysPrintf("recLWBlock %d: %d\n", count, IsConst(_Rs_));
95620 - iPushOfB();
95621 - CALLFunc((u32)psxMemPointer);
95622 -// ADD32ItoR(ESP, 4);
95623 - resp+= 4;
95624 -
95625 - respsave = resp; resp = 0;
95626 - TEST32RtoR(EAX, EAX);
95627 - j32Ptr[4] = JZ32(0);
95628 - XOR32RtoR(ECX, ECX);
95629 - for (i=0; i<count; i++, code++) {
95630 - if (_fRt_(*code)) {
95631 - iRegs[_fRt_(*code)].state = ST_UNK;
95632 -
95633 - MOV32RmStoR(EDX, EAX, ECX, 2);
95634 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EDX);
95635 - }
95636 - if (i != (count-1)) INC32R(ECX);
95637 - }
95638 - j32Ptr[5] = JMP32(0);
95639 - x86SetJ32(j32Ptr[4]);
95640 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
95641 - psxRegs.code = *code;
95642 - recLW();
95643 - }
95644 - ADD32ItoR(ESP, resp);
95645 - x86SetJ32(j32Ptr[5]);
95646 - resp = respsave;
95647 -}
95648 -
95649 -extern u32 LWR_MASK[4];
95650 -extern u32 LWR_SHIFT[4];
95651 -
95652 -void iLWRk(u32 shift) {
95653 - if (IsConst(_Rt_)) {
95654 - MOV32ItoR(ECX, iRegs[_Rt_].k);
95655 - } else {
95656 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
95657 - }
95658 - AND32ItoR(ECX, LWR_MASK[shift]);
95659 - SHR32ItoR(EAX, LWR_SHIFT[shift]);
95660 - OR32RtoR (EAX, ECX);
95661 -}
95662 -
95663 -void recLWR() {
95664 -// Rt = Rt Merge mem[Rs + Im]
95665 -
95666 - if (IsConst(_Rs_)) {
95667 - u32 addr = iRegs[_Rs_].k + _Imm_;
95668 - int t = addr >> 16;
95669 -
95670 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95671 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
95672 - iLWRk(addr & 3);
95673 -
95674 - iRegs[_Rt_].state = ST_UNK;
95675 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
95676 - return;
95677 - }
95678 - if (t == 0x1f80 && addr < 0x1f801000) {
95679 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
95680 - iLWRk(addr & 3);
95681 -
95682 - iRegs[_Rt_].state = ST_UNK;
95683 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
95684 - return;
95685 - }
95686 - }
95687 -
95688 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
95689 - else {
95690 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
95691 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
95692 - }
95693 - PUSH32R (EAX);
95694 - AND32ItoR(EAX, ~3);
95695 - PUSH32R (EAX);
95696 - CALLFunc((u32)psxMemRead32);
95697 -
95698 - if (_Rt_) {
95699 - ADD32ItoR(ESP, 4);
95700 - POP32R (EDX);
95701 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
95702 -
95703 - MOV32ItoR(ECX, (u32)LWR_SHIFT);
95704 - MOV32RmStoR(ECX, ECX, EDX, 2);
95705 - SHR32CLtoR(EAX); // mem(EAX) >> LWR_SHIFT[shift]
95706 -
95707 - MOV32ItoR(ECX, (u32)LWR_MASK);
95708 - MOV32RmStoR(ECX, ECX, EDX, 2);
95709 -
95710 - if (IsConst(_Rt_)) {
95711 - MOV32ItoR(EDX, iRegs[_Rt_].k);
95712 - } else {
95713 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
95714 - }
95715 - AND32RtoR(EDX, ECX); // _rRt_ & LWR_MASK[shift]
95716 -
95717 - OR32RtoR(EAX, EDX);
95718 -
95719 - iRegs[_Rt_].state = ST_UNK;
95720 - MOV32RtoM((u32)&psxRegs.GPR.r[_Rt_], EAX);
95721 - } else {
95722 -// ADD32ItoR(ESP, 8);
95723 - resp+= 8;
95724 - }
95725 -}*/
95726 -
95727 -static void recSB() {
95728 -// mem[Rs + Im] = Rt
95729 -
95730 - /*if (IsConst(_Rs_)) {
95731 - u32 addr = iRegs[_Rs_].k + _Imm_;
95732 - int t = addr >> 16;
95733 -
95734 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95735 - if (IsConst(_Rt_)) {
95736 - MOV8ItoM((u32)&psxM[addr & 0x1fffff], (u8)iRegs[_Rt_].k);
95737 - } else {
95738 - MOV8MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
95739 - MOV8RtoM((u32)&psxM[addr & 0x1fffff], EAX);
95740 - }
95741 - return;
95742 - }
95743 - if (t == 0x1f80 && addr < 0x1f801000) {
95744 - if (IsConst(_Rt_)) {
95745 - MOV8ItoM((u32)&psxH[addr & 0xfff], (u8)iRegs[_Rt_].k);
95746 - } else {
95747 - MOV8MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
95748 - MOV8RtoM((u32)&psxH[addr & 0xfff], EAX);
95749 - }
95750 - return;
95751 - }
95752 -// SysPrintf("unhandled w8 %x\n", addr);
95753 - }*/
95754 -
95755 - preMemWrite(1);
95756 - CALLFunc((u32)psxMemWrite8);
95757 -}
95758 -
95759 -static void recSH() {
95760 -// mem[Rs + Im] = Rt
95761 -
95762 - /*if (IsConst(_Rs_)) {
95763 - u32 addr = iRegs[_Rs_].k + _Imm_;
95764 - int t = addr >> 16;
95765 -
95766 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95767 - if (IsConst(_Rt_)) {
95768 - MOV16ItoM((u32)&psxM[addr & 0x1fffff], (u16)iRegs[_Rt_].k);
95769 - } else {
95770 - MOV16MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
95771 - MOV16RtoM((u32)&psxM[addr & 0x1fffff], EAX);
95772 - }
95773 - return;
95774 - }
95775 - if (t == 0x1f80 && addr < 0x1f801000) {
95776 - if (IsConst(_Rt_)) {
95777 - MOV16ItoM((u32)&psxH[addr & 0xfff], (u16)iRegs[_Rt_].k);
95778 - } else {
95779 - MOV16MtoR(EAX, (u32)&psxRegs.GPR.r[_Rt_]);
95780 - MOV16RtoM((u32)&psxH[addr & 0xfff], EAX);
95781 - }
95782 - return;
95783 - }
95784 - if (t == 0x1f80) {
95785 - if (addr >= 0x1f801c00 && addr < 0x1f801e00) {
95786 - if (IsConst(_Rt_)) {
95787 - PUSH32I(iRegs[_Rt_].k);
95788 - } else {
95789 - PUSH32M((u32)&psxRegs.GPR.r[_Rt_]);
95790 - }
95791 - PUSH32I (addr);
95792 - CALL32M ((u32)&SPU_writeRegister);
95793 -#ifndef __WIN32__
95794 - resp+= 8;
95795 -#endif
95796 - return;
95797 - }
95798 - }
95799 -// SysPrintf("unhandled w16 %x\n", addr);
95800 - }*/
95801 -
95802 - preMemWrite(2);
95803 - CALLFunc((u32)psxMemWrite16);
95804 -}
95805 -
95806 -static void recSW() {
95807 -// mem[Rs + Im] = Rt
95808 - u32 *b1, *b2;
95809 -#if 0
95810 - if (IsConst(_Rs_)) {
95811 - u32 addr = iRegs[_Rs_].k + _Imm_;
95812 - int t = addr >> 16;
95813 -
95814 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95815 - LIW(0, addr & 0x1fffff);
95816 - STWBRX(GetHWReg32(_Rt_), GetHWRegSpecial(PSXMEM), 0);
95817 - return;
95818 - }
95819 - if (t == 0x1f80 && addr < 0x1f801000) {
95820 - LIW(0, (u32)&psxH[addr & 0xfff]);
95821 - STWBRX(GetHWReg32(_Rt_), 0, 0);
95822 - return;
95823 - }
95824 - if (t == 0x1f80) {
95825 - switch (addr) {
95826 - case 0x1f801080: case 0x1f801084:
95827 - case 0x1f801090: case 0x1f801094:
95828 - case 0x1f8010a0: case 0x1f8010a4:
95829 - case 0x1f8010b0: case 0x1f8010b4:
95830 - case 0x1f8010c0: case 0x1f8010c4:
95831 - case 0x1f8010d0: case 0x1f8010d4:
95832 - case 0x1f8010e0: case 0x1f8010e4:
95833 - case 0x1f801074:
95834 - case 0x1f8010f0:
95835 - LIW(0, (u32)&psxH[addr & 0xffff]);
95836 - STWBRX(GetHWReg32(_Rt_), 0, 0);
95837 - return;
95838 -
95839 -/* case 0x1f801810:
95840 - if (IsConst(_Rt_)) {
95841 - PUSH32I(iRegs[_Rt_].k);
95842 - } else {
95843 - PUSH32M((u32)&psxRegs.GPR.r[_Rt_]);
95844 - }
95845 - CALL32M((u32)&GPU_writeData);
95846 -#ifndef __WIN32__
95847 - resp+= 4;
95848 -#endif
95849 - return;
95850 -
95851 - case 0x1f801814:
95852 - if (IsConst(_Rt_)) {
95853 - PUSH32I(iRegs[_Rt_].k);
95854 - } else {
95855 - PUSH32M((u32)&psxRegs.GPR.r[_Rt_]);
95856 - }
95857 - CALL32M((u32)&GPU_writeStatus);
95858 -#ifndef __WIN32__
95859 - resp+= 4;
95860 -#endif*/
95861 - }
95862 - }
95863 -// SysPrintf("unhandled w32 %x\n", addr);
95864 - }
95865 -
95866 -/* LIS(0, 0x0079 + ((_Imm_ <= 0) ? 1 : 0));
95867 - CMPLW(GetHWReg32(_Rs_), 0);
95868 - BGE_L(b1);
95869 -
95870 - //SaveContext();
95871 - ADDI(0, GetHWReg32(_Rs_), _Imm_);
95872 - RLWINM(0, GetHWReg32(_Rs_), 0, 11, 31);
95873 - STWBRX(GetHWReg32(_Rt_), GetHWRegSpecial(PSXMEM), 0);
95874 - B_L(b2);
95875 -
95876 - B_DST(b1);*/
95877 -#endif
95878 - preMemWrite(4);
95879 - CALLFunc((u32)psxMemWrite32);
95880 -
95881 - //B_DST(b2);
95882 -}
95883 -
95884 -/*
95885 -static void recSWBlock(int count) {
95886 - u32 *code;
95887 - int i, respsave;
95888 -// mem[Rs + Im] = Rt
95889 -
95890 -// iFlushRegs();
95891 -
95892 - if (IsConst(_Rs_)) {
95893 - u32 addr = iRegs[_Rs_].k + _Imm_;
95894 - int t = addr >> 16;
95895 - code = PSXM(pc);
95896 -
95897 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95898 - for (i=0; i<count; i++, code++, addr+=4) {
95899 - if (IsConst(_fRt_(*code))) {
95900 - MOV32ItoM((u32)&psxM[addr & 0x1fffff], iRegs[_fRt_(*code)].k);
95901 - } else {
95902 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_fRt_(*code)]);
95903 - MOV32RtoM((u32)&psxM[addr & 0x1fffff], EAX);
95904 - }
95905 - }
95906 - return;
95907 - }
95908 - if (t == 0x1f80 && addr < 0x1f801000) {
95909 - for (i=0; i<count; i++, code++, addr+=4) {
95910 - if (!_fRt_(*code)) return;
95911 - iRegs[_fRt_(*code)].state = ST_UNK;
95912 -
95913 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xfff]);
95914 - MOV32RtoM((u32)&psxRegs.GPR.r[_fRt_(*code)], EAX);
95915 - }
95916 - return;
95917 - }
95918 - }
95919 -
95920 - SysPrintf("recSWBlock %d: %d\n", count, IsConst(_Rs_));
95921 - iPushOfB();
95922 - CALLFunc((u32)psxMemPointer);
95923 -// ADD32ItoR(ESP, 4);
95924 - resp+= 4;
95925 -
95926 - respsave = resp; resp = 0;
95927 - TEST32RtoR(EAX, EAX);
95928 - j32Ptr[4] = JZ32(0);
95929 - XOR32RtoR(ECX, ECX);
95930 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
95931 - if (IsConst(_fRt_(*code))) {
95932 - MOV32ItoR(EDX, iRegs[_fRt_(*code)].k);
95933 - } else {
95934 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_fRt_(*code)]);
95935 - }
95936 - MOV32RtoRmS(EAX, ECX, 2, EDX);
95937 - if (i != (count-1)) INC32R(ECX);
95938 - }
95939 - j32Ptr[5] = JMP32(0);
95940 - x86SetJ32(j32Ptr[4]);
95941 - for (i=0, code = PSXM(pc); i<count; i++, code++) {
95942 - psxRegs.code = *code;
95943 - recSW();
95944 - }
95945 - ADD32ItoR(ESP, resp);
95946 - x86SetJ32(j32Ptr[5]);
95947 - resp = respsave;
95948 -}
95949 -
95950 -extern u32 SWL_MASK[4];
95951 -extern u32 SWL_SHIFT[4];
95952 -
95953 -void iSWLk(u32 shift) {
95954 - if (IsConst(_Rt_)) {
95955 - MOV32ItoR(ECX, iRegs[_Rt_].k);
95956 - } else {
95957 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
95958 - }
95959 - SHR32ItoR(ECX, SWL_SHIFT[shift]);
95960 - AND32ItoR(EAX, SWL_MASK[shift]);
95961 - OR32RtoR (EAX, ECX);
95962 -}
95963 -
95964 -void recSWL() {
95965 -// mem[Rs + Im] = Rt Merge mem[Rs + Im]
95966 -
95967 - if (IsConst(_Rs_)) {
95968 - u32 addr = iRegs[_Rs_].k + _Imm_;
95969 - int t = addr >> 16;
95970 -
95971 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
95972 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
95973 - iSWLk(addr & 3);
95974 - MOV32RtoM((u32)&psxM[addr & 0x1ffffc], EAX);
95975 - return;
95976 - }
95977 - if (t == 0x1f80 && addr < 0x1f801000) {
95978 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
95979 - iSWLk(addr & 3);
95980 - MOV32RtoM((u32)&psxH[addr & 0xffc], EAX);
95981 - return;
95982 - }
95983 - }
95984 -
95985 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
95986 - else {
95987 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
95988 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
95989 - }
95990 - PUSH32R (EAX);
95991 - AND32ItoR(EAX, ~3);
95992 - PUSH32R (EAX);
95993 -
95994 - CALLFunc((u32)psxMemRead32);
95995 -
95996 - ADD32ItoR(ESP, 4);
95997 - POP32R (EDX);
95998 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
95999 -
96000 - MOV32ItoR(ECX, (u32)SWL_MASK);
96001 - MOV32RmStoR(ECX, ECX, EDX, 2);
96002 - AND32RtoR(EAX, ECX); // mem & SWL_MASK[shift]
96003 -
96004 - MOV32ItoR(ECX, (u32)SWL_SHIFT);
96005 - MOV32RmStoR(ECX, ECX, EDX, 2);
96006 - if (IsConst(_Rt_)) {
96007 - MOV32ItoR(EDX, iRegs[_Rt_].k);
96008 - } else {
96009 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
96010 - }
96011 - SHR32CLtoR(EDX); // _rRt_ >> SWL_SHIFT[shift]
96012 -
96013 - OR32RtoR (EAX, EDX);
96014 - PUSH32R (EAX);
96015 -
96016 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
96017 - else {
96018 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
96019 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
96020 - }
96021 - AND32ItoR(EAX, ~3);
96022 - PUSH32R (EAX);
96023 -
96024 - CALLFunc((u32)psxMemWrite32);
96025 -// ADD32ItoR(ESP, 8);
96026 - resp+= 8;
96027 -}
96028 -
96029 -extern u32 SWR_MASK[4];
96030 -extern u32 SWR_SHIFT[4];
96031 -
96032 -void iSWRk(u32 shift) {
96033 - if (IsConst(_Rt_)) {
96034 - MOV32ItoR(ECX, iRegs[_Rt_].k);
96035 - } else {
96036 - MOV32MtoR(ECX, (u32)&psxRegs.GPR.r[_Rt_]);
96037 - }
96038 - SHL32ItoR(ECX, SWR_SHIFT[shift]);
96039 - AND32ItoR(EAX, SWR_MASK[shift]);
96040 - OR32RtoR (EAX, ECX);
96041 -}
96042 -
96043 -void recSWR() {
96044 -// mem[Rs + Im] = Rt Merge mem[Rs + Im]
96045 -
96046 - if (IsConst(_Rs_)) {
96047 - u32 addr = iRegs[_Rs_].k + _Imm_;
96048 - int t = addr >> 16;
96049 -
96050 - if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
96051 - MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
96052 - iSWRk(addr & 3);
96053 - MOV32RtoM((u32)&psxM[addr & 0x1ffffc], EAX);
96054 - return;
96055 - }
96056 - if (t == 0x1f80 && addr < 0x1f801000) {
96057 - MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
96058 - iSWRk(addr & 3);
96059 - MOV32RtoM((u32)&psxH[addr & 0xffc], EAX);
96060 - return;
96061 - }
96062 - }
96063 -
96064 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
96065 - else {
96066 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
96067 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
96068 - }
96069 - PUSH32R (EAX);
96070 - AND32ItoR(EAX, ~3);
96071 - PUSH32R (EAX);
96072 -
96073 - CALLFunc((u32)psxMemRead32);
96074 -
96075 - ADD32ItoR(ESP, 4);
96076 - POP32R (EDX);
96077 - AND32ItoR(EDX, 0x3); // shift = addr & 3;
96078 -
96079 - MOV32ItoR(ECX, (u32)SWR_MASK);
96080 - MOV32RmStoR(ECX, ECX, EDX, 2);
96081 - AND32RtoR(EAX, ECX); // mem & SWR_MASK[shift]
96082 -
96083 - MOV32ItoR(ECX, (u32)SWR_SHIFT);
96084 - MOV32RmStoR(ECX, ECX, EDX, 2);
96085 - if (IsConst(_Rt_)) {
96086 - MOV32ItoR(EDX, iRegs[_Rt_].k);
96087 - } else {
96088 - MOV32MtoR(EDX, (u32)&psxRegs.GPR.r[_Rt_]);
96089 - }
96090 - SHL32CLtoR(EDX); // _rRt_ << SWR_SHIFT[shift]
96091 -
96092 - OR32RtoR (EAX, EDX);
96093 - PUSH32R (EAX);
96094 -
96095 - if (IsConst(_Rs_)) MOV32ItoR(EAX, iRegs[_Rs_].k + _Imm_);
96096 - else {
96097 - MOV32MtoR(EAX, (u32)&psxRegs.GPR.r[_Rs_]);
96098 - if (_Imm_) ADD32ItoR(EAX, _Imm_);
96099 - }
96100 - AND32ItoR(EAX, ~3);
96101 - PUSH32R (EAX);
96102 -
96103 - CALLFunc((u32)psxMemWrite32);
96104 -// ADD32ItoR(ESP, 8);
96105 - resp+= 8;
96106 -}*/
96107 -#endif
96108 -
96109 -#if 0
96110 -/*REC_FUNC(SLL);
96111 -REC_FUNC(SRL);
96112 -REC_FUNC(SRA);*/
96113 -#else
96114 -static void recSLL() {
96115 -// Rd = Rt << Sa
96116 - if (!_Rd_) return;
96117 -
96118 - if (IsConst(_Rt_)) {
96119 - MapConst(_Rd_, iRegs[_Rt_].k << _Sa_);
96120 - } else {
96121 - SLWI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), _Sa_);
96122 - }
96123 -}
96124 -
96125 -static void recSRL() {
96126 -// Rd = Rt >> Sa
96127 - if (!_Rd_) return;
96128 -
96129 - if (IsConst(_Rt_)) {
96130 - MapConst(_Rd_, iRegs[_Rt_].k >> _Sa_);
96131 - } else {
96132 - SRWI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), _Sa_);
96133 - }
96134 -}
96135 -
96136 -static void recSRA() {
96137 -// Rd = Rt >> Sa
96138 - if (!_Rd_) return;
96139 -
96140 - if (IsConst(_Rt_)) {
96141 - MapConst(_Rd_, (s32)iRegs[_Rt_].k >> _Sa_);
96142 - } else {
96143 - SRAWI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), _Sa_);
96144 - }
96145 -}
96146 -#endif
96147 -
96148 -#pragma mark - shift ops -
96149 -#if 0
96150 -/*REC_FUNC(SLLV);
96151 -REC_FUNC(SRLV);
96152 -REC_FUNC(SRAV);*/
96153 -#else
96154 -static void recSLLV() {
96155 -// Rd = Rt << Rs
96156 - if (!_Rd_) return;
96157 -
96158 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
96159 - MapConst(_Rd_, iRegs[_Rt_].k << iRegs[_Rs_].k);
96160 - } else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
96161 - SLWI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k);
96162 - } else {
96163 - SLW(PutHWReg32(_Rd_), GetHWReg32(_Rt_), GetHWReg32(_Rs_));
96164 - }
96165 -}
96166 -
96167 -static void recSRLV() {
96168 -// Rd = Rt >> Rs
96169 - if (!_Rd_) return;
96170 -
96171 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
96172 - MapConst(_Rd_, iRegs[_Rt_].k >> iRegs[_Rs_].k);
96173 - } else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
96174 - SRWI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k);
96175 - } else {
96176 - SRW(PutHWReg32(_Rd_), GetHWReg32(_Rt_), GetHWReg32(_Rs_));
96177 - }
96178 -}
96179 -
96180 -static void recSRAV() {
96181 -// Rd = Rt >> Rs
96182 - if (!_Rd_) return;
96183 -
96184 - if (IsConst(_Rt_) && IsConst(_Rs_)) {
96185 - MapConst(_Rd_, (s32)iRegs[_Rt_].k >> iRegs[_Rs_].k);
96186 - } else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
96187 - SRAWI(PutHWReg32(_Rd_), GetHWReg32(_Rt_), iRegs[_Rs_].k);
96188 - } else {
96189 - SRAW(PutHWReg32(_Rd_), GetHWReg32(_Rt_), GetHWReg32(_Rs_));
96190 - }
96191 -}
96192 -#endif
96193 -
96194 -//REC_SYS(SYSCALL);
96195 -//REC_SYS(BREAK);
96196 -
96197 -//#if 0*/
96198 -/*int dump;*/
96199 -static void recSYSCALL() {
96200 -// dump=1;
96201 - iFlushRegs(0);
96202 -
96203 - ReserveArgs(2);
96204 - LIW(PutHWRegSpecial(PSXPC), pc - 4);
96205 - LIW(PutHWRegSpecial(ARG1), 0x20);
96206 - LIW(PutHWRegSpecial(ARG2), (branch == 1 ? 1 : 0));
96207 - FlushAllHWReg();
96208 - CALLFunc ((u32)psxException);
96209 -
96210 - branch = 2;
96211 - iRet();
96212 -}
96213 -
96214 -static void recBREAK() {
96215 -}
96216 -//#endif
96217 -
96218 -#if 0
96219 -/*REC_FUNC(MFHI);
96220 -REC_FUNC(MTHI);
96221 -REC_FUNC(MFLO);
96222 -REC_FUNC(MTLO);*/
96223 -#else
96224 -static void recMFHI() {
96225 -// Rd = Hi
96226 - if (!_Rd_) return;
96227 -
96228 - if (IsConst(REG_HI)) {
96229 - MapConst(_Rd_, iRegs[REG_HI].k);
96230 - } else {
96231 - MapCopy(_Rd_, REG_HI);
96232 - }
96233 -}
96234 -
96235 -static void recMTHI() {
96236 -// Hi = Rs
96237 -
96238 - if (IsConst(_Rs_)) {
96239 - MapConst(REG_HI, iRegs[_Rs_].k);
96240 - } else {
96241 - MapCopy(REG_HI, _Rs_);
96242 - }
96243 -}
96244 -
96245 -static void recMFLO() {
96246 -// Rd = Lo
96247 - if (!_Rd_) return;
96248 -
96249 - if (IsConst(REG_LO)) {
96250 - MapConst(_Rd_, iRegs[REG_LO].k);
96251 - } else {
96252 - MapCopy(_Rd_, REG_LO);
96253 - }
96254 -}
96255 -
96256 -static void recMTLO() {
96257 -// Lo = Rs
96258 -
96259 - if (IsConst(_Rs_)) {
96260 - MapConst(REG_LO, iRegs[_Rs_].k);
96261 - } else {
96262 - MapCopy(REG_LO, _Rs_);
96263 - }
96264 -}
96265 -#endif
96266 -
96267 -#pragma mark - branch ops -
96268 -#if 0
96269 -/*REC_BRANCH(J);
96270 -REC_BRANCH(JR);
96271 -REC_BRANCH(JAL);
96272 -REC_BRANCH(JALR);
96273 -REC_BRANCH(BLTZ);
96274 -REC_BRANCH(BGTZ);
96275 -REC_BRANCH(BLTZAL);
96276 -REC_BRANCH(BGEZAL);
96277 -REC_BRANCH(BNE);
96278 -REC_BRANCH(BEQ);
96279 -REC_BRANCH(BLEZ);
96280 -REC_BRANCH(BGEZ);*/
96281 -#else
96282 -static void recBLTZ() {
96283 -// Branch if Rs < 0
96284 - u32 bpc = _Imm_ * 4 + pc;
96285 - u32 *b;
96286 -
96287 - if (IsConst(_Rs_)) {
96288 - if ((s32)iRegs[_Rs_].k < 0) {
96289 - iJump(bpc); return;
96290 - } else {
96291 - iJump(pc+4); return;
96292 - }
96293 - }
96294 -
96295 - CMPWI(GetHWReg32(_Rs_), 0);
96296 - BLT_L(b);
96297 -
96298 - iBranch(pc+4, 1);
96299 -
96300 - B_DST(b);
96301 -
96302 - iBranch(bpc, 0);
96303 - pc+=4;
96304 -}
96305 -
96306 -static void recBGTZ() {
96307 -// Branch if Rs > 0
96308 - u32 bpc = _Imm_ * 4 + pc;
96309 - u32 *b;
96310 -
96311 - if (IsConst(_Rs_)) {
96312 - if ((s32)iRegs[_Rs_].k > 0) {
96313 - iJump(bpc); return;
96314 - } else {
96315 - iJump(pc+4); return;
96316 - }
96317 - }
96318 -
96319 - CMPWI(GetHWReg32(_Rs_), 0);
96320 - BGT_L(b);
96321 -
96322 - iBranch(pc+4, 1);
96323 -
96324 - B_DST(b);
96325 -
96326 - iBranch(bpc, 0);
96327 - pc+=4;
96328 -}
96329 -
96330 -static void recBLTZAL() {
96331 -// Branch if Rs < 0
96332 - u32 bpc = _Imm_ * 4 + pc;
96333 - u32 *b;
96334 -
96335 - if (IsConst(_Rs_)) {
96336 - if ((s32)iRegs[_Rs_].k < 0) {
96337 - MapConst(31, pc + 4);
96338 -
96339 - iJump(bpc); return;
96340 - } else {
96341 - iJump(pc+4); return;
96342 - }
96343 - }
96344 -
96345 - CMPWI(GetHWReg32(_Rs_), 0);
96346 - BLT_L(b);
96347 -
96348 - iBranch(pc+4, 1);
96349 -
96350 - B_DST(b);
96351 -
96352 - MapConst(31, pc + 4);
96353 -
96354 - iBranch(bpc, 0);
96355 - pc+=4;
96356 -}
96357 -
96358 -static void recBGEZAL() {
96359 -// Branch if Rs >= 0
96360 - u32 bpc = _Imm_ * 4 + pc;
96361 - u32 *b;
96362 -
96363 - if (IsConst(_Rs_)) {
96364 - if ((s32)iRegs[_Rs_].k >= 0) {
96365 - MapConst(31, pc + 4);
96366 -
96367 - iJump(bpc); return;
96368 - } else {
96369 - iJump(pc+4); return;
96370 - }
96371 - }
96372 -
96373 - CMPWI(GetHWReg32(_Rs_), 0);
96374 - BGE_L(b);
96375 -
96376 - iBranch(pc+4, 1);
96377 -
96378 - B_DST(b);
96379 -
96380 - MapConst(31, pc + 4);
96381 -
96382 - iBranch(bpc, 0);
96383 - pc+=4;
96384 -}
96385 -
96386 -static void recJ() {
96387 -// j target
96388 -
96389 - iJump(_Target_ * 4 + (pc & 0xf0000000));
96390 -}
96391 -
96392 -static void recJAL() {
96393 -// jal target
96394 - MapConst(31, pc + 4);
96395 -
96396 - iJump(_Target_ * 4 + (pc & 0xf0000000));
96397 -}
96398 -
96399 -static void recJR() {
96400 -// jr Rs
96401 -
96402 - if (IsConst(_Rs_)) {
96403 - iJump(iRegs[_Rs_].k);
96404 - //LIW(PutHWRegSpecial(TARGET), iRegs[_Rs_].k);
96405 - } else {
96406 - MR(PutHWRegSpecial(TARGET), GetHWReg32(_Rs_));
96407 - SetBranch();
96408 - }
96409 -}
96410 -
96411 -static void recJALR() {
96412 -// jalr Rs
96413 -
96414 - if (_Rd_) {
96415 - MapConst(_Rd_, pc + 4);
96416 - }
96417 -
96418 - if (IsConst(_Rs_)) {
96419 - iJump(iRegs[_Rs_].k);
96420 - //LIW(PutHWRegSpecial(TARGET), iRegs[_Rs_].k);
96421 - } else {
96422 - MR(PutHWRegSpecial(TARGET), GetHWReg32(_Rs_));
96423 - SetBranch();
96424 - }
96425 -}
96426 -
96427 -static void recBEQ() {
96428 -// Branch if Rs == Rt
96429 - u32 bpc = _Imm_ * 4 + pc;
96430 - u32 *b;
96431 -
96432 - if (_Rs_ == _Rt_) {
96433 - iJump(bpc);
96434 - }
96435 - else {
96436 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
96437 - if (iRegs[_Rs_].k == iRegs[_Rt_].k) {
96438 - iJump(bpc); return;
96439 - } else {
96440 - iJump(pc+4); return;
96441 - }
96442 - }
96443 - else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
96444 - if ((iRegs[_Rs_].k & 0xffff) == iRegs[_Rs_].k) {
96445 - CMPLWI(GetHWReg32(_Rt_), iRegs[_Rs_].k);
96446 - }
96447 - else if ((s32)(s16)iRegs[_Rs_].k == (s32)iRegs[_Rs_].k) {
96448 - CMPWI(GetHWReg32(_Rt_), iRegs[_Rs_].k);
96449 - }
96450 - else {
96451 - CMPLW(GetHWReg32(_Rs_), GetHWReg32(_Rt_));
96452 - }
96453 - }
96454 - else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
96455 - if ((iRegs[_Rt_].k & 0xffff) == iRegs[_Rt_].k) {
96456 - CMPLWI(GetHWReg32(_Rs_), iRegs[_Rt_].k);
96457 - }
96458 - else if ((s32)(s16)iRegs[_Rt_].k == (s32)iRegs[_Rt_].k) {
96459 - CMPWI(GetHWReg32(_Rs_), iRegs[_Rt_].k);
96460 - }
96461 - else {
96462 - CMPLW(GetHWReg32(_Rs_), GetHWReg32(_Rt_));
96463 - }
96464 - }
96465 - else {
96466 - CMPLW(GetHWReg32(_Rs_), GetHWReg32(_Rt_));
96467 - }
96468 -
96469 - BEQ_L(b);
96470 -
96471 - iBranch(pc+4, 1);
96472 -
96473 - B_DST(b);
96474 -
96475 - iBranch(bpc, 0);
96476 - pc+=4;
96477 - }
96478 -}
96479 -
96480 -static void recBNE() {
96481 -// Branch if Rs != Rt
96482 - u32 bpc = _Imm_ * 4 + pc;
96483 - u32 *b;
96484 -
96485 - if (_Rs_ == _Rt_) {
96486 - iJump(pc+4);
96487 - }
96488 - else {
96489 - if (IsConst(_Rs_) && IsConst(_Rt_)) {
96490 - if (iRegs[_Rs_].k != iRegs[_Rt_].k) {
96491 - iJump(bpc); return;
96492 - } else {
96493 - iJump(pc+4); return;
96494 - }
96495 - }
96496 - else if (IsConst(_Rs_) && !IsMapped(_Rs_)) {
96497 - if ((iRegs[_Rs_].k & 0xffff) == iRegs[_Rs_].k) {
96498 - CMPLWI(GetHWReg32(_Rt_), iRegs[_Rs_].k);
96499 - }
96500 - else if ((s32)(s16)iRegs[_Rs_].k == (s32)iRegs[_Rs_].k) {
96501 - CMPWI(GetHWReg32(_Rt_), iRegs[_Rs_].k);
96502 - }
96503 - else {
96504 - CMPLW(GetHWReg32(_Rs_), GetHWReg32(_Rt_));
96505 - }
96506 - }
96507 - else if (IsConst(_Rt_) && !IsMapped(_Rt_)) {
96508 - if ((iRegs[_Rt_].k & 0xffff) == iRegs[_Rt_].k) {
96509 - CMPLWI(GetHWReg32(_Rs_), iRegs[_Rt_].k);
96510 - }
96511 - else if ((s32)(s16)iRegs[_Rt_].k == (s32)iRegs[_Rt_].k) {
96512 - CMPWI(GetHWReg32(_Rs_), iRegs[_Rt_].k);
96513 - }
96514 - else {
96515 - CMPLW(GetHWReg32(_Rs_), GetHWReg32(_Rt_));
96516 - }
96517 - }
96518 - else {
96519 - CMPLW(GetHWReg32(_Rs_), GetHWReg32(_Rt_));
96520 - }
96521 -
96522 - BNE_L(b);
96523 -
96524 - iBranch(pc+4, 1);
96525 -
96526 - B_DST(b);
96527 -
96528 - iBranch(bpc, 0);
96529 - pc+=4;
96530 - }
96531 -}
96532 -
96533 -static void recBLEZ() {
96534 -// Branch if Rs <= 0
96535 - u32 bpc = _Imm_ * 4 + pc;
96536 - u32 *b;
96537 -
96538 - if (IsConst(_Rs_)) {
96539 - if ((s32)iRegs[_Rs_].k <= 0) {
96540 - iJump(bpc); return;
96541 - } else {
96542 - iJump(pc+4); return;
96543 - }
96544 - }
96545 -
96546 - CMPWI(GetHWReg32(_Rs_), 0);
96547 - BLE_L(b);
96548 -
96549 - iBranch(pc+4, 1);
96550 -
96551 - B_DST(b);
96552 -
96553 - iBranch(bpc, 0);
96554 - pc+=4;
96555 -}
96556 -
96557 -static void recBGEZ() {
96558 -// Branch if Rs >= 0
96559 - u32 bpc = _Imm_ * 4 + pc;
96560 - u32 *b;
96561 -
96562 - if (IsConst(_Rs_)) {
96563 - if ((s32)iRegs[_Rs_].k >= 0) {
96564 - iJump(bpc); return;
96565 - } else {
96566 - iJump(pc+4); return;
96567 - }
96568 - }
96569 -
96570 - CMPWI(GetHWReg32(_Rs_), 0);
96571 - BGE_L(b);
96572 -
96573 - iBranch(pc+4, 1);
96574 -
96575 - B_DST(b);
96576 -
96577 - iBranch(bpc, 0);
96578 - pc+=4;
96579 -}
96580 -#endif
96581 -
96582 -#if 1
96583 -//REC_FUNC(MFC0);
96584 -//REC_SYS(MTC0);
96585 -//REC_FUNC(CFC0);
96586 -//REC_SYS(CTC0);
96587 -REC_FUNC(RFE);
96588 -//#else
96589 -static void recMFC0() {
96590 -// Rt = Cop0->Rd
96591 - if (!_Rt_) return;
96592 -
96593 - LWZ(PutHWReg32(_Rt_), OFFSET(&psxRegs, &psxRegs.CP0.r[_Rd_]), GetHWRegSpecial(PSXREGS));
96594 -}
96595 -
96596 -static void recCFC0() {
96597 -// Rt = Cop0->Rd
96598 -
96599 - recMFC0();
96600 -}
96601 -
96602 -static void recMTC0() {
96603 -// Cop0->Rd = Rt
96604 -
96605 - /*if (IsConst(_Rt_)) {
96606 - switch (_Rd_) {
96607 - case 12:
96608 - MOV32ItoM((u32)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k);
96609 - break;
96610 - case 13:
96611 - MOV32ItoM((u32)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k & ~(0xfc00));
96612 - break;
96613 - default:
96614 - MOV32ItoM((u32)&psxRegs.CP0.r[_Rd_], iRegs[_Rt_].k);
96615 - break;
96616 - }
96617 - } else*/ {
96618 - switch (_Rd_) {
96619 - case 13:
96620 - RLWINM(0,GetHWReg32(_Rt_),0,22,15); // & ~(0xfc00)
96621 - STW(0, OFFSET(&psxRegs, &psxRegs.CP0.r[_Rd_]), GetHWRegSpecial(PSXREGS));
96622 - break;
96623 - default:
96624 - STW(GetHWReg32(_Rt_), OFFSET(&psxRegs, &psxRegs.CP0.r[_Rd_]), GetHWRegSpecial(PSXREGS));
96625 - break;
96626 - }
96627 - }
96628 -
96629 - if (_Rd_ == 12 || _Rd_ == 13) {
96630 - iFlushRegs(0);
96631 - LIW(PutHWRegSpecial(PSXPC), (u32)pc);
96632 - FlushAllHWReg();
96633 - CALLFunc((u32)psxTestSWInts);
96634 - if(_Rd_ == 12) {
96635 - LWZ(0, OFFSET(&psxRegs, &psxRegs.interrupt), GetHWRegSpecial(PSXREGS));
96636 - ORIS(0, 0, 0x8000);
96637 - STW(0, OFFSET(&psxRegs, &psxRegs.interrupt), GetHWRegSpecial(PSXREGS));
96638 - }
96639 - branch = 2;
96640 - iRet();
96641 - }
96642 -}
96643 -
96644 -static void recCTC0() {
96645 -// Cop0->Rd = Rt
96646 -
96647 - recMTC0();
96648 -}
96649 -#else
96650 -static void recRFE() {
96651 - // TODO: implement multiple temp registers or cop0 registers
96652 - RLWINM(t1,Status,0,0,27);
96653 - RLWINM(Status,Status,30,28,31);
96654 - OR(Status,t1,Status);
96655 -
96656 - MOV32MtoR(EAX, (u32)&psxRegs.CP0.n.Status);
96657 - MOV32RtoR(ECX, EAX);
96658 - AND32ItoR(EAX, 0xfffffff0);
96659 - AND32ItoR(ECX, 0x3c);
96660 - SHR32ItoR(ECX, 2);
96661 - OR32RtoR (EAX, ECX);
96662 - MOV32RtoM((u32)&psxRegs.CP0.n.Status, EAX);
96663 - CALLFunc((u32)psxExceptionTest);
96664 -}
96665 -#endif
96666 -
96667 -#if 0
96668 -#define CP2_FUNC(f) \
96669 -void gte##f(); \
96670 -static void rec##f() { \
96671 - iFlushRegs(0); \
96672 - LIW(0, (u32)psxRegs.code); \
96673 - STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS)); \
96674 - FlushAllHWReg(); \
96675 - CALLFunc ((u32)gte##f); \
96676 -}
96677 -CP2_FUNC(LWC2);
96678 -CP2_FUNC(SWC2);
96679 -
96680 -#else
96681 -#include "pGte.h"
96682 -#endif
96683 -//
96684 -
96685 -static void recHLE() {
96686 - iFlushRegs(0);
96687 - FlushAllHWReg();
96688 -
96689 - if ((psxRegs.code & 0x3ffffff) == (psxRegs.code & 0x7)) {
96690 - CALLFunc((u32)psxHLEt[psxRegs.code & 0x7]);
96691 - } else {
96692 - // somebody else must have written to current opcode for this to happen!!!!
96693 - CALLFunc((u32)psxHLEt[0]); // call dummy function
96694 - }
96695 -
96696 - count = idlecyclecount + (pc - pcold)/4 + 20;
96697 - ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
96698 - FlushAllHWReg();
96699 - CALLFunc((u32)psxBranchTest);
96700 - Return();
96701 -
96702 - branch = 2;
96703 -}
96704 -
96705 -//
96706 -
96707 -static void (*recBSC[64])() = {
96708 - recSPECIAL, recREGIMM, recJ , recJAL , recBEQ , recBNE , recBLEZ, recBGTZ,
96709 - recADDI , recADDIU , recSLTI, recSLTIU, recANDI, recORI , recXORI, recLUI ,
96710 - recCOP0 , recNULL , recCOP2, recNULL , recNULL, recNULL, recNULL, recNULL,
96711 - recNULL , recNULL , recNULL, recNULL , recNULL, recNULL, recNULL, recNULL,
96712 - recLB , recLH , recLWL , recLW , recLBU , recLHU , recLWR , recNULL,
96713 - recSB , recSH , recSWL , recSW , recNULL, recNULL, recSWR , recNULL,
96714 - recNULL , recNULL , recLWC2, recNULL , recNULL, recNULL, recNULL, recNULL,
96715 - recNULL , recNULL , recSWC2, recHLE , recNULL, recNULL, recNULL, recNULL
96716 -};
96717 -
96718 -static void (*recSPC[64])() = {
96719 - recSLL , recNULL, recSRL , recSRA , recSLLV , recNULL , recSRLV, recSRAV,
96720 - recJR , recJALR, recNULL, recNULL, recSYSCALL, recBREAK, recNULL, recNULL,
96721 - recMFHI, recMTHI, recMFLO, recMTLO, recNULL , recNULL , recNULL, recNULL,
96722 - recMULT, recMULTU, recDIV, recDIVU, recNULL , recNULL , recNULL, recNULL,
96723 - recADD , recADDU, recSUB , recSUBU, recAND , recOR , recXOR , recNOR ,
96724 - recNULL, recNULL, recSLT , recSLTU, recNULL , recNULL , recNULL, recNULL,
96725 - recNULL, recNULL, recNULL, recNULL, recNULL , recNULL , recNULL, recNULL,
96726 - recNULL, recNULL, recNULL, recNULL, recNULL , recNULL , recNULL, recNULL
96727 -};
96728 -
96729 -static void (*recREG[32])() = {
96730 - recBLTZ , recBGEZ , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
96731 - recNULL , recNULL , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
96732 - recBLTZAL, recBGEZAL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
96733 - recNULL , recNULL , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
96734 -};
96735 -
96736 -static void (*recCP0[32])() = {
96737 - recMFC0, recNULL, recCFC0, recNULL, recMTC0, recNULL, recCTC0, recNULL,
96738 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
96739 - recRFE , recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
96740 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
96741 -};
96742 -
96743 -static void (*recCP2[64])() = {
96744 - recBASIC, recRTPS , recNULL , recNULL, recNULL, recNULL , recNCLIP, recNULL, // 00
96745 - recNULL , recNULL , recNULL , recNULL, recOP , recNULL , recNULL , recNULL, // 08
96746 - recDPCS , recINTPL, recMVMVA, recNCDS, recCDP , recNULL , recNCDT , recNULL, // 10
96747 - recNULL , recNULL , recNULL , recNCCS, recCC , recNULL , recNCS , recNULL, // 18
96748 - recNCT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 20
96749 - recSQR , recDCPL , recDPCT , recNULL, recNULL, recAVSZ3, recAVSZ4, recNULL, // 28
96750 - recRTPT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 30
96751 - recNULL , recNULL , recNULL , recNULL, recNULL, recGPF , recGPL , recNCCT // 38
96752 -};
96753 -
96754 -static void (*recCP2BSC[32])() = {
96755 - recMFC2, recNULL, recCFC2, recNULL, recMTC2, recNULL, recCTC2, recNULL,
96756 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
96757 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL,
96758 - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL
96759 -};
96760 -
96761 -static void recRecompile() {
96762 - //static int recCount = 0;
96763 - char *p;
96764 - u32 *ptr;
96765 - int i;
96766 -
96767 - cop2readypc = 0;
96768 - idlecyclecount = 0;
96769 -
96770 - // initialize state variables
96771 - UniqueRegAlloc = 1;
96772 - HWRegUseCount = 0;
96773 - DstCPUReg = -1;
96774 - memset(HWRegisters, 0, sizeof(HWRegisters));
96775 - for (i=0; i<NUM_HW_REGISTERS; i++)
96776 - HWRegisters[i].code = cpuHWRegisters[NUM_HW_REGISTERS-i-1];
96777 -
96778 - // reserve the special psxReg register
96779 - HWRegisters[0].usage = HWUSAGE_SPECIAL | HWUSAGE_RESERVED | HWUSAGE_HARDWIRED;
96780 - HWRegisters[0].private = PSXREGS;
96781 - HWRegisters[0].k = (u32)&psxRegs;
96782 -
96783 - HWRegisters[1].usage = HWUSAGE_SPECIAL | HWUSAGE_RESERVED | HWUSAGE_HARDWIRED;
96784 - HWRegisters[1].private = PSXMEM;
96785 - HWRegisters[1].k = (u32)&psxM;
96786 -
96787 - // reserve the special psxRegs.cycle register
96788 - //HWRegisters[1].usage = HWUSAGE_SPECIAL | HWUSAGE_RESERVED | HWUSAGE_HARDWIRED;
96789 - //HWRegisters[1].private = CYCLECOUNT;
96790 -
96791 - //memset(iRegs, 0, sizeof(iRegs));
96792 - for (i=0; i<NUM_REGISTERS; i++) {
96793 - iRegs[i].state = ST_UNK;
96794 - iRegs[i].reg = -1;
96795 - }
96796 - iRegs[0].k = 0;
96797 - iRegs[0].state = ST_CONST;
96798 -
96799 - /* if ppcPtr reached the mem limit reset whole mem */
96800 - if (((u32)ppcPtr - (u32)recMem) >= (RECMEM_SIZE - 0x10000))
96801 - recReset();
96802 -
96803 - ppcAlign(/*32*/4);
96804 - ptr = ppcPtr;
96805 -
96806 - // give us write access
96807 - //mprotect(recMem, RECMEM_SIZE, PROT_EXEC|PROT_READ|PROT_WRITE);
96808 -
96809 - // tell the LUT where to find us
96810 - PC_REC32(psxRegs.pc) = (u32)ppcPtr;
96811 -
96812 - pcold = pc = psxRegs.pc;
96813 -
96814 - //SysPrintf("RecCount: %i\n", recCount++);
96815 -
96816 - for (count=0; count<500;) {
96817 - p = (char *)PSXM(pc);
96818 - if (p == NULL) recError();
96819 - psxRegs.code = SWAP32(*(u32 *)p);
96820 -/*
96821 - if ((psxRegs.code >> 26) == 0x23) { // LW
96822 - int i;
96823 - u32 code;
96824 -
96825 - for (i=1;; i++) {
96826 - p = (char *)PSXM(pc+i*4);
96827 - if (p == NULL) recError();
96828 - code = *(u32 *)p;
96829 -
96830 - if ((code >> 26) != 0x23 ||
96831 - _fRs_(code) != _Rs_ ||
96832 - _fImm_(code) != (_Imm_+i*4))
96833 - break;
96834 - }
96835 - if (i > 1) {
96836 - recLWBlock(i);
96837 - pc = pc + i*4; continue;
96838 - }
96839 - }
96840 -
96841 - if ((psxRegs.code >> 26) == 0x2b) { // SW
96842 - int i;
96843 - u32 code;
96844 -
96845 - for (i=1;; i++) {
96846 - p = (char *)PSXM(pc+i*4);
96847 - if (p == NULL) recError();
96848 - code = *(u32 *)p;
96849 -
96850 - if ((code >> 26) != 0x2b ||
96851 - _fRs_(code) != _Rs_ ||
96852 - _fImm_(code) != (_Imm_+i*4))
96853 - break;
96854 - }
96855 - if (i > 1) {
96856 - recSWBlock(i);
96857 - pc = pc + i*4; continue;
96858 - }
96859 - }*/
96860 -
96861 - pc+=4; count++;
96862 -// iFlushRegs(0); // test
96863 - recBSC[psxRegs.code>>26]();
96864 -
96865 - if (branch) {
96866 - branch = 0;
96867 - //if (dump) iDumpBlock(ptr);
96868 - goto done;
96869 - }
96870 - }
96871 -
96872 - iFlushRegs(pc);
96873 -
96874 - LIW(PutHWRegSpecial(PSXPC), pc);
96875 -
96876 - iRet();
96877 -
96878 -done:;
96879 -#if 0
96880 - MakeDataExecutable(ptr, ((u8*)ppcPtr)-((u8*)ptr));
96881 -#else
96882 - u32 a = (u32)(u8*)ptr;
96883 - while(a < (u32)(u8*)ppcPtr) {
96884 - __asm__ __volatile__("icbi 0,%0" : : "r" (a));
96885 - __asm__ __volatile__("dcbst 0,%0" : : "r" (a));
96886 - a += 4;
96887 - }
96888 - __asm__ __volatile__("sync");
96889 - __asm__ __volatile__("isync");
96890 -#endif
96891 -
96892 -#if 1
96893 - sprintf((char *)ppcPtr, "PC=%08x", pcold);
96894 - ppcPtr += strlen((char *)ppcPtr);
96895 -#endif
96896 -
96897 - //mprotect(recMem, RECMEM_SIZE, PROT_EXEC|PROT_READ/*|PROT_WRITE*/);
96898 -}
96899 -
96900 -
96901 -R3000Acpu psxRec = {
96902 - recInit,
96903 - recReset,
96904 - recExecute,
96905 - recExecuteBlock,
96906 - recClear,
96907 - recShutdown
96908 -};
96909 -
96910 diff -rupN original/libpcsxcore/libpcsxcore/ppc/pasm.s new/libpcsxcore/libpcsxcore/ppc/pasm.s
96911 --- original/libpcsxcore/libpcsxcore/ppc/pasm.s 2007-10-08 17:13:28.000000000 -0400
96912 +++ new/libpcsxcore/libpcsxcore/ppc/pasm.s 1969-12-31 20:00:00.000000000 -0400
96913 @@ -1,124 +0,0 @@
96914 -
96915 -
96916 -#define OLD_REGISTER_OFFSET (19*4)
96917 -#define SP_SIZE (OLD_REGISTER_OFFSET+4+8)
96918 -
96919 -/*asm void recRun(register void (*func)(), register u32 hw1, register u32 hw2)*/
96920 - .text
96921 - .align 4
96922 - .globl recRun
96923 -recRun:
96924 - /* prologue code */
96925 - mflr r0
96926 - stmw r13, -(32-13)*4(r1)
96927 - stw r0, 4(r1)
96928 - stwu r1, -((32-13)*4+8)(r1)
96929 -
96930 - /* execute code */
96931 - mtctr r3
96932 - mr r31, r4
96933 - mr r30, r5
96934 - bctrl
96935 -/*
96936 -}
96937 -asm void returnPC()
96938 -{*/
96939 - .text
96940 - .align 4
96941 - .globl returnPC
96942 -returnPC:
96943 - // end code
96944 - lwz r0, (32-13)*4+8+4(r1)
96945 - addi r1, r1, (32-13)*4+8
96946 - mtlr r0
96947 - lmw r13, -(32-13)*4(r1)
96948 - blr
96949 -//}*/
96950 -
96951 -// Memory functions that only works with a linear memory
96952 -
96953 - .text
96954 - .align 4
96955 - .globl dynMemRead8
96956 -dynMemRead8:
96957 -// assumes that memory pointer is in r30
96958 - addis r2,r3,-0x1f80
96959 - srwi. r4,r2,16
96960 - bne+ .norm8
96961 - cmplwi r2,0x1000
96962 - blt- .norm8
96963 - b psxHwRead8
96964 -.norm8:
96965 - clrlwi r5,r3,3
96966 - lbzx r3,r5,r30
96967 - blr
96968 -
96969 - .text
96970 - .align 4
96971 - .globl dynMemRead16
96972 -dynMemRead16:
96973 -// assumes that memory pointer is in r30
96974 - addis r2,r3,-0x1f80
96975 - srwi. r4,r2,16
96976 - bne+ .norm16
96977 - cmplwi r2,0x1000
96978 - blt- .norm16
96979 - b psxHwRead16
96980 -.norm16:
96981 - clrlwi r5,r3,3
96982 - lhbrx r3,r5,r30
96983 - blr
96984 -
96985 - .text
96986 - .align 4
96987 - .globl dynMemRead32
96988 -dynMemRead32:
96989 -// assumes that memory pointer is in r30
96990 - addis r2,r3,-0x1f80
96991 - srwi. r4,r2,16
96992 - bne+ .norm32
96993 - cmplwi r2,0x1000
96994 - blt- .norm32
96995 - b psxHwRead32
96996 -.norm32:
96997 - clrlwi r5,r3,3
96998 - lwbrx r3,r5,r30
96999 - blr
97000 -
97001 -/*
97002 - N P Z
97003 - 0 0 0 X
97004 -- 0 0 1 X
97005 - 1 0 0 X
97006 - 1 0 1 X
97007 -
97008 -P | (!N & Z)
97009 -P | !(N | !Z)
97010 -*/
97011 -
97012 - .text
97013 - .align 4
97014 - .globl dynMemWrite32
97015 -dynMemWrite32:
97016 -// assumes that memory pointer is in r30
97017 - addis r2,r3,-0x1f80
97018 - srwi. r5,r2,16
97019 - bne+ .normw32
97020 - cmplwi r2,0x1000
97021 - blt .normw32
97022 - b psxHwWrite32
97023 -.normw32:
97024 - mtcrf 0xFF, r3
97025 - clrlwi r5,r3,3
97026 - crandc 0, 2, 0
97027 - cror 2, 1, 0
97028 - bne+ .okw32
97029 - // write test
97030 - li r2,0x0130
97031 - addis r2,r2,0xfffe
97032 - cmplw r3,r2
97033 - bnelr
97034 -.okw32:
97035 - stwbrx r4,r5,r30
97036 - blr
97037 -
97038 diff -rupN original/libpcsxcore/libpcsxcore/ppc/ppc.c new/libpcsxcore/libpcsxcore/ppc/ppc.c
97039 --- original/libpcsxcore/libpcsxcore/ppc/ppc.c 2007-10-08 17:13:28.000000000 -0400
97040 +++ new/libpcsxcore/libpcsxcore/ppc/ppc.c 1969-12-31 20:00:00.000000000 -0400
97041 @@ -1,32 +0,0 @@
97042 -/*
97043 - * ix86 core v0.5.1
97044 - * Authors: linuzappz <linuzappz@pcsx.net>
97045 - * alexey silinov
97046 - */
97047 -
97048 -#include <stdio.h>
97049 -#include <string.h>
97050 -
97051 -#include "ppc.h"
97052 -
97053 -// General Purpose hardware registers
97054 -int cpuHWRegisters[NUM_HW_REGISTERS] = {
97055 - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
97056 - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
97057 -};
97058 -
97059 -u32 *ppcPtr;
97060 -
97061 -void ppcInit() {
97062 -}
97063 -void ppcSetPtr(u32 *ptr) {
97064 - ppcPtr = ptr;
97065 -}
97066 -void ppcAlign(int bytes) {
97067 - // forward align
97068 - ppcPtr = (u32*)(((u32)ppcPtr + bytes) & ~(bytes - 1));
97069 -}
97070 -
97071 -void ppcShutdown() {
97072 -}
97073 -
97074 diff -rupN original/libpcsxcore/libpcsxcore/ppc/ppc.h new/libpcsxcore/libpcsxcore/ppc/ppc.h
97075 --- original/libpcsxcore/libpcsxcore/ppc/ppc.h 2007-10-08 17:13:28.000000000 -0400
97076 +++ new/libpcsxcore/libpcsxcore/ppc/ppc.h 1969-12-31 20:00:00.000000000 -0400
97077 @@ -1,74 +0,0 @@
97078 -/*
97079 - * ppc definitions v0.5.1
97080 - * Authors: linuzappz <linuzappz@pcsx.net>
97081 - * alexey silinov
97082 - */
97083 -
97084 -#ifndef __PPC_H__
97085 -#define __PPC_H__
97086 -
97087 -// include basic types
97088 -#include "../psxcommon.h"
97089 -#include "ppc_mnemonics.h"
97090 -
97091 -#define NUM_HW_REGISTERS 29
97092 -
97093 -/* general defines */
97094 -#define write8(val) *(u8 *)ppcPtr = val; ppcPtr++;
97095 -#define write16(val) *(u16*)ppcPtr = val; ppcPtr+=2;
97096 -#define write32(val) *(u32*)ppcPtr = val; ppcPtr+=4;
97097 -#define write64(val) *(u64*)ppcPtr = val; ppcPtr+=8;
97098 -
97099 -#define CALLFunc(FUNC) \
97100 -{ \
97101 - u32 _func = (FUNC); \
97102 - ReleaseArgs(); \
97103 - if ((_func & 0x1fffffc) == _func) { \
97104 - BLA(_func); \
97105 - } else { \
97106 - LIW(0, _func); \
97107 - MTCTR(0); \
97108 - BCTRL(); \
97109 - } \
97110 -}
97111 -
97112 -extern int cpuHWRegisters[NUM_HW_REGISTERS];
97113 -
97114 -extern u32 *ppcPtr;
97115 -extern u8 *j8Ptr[32];
97116 -extern u32 *j32Ptr[32];
97117 -
97118 -void ppcInit();
97119 -void ppcSetPtr(u32 *ptr);
97120 -void ppcShutdown();
97121 -
97122 -void ppcAlign(int bytes);
97123 -void returnPC();
97124 -void recRun(void (*func)(), u32 hw1, u32 hw2);
97125 -u8 dynMemRead8(u32 mem);
97126 -u16 dynMemRead16(u32 mem);
97127 -u32 dynMemRead32(u32 mem);
97128 -void dynMemWrite32(u32 mem, u32 val);
97129 -
97130 -#endif /* __PPC_H__ */
97131 -
97132 -
97133 -
97134 -
97135 -
97136 -
97137 -
97138 -
97139 -
97140 -
97141 -
97142 -
97143 -
97144 -
97145 -
97146 -
97147 -
97148 -
97149 -
97150 -
97151 -
97152 diff -rupN original/libpcsxcore/libpcsxcore/ppc/ppc_mnemonics.h new/libpcsxcore/libpcsxcore/ppc/ppc_mnemonics.h
97153 --- original/libpcsxcore/libpcsxcore/ppc/ppc_mnemonics.h 2007-10-08 17:13:28.000000000 -0400
97154 +++ new/libpcsxcore/libpcsxcore/ppc/ppc_mnemonics.h 1969-12-31 20:00:00.000000000 -0400
97155 @@ -1,529 +0,0 @@
97156 -// ppc_mnemonics.h
97157 -
97158 -#define INSTR (*(ppcPtr)++)
97159 -
97160 -/* Link register related */
97161 -#define MFLR(REG) \
97162 - {int _reg = (REG); \
97163 - INSTR = (0x7C0802A6 | (_reg << 21));}
97164 -
97165 -#define MTLR(REG) \
97166 - {int _reg = (REG); \
97167 - INSTR = (0x7C0803A6 | (_reg << 21));}
97168 -
97169 -#define MTCTR(REG) \
97170 - {int _reg = (REG); \
97171 - INSTR = (0x7C0903A6 | (_reg << 21));}
97172 -
97173 -#define BLR() \
97174 - {INSTR = (0x4E800020);}
97175 -
97176 -#define BGTLR() \
97177 - {INSTR = (0x4D810020);}
97178 -
97179 -
97180 -/* Load ops */
97181 -#define LI(REG, IMM) \
97182 - {int _reg = (REG); \
97183 - INSTR = (0x38000000 | (_reg << 21) | ((IMM) & 0xffff));}
97184 -
97185 -#define LIS(REG_DST, IMM) \
97186 - {int _dst = (REG_DST); \
97187 - INSTR = (0x3C000000 | (_dst << 21) | ((IMM) & 0xffff));}
97188 -
97189 -#define LWZ(REG_DST, OFFSET, REG) \
97190 - {int _reg = (REG); int _dst=(REG_DST); \
97191 - INSTR = (0x80000000 | (_dst << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97192 -
97193 -#define LWZX(REG_DST, REG, REG_OFF) \
97194 - {int _reg = (REG), _off = (REG_OFF); int _dst=(REG_DST); \
97195 - INSTR = (0x7C00002E | (_dst << 21) | (_reg << 16) | (_off << 11));}
97196 -
97197 -#define LWBRX(REG_DST, REG, REG_OFF) \
97198 - {int _reg = (REG), _off = (REG_OFF); int _dst=(REG_DST); \
97199 - INSTR = (0x7C00042C | (_dst << 21) | (_reg << 16) | (_off << 11));}
97200 -
97201 -#define LHZ(REG_DST, OFFSET, REG) \
97202 - {int _reg = (REG); int _dst=(REG_DST); \
97203 - INSTR = (0xA0000000 | (_dst << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97204 -
97205 -#define LHA(REG_DST, OFFSET, REG) \
97206 - {int _reg = (REG); int _dst=(REG_DST); \
97207 - INSTR = (0xA8000000 | (_dst << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97208 -
97209 -#define LHBRX(REG_DST, REG, REG_OFF) \
97210 - {int _reg = (REG), _off = (REG_OFF); int _dst=(REG_DST); \
97211 - INSTR = (0x7C00062C | (_dst << 21) | (_reg << 16) | (_off << 11));}
97212 -
97213 -#define LBZ(REG_DST, OFFSET, REG) \
97214 - {int _reg = (REG); int _dst=(REG_DST); \
97215 - INSTR = (0x88000000 | (_dst << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97216 -
97217 -#define LMW(REG_DST, OFFSET, REG) \
97218 - {int _reg = (REG); int _dst=(REG_DST); \
97219 - INSTR = (0xB8000000 | (_dst << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97220 -
97221 -
97222 -
97223 -/* Store ops */
97224 -#define STMW(REG_SRC, OFFSET, REG) \
97225 - {int _reg = (REG), _src=(REG_SRC); \
97226 - INSTR = (0xBC000000 | (_src << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97227 -
97228 -#define STW(REG_SRC, OFFSET, REG) \
97229 - {int _reg = (REG), _src=(REG_SRC); \
97230 - INSTR = (0x90000000 | (_src << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97231 -
97232 -#define STWBRX(REG_SRC, REG, REG_OFF) \
97233 - {int _reg = (REG), _src=(REG_SRC), _off = (REG_OFF); \
97234 - INSTR = (0x7C00052C | (_src << 21) | (_reg << 16) | (_off << 11));}
97235 -
97236 -#define STH(REG_SRC, OFFSET, REG) \
97237 - {int _reg = (REG), _src=(REG_SRC); \
97238 - INSTR = (0xB0000000 | (_src << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97239 -
97240 -#define STHBRX(REG_SRC, REG, REG_OFF) \
97241 - {int _reg = (REG), _src=(REG_SRC), _off = (REG_OFF); \
97242 - INSTR = (0x7C00072C | (_src << 21) | (_reg << 16) | (_off << 11));}
97243 -
97244 -#define STB(REG_SRC, OFFSET, REG) \
97245 - {int _reg = (REG), _src=(REG_SRC); \
97246 - INSTR = (0x98000000 | (_src << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97247 -
97248 -#define STWU(REG_SRC, OFFSET, REG) \
97249 - {int _reg = (REG), _src=(REG_SRC); \
97250 - INSTR = (0x94000000 | (_src << 21) | (_reg << 16) | ((OFFSET) & 0xffff));}
97251 -
97252 -
97253 -/* Arithmic ops */
97254 -#define ADDI(REG_DST, REG_SRC, IMM) \
97255 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97256 - INSTR = (0x38000000 | (_dst << 21) | (_src << 16) | ((IMM) & 0xffff));}
97257 -
97258 -#define ADDIS(REG_DST, REG_SRC, IMM) \
97259 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97260 - INSTR = (0x3C000000 | (_dst << 21) | (_src << 16) | ((IMM) & 0xffff));}
97261 -
97262 -#define MR(REG_DST, REG_SRC) \
97263 - {int __src = (REG_SRC); int __dst=(REG_DST); \
97264 - if (__src != __dst) {ADDI(__dst, __src, 0)}}
97265 -
97266 -#define ADD(REG_DST, REG1, REG2) \
97267 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97268 - INSTR = (0x7C000214 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97269 -
97270 -#define ADDO(REG_DST, REG1, REG2) \
97271 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97272 - INSTR = (0x7C000614 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97273 -
97274 -#define ADDEO(REG_DST, REG1, REG2) \
97275 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97276 - INSTR = (0x7C000514 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97277 -
97278 -#define ADDE(REG_DST, REG1, REG2) \
97279 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97280 - INSTR = (0x7C000114 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97281 -
97282 -#define ADDCO(REG_DST, REG1, REG2) \
97283 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97284 - INSTR = (0x7C000414 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97285 -
97286 -#define ADDIC(REG_DST, REG_SRC, IMM) \
97287 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97288 - INSTR = (0x30000000 | (_dst << 21) | (_src << 16) | ((IMM) & 0xffff));}
97289 -
97290 -#define ADDIC_(REG_DST, REG_SRC, IMM) \
97291 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97292 - INSTR = (0x34000000 | (_dst << 21) | (_src << 16) | ((IMM) & 0xffff));}
97293 -
97294 -#define ADDZE(REG_DST, REG_SRC) \
97295 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97296 - INSTR = (0x7C000194 | (_dst << 21) | (_src << 16));}
97297 -
97298 -#define SUBF(REG_DST, REG1, REG2) \
97299 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97300 - INSTR = (0x7C000050 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97301 -
97302 -#define SUBFO(REG_DST, REG1, REG2) \
97303 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97304 - INSTR = (0x7C000450 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97305 -
97306 -#define SUBFC(REG_DST, REG1, REG2) \
97307 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97308 - INSTR = (0x7C000010 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97309 -
97310 -#define SUBFE(REG_DST, REG1, REG2) \
97311 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97312 - INSTR = (0x7C000110 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97313 -
97314 -#define SUBFCO(REG_DST, REG1, REG2) \
97315 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97316 - INSTR = (0x7C000410 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97317 -
97318 -#define SUBFCO_(REG_DST, REG1, REG2) \
97319 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97320 - INSTR = (0x7C000411 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97321 -
97322 -#define SUB(REG_DST, REG1, REG2) \
97323 - {SUBF(REG_DST, REG2, REG1)}
97324 -
97325 -#define SUBO(REG_DST, REG1, REG2) \
97326 - {SUBFO(REG_DST, REG2, REG1)}
97327 -
97328 -#define SUBCO(REG_DST, REG1, REG2) \
97329 - {SUBFCO(REG_DST, REG2, REG1)}
97330 -
97331 -#define SUBCO_(REG_DST, REG1, REG2) \
97332 - {SUBFCO_(REG_DST, REG2, REG1)}
97333 -
97334 -#define SRAWI(REG_DST, REG_SRC, SHIFT) \
97335 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97336 - INSTR = (0x7C000670 | (_src << 21) | (_dst << 16) | (SHIFT << 11));}
97337 -
97338 -#define MULHW(REG_DST, REG1, REG2) \
97339 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97340 - INSTR = (0x7C000096 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97341 -
97342 -#define MULLW(REG_DST, REG1, REG2) \
97343 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97344 - INSTR = (0x7C0001D6 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97345 -
97346 -#define MULHWU(REG_DST, REG1, REG2) \
97347 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97348 - INSTR = (0x7C000016 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97349 -
97350 -#define MULLI(REG_DST, REG_SRC, IMM) \
97351 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97352 - INSTR = (0x1C000000 | (_dst << 21) | (_src << 16) | ((IMM) & 0xffff));}
97353 -
97354 -#define DIVW(REG_DST, REG1, REG2) \
97355 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97356 - INSTR = (0x7C0003D6 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97357 -
97358 -#define DIVWU(REG_DST, REG1, REG2) \
97359 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97360 - INSTR = (0x7C000396 | (_dst << 21) | (_reg1 << 16) | (_reg2 << 11));}
97361 -
97362 -
97363 -/* Branch ops */
97364 -#define B_FROM(VAR) VAR = ppcPtr
97365 -#define B_DST(VAR) *VAR = *VAR | (((s16)((u32)ppcPtr - (u32)VAR)) & 0xfffc)
97366 -
97367 -#define B(DST) \
97368 - {INSTR = (0x48000000 | (((s32)(((DST)+1)<<2)) & 0x3fffffc));}
97369 -
97370 -#define B_L(VAR) \
97371 - {B_FROM(VAR); INSTR = (0x48000000);}
97372 -
97373 -#define BA(DST) \
97374 - {INSTR = (0x48000002 | ((s32)((DST) & 0x3fffffc)));}
97375 -
97376 -#define BLA(DST) \
97377 - {INSTR = (0x48000003 | ((s32)((DST) & 0x3fffffc)));}
97378 -
97379 -#define BNS(DST) \
97380 - {INSTR = (0x40830000 | (((s16)(((DST)+1)<<2)) & 0xfffc));}
97381 -
97382 -#define BNE(DST) \
97383 - {INSTR = (0x40820000 | (((s16)(((DST)+1)<<2)) & 0xfffc));}
97384 -
97385 -#define BNE_L(VAR) \
97386 - {B_FROM(VAR); INSTR = (0x40820000);}
97387 -
97388 -#define BEQ(DST) \
97389 - {INSTR = (0x41820000 | (((s16)(((DST)+1)<<2)) & 0xfffc));}
97390 -
97391 -#define BEQ_L(VAR) \
97392 - {B_FROM(VAR); INSTR = (0x41820000);}
97393 -
97394 -#define BLT(DST) \
97395 - {INSTR = (0x41800000 | (((s16)(((DST)+1)<<2)) & 0xfffc));}
97396 -
97397 -#define BLT_L(VAR) \
97398 - {B_FROM(VAR); INSTR = (0x41800000);}
97399 -
97400 -#define BGT(DST) \
97401 - {INSTR = (0x41810000 | (((s16)(((DST)+1)<<2)) & 0xfffc));}
97402 -
97403 -#define BGT_L(VAR) \
97404 - {B_FROM(VAR); INSTR = (0x41810000);}
97405 -
97406 -#define BGE(DST) \
97407 - {INSTR = (0x40800000 | (((s16)(((DST)+1)<<2)) & 0xfffc));}
97408 -
97409 -#define BGE_L(VAR) \
97410 - {B_FROM(VAR); INSTR = (0x40800000);}
97411 -
97412 -#define BLE(DST) \
97413 - {INSTR = (0x40810000 | (((s16)(((DST)+1)<<2)) & 0xfffc));}
97414 -
97415 -#define BLE_L(VAR) \
97416 - {B_FROM(VAR); INSTR = (0x40810000);}
97417 -
97418 -#define BCTRL() \
97419 - {INSTR = (0x4E800421);}
97420 -
97421 -#define BCTR() \
97422 - {INSTR = (0x4E800420);}
97423 -
97424 -
97425 -/* compare ops */
97426 -#define CMPLWI(REG, IMM) \
97427 - {int _reg = (REG); \
97428 - INSTR = (0x28000000 | (_reg << 16) | ((IMM) & 0xffff));}
97429 -
97430 -#define CMPLWI2(REG, IMM) \
97431 - {int _reg = (REG); \
97432 - INSTR = (0x29000000 | (_reg << 16) | ((IMM) & 0xffff));}
97433 -
97434 -#define CMPLWI7(REG, IMM) \
97435 - {int _reg = (REG); \
97436 - INSTR = (0x2B800000 | (_reg << 16) | ((IMM) & 0xffff));}
97437 -
97438 -#define CMPLW(REG1, REG2) \
97439 - {int _reg1 = (REG1), _reg2 = (REG2); \
97440 - INSTR = (0x7C000040 | (_reg1 << 16) | (_reg2 << 11));}
97441 -
97442 -#define CMPLW1(REG1, REG2) \
97443 - {int _reg1 = (REG1), _reg2 = (REG2); \
97444 - INSTR = (0x7C800040 | (_reg1 << 16) | (_reg2 << 11));}
97445 -
97446 -#define CMPLW2(REG1, REG2) \
97447 - {int _reg1 = (REG1), _reg2 = (REG2); \
97448 - INSTR = (0x7D000040 | (_reg1 << 16) | (_reg2 << 11));}
97449 -
97450 -#define CMPW(REG1, REG2) \
97451 - {int _reg1 = (REG1), _reg2 = (REG2); \
97452 - INSTR = (0x7C000000 | (_reg1 << 16) | (_reg2 << 11));}
97453 -
97454 -#define CMPW1(REG1, REG2) \
97455 - {int _reg1 = (REG1), _reg2 = (REG2); \
97456 - INSTR = (0x7C800000 | (_reg1 << 16) | (_reg2 << 11));}
97457 -
97458 -#define CMPW2(REG1, REG2) \
97459 - {int _reg1 = (REG1), _reg2 = (REG2); \
97460 - INSTR = (0x7D000000 | (_reg1 << 16) | (_reg2 << 11));}
97461 -
97462 -#define CMPWI(REG, IMM) \
97463 - {int _reg = (REG); \
97464 - INSTR = (0x2C000000 | (_reg << 16) | ((IMM) & 0xffff));}
97465 -
97466 -#define CMPWI2(REG, IMM) \
97467 - {int _reg = (REG); \
97468 - INSTR = (0x2D000000 | (_reg << 16) | ((IMM) & 0xffff));}
97469 -
97470 -#define MTCRF(MASK, REG) \
97471 - {int _reg = (REG); \
97472 - INSTR = (0x7C000120 | (_reg << 21) | (((MASK)&0xff)<<12));}
97473 -
97474 -#define MFCR(REG) \
97475 - {int _reg = (REG); \
97476 - INSTR = (0x7C000026 | (_reg << 21));}
97477 -
97478 -#define CROR(CR_DST, CR1, CR2) \
97479 - {INSTR = (0x4C000382 | ((CR_DST) << 21) | ((CR1) << 16) | ((CR2) << 11));}
97480 -
97481 -#define CRXOR(CR_DST, CR1, CR2) \
97482 - {INSTR = (0x4C000182 | ((CR_DST) << 21) | ((CR1) << 16) | ((CR2) << 11));}
97483 -
97484 -#define CRNAND(CR_DST, CR1, CR2) \
97485 - {INSTR = (0x4C0001C2 | ((CR_DST) << 21) | ((CR1) << 16) | ((CR2) << 11));}
97486 -
97487 -#define CRANDC(CR_DST, CR1, CR2) \
97488 - {INSTR = (0x4C000102 | ((CR_DST) << 21) | ((CR1) << 16) | ((CR2) << 11));}
97489 -
97490 -
97491 -/* shift ops */
97492 -#define RLWINM(REG_DST, REG_SRC, SHIFT, START, END) \
97493 - {int _src = (REG_SRC); int _dst = (REG_DST); \
97494 - INSTR = (0x54000000 | (_src << 21) | (_dst << 16) | (SHIFT << 11) | (START << 6) | (END << 1));}
97495 -
97496 -#define RLWINM_(REG_DST, REG_SRC, SHIFT, START, END) \
97497 - {int _src = (REG_SRC); int _dst = (REG_DST); \
97498 - INSTR = (0x54000001 | (_src << 21) | (_dst << 16) | (SHIFT << 11) | (START << 6) | (END << 1));}
97499 -
97500 -#define CLRRWI(REG_DST, REG_SRC, LEN) \
97501 - RLWINM(REG_DST, REG_SRC, 0, 0, 31-LEN)
97502 -
97503 -#define SLWI(REG_DST, REG_SRC, SHIFT) \
97504 - {int _shift = (SHIFT); \
97505 - if (_shift==0) {MR(REG_DST, REG_SRC)} else \
97506 - {RLWINM(REG_DST, REG_SRC, _shift, 0, 31-_shift)}}
97507 -
97508 -#define SRWI(REG_DST, REG_SRC, SHIFT) \
97509 - {int _shift = (SHIFT); \
97510 - if (_shift==0) {MR(REG_DST, REG_SRC)} else \
97511 - RLWINM(REG_DST, REG_SRC, 32-_shift, _shift, 31)}
97512 -
97513 -#define SLW(REG_DST, REG_SRC, REG_SHIFT) \
97514 - {int _src = (REG_SRC), _shift = (REG_SHIFT); int _dst = (REG_DST); \
97515 - INSTR = (0x7C000030 | (_src << 21) | (_dst << 16) | (_shift << 11));}
97516 -
97517 -#define SRW(REG_DST, REG_SRC, REG_SHIFT) \
97518 - {int _src = (REG_SRC), _shift = (REG_SHIFT); int _dst = (REG_DST); \
97519 - INSTR = (0x7C000430 | (_src << 21) | (_dst << 16) | (_shift << 11));}
97520 -
97521 -#define SRAW(REG_DST, REG_SRC, REG_SHIFT) \
97522 - {int _src = (REG_SRC), _shift = (REG_SHIFT); int _dst = (REG_DST); \
97523 - INSTR = (0x7C000630 | (_src << 21) | (_dst << 16) | (_shift << 11));}
97524 -
97525 -#define SRAWI(REG_DST, REG_SRC, SHIFT) \
97526 - {int _src = (REG_SRC); int _dst = (REG_DST); int _shift = (SHIFT); \
97527 - if (_shift==0) {MR(REG_DST, REG_SRC)} else \
97528 - INSTR = (0x7C000670 | (_src << 21) | (_dst << 16) | (_shift << 11));}
97529 -
97530 -#define RLWNM(REG_DST, REG_SRC, REG_SHIFT, START, END) \
97531 - {int _src = (REG_SRC), _shift = (REG_SHIFT); int _dst = (REG_DST); \
97532 - INSTR = (0x5C000000 | (_src << 21) | (_dst << 16) | (_shift << 11) | (START << 6) | (END << 1));}
97533 -
97534 -/* other ops */
97535 -#define ORI(REG_DST, REG_SRC, IMM) \
97536 - {int _src = (REG_SRC), _imm = (IMM); int _dst = (REG_DST); \
97537 - if (!((_imm == 0) && ((_src^_dst) == 0))) \
97538 - INSTR = (0x60000000 | (_src << 21) | (_dst << 16) | (_imm & 0xffff));}
97539 -
97540 -#define ORIS(REG_DST, REG_SRC, IMM) \
97541 - {int _src = (REG_SRC), _imm = (IMM); int _dst = (REG_DST); \
97542 - if (!((_imm == 0) && ((_src^_dst) == 0))) \
97543 - INSTR = (0x64000000 | (_src << 21) | (_dst << 16) | (_imm & 0xffff));}
97544 -
97545 -#define OR(REG_DST, REG1, REG2) \
97546 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97547 - INSTR = (0x7C000378 | (_reg1 << 21) | (_dst << 16) | (_reg2 << 11));}
97548 -
97549 -#define OR_(REG_DST, REG1, REG2) \
97550 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97551 - INSTR = (0x7C000379 | (_reg1 << 21) | (_dst << 16) | (_reg2 << 11));}
97552 -
97553 -#define XORI(REG_DST, REG_SRC, IMM) \
97554 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97555 - INSTR = (0x68000000 | (_src << 21) | (_dst << 16) | ((IMM) & 0xffff));}
97556 -
97557 -#define XOR(REG_DST, REG1, REG2) \
97558 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97559 - INSTR = (0x7C000278 | (_reg1 << 21) | (_dst << 16) | (_reg2 << 11));}
97560 -
97561 -#define XOR_(REG_DST, REG1, REG2) \
97562 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97563 - INSTR = (0x7C000279 | (_reg1 << 21) | (_dst << 16) | (_reg2 << 11));}
97564 -
97565 -#define ANDI_(REG_DST, REG_SRC, IMM) \
97566 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97567 - INSTR = (0x70000000 | (_src << 21) | (_dst << 16) | ((IMM) & 0xffff));}
97568 -
97569 -#define AND(REG_DST, REG1, REG2) \
97570 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97571 - INSTR = (0x7C000038 | (_reg1 << 21) | (_dst << 16) | (_reg2 << 11));}
97572 -
97573 -#define NOR(REG_DST, REG1, REG2) \
97574 - {int _reg1 = (REG1), _reg2 = (REG2); int _dst=(REG_DST); \
97575 - INSTR = (0x7C0000f8 | (_reg1 << 21) | (_dst << 16) | (_reg2 << 11));}
97576 -
97577 -#define NEG(REG_DST, REG_SRC) \
97578 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97579 - INSTR = (0x7C0000D0 | (_dst << 21) | (_src << 16));}
97580 -
97581 -#define NOP() \
97582 - {INSTR = 0x60000000;}
97583 -
97584 -#define MCRXR(CR_DST) \
97585 - {INSTR = (0x7C000400 | (CR_DST << 23));}
97586 -
97587 -#define EXTSB(REG_DST, REG_SRC) \
97588 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97589 - INSTR = (0x7C000774 | (_src << 21) | (_dst << 16));}
97590 -
97591 -#define EXTSH(REG_DST, REG_SRC) \
97592 - {int _src = (REG_SRC); int _dst=(REG_DST); \
97593 - INSTR = (0x7C000734 | (_src << 21) | (_dst << 16));}
97594 -
97595 -
97596 -/* floating point ops */
97597 -#define FDIVS(FPR_DST, FPR1, FPR2) \
97598 - {INSTR = (0xEC000024 | (FPR_DST << 21) | (FPR1 << 16) | (FPR2 << 11));}
97599 -
97600 -#define FDIV(FPR_DST, FPR1, FPR2) \
97601 - {INSTR = (0xFC000024 | (FPR_DST << 21) | (FPR1 << 16) | (FPR2 << 11));}
97602 -
97603 -#define FMULS(FPR_DST, FPR1, FPR2) \
97604 - {INSTR = (0xEC000032 | (FPR_DST << 21) | (FPR1 << 16) | (FPR2 << 11));}
97605 -
97606 -#define FMUL(FPR_DST, FPR1, FPR2) \
97607 - {INSTR = (0xFC000032 | (FPR_DST << 21) | (FPR1 << 16) | (FPR2 << 11));}
97608 -
97609 -#define FADDS(FPR_DST, FPR1, FPR2) \
97610 - {INSTR = (0xEC00002A | (FPR_DST << 21) | (FPR1 << 16) | (FPR2 << 11));}
97611 -
97612 -#define FADD(FPR_DST, FPR1, FPR2) \
97613 - {INSTR = (0xFC00002A | (FPR_DST << 21) | (FPR1 << 16) | (FPR2 << 11));}
97614 -
97615 -#define FRSP(FPR_DST, FPR_SRC) \
97616 - {INSTR = (0xFC000018 | (FPR_DST << 21) | (FPR_SRC << 11));}
97617 -
97618 -#define FCTIW(FPR_DST, FPR_SRC) \
97619 - {INSTR = (0xFC00001C | (FPR_DST << 21) | (FPR_SRC << 11));}
97620 -
97621 -
97622 -#define LFS(FPR_DST, OFFSET, REG) \
97623 - {INSTR = (0xC0000000 | (FPR_DST << 21) | (REG << 16) | ((OFFSET) & 0xffff));}
97624 -
97625 -#define STFS(FPR_DST, OFFSET, REG) \
97626 - {INSTR = (0xD0000000 | (FPR_DST << 21) | (REG << 16) | ((OFFSET) & 0xffff));}
97627 -
97628 -#define LFD(FPR_DST, OFFSET, REG) \
97629 - {INSTR = (0xC8000000 | (FPR_DST << 21) | (REG << 16) | ((OFFSET) & 0xffff));}
97630 -
97631 -#define STFD(FPR_DST, OFFSET, REG) \
97632 - {INSTR = (0xD8000000 | (FPR_DST << 21) | (REG << 16) | ((OFFSET) & 0xffff));}
97633 -
97634 -
97635 -
97636 -/* extra combined opcodes */
97637 -#if 1
97638 -#define LIW(REG, IMM) /* Load Immidiate Word */ \
97639 -{ \
97640 - int __reg = (REG); u32 __imm = (u32)(IMM); \
97641 - if ((s32)__imm == (s32)((s16)__imm)) \
97642 - { \
97643 - LI(__reg, (s32)((s16)__imm)); \
97644 - } else if (__reg == 0) { \
97645 - LIS(__reg, (((u32)__imm)>>16)); \
97646 - if ((((u32)__imm) & 0xffff) != 0) \
97647 - { \
97648 - ORI(__reg, __reg, __imm); \
97649 - } \
97650 - } else { \
97651 - if ((((u32)__imm) & 0xffff) == 0) { \
97652 - LIS(__reg, (((u32)__imm)>>16)); \
97653 - } else { \
97654 - LI(__reg, __imm); \
97655 - if ((__imm & 0x8000) == 0) { \
97656 - ADDIS(__reg, __reg, ((u32)__imm)>>16); \
97657 - } else { \
97658 - ADDIS(__reg, __reg, ((((u32)__imm)>>16) & 0xffff) + 1); \
97659 - } \
97660 - } \
97661 - /*if ((((u32)__imm) & 0xffff) != 0) \
97662 - { \
97663 - ORI(__reg, __reg, __imm); \
97664 - }*/ \
97665 - } \
97666 -}
97667 -#else
97668 -#define LIW(REG, IMM) /* Load Immidiate Word */ \
97669 -{ \
97670 - int __reg = (REG); u32 __imm = (u32)(IMM); \
97671 - if ((s32)__imm == (s32)((s16)__imm)) \
97672 - { \
97673 - LI(__reg, (s32)((s16)__imm)); \
97674 - } \
97675 - else \
97676 - { \
97677 - LIS(__reg, (((u32)__imm)>>16)); \
97678 - if ((((u32)__imm) & 0xffff) != 0) \
97679 - { \
97680 - ORI(__reg, __reg, __imm); \
97681 - } \
97682 - } \
97683 -}
97684 -#endif
97685 diff -rupN original/libpcsxcore/libpcsxcore/ppc/reguse.c new/libpcsxcore/libpcsxcore/ppc/reguse.c
97686 --- original/libpcsxcore/libpcsxcore/ppc/reguse.c 2007-10-08 17:13:28.000000000 -0400
97687 +++ new/libpcsxcore/libpcsxcore/ppc/reguse.c 1969-12-31 20:00:00.000000000 -0400
97688 @@ -1,419 +0,0 @@
97689 -
97690 -#include "../psxcommon.h"
97691 -#include "reguse.h"
97692 -
97693 -#include "../r3000a.h"
97694 -
97695 -//#define SAME_CYCLE_MODE
97696 -
97697 -static const int useBSC[64] = {
97698 - /*recSPECIAL*/ REGUSE_SUB | REGUSE_SPECIAL,
97699 - /*recREGIMM*/ REGUSE_SUB | REGUSE_REGIMM,
97700 - /*recJ*/ REGUSE_JUMP,
97701 - /*recJAL*/ REGUSE_JUMP | REGUSE_R31_W,
97702 - /*recBEQ*/ REGUSE_BRANCH | REGUSE_RS_R | REGUSE_RT_R,
97703 - /*recBNE*/ REGUSE_BRANCH | REGUSE_RS_R | REGUSE_RT_R,
97704 - /*recBLEZ*/ REGUSE_BRANCH | REGUSE_RS_R,
97705 - /*recBGTZ*/ REGUSE_BRANCH | REGUSE_RS_R,
97706 - /*recADDI*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_W,
97707 - /*recADDIU*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_W,
97708 - /*recSLTI*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_W,
97709 - /*recSLTIU*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_W,
97710 - /*recANDI*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_RT_W,
97711 - /*recORI*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_RT_W,
97712 - /*recXORI*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_RT_W,
97713 - /*recLUI*/ REGUSE_ACC | REGUSE_RT_W,
97714 - /*recCOP0*/ REGUSE_SUB | REGUSE_COP0,
97715 - REGUSE_NONE,
97716 - /*recCOP2*/ REGUSE_SUB | REGUSE_COP2,
97717 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97718 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97719 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97720 - /*recLB*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_RT_W,
97721 - /*recLH*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_RT_W,
97722 - /*recLWL*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_RT,
97723 - /*recLW*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_RT_W,
97724 - /*recLBU*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_RT_W,
97725 - /*recLHU*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_RT_W,
97726 - /*recLWR*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_RT,
97727 - REGUSE_NONE,
97728 - /*recSB*/ REGUSE_MEM_W | REGUSE_RS_R | REGUSE_RT_R,
97729 - /*recSH*/ REGUSE_MEM_W | REGUSE_RS_R | REGUSE_RT_R,
97730 - /*recSWL*/ REGUSE_MEM | REGUSE_RS_R | REGUSE_RT_R,
97731 - /*recSW*/ REGUSE_MEM_W | REGUSE_RS_R | REGUSE_RT_R,
97732 - REGUSE_NONE, REGUSE_NONE,
97733 - /*recSWR*/ REGUSE_MEM | REGUSE_RS_R | REGUSE_RT_R,
97734 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97735 - /*recLWC2*/ REGUSE_MEM_R | REGUSE_RS_R | REGUSE_COP2_RT_W,
97736 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97737 - REGUSE_NONE, REGUSE_NONE,
97738 - /*recSWC2*/ REGUSE_MEM_W | REGUSE_RS_R | REGUSE_COP2_RT_R,
97739 - /*recHLE*/ REGUSE_UNKNOWN, // TODO: can this be done in a better way
97740 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE
97741 -};
97742 -
97743 -static const int useSPC[64] = {
97744 - /*recSLL*/ REGUSE_ACC | REGUSE_RT_R | REGUSE_RD_W,
97745 - REGUSE_NONE,
97746 - /*recSRL*/ REGUSE_ACC | REGUSE_RT_R | REGUSE_RD_W,
97747 - /*recSRA*/ REGUSE_ACC | REGUSE_RT_R | REGUSE_RD_W,
97748 - /*recSLLV*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97749 - REGUSE_NONE,
97750 - /*recSRLV*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97751 - /*recSRAV*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97752 - /*recJR*/ REGUSE_JUMPR | REGUSE_RS_R,
97753 - /*recJALR*/ REGUSE_JUMPR | REGUSE_RS_R | REGUSE_RD_W,
97754 - REGUSE_NONE, REGUSE_NONE,
97755 - /*rSYSCALL*/ REGUSE_SYS | REGUSE_PC | REGUSE_COP0_STATUS | REGUSE_EXCEPTION,
97756 - /*recBREAK*/ REGUSE_NONE,
97757 - REGUSE_NONE, REGUSE_NONE,
97758 - /*recMFHI*/ REGUSE_LOGIC | REGUSE_RD_W | REGUSE_HI_R,
97759 - /*recMTHI*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_HI_W,
97760 - /*recMFLO*/ REGUSE_LOGIC | REGUSE_RD_W | REGUSE_LO_R,
97761 - /*recMTLO*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_LO_W,
97762 - REGUSE_NONE, REGUSE_NONE , REGUSE_NONE, REGUSE_NONE,
97763 - /*recMULT*/ REGUSE_MULT | REGUSE_RS_R | REGUSE_RT_R | REGUSE_LO_W | REGUSE_HI_W,
97764 - /*recMULTU*/ REGUSE_MULT | REGUSE_RS_R | REGUSE_RT_R | REGUSE_LO_W | REGUSE_HI_W,
97765 - /*recDIV*/ REGUSE_MULT | REGUSE_RS_R | REGUSE_RT_R | REGUSE_LO_W | REGUSE_HI_W,
97766 - /*recDIVU*/ REGUSE_MULT | REGUSE_RS_R | REGUSE_RT_R | REGUSE_LO_W | REGUSE_HI_W,
97767 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97768 - /*recADD*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97769 - /*recADDU*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97770 - /*recSUB*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97771 - /*recSUBU*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97772 - /*recAND*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97773 - /*recOR*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97774 - /*recXOR*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97775 - /*recNOR*/ REGUSE_LOGIC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97776 - REGUSE_NONE, REGUSE_NONE,
97777 - /*recSLT*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97778 - /*recSLTU*/ REGUSE_ACC | REGUSE_RS_R | REGUSE_RT_R | REGUSE_RD_W,
97779 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97780 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97781 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97782 - REGUSE_NONE, REGUSE_NONE
97783 -};
97784 -
97785 -static const int useREGIMM[32] = {
97786 - /*recBLTZ*/ REGUSE_BRANCH | REGUSE_RS_R,
97787 - /*recBGEZ*/ REGUSE_BRANCH | REGUSE_RS_R,
97788 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97789 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97790 - REGUSE_NONE, REGUSE_NONE,
97791 - /*recBLTZAL*/REGUSE_BRANCH | REGUSE_RS_R | REGUSE_R31_W,
97792 - /*recBGEZAL*/REGUSE_BRANCH | REGUSE_RS_R | REGUSE_R31_W,
97793 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97794 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97795 - REGUSE_NONE, REGUSE_NONE
97796 -};
97797 -
97798 -static const int useCP0[32] = {
97799 - /*recMFC0*/ REGUSE_LOGIC | REGUSE_RT_W | REGUSE_COP0_RD_R,
97800 - REGUSE_NONE,
97801 - /*recCFC0*/ REGUSE_LOGIC | REGUSE_RT_W | REGUSE_COP0_RD_R,
97802 - REGUSE_NONE,
97803 - /*recMTC0*/ REGUSE_LOGIC | REGUSE_RT_R | REGUSE_COP0_RD_W,
97804 - REGUSE_NONE,
97805 - /*recCTC0*/ REGUSE_LOGIC | REGUSE_RT_R | REGUSE_COP0_RD_W,
97806 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97807 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97808 - /*recRFE*/ REGUSE_LOGIC | REGUSE_COP0_STATUS,
97809 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97810 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97811 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE
97812 -};
97813 -
97814 -// TODO: make more explicit
97815 -static const int useCP2[64] = {
97816 - /*recBASIC*/ REGUSE_SUB | REGUSE_BASIC,
97817 - /*recRTPS*/ REGUSE_GTE,
97818 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97819 - /*recNCLIP*/ REGUSE_GTE,
97820 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97821 - /*recOP*/ REGUSE_GTE,
97822 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97823 - /*recDPCS*/ REGUSE_GTE,
97824 - /*recINTPL*/ REGUSE_GTE,
97825 - /*recMVMVA*/ REGUSE_GTE,
97826 - /*recNCDS*/ REGUSE_GTE,
97827 - /*recCDP*/ REGUSE_GTE,
97828 - REGUSE_NONE,
97829 - /*recNCDT*/ REGUSE_GTE,
97830 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97831 - /*recNCCS*/ REGUSE_GTE,
97832 - /*recCC*/ REGUSE_GTE,
97833 - REGUSE_NONE,
97834 - /*recNCS*/ REGUSE_GTE,
97835 - REGUSE_NONE,
97836 - /*recNCT*/ REGUSE_GTE,
97837 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97838 - REGUSE_NONE,
97839 - /*recSQR*/ REGUSE_GTE,
97840 - /*recDCPL*/ REGUSE_GTE,
97841 - /*recDPCT*/ REGUSE_GTE,
97842 - REGUSE_NONE, REGUSE_NONE,
97843 - /*recAVSZ3*/ REGUSE_GTE,
97844 - /*recAVSZ4*/ REGUSE_GTE,
97845 - REGUSE_NONE,
97846 - /*recRTPT*/ REGUSE_GTE,
97847 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97848 - REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE, REGUSE_NONE,
97849 - /*recGPF*/ REGUSE_GTE,
97850 - /*recGPL*/ REGUSE_GTE,
97851 - /*recNCCT*/ REGUSE_GTE
97852 -};
97853 -
97854 -static const int useCP2BSC[32] = {
97855 - /*recMFC2*/ REGUSE_LOGIC | REGUSE_RT_W | REGUSE_COP2_RD_R,
97856 - REGUSE_NONE,
97857 - /*recCFC2*/ REGUSE_LOGIC | REGUSE_RT_W | REGUSE_COP2_RD_R,
97858 - REGUSE_NONE,
97859 - /*recMTC2*/ REGUSE_LOGIC | REGUSE_RT_R | REGUSE_COP2_RD_W,
97860 - REGUSE_NONE,
97861 - /*recCTC2*/ REGUSE_LOGIC | REGUSE_RT_R | REGUSE_COP2_RD_W,
97862 - REGUSE_NONE,
97863 - REGUSE_NONE,
97864 - REGUSE_NONE,
97865 - REGUSE_NONE,
97866 - REGUSE_NONE,
97867 - REGUSE_NONE,
97868 - REGUSE_NONE,
97869 - REGUSE_NONE,
97870 - REGUSE_NONE,
97871 - REGUSE_NONE,
97872 - REGUSE_NONE,
97873 - REGUSE_NONE,
97874 - REGUSE_NONE,
97875 - REGUSE_NONE,
97876 - REGUSE_NONE,
97877 - REGUSE_NONE,
97878 - REGUSE_NONE,
97879 - REGUSE_NONE,
97880 - REGUSE_NONE,
97881 - REGUSE_NONE,
97882 - REGUSE_NONE,
97883 - REGUSE_NONE,
97884 - REGUSE_NONE,
97885 - REGUSE_NONE,
97886 - REGUSE_NONE
97887 -};
97888 -
97889 -static int getRegUse(u32 code) __attribute__ ((__pure__));
97890 -static int getRegUse(u32 code)
97891 -{
97892 - int use = useBSC[code>>26];
97893 -
97894 - switch (use & REGUSE_SUBMASK) {
97895 - case REGUSE_NONE:
97896 - break;
97897 - case REGUSE_SPECIAL:
97898 - use = useSPC[_fFunct_(code)];
97899 - break;
97900 - case REGUSE_REGIMM:
97901 - use = useREGIMM[_fRt_(code)];
97902 - break;
97903 - case REGUSE_COP0:
97904 - use = useCP0[_fRs_(code)];
97905 - break;
97906 - case REGUSE_COP2:
97907 - use = useCP2[_fFunct_(code)];
97908 - if ((use & REGUSE_SUBMASK) == REGUSE_BASIC)
97909 - use = useCP2BSC[_fRs_(code)];
97910 - break;
97911 - default:
97912 - use = REGUSE_UNKNOWN;
97913 - break;
97914 - }
97915 -
97916 - if ((use & REGUSE_COP0_RD_W)) {
97917 - if (_fRd_(code) == 12 || _fRd_(code) == 13) {
97918 - use = REGUSE_UNKNOWN;
97919 - }
97920 - }
97921 -
97922 - return use;
97923 -}
97924 -
97925 -/* returns how psxreg is used in the code instruction */
97926 -int useOfPsxReg(u32 code, int use, int psxreg)
97927 -{
97928 - int retval = REGUSE_NONE;
97929 -
97930 - // get use if it wasn't supplied
97931 - if (-1 == use) use = getRegUse(code);
97932 -
97933 - // if we don't know what the usage is, assume it's read from
97934 - if (REGUSE_UNKNOWN == use) return REGUSE_READ;
97935 -
97936 - if (psxreg < 32) {
97937 - // check for 3 standard types
97938 - if ((use & REGUSE_RT) && _fRt_(code) == (u32)psxreg) {
97939 - retval |= ((use & REGUSE_RT_R) ? REGUSE_READ:0) | ((use & REGUSE_RT_W) ? REGUSE_WRITE:0);
97940 - }
97941 - if ((use & REGUSE_RS) && _fRs_(code) == (u32)psxreg) {
97942 - retval |= ((use & REGUSE_RS_R) ? REGUSE_READ:0) | ((use & REGUSE_RS_W) ? REGUSE_WRITE:0);
97943 - }
97944 - if ((use & REGUSE_RD) && _fRd_(code) == (u32)psxreg) {
97945 - retval |= ((use & REGUSE_RD_R) ? REGUSE_READ:0) | ((use & REGUSE_RD_W) ? REGUSE_WRITE:0);
97946 - }
97947 - // some instructions explicitly writes to r31
97948 - if ((use & REGUSE_R31_W) && 31 == psxreg) {
97949 - retval |= REGUSE_WRITE;
97950 - }
97951 - } else if (psxreg == 32) { // Special register LO
97952 - retval |= ((use & REGUSE_LO_R) ? REGUSE_READ:0) | ((use & REGUSE_LO_W) ? REGUSE_WRITE:0);
97953 - } else if (psxreg == 33) { // Special register HI
97954 - retval |= ((use & REGUSE_HI_R) ? REGUSE_READ:0) | ((use & REGUSE_HI_W) ? REGUSE_WRITE:0);
97955 - }
97956 -
97957 - return retval;
97958 -}
97959 -
97960 -//#define NOREGUSE_FOLLOW
97961 -
97962 -static int _nextPsxRegUse(u32 pc, int psxreg, int numInstr) __attribute__ ((__pure__, __unused__));
97963 -static int _nextPsxRegUse(u32 pc, int psxreg, int numInstr)
97964 -{
97965 - u32 *ptr, code, bPC = 0;
97966 - int i, use, reguse = 0;
97967 -
97968 - for (i=0; i<numInstr; ) {
97969 - // load current instruction
97970 - ptr = PSXM(pc);
97971 - if (ptr==NULL) {
97972 - // going nowhere... might as well assume a write, since we will hopefully never reach here
97973 - reguse = REGUSE_WRITE;
97974 - break;
97975 - }
97976 - code = SWAP32(*ptr);
97977 - // get usage patterns for instruction
97978 - use = getRegUse(code);
97979 - // find the use of psxreg in the instruction
97980 - reguse = useOfPsxReg(code, use, psxreg);
97981 -
97982 - // return if we have found a use
97983 - if (reguse != REGUSE_NONE)
97984 - break;
97985 -
97986 - // goto next instruction
97987 - pc += 4;
97988 - i++;
97989 -
97990 - // check for code branches/jumps
97991 - if (i != numInstr) {
97992 - if ((use & REGUSE_TYPEM) == REGUSE_BRANCH) {
97993 -#ifndef NOREGUSE_FOLLOW
97994 - // check delay slot
97995 - reguse = _nextPsxRegUse(pc, psxreg, 1);
97996 - if (reguse != REGUSE_NONE) break;
97997 -
97998 - bPC = _fImm_(code) * 4 + pc;
97999 - reguse = _nextPsxRegUse(pc+4, psxreg, (numInstr-i-1)/2);
98000 - if (reguse != REGUSE_NONE) {
98001 - int reguse2 = _nextPsxRegUse(bPC, psxreg, (numInstr-i-1)/2);
98002 - if (reguse2 != REGUSE_NONE)
98003 - reguse |= reguse2;
98004 - else
98005 - reguse = REGUSE_NONE;
98006 - }
98007 -#endif
98008 - break;
98009 - } else if ((use & REGUSE_TYPEM) == REGUSE_JUMP) {
98010 -#ifndef NOREGUSE_FOLLOW
98011 - // check delay slot
98012 - reguse = _nextPsxRegUse(pc, psxreg, 1);
98013 - if (reguse != REGUSE_NONE) break;
98014 -
98015 - bPC = _fTarget_(code) * 4 + (pc & 0xf0000000);
98016 - reguse = _nextPsxRegUse(bPC, psxreg, numInstr-i-1);
98017 -#endif
98018 - break;
98019 - } else if ((use & REGUSE_TYPEM) == REGUSE_JUMPR) {
98020 -#ifndef NOREGUSE_FOLLOW
98021 - // jump to unknown location - bail after checking delay slot
98022 - reguse = _nextPsxRegUse(pc, psxreg, 1);
98023 -#endif
98024 - break;
98025 - } else if ((use & REGUSE_TYPEM) == REGUSE_SYS) {
98026 - break;
98027 - }
98028 - }
98029 - }
98030 -
98031 - return reguse;
98032 -}
98033 -
98034 -
98035 -int nextPsxRegUse(u32 pc, int psxreg)
98036 -{
98037 -#if 1
98038 - if (psxreg == 0)
98039 - return REGUSE_WRITE; // pretend we are writing to it to fool compiler
98040 -
98041 -#ifdef SAME_CYCLE_MODE
98042 - return REGUSE_READ;
98043 -#else
98044 - return _nextPsxRegUse(pc, psxreg, 80);
98045 -#endif
98046 -#else
98047 - u32 code, bPC = 0;
98048 - int use, reguse = 0, reguse1 = 0, b = 0, i, index = 0;
98049 -
98050 -retry:
98051 - for (i=index; i<80; i++) {
98052 - code = PSXMu32(pc);
98053 - use = getRegUse(code);
98054 - reguse = useOfPsxReg(code, use, psxreg);
98055 -
98056 - if (reguse != REGUSE_NONE) break;
98057 -
98058 - pc += 4;
98059 - if ((use & REGUSE_TYPEM) == REGUSE_BRANCH) {
98060 - if (b == 0) {
98061 - bPC = _fImm_(code) * 4 + pc;
98062 - index = i+1;
98063 - }
98064 - b += 1; // TODO: follow branches
98065 - continue;
98066 - } else if ((use & REGUSE_TYPEM) == REGUSE_JUMP) {
98067 - if (b == 0) {
98068 - bPC = _fTarget_(code) * 4 + (pc & 0xf0000000);
98069 - }
98070 - b = 2;
98071 - continue;
98072 - } else if ((use & REGUSE_TYPEM) == REGUSE_JUMPR ||
98073 - (use & REGUSE_TYPEM) == REGUSE_SYS) {
98074 - b = 2;
98075 - continue;
98076 - }
98077 -
98078 - if (b == 2 && bPC && index == 0) {
98079 - pc = bPC; bPC = 0;
98080 - b = 1;
98081 - }
98082 - if (b >= 2) break; // only follow 1 branch
98083 - }
98084 - if (reguse == REGUSE_NONE) return reguse;
98085 -
98086 - if (bPC) {
98087 - reguse1 = reguse;
98088 - pc = bPC; bPC = 0;
98089 - b = 1;
98090 - goto retry;
98091 - }
98092 -
98093 - return reguse1 | reguse;
98094 -#endif
98095 -}
98096 -
98097 -int isPsxRegUsed(u32 pc, int psxreg)
98098 -{
98099 - int use = nextPsxRegUse(pc, psxreg);
98100 -
98101 - if (use == REGUSE_NONE)
98102 - return 2; // unknown use - assume it is used
98103 - else if (use & REGUSE_READ)
98104 - return 1; // the next use is a read
98105 - else
98106 - return 0; // the next use is a write, i.e. current value is not important
98107 -}
98108 diff -rupN original/libpcsxcore/libpcsxcore/ppc/reguse.h new/libpcsxcore/libpcsxcore/ppc/reguse.h
98109 --- original/libpcsxcore/libpcsxcore/ppc/reguse.h 2007-10-08 17:13:28.000000000 -0400
98110 +++ new/libpcsxcore/libpcsxcore/ppc/reguse.h 1969-12-31 20:00:00.000000000 -0400
98111 @@ -1,77 +0,0 @@
98112 -
98113 -#ifndef __REGUSE_H__
98114 -#define __REGUSE_H__
98115 -
98116 -// include basic types
98117 -#include "../psxcommon.h"
98118 -
98119 -#define REGUSE_NONE 0x0000
98120 -#define REGUSE_UNKNOWN 0x0001
98121 -
98122 -//sub functions
98123 -#define REGUSE_SPECIAL 0x0002
98124 -#define REGUSE_REGIMM 0x0004
98125 -#define REGUSE_COP0 0x0006
98126 -#define REGUSE_COP2 0x0008
98127 -#define REGUSE_BASIC 0x000a
98128 -#define REGUSE_SUBMASK 0x000e /* sub function mask */
98129 -
98130 -#define REGUSE_ACC 0x0010 /* accumulator */
98131 -#define REGUSE_LOGIC 0x0020 /* logic operations */
98132 -#define REGUSE_MULT 0x0030 /* multiplier */
98133 -#define REGUSE_JUMP 0x0040 /* jump to dest */
98134 -#define REGUSE_JUMPR 0x0050 /* jump to reg */
98135 -#define REGUSE_BRANCH 0x0060 /* branch */
98136 -#define REGUSE_MEM_R 0x0070 /* read from memory */
98137 -#define REGUSE_MEM_W 0x0080 /* write to memory */
98138 -#define REGUSE_MEM 0x0090 /* read and write to memory */
98139 -#define REGUSE_SYS 0x00a0 /* syscall */
98140 -#define REGUSE_GTE 0x00b0 /* gte operation */
98141 -#define REGUSE_SUB 0x00f0 /* sub usage */
98142 -#define REGUSE_TYPEM 0x00f0 /* type mask */
98143 -
98144 -
98145 -#define REGUSE_RS_R 0x0100
98146 -#define REGUSE_RS_W 0x0200
98147 -#define REGUSE_RS (REGUSE_RS_R | REGUSE_RS_W)
98148 -#define REGUSE_RT_R 0x0400
98149 -#define REGUSE_RT_W 0x0800
98150 -#define REGUSE_RT (REGUSE_RT_R | REGUSE_RT_W)
98151 -#define REGUSE_RD_R 0x1000
98152 -#define REGUSE_RD_W 0x2000
98153 -#define REGUSE_RD (REGUSE_RD_R | REGUSE_RD_W)
98154 -
98155 -#define REGUSE_R31_W 0x4000 /* writes to link register (r31) */
98156 -#define REGUSE_PC 0x8000 /* reads pc */
98157 -
98158 -#define REGUSE_LO_R 0x10000
98159 -#define REGUSE_LO_W 0x20000
98160 -#define REGUSE_LO (REGUSE_LO_R | REGUSE_LO_W)
98161 -#define REGUSE_HI_R 0x40000
98162 -#define REGUSE_HI_W 0x80000
98163 -#define REGUSE_HI (REGUSE_HI_R | REGUSE_HI_W)
98164 -
98165 -#define REGUSE_COP0_RD_R 0x100000
98166 -#define REGUSE_COP0_RD_W 0x200000
98167 -#define REGUSE_COP0_RD (REGUSE_COP0_RD_R | REGUSE_COP0_RD_W)
98168 -#define REGUSE_COP0_STATUS 0x400000
98169 -#define REGUSE_EXCEPTION 0x800000
98170 -
98171 -#define REGUSE_COP2_RT_R 0x1000000
98172 -#define REGUSE_COP2_RT_W 0x2000000
98173 -#define REGUSE_COP2_RT (REGUSE_COP2_RT_R | REGUSE_COP2_RT_W)
98174 -#define REGUSE_COP2_RD_R 0x4000000
98175 -#define REGUSE_COP2_RD_W 0x8000000
98176 -#define REGUSE_COP2_RD (REGUSE_COP2_RD_R | REGUSE_COP2_RD_W)
98177 -
98178 -
98179 -// specific register use
98180 -#define REGUSE_READ 1
98181 -#define REGUSE_WRITE 2
98182 -#define REGUSE_RW 3
98183 -
98184 -int useOfPsxReg(u32 code, int use, int psxreg) __attribute__ ((__pure__));;
98185 -int nextPsxRegUse(u32 pc, int psxreg) __attribute__ ((__pure__));;
98186 -int isPsxRegUsed(u32 pc, int psxreg) __attribute__ ((__pure__));;
98187 -
98188 -#endif /* __REGUSE_H__ */
98189 diff -rupN original/libpcsxcore/libpcsxcore/psemu_plugin_defs.h new/libpcsxcore/libpcsxcore/psemu_plugin_defs.h
98190 --- original/libpcsxcore/libpcsxcore/psemu_plugin_defs.h 2007-10-08 17:13:27.000000000 -0400
98191 +++ new/libpcsxcore/libpcsxcore/psemu_plugin_defs.h 1969-12-31 20:00:00.000000000 -0400
98192 @@ -1,283 +0,0 @@
98193 -#ifndef _PSEMU_PLUGIN_DEFS_H
98194 -#define _PSEMU_PLUGIN_DEFS_H
98195 -
98196 -// header version
98197 -#define _PPDK_HEADER_VERSION 3
98198 -
98199 -#define PLUGIN_VERSION 1
98200 -
98201 -// plugin type returned by PSEgetLibType (types can be merged if plugin is multi type!)
98202 -#define PSE_LT_CDR 1
98203 -#define PSE_LT_GPU 2
98204 -#define PSE_LT_SPU 4
98205 -#define PSE_LT_PAD 8
98206 -#define PSE_LT_NET 16
98207 -
98208 -// DLL function return codes
98209 -#define PSE_ERR_SUCCESS 0 // every function in DLL if completed sucessfully should return this value
98210 -#define PSE_ERR_FATAL -1 // undefined error but fatal one, that kills all functionality
98211 -
98212 -// XXX_Init return values
98213 -// Those return values apply to all libraries
98214 -// currently obsolete - preserved for compatibilty
98215 -
98216 -#define PSE_INIT_ERR_SUCCESS 0 // initialization went OK
98217 -#define PSE_INIT_ERR_NOTCONFIGURED -2 // this driver is not configured
98218 -#define PSE_INIT_ERR_NOHARDWARE -3 // this driver can not operate properly on this hardware or hardware is not detected
98219 -
98220 -/* GPU PlugIn */
98221 -
98222 -
98223 -// GPU_Test return values
98224 -
98225 -// sucess, everything configured, and went OK.
98226 -#define PSE_GPU_ERR_SUCCESS 0
98227 -
98228 -// ERRORS
98229 -// this error might be returned as critical error but none of below
98230 -#define PSE_GPU_ERR -20
98231 -
98232 -
98233 -// this driver is not configured
98234 -#define PSE_GPU_ERR_NOTCONFIGURED PSE_GPU_ERR - 1
98235 -// this driver failed Init
98236 -#define PSE_GPU_ERR_INIT PSE_GPU_ERR - 2
98237 -
98238 -// WARNINGS
98239 -// this warning might be returned as undefined warning but allowing driver to continue
98240 -#define PSE_GPU_WARN 20
98241 -
98242 -
98243 -
98244 -
98245 -// GPU_Query - will be implemented soon
98246 -
98247 -typedef struct
98248 -{
98249 - uint32_t flags;
98250 - uint32_t status;
98251 - void* window;
98252 - unsigned char reserved[100];
98253 -} gpuQueryS;
98254 -
98255 -// gpuQueryS.flags
98256 -// if driver can operate in both modes it must support GPU_changeMode();
98257 -#define PSE_GPU_FLAGS_FULLSCREEN 1 // this driver can operate in fullscreen mode
98258 -#define PSE_GPU_FLAGS_WINDOWED 2 // this driver can operate in windowed mode
98259 -
98260 -// gpuQueryS.status
98261 -#define PSE_GPU_STATUS_WINDOWWRONG 1 // this driver cannot operate in this windowed mode
98262 -
98263 -// GPU_Query End - will be implemented in v2
98264 -
98265 -
98266 -/* CDR PlugIn */
98267 -
98268 -// CDR_Test return values
98269 -
98270 -// sucess, everything configured, and went OK.
98271 -#define PSE_CDR_ERR_SUCCESS 0
98272 -
98273 -// general failure (error undefined)
98274 -#define PSE_CDR_ERR_FAILURE -1
98275 -
98276 -// ERRORS
98277 -#define PSE_CDR_ERR -40
98278 -// this driver is not configured
98279 -#define PSE_CDR_ERR_NOTCONFIGURED PSE_CDR_ERR - 0
98280 -// if this driver is unable to read data from medium
98281 -#define PSE_CDR_ERR_NOREAD PSE_CDR_ERR - 1
98282 -
98283 -// WARNINGS
98284 -#define PSE_CDR_WARN 40
98285 -// if this driver emulates lame mode ie. can read only 2048 tracks and sector header is emulated
98286 -// this might happen to CDROMS that do not support RAW mode reading - surelly it will kill many games
98287 -#define PSE_CDR_WARN_LAMECD PSE_CDR_WARN + 0
98288 -
98289 -
98290 -
98291 -
98292 -/* SPU PlugIn */
98293 -
98294 -// some info retricted (now!)
98295 -
98296 -// sucess, everything configured, and went OK.
98297 -#define PSE_SPU_ERR_SUCCESS 0
98298 -
98299 -// ERRORS
98300 -// this error might be returned as critical error but none of below
98301 -#define PSE_SPU_ERR -60
98302 -
98303 -// this driver is not configured
98304 -#define PSE_SPU_ERR_NOTCONFIGURED PSE_SPU_ERR - 1
98305 -// this driver failed Init
98306 -#define PSE_SPU_ERR_INIT PSE_SPU_ERR - 2
98307 -
98308 -
98309 -// WARNINGS
98310 -// this warning might be returned as undefined warning but allowing driver to continue
98311 -#define PSE_SPU_WARN 60
98312 -
98313 -
98314 -
98315 -
98316 -/* PAD PlugIn */
98317 -
98318 -/*
98319 -
98320 - functions that must be exported from PAD Plugin
98321 -
98322 - long PADinit(long flags); // called only once when PSEmu Starts
98323 - void PADshutdown(void); // called when PSEmu exits
98324 - long PADopen(PadInitS *); // called when PSEmu is running program
98325 - long PADclose(void);
98326 - long PADconfigure(void);
98327 - void PADabout(void);
98328 - long PADtest(void); // called from Configure Dialog and after PADopen();
98329 - long PADquery(void);
98330 -
98331 - long PADreadPort1(PadDataS *);
98332 - long PADreadPort2(PadDataS *);
98333 -
98334 -*/
98335 -
98336 -// PADquery responses (notice - values ORed)
98337 -// PSEmu will use them also in PADinit to tell Plugin which Ports will use
98338 -// notice that PSEmu will call PADinit and PADopen only once when they are from
98339 -// same plugin
98340 -
98341 -// might be used in port 1 (must support PADreadPort1() function)
98342 -#define PSE_PAD_USE_PORT1 1
98343 -// might be used in port 2 (must support PADreadPort2() function)
98344 -#define PSE_PAD_USE_PORT2 2
98345 -
98346 -
98347 -
98348 -// MOUSE SCPH-1030
98349 -#define PSE_PAD_TYPE_MOUSE 1
98350 -// NEGCON - 16 button analog controller SLPH-00001
98351 -#define PSE_PAD_TYPE_NEGCON 2
98352 -// GUN CONTROLLER - gun controller SLPH-00014 from Konami
98353 -#define PSE_PAD_TYPE_GUN 3
98354 -// STANDARD PAD SCPH-1080, SCPH-1150
98355 -#define PSE_PAD_TYPE_STANDARD 4
98356 -// ANALOG JOYSTICK SCPH-1110
98357 -#define PSE_PAD_TYPE_ANALOGJOY 5
98358 -// GUNCON - gun controller SLPH-00034 from Namco
98359 -#define PSE_PAD_TYPE_GUNCON 6
98360 -// ANALOG CONTROLLER SCPH-1150
98361 -#define PSE_PAD_TYPE_ANALOGPAD 7
98362 -
98363 -
98364 -// sucess, everything configured, and went OK.
98365 -#define PSE_PAD_ERR_SUCCESS 0
98366 -// general plugin failure (undefined error)
98367 -#define PSE_PAD_ERR_FAILURE -1
98368 -
98369 -
98370 -// ERRORS
98371 -// this error might be returned as critical error but none of below
98372 -#define PSE_PAD_ERR -80
98373 -// this driver is not configured
98374 -#define PSE_PAD_ERR_NOTCONFIGURED PSE_PAD_ERR - 1
98375 -// this driver failed Init
98376 -#define PSE_PAD_ERR_INIT PSE_PAD_ERR - 2
98377 -
98378 -
98379 -// WARNINGS
98380 -// this warning might be returned as undefined warning but allowing driver to continue
98381 -#define PSE_PAD_WARN 80
98382 -
98383 -
98384 -typedef struct
98385 -{
98386 - // controler type - fill it withe predefined values above
98387 - unsigned char controllerType;
98388 -
98389 - // status of buttons - every controller fills this field
98390 - unsigned short buttonStatus;
98391 -
98392 - // for analog pad fill those next 4 bytes
98393 - // values are analog in range 0-255 where 128 is center position
98394 - unsigned char rightJoyX, rightJoyY, leftJoyX, leftJoyY;
98395 -
98396 - // for mouse fill those next 2 bytes
98397 - // values are in range -128 - 127
98398 - unsigned char moveX, moveY;
98399 -
98400 - unsigned char reserved[91];
98401 -
98402 -} PadDataS;
98403 -
98404 -/* NET PlugIn v2 */
98405 -/* Added by linuzappz@pcsx.net */
98406 -
98407 -/* Modes bits for NETsendData/NETrecvData */
98408 -#define PSE_NET_BLOCKING 0x00000000
98409 -#define PSE_NET_NONBLOCKING 0x00000001
98410 -
98411 -/* note: unsupported fields should be zeroed.
98412 -
98413 -typedef struct {
98414 - char EmuName[32];
98415 - char CdromID[9]; // ie. 'SCPH12345', no \0 trailing character
98416 - char CdromLabel[11];
98417 - void *psxMem;
98418 - GPUshowScreenPic GPU_showScreenPic;
98419 - GPUdisplayText GPU_displayText;
98420 - PADsetSensitive PAD_setSensitive;
98421 - char GPUpath[256];
98422 - char SPUpath[256];
98423 - char CDRpath[256];
98424 - char MCD1path[256];
98425 - char MCD2path[256];
98426 - char BIOSpath[256]; // 'HLE' for internal bios
98427 - char Unused[1024];
98428 -} netInfo;
98429 -
98430 -*/
98431 -
98432 -/*
98433 - basic funcs:
98434 -
98435 - long NETopen(HWND hWnd)
98436 - opens the connection.
98437 - shall return 0 on success, else -1.
98438 - -1 is also returned if the user selects offline mode.
98439 -
98440 - long NETclose()
98441 - closes the connection.
98442 - shall return 0 on success, else -1.
98443 -
98444 - void NETpause()
98445 - this is called when the user paused the emulator.
98446 -
98447 - void NETresume()
98448 - this is called when the user resumed the emulator.
98449 -
98450 - long NETqueryPlayer()
98451 - returns player number
98452 -
98453 - long NETsendPadData(void *pData, int Size)
98454 - this should be called for the first pad only on each side.
98455 -
98456 - long NETrecvPadData(void *pData, int Pad)
98457 - call this for Pad 1/2 to get the data sent by the above func.
98458 -
98459 - extended funcs:
98460 -
98461 - long NETsendData(void *pData, int Size, int Mode)
98462 - sends Size bytes from pData to the other side.
98463 -
98464 - long NETrecvData(void *pData, int Size, int Mode)
98465 - receives Size bytes from pData to the other side.
98466 -
98467 - void NETsetInfo(netInfo *info);
98468 - sets the netInfo struct.
98469 -
98470 - void NETkeypressed(int key) (linux only)
98471 - key is a XK_?? (X11) keycode.
98472 -*/
98473 -
98474 -
98475 -#endif // _PSEMU_PLUGIN_DEFS_H
98476 diff -rupN original/libpcsxcore/libpcsxcore/psxbios.c new/libpcsxcore/libpcsxcore/psxbios.c
98477 --- original/libpcsxcore/libpcsxcore/psxbios.c 2008-03-09 07:31:37.000000000 -0430
98478 +++ new/libpcsxcore/libpcsxcore/psxbios.c 1969-12-31 20:00:00.000000000 -0400
98479 @@ -1,2397 +0,0 @@
98480 -/***************************************************************************
98481 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
98482 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
98483 - * *
98484 - * This program is free software; you can redistribute it and/or modify *
98485 - * it under the terms of the GNU General Public License as published by *
98486 - * the Free Software Foundation; either version 2 of the License, or *
98487 - * (at your option) any later version. *
98488 - * *
98489 - * This program is distributed in the hope that it will be useful, *
98490 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
98491 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
98492 - * GNU General Public License for more details. *
98493 - * *
98494 - * You should have received a copy of the GNU General Public License *
98495 - * along with this program; if not, write to the *
98496 - * Free Software Foundation, Inc., *
98497 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
98498 - ***************************************************************************/
98499 -
98500 -/*
98501 -* Internal emulated HLE BIOS.
98502 -*/
98503 -
98504 -#include "psxbios.h"
98505 -
98506 -//We try to emulate bios :) HELP US :P
98507 -
98508 -char *biosA0n[256] = {
98509 -// 0x00
98510 - "open", "lseek", "read", "write",
98511 - "close", "ioctl", "exit", "sys_a0_07",
98512 - "getc", "putc", "todigit", "atof",
98513 - "strtoul", "strtol", "abs", "labs",
98514 -// 0x10
98515 - "atoi", "atol", "atob", "setjmp",
98516 - "longjmp", "strcat", "strncat", "strcmp",
98517 - "strncmp", "strcpy", "strncpy", "strlen",
98518 - "index", "rindex", "strchr", "strrchr",
98519 -// 0x20
98520 - "strpbrk", "strspn", "strcspn", "strtok",
98521 - "strstr", "toupper", "tolower", "bcopy",
98522 - "bzero", "bcmp", "memcpy", "memset",
98523 - "memmove", "memcmp", "memchr", "rand",
98524 -// 0x30
98525 - "srand", "qsort", "strtod", "malloc",
98526 - "free", "lsearch", "bsearch", "calloc",
98527 - "realloc", "InitHeap", "_exit", "getchar",
98528 - "putchar", "gets", "puts", "printf",
98529 -// 0x40
98530 - "sys_a0_40", "LoadTest", "Load", "Exec",
98531 - "FlushCache", "InstallInterruptHandler", "GPU_dw", "mem2vram",
98532 - "SendGPUStatus", "GPU_cw", "GPU_cwb", "SendPackets",
98533 - "sys_a0_4c", "GetGPUStatus", "GPU_sync", "sys_a0_4f",
98534 -// 0x50
98535 - "sys_a0_50", "LoadExec", "GetSysSp", "sys_a0_53",
98536 - "_96_init()", "_bu_init()", "_96_remove()", "sys_a0_57",
98537 - "sys_a0_58", "sys_a0_59", "sys_a0_5a", "dev_tty_init",
98538 - "dev_tty_open", "sys_a0_5d", "dev_tty_ioctl","dev_cd_open",
98539 -// 0x60
98540 - "dev_cd_read", "dev_cd_close", "dev_cd_firstfile", "dev_cd_nextfile",
98541 - "dev_cd_chdir", "dev_card_open", "dev_card_read", "dev_card_write",
98542 - "dev_card_close", "dev_card_firstfile", "dev_card_nextfile","dev_card_erase",
98543 - "dev_card_undelete","dev_card_format", "dev_card_rename", "dev_card_6f",
98544 -// 0x70
98545 - "_bu_init", "_96_init", "_96_remove", "sys_a0_73",
98546 - "sys_a0_74", "sys_a0_75", "sys_a0_76", "sys_a0_77",
98547 - "_96_CdSeekL", "sys_a0_79", "sys_a0_7a", "sys_a0_7b",
98548 - "_96_CdGetStatus", "sys_a0_7d", "_96_CdRead", "sys_a0_7f",
98549 -// 0x80
98550 - "sys_a0_80", "sys_a0_81", "sys_a0_82", "sys_a0_83",
98551 - "sys_a0_84", "_96_CdStop", "sys_a0_86", "sys_a0_87",
98552 - "sys_a0_88", "sys_a0_89", "sys_a0_8a", "sys_a0_8b",
98553 - "sys_a0_8c", "sys_a0_8d", "sys_a0_8e", "sys_a0_8f",
98554 -// 0x90
98555 - "sys_a0_90", "sys_a0_91", "sys_a0_92", "sys_a0_93",
98556 - "sys_a0_94", "sys_a0_95", "AddCDROMDevice", "AddMemCardDevide",
98557 - "DisableKernelIORedirection", "EnableKernelIORedirection", "sys_a0_9a", "sys_a0_9b",
98558 - "SetConf", "GetConf", "sys_a0_9e", "SetMem",
98559 -// 0xa0
98560 - "_boot", "SystemError", "EnqueueCdIntr", "DequeueCdIntr",
98561 - "sys_a0_a4", "ReadSector", "get_cd_status", "bufs_cb_0",
98562 - "bufs_cb_1", "bufs_cb_2", "bufs_cb_3", "_card_info",
98563 - "_card_load", "_card_auto", "bufs_cd_4", "sys_a0_af",
98564 -// 0xb0
98565 - "sys_a0_b0", "sys_a0_b1", "do_a_long_jmp", "sys_a0_b3",
98566 - "?? sub_function",
98567 -};
98568 -
98569 -char *biosB0n[256] = {
98570 -// 0x00
98571 - "SysMalloc", "sys_b0_01", "sys_b0_02", "sys_b0_03",
98572 - "sys_b0_04", "sys_b0_05", "sys_b0_06", "DeliverEvent",
98573 - "OpenEvent", "CloseEvent", "WaitEvent", "TestEvent",
98574 - "EnableEvent", "DisableEvent", "OpenTh", "CloseTh",
98575 -// 0x10
98576 - "ChangeTh", "sys_b0_11", "InitPAD", "StartPAD",
98577 - "StopPAD", "PAD_init", "PAD_dr", "ReturnFromExecption",
98578 - "ResetEntryInt", "HookEntryInt", "sys_b0_1a", "sys_b0_1b",
98579 - "sys_b0_1c", "sys_b0_1d", "sys_b0_1e", "sys_b0_1f",
98580 -// 0x20
98581 - "UnDeliverEvent", "sys_b0_21", "sys_b0_22", "sys_b0_23",
98582 - "sys_b0_24", "sys_b0_25", "sys_b0_26", "sys_b0_27",
98583 - "sys_b0_28", "sys_b0_29", "sys_b0_2a", "sys_b0_2b",
98584 - "sys_b0_2c", "sys_b0_2d", "sys_b0_2e", "sys_b0_2f",
98585 -// 0x30
98586 - "sys_b0_30", "sys_b0_31", "open", "lseek",
98587 - "read", "write", "close", "ioctl",
98588 - "exit", "sys_b0_39", "getc", "putc",
98589 - "getchar", "putchar", "gets", "puts",
98590 -// 0x40
98591 - "cd", "format", "firstfile", "nextfile",
98592 - "rename", "delete", "undelete", "AddDevice",
98593 - "RemoteDevice", "PrintInstalledDevices", "InitCARD", "StartCARD",
98594 - "StopCARD", "sys_b0_4d", "_card_write", "_card_read",
98595 -// 0x50
98596 - "_new_card", "Krom2RawAdd", "sys_b0_52", "sys_b0_53",
98597 - "_get_errno", "_get_error", "GetC0Table", "GetB0Table",
98598 - "_card_chan", "sys_b0_59", "sys_b0_5a", "ChangeClearPAD",
98599 - "_card_status", "_card_wait",
98600 -};
98601 -
98602 -char *biosC0n[256] = {
98603 -// 0x00
98604 - "InitRCnt", "InitException", "SysEnqIntRP", "SysDeqIntRP",
98605 - "get_free_EvCB_slot", "get_free_TCB_slot", "ExceptionHandler", "InstallExeptionHandler",
98606 - "SysInitMemory", "SysInitKMem", "ChangeClearRCnt", "SystemError",
98607 - "InitDefInt", "sys_c0_0d", "sys_c0_0e", "sys_c0_0f",
98608 -// 0x10
98609 - "sys_c0_10", "sys_c0_11", "InstallDevices", "FlushStfInOutPut",
98610 - "sys_c0_14", "_cdevinput", "_cdevscan", "_circgetc",
98611 - "_circputc", "ioabort", "sys_c0_1a", "KernelRedirect",
98612 - "PatchAOTable",
98613 -};
98614 -
98615 -//#define r0 (psxRegs.GPR.n.r0)
98616 -#define at (psxRegs.GPR.n.at)
98617 -#define v0 (psxRegs.GPR.n.v0)
98618 -#define v1 (psxRegs.GPR.n.v1)
98619 -#define a0 (psxRegs.GPR.n.a0)
98620 -#define a1 (psxRegs.GPR.n.a1)
98621 -#define a2 (psxRegs.GPR.n.a2)
98622 -#define a3 (psxRegs.GPR.n.a3)
98623 -#define t0 (psxRegs.GPR.n.t0)
98624 -#define t1 (psxRegs.GPR.n.t1)
98625 -#define t2 (psxRegs.GPR.n.t2)
98626 -#define t3 (psxRegs.GPR.n.t3)
98627 -#define t4 (psxRegs.GPR.n.t4)
98628 -#define t5 (psxRegs.GPR.n.t5)
98629 -#define t6 (psxRegs.GPR.n.t6)
98630 -#define t7 (psxRegs.GPR.n.t7)
98631 -#define s0 (psxRegs.GPR.n.s0)
98632 -#define s1 (psxRegs.GPR.n.s1)
98633 -#define s2 (psxRegs.GPR.n.s2)
98634 -#define s3 (psxRegs.GPR.n.s3)
98635 -#define s4 (psxRegs.GPR.n.s4)
98636 -#define s5 (psxRegs.GPR.n.s5)
98637 -#define s6 (psxRegs.GPR.n.s6)
98638 -#define s7 (psxRegs.GPR.n.s7)
98639 -#define t8 (psxRegs.GPR.n.t6)
98640 -#define t9 (psxRegs.GPR.n.t7)
98641 -#define k0 (psxRegs.GPR.n.k0)
98642 -#define k1 (psxRegs.GPR.n.k1)
98643 -#define gp (psxRegs.GPR.n.gp)
98644 -#define sp (psxRegs.GPR.n.sp)
98645 -#define fp (psxRegs.GPR.n.s8)
98646 -#define ra (psxRegs.GPR.n.ra)
98647 -#define pc0 (psxRegs.pc)
98648 -
98649 -#define Ra0 ((char*)PSXM(a0))
98650 -#define Ra1 ((char*)PSXM(a1))
98651 -#define Ra2 ((char*)PSXM(a2))
98652 -#define Ra3 ((char*)PSXM(a3))
98653 -#define Rv0 ((char*)PSXM(v0))
98654 -#define Rsp ((char*)PSXM(sp))
98655 -
98656 -
98657 -typedef struct {
98658 - u32 desc;
98659 - s32 status;
98660 - s32 mode;
98661 - u32 fhandler;
98662 -} EvCB[32];
98663 -
98664 -#define EvStUNUSED 0x0000
98665 -#define EvStWAIT 0x1000
98666 -#define EvStACTIVE 0x2000
98667 -#define EvStALREADY 0x4000
98668 -
98669 -#define EvMdINTR 0x1000
98670 -#define EvMdNOINTR 0x2000
98671 -
98672 -/*
98673 -typedef struct {
98674 - long next;
98675 - long func1;
98676 - long func2;
98677 - long pad;
98678 -} SysRPst;
98679 -*/
98680 -
98681 -typedef struct {
98682 - s32 status;
98683 - s32 mode;
98684 - u32 reg[32];
98685 - u32 func;
98686 -} TCB;
98687 -
98688 -typedef struct {
98689 - u32 _pc0;
98690 - u32 gp0;
98691 - u32 t_addr;
98692 - u32 t_size;
98693 - u32 d_addr;
98694 - u32 d_size;
98695 - u32 b_addr;
98696 - u32 b_size;
98697 - u32 S_addr;
98698 - u32 s_size;
98699 - u32 _sp,_fp,_gp,ret,base;
98700 -} EXEC;
98701 -
98702 -struct DIRENTRY {
98703 - char name[20];
98704 - long attr;
98705 - long size;
98706 - struct DIRENTRY *next;
98707 - long head;
98708 - char system[4];
98709 -};
98710 -
98711 -typedef struct {
98712 - char name[32];
98713 - u32 mode;
98714 - u32 offset;
98715 - u32 size;
98716 - u32 mcfile;
98717 -} FileDesc;
98718 -
98719 -static u32 *jmp_int = NULL;
98720 -static int *pad_buf = NULL;
98721 -static char *pad_buf1,*pad_buf2;//shadow add
98722 -static int pad_buf1len,pad_buf2len;//shadow add
98723 -
98724 -
98725 -static u32 regs[35];
98726 -static EvCB *Event;
98727 -static EvCB *HwEV; // 0xf0
98728 -static EvCB *EvEV; // 0xf1
98729 -static EvCB *RcEV; // 0xf2
98730 -static EvCB *UeEV; // 0xf3
98731 -static EvCB *SwEV; // 0xf4
98732 -static EvCB *ThEV; // 0xff
98733 -static u32 *heap_addr = NULL;
98734 -static u32 *heap_end = NULL;
98735 -static u32 SysIntRP[8];
98736 -static int CardState = -1;
98737 -static TCB Thread[8];
98738 -static int CurThread = 0;
98739 -static FileDesc FDesc[32];
98740 -
98741 -static __inline void softCall(u32 pc) {
98742 - pc0 = pc;
98743 - ra = 0x80001000;
98744 - while (pc0 != 0x80001000) psxCpu->ExecuteBlock();
98745 -}
98746 -
98747 -static __inline void softCall2(u32 pc) {
98748 - u32 sra = ra;
98749 - pc0 = pc;
98750 - ra = 0x80001000;
98751 - while (pc0 != 0x80001000) psxCpu->ExecuteBlock();
98752 - ra = sra;
98753 -}
98754 -
98755 -static __inline void DeliverEvent(u32 ev, u32 spec) {
98756 - if (Event[ev][spec].status != EvStACTIVE) return;
98757 -
98758 -// Event[ev][spec].status = EvStALREADY;
98759 - if (Event[ev][spec].mode == EvMdINTR) {
98760 - softCall2(Event[ev][spec].fhandler);
98761 - } else Event[ev][spec].status = EvStALREADY;
98762 -}
98763 -
98764 -/* *
98765 -// *
98766 -// *
98767 -// System calls A0 */
98768 -
98769 -
98770 -void psxBios_abs() { // 0x0e
98771 - v0 = abs(a0);
98772 - pc0 = ra;
98773 -}
98774 -
98775 -void psxBios_labs() { // 0x0f
98776 - v0 = labs(a0);
98777 - pc0 = ra;
98778 -}
98779 -
98780 -void psxBios_atoi() { // 0x10
98781 - v0 = atoi((char *)Ra0);
98782 - pc0 = ra;
98783 -}
98784 -
98785 -void psxBios_atol() { // 0x11
98786 - v0 = atoi((char *)Ra0);
98787 - pc0 = ra;
98788 -}
98789 -
98790 -void psxBios_setjmp() { // 13
98791 - u32 *jmp_buf= (u32*)Ra0;
98792 - int i;
98793 -
98794 -#ifdef PSXBIOS_LOG
98795 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x13]);
98796 -#endif
98797 -
98798 - jmp_buf[0] = ra;
98799 - jmp_buf[1] = sp;
98800 - jmp_buf[2] = fp;
98801 - for (i=0; i<8; i++) // s0-s7
98802 - jmp_buf[3+i] = psxRegs.GPR.r[16+i];
98803 - jmp_buf[11] = gp;
98804 -
98805 - v0 = 0; pc0 = ra;
98806 -}
98807 -
98808 -void psxBios_longjmp() { //14
98809 - u32 *jmp_buf= (u32*)Ra0;
98810 - int i;
98811 -
98812 -#ifdef PSXBIOS_LOG
98813 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x14]);
98814 -#endif
98815 -
98816 - ra = jmp_buf[0]; /* ra */
98817 - sp = jmp_buf[1]; /* sp */
98818 - fp = jmp_buf[2]; /* fp */
98819 - for (i=0; i<8; i++) // s0-s7
98820 - psxRegs.GPR.r[16+i] = jmp_buf[3+i];
98821 - gp = jmp_buf[11]; /* gp */
98822 -
98823 - v0 = a1; pc0 = ra;
98824 -}
98825 -
98826 -void psxBios_strcat() { // 0x15
98827 -#ifdef PSXBIOS_LOG
98828 - PSXBIOS_LOG("psxBios_%s: %s, %s\n", biosA0n[0x15], Ra0, Ra1);
98829 -#endif
98830 -
98831 - strcat(Ra0, Ra1);
98832 - v0 = a0; pc0 = ra;
98833 -}
98834 -
98835 -/*0x16*/void psxBios_strncat() { strncat(Ra0, Ra1, a2); v0 = a0; pc0 = ra;}
98836 -
98837 -void psxBios_strcmp() { // 0x17
98838 -#ifdef PSXBIOS_LOG
98839 - PSXBIOS_LOG("psxBios_%s: %s (%lx), %s (%lx)\n", biosA0n[0x17], Ra0, a0, Ra1, a1);
98840 -#endif
98841 -
98842 - v0 = strcmp(Ra0, Ra1);
98843 - pc0 = ra;
98844 -}
98845 -
98846 -void psxBios_strncmp() { // 0x18
98847 -#ifdef PSXBIOS_LOG
98848 - PSXBIOS_LOG("psxBios_%s: %s (%lx), %s (%lx), %d\n", biosA0n[0x18], Ra0, a0, Ra1, a1, a2);
98849 -#endif
98850 -
98851 - v0 = strncmp(Ra0, Ra1, a2);
98852 - pc0 = ra;
98853 -}
98854 -
98855 -/*0x19*/void psxBios_strcpy() { strcpy(Ra0, Ra1); v0 = a0; pc0 = ra;}
98856 -/*0x1a*/void psxBios_strncpy() { strncpy(Ra0, Ra1, a2); v0 = a0; pc0 = ra;}
98857 -/*0x1b*/void psxBios_strlen() { v0 = strlen(Ra0); pc0 = ra;}
98858 -
98859 -void psxBios_index() { // 0x1c
98860 - char *pcA0 = (char *)Ra0;
98861 - char *pcRet = strchr(pcA0, a1);
98862 - if(pcRet)
98863 - v0 = a0 + pcRet - pcA0;
98864 - else
98865 - v0 = 0;
98866 - pc0 = ra;
98867 -}
98868 -
98869 -void psxBios_rindex() { // 0x1d
98870 - char *pcA0 = (char *)Ra0;
98871 - char *pcRet = strrchr(pcA0, a1);
98872 - if(pcRet)
98873 - v0 = a0 + pcRet - pcA0;
98874 - else
98875 - v0 = 0;
98876 - pc0 = ra;
98877 -}
98878 -
98879 -void psxBios_strchr() { // 0x1e
98880 - char *pcA0 = (char *)Ra0;
98881 - char *pcRet = strchr(pcA0, a1);
98882 - if(pcRet)
98883 - v0 = a0 + pcRet - pcA0;
98884 - else
98885 - v0 = 0;
98886 - pc0 = ra;
98887 -}
98888 -
98889 -void psxBios_strrchr() { // 0x1f
98890 - char *pcA0 = (char *)Ra0;
98891 - char *pcRet = strrchr(pcA0, a1);
98892 - if(pcRet)
98893 - v0 = a0 + pcRet - pcA0;
98894 - else
98895 - v0 = 0;
98896 - pc0 = ra;
98897 -}
98898 -
98899 -void psxBios_strpbrk() { // 0x20
98900 - char *pcA0 = (char *)Ra0;
98901 - char *pcRet = strpbrk(pcA0, (char *)Ra1);
98902 - if(pcRet)
98903 - v0 = a0 + pcRet - pcA0;
98904 - else
98905 - v0 = 0;
98906 - pc0 = ra;
98907 -}
98908 -
98909 -void psxBios_strspn() { v0 = strspn ((char *)Ra0, (char *)Ra1); pc0 = ra;}/*21*/
98910 -void psxBios_strcspn() { v0 = strcspn((char *)Ra0, (char *)Ra1); pc0 = ra;}/*22*/
98911 -
98912 -void psxBios_strtok() { // 0x23
98913 - char *pcA0 = (char *)Ra0;
98914 - char *pcRet = strtok(pcA0, (char *)Ra1);
98915 - if(pcRet)
98916 - v0 = a0 + pcRet - pcA0;
98917 - else
98918 - v0 = 0;
98919 - pc0 = ra;
98920 -}
98921 -
98922 -void psxBios_strstr() { // 0x24
98923 - char *pcA0 = (char *)Ra0;
98924 - char *pcRet = strstr(pcA0, (char *)Ra1);
98925 - if(pcRet)
98926 - v0 = a0 + pcRet - pcA0;
98927 - else
98928 - v0 = 0;
98929 - pc0 = ra;
98930 -}
98931 -
98932 -/*0x25*/void psxBios_toupper() {v0 = toupper(a0); pc0 = ra;}
98933 -/*0x26*/void psxBios_tolower() {v0 = tolower(a0); pc0 = ra;}
98934 -/*0x27*/void psxBios_bcopy() {memcpy(Ra1,Ra0,a2); pc0=ra;}
98935 -/*0x28*/void psxBios_bzero() {memset(Ra0,0,a1); pc0=ra;}
98936 -/*0x29*/void psxBios_bcmp() {v0 = memcmp(Ra0,Ra1,a2); pc0=ra; }
98937 -/*0x2a*/void psxBios_memcpy() {memcpy(Ra0, Ra1, a2); v0 = a0; pc0 = ra;}
98938 -/*0x2b*/void psxBios_memset() {memset(Ra0, a1, a2); v0 = a0; pc0 = ra;}
98939 -/*0x2c*/void psxBios_memmove() {memmove(Ra0, Ra1, a2); v0 = a0; pc0 = ra;}
98940 -/*0x2d*/void psxBios_memcmp() {v0 = memcmp(Ra0, Ra1, a2); pc0 = ra;}
98941 -
98942 -void psxBios_memchr() { // 2e
98943 - void *ret = memchr(Ra0, a1, a2);
98944 - if (ret != NULL) v0 = (u32)((char*)ret - Ra0) + a0;
98945 - else v0 = 0;
98946 - pc0 = ra;
98947 -}
98948 -
98949 -void psxBios_rand() { // 2f
98950 - v0 = 1+(int) (32767.0*rand()/(RAND_MAX+1.0));
98951 - pc0 = ra;
98952 -}
98953 -
98954 -void psxBios_srand() { // 30
98955 - srand(a0); pc0 = ra;
98956 -}
98957 -
98958 -
98959 -void psxBios_malloc() { // 33
98960 -#ifdef PSXBIOS_LOG
98961 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x33]);
98962 -#endif
98963 - unsigned int *chunk, *newchunk;
98964 - unsigned int dsize, csize, cstat;
98965 - int colflag;
98966 -
98967 - // scan through heap and combine free chunks of space
98968 - chunk = heap_addr;
98969 - colflag = 0;
98970 - while(chunk < heap_end) {
98971 - // get size and status of actual chunk
98972 - csize = ((u32)*chunk) & 0xfffffffc;
98973 - cstat = ((u32)*chunk) & 1;
98974 -
98975 - // it's a free chunk
98976 - if(cstat == 1) {
98977 - if(colflag == 0) {
98978 - newchunk = chunk;
98979 - dsize = csize;
98980 - colflag = 1; // let's begin a new collection of free memory
98981 - }
98982 - else dsize += (csize+4); // add the new size including header
98983 - }
98984 - // not a free chunk: did we start a collection ?
98985 - else {
98986 - if(colflag == 1) { // collection is over
98987 - colflag = 0;
98988 - *newchunk = SWAP32(dsize | 1);
98989 - }
98990 - }
98991 -
98992 - // next chunk
98993 - chunk = (u32*)((u32)chunk + csize + 4);
98994 - }
98995 - // if neccessary free memory on end of heap
98996 - if(colflag == 1) *newchunk = SWAP32(dsize | 1);
98997 -
98998 -
98999 - chunk = heap_addr;
99000 - csize = ((u32)*chunk) & 0xfffffffc;
99001 - cstat = ((u32)*chunk) & 1;
99002 - dsize = (a0+3) & 0xfffffffc;
99003 -
99004 - // exit on uninitialized heap
99005 - if (chunk == NULL) { SysPrintf("malloc %lx,%lx: Uninitialised Heap!\n", v0, a0); v0 = 0; pc0 = ra; return; }
99006 -
99007 - // search an unused chunk that is big enough until the end of the heap
99008 - while((dsize>csize || cstat==0) && chunk<heap_end ) {
99009 - chunk = (u32*)((u32)chunk + csize + 4);
99010 - csize = ((u32)*chunk) & 0xfffffffc;
99011 - cstat = ((u32)*chunk) & 1;
99012 - }
99013 -
99014 - // catch out of memory
99015 - if(chunk >= heap_end) { SysPrintf("malloc %lx,%lx: Out of memory error!\n", v0, a0); v0 = 0; pc0 = ra; return; }
99016 -
99017 - // allocate memory
99018 - if(dsize == csize) {
99019 - // chunk has same size
99020 - *chunk &= 0xfffffffc;
99021 - }
99022 - else {
99023 - // split free chunk
99024 - *chunk = SWAP32(dsize);
99025 - newchunk = (u32*)((u32)chunk + dsize + 4);
99026 - *newchunk = SWAP32((csize - dsize - 4) & 0xfffffffc | 1);
99027 - }
99028 -
99029 - // return pointer to allocated memory
99030 - v0 = ((unsigned long)chunk - (unsigned long)psxM) + 4;
99031 - v0|= 0x80000000;
99032 - SysPrintf ("malloc %lx,%lx\n", v0, a0);
99033 - pc0 = ra;
99034 -}
99035 -
99036 -void psxBios_free() { // 34
99037 -
99038 -#ifdef PSXBIOS_LOG
99039 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x34]);
99040 -#endif
99041 -
99042 - SysPrintf("free %lx: %lx bytes\n", a0, *(u32*)(Ra0-4));
99043 -
99044 - *(u32*)(Ra0-4) |= 1; // set chunk to free
99045 - pc0 = ra;
99046 -}
99047 -
99048 -void psxBios_calloc() { // 37
99049 -#ifdef PSXBIOS_LOG
99050 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x37]);
99051 -#endif
99052 -
99053 - a0 = a0 * a1;
99054 - psxBios_malloc();
99055 - memset(Rv0, 0, a0);
99056 -}
99057 -
99058 -void psxBios_realloc() { // 38
99059 -#ifdef PSXBIOS_LOG
99060 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x38]);
99061 -#endif
99062 -
99063 - u32 block = a0;
99064 - u32 size = a1;
99065 -
99066 - a0 = block;
99067 - psxBios_free();
99068 - a0 = size;
99069 - psxBios_malloc();
99070 -}
99071 -
99072 -
99073 -/* InitHeap(void *block , int n) */
99074 -void psxBios_InitHeap() { // 39
99075 -
99076 -#ifdef PSXBIOS_LOG
99077 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x39]);
99078 -#endif
99079 -
99080 - unsigned int size;
99081 -
99082 - if (((a0 & 0x1fffff) + a1)>= 0x200000) size = 0x1ffffc - (a0 & 0x1fffff);
99083 - else size = a1;
99084 -
99085 - size &= 0xfffffffc;
99086 -
99087 - heap_addr = (u32*)Ra0;
99088 - heap_end = (u32*)((u32)heap_addr + size);
99089 - *heap_addr = SWAP32(size | 1);
99090 -
99091 - SysPrintf("InitHeap %lx,%lx : %lx %lx\n",a0,a1, (u32)heap_addr-(u32)psxM, size);
99092 -
99093 - pc0 = ra;
99094 -}
99095 -
99096 -void psxBios_getchar(){ v0 = getchar(); pc0=ra;} //0x3b
99097 -
99098 -void psxBios_printf() { // 3f
99099 - char tmp[1024];
99100 - char tmp2[1024];
99101 - u32 save[4];
99102 - char *ptmp = tmp;
99103 - int n=1, i=0, j;
99104 -
99105 - memcpy(save, (char*)PSXM(sp), 4*4);
99106 - psxMu32ref(sp) = SWAP32((u32)a0);
99107 - psxMu32ref(sp + 4) = SWAP32((u32)a1);
99108 - psxMu32ref(sp + 8) = SWAP32((u32)a2);
99109 - psxMu32ref(sp + 12) = SWAP32((u32)a3);
99110 -
99111 - while (Ra0[i]) {
99112 - switch (Ra0[i]) {
99113 - case '%':
99114 - j = 0;
99115 - tmp2[j++] = '%';
99116 -_start:
99117 - switch (Ra0[++i]) {
99118 - case '.':
99119 - case 'l':
99120 - tmp2[j++] = Ra0[i]; goto _start;
99121 - default:
99122 - if (Ra0[i] >= '0' && Ra0[i] <= '9') {
99123 - tmp2[j++] = Ra0[i];
99124 - goto _start;
99125 - }
99126 - break;
99127 - }
99128 - tmp2[j++] = Ra0[i];
99129 - tmp2[j] = 0;
99130 -
99131 - switch (Ra0[i]) {
99132 - case 'f': case 'F':
99133 - ptmp+= sprintf(ptmp, tmp2, (float)psxMu32(sp + n * 4)); n++; break;
99134 - case 'a': case 'A':
99135 - case 'e': case 'E':
99136 - case 'g': case 'G':
99137 - ptmp+= sprintf(ptmp, tmp2, (double)psxMu32(sp + n * 4)); n++; break;
99138 - case 'p':
99139 - case 'i':
99140 - case 'd': case 'D':
99141 - case 'o': case 'O':
99142 - case 'x': case 'X':
99143 - ptmp+= sprintf(ptmp, tmp2, (unsigned int)psxMu32(sp + n * 4)); n++; break;
99144 - case 'c':
99145 - ptmp+= sprintf(ptmp, tmp2, (unsigned char)psxMu32(sp + n * 4)); n++; break;
99146 - case 's':
99147 - ptmp+= sprintf(ptmp, tmp2, (char*)PSXM(psxMu32(sp + n * 4))); n++; break;
99148 - case '%':
99149 - *ptmp++ = Ra0[i]; break;
99150 - }
99151 - i++;
99152 - break;
99153 - default:
99154 - *ptmp++ = Ra0[i++];
99155 - }
99156 - }
99157 - *ptmp = 0;
99158 -
99159 - memcpy((char*)PSXM(sp), save, 4*4);
99160 -
99161 - SysPrintf(tmp);
99162 -
99163 - pc0 = ra;
99164 -}
99165 -
99166 -/*
99167 - * long Load(char *name, struct EXEC *header);
99168 - */
99169 -
99170 -void psxBios_Load() { // 42
99171 - EXE_HEADER eheader;
99172 -
99173 -#ifdef PSXBIOS_LOG
99174 - PSXBIOS_LOG("psxBios_%s: %s, %x\n", biosA0n[0x42], Ra0, a1);
99175 -#endif
99176 -
99177 - if (LoadCdromFile(Ra0, &eheader) == 0) {
99178 - memcpy(Ra1, ((char*)&eheader)+16, sizeof(EXEC));
99179 - v0 = 1;
99180 - } else v0 = 0;
99181 -
99182 - pc0 = ra;
99183 -}
99184 -
99185 -/*
99186 - * int Exec(struct EXEC *header , int argc , char **argv);
99187 - */
99188 -
99189 -void psxBios_Exec() { // 43
99190 - EXEC *header = (EXEC*)Ra0;
99191 - u32 tmp;
99192 -
99193 -#ifdef PSXBIOS_LOG
99194 - PSXBIOS_LOG("psxBios_%s: %x, %x, %x\n", biosA0n[0x43], a0, a1, a2);
99195 -#endif
99196 -
99197 - header->_sp = sp;
99198 - header->_fp = fp;
99199 - header->_sp = sp;
99200 - header->_gp = gp;
99201 - header->ret = ra;
99202 - header->base = s0;
99203 -
99204 - if (header->S_addr != 0) {
99205 - tmp = header->S_addr + header->s_size;
99206 - sp = tmp;
99207 - fp = sp;
99208 - }
99209 -
99210 - gp = header->gp0;
99211 -
99212 - s0 = a0;
99213 -
99214 - a0 = a1;
99215 - a1 = a2;
99216 -
99217 - ra = 0x8000;
99218 - pc0 = header->_pc0;
99219 -}
99220 -
99221 -void psxBios_FlushCache() { // 44
99222 -#ifdef PSXBIOS_LOG
99223 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x44]);
99224 -#endif
99225 -
99226 - pc0 = ra;
99227 -}
99228 -
99229 -void psxBios_GPU_dw() { // 0x46
99230 - int size;
99231 - s32 *ptr;
99232 -
99233 -#ifdef PSXBIOS_LOG
99234 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x46]);
99235 -#endif
99236 -
99237 - GPU_writeData(0xa0000000);
99238 - GPU_writeData((a1<<16)|(a0&0xffff));
99239 - GPU_writeData((a3<<16)|(a2&0xffff));
99240 - size = (a2*a3+1)/2;
99241 - ptr = (s32*)PSXM(Rsp[4]); //that is correct?
99242 - do {
99243 - GPU_writeData(SWAP32(*ptr));
99244 - ptr++;
99245 - } while(--size);
99246 -
99247 - pc0 = ra;
99248 -}
99249 -
99250 -void psxBios_mem2vram() { // 0x47
99251 - int size;
99252 -
99253 - GPU_writeData(0xa0000000);
99254 - GPU_writeData((a1<<16)|(a0&0xffff));
99255 - GPU_writeData((a3<<16)|(a2&0xffff));
99256 - size = (a2*a3+1)/2;
99257 - GPU_writeStatus(0x04000002);
99258 - psxHwWrite32(0x1f8010f4,0);
99259 - psxHwWrite32(0x1f8010f0,psxHwRead32(0x1f8010f0)|0x800);
99260 - psxHwWrite32(0x1f8010a0,Rsp[4]);//might have a buggy...
99261 - psxHwWrite32(0x1f8010a4,((size/16)<<16)|16);
99262 - psxHwWrite32(0x1f8010a8,0x01000201);
99263 -
99264 - pc0 = ra;
99265 -}
99266 -
99267 -void psxBios_SendGPU() { // 0x48
99268 - GPU_writeStatus(a0);
99269 - pc0 = ra;
99270 -}
99271 -
99272 -void psxBios_GPU_cw() { // 0x49
99273 - GPU_writeData(a0);
99274 - pc0 = ra;
99275 -}
99276 -
99277 -void psxBios_GPU_cwb() { // 0x4a
99278 - s32 *ptr = (s32*)Ra0;
99279 - int size = a1;
99280 - while(size--) {
99281 - GPU_writeData(SWAP32(*ptr));
99282 - ptr++;
99283 - }
99284 -
99285 - pc0 = ra;
99286 -}
99287 -
99288 -void psxBios_GPU_SendPackets() { //4b:
99289 - GPU_writeStatus(0x04000002);
99290 - psxHwWrite32(0x1f8010f4,0);
99291 - psxHwWrite32(0x1f8010f0,psxHwRead32(0x1f8010f0)|0x800);
99292 - psxHwWrite32(0x1f8010a0,a0);
99293 - psxHwWrite32(0x1f8010a4,0);
99294 - psxHwWrite32(0x1f8010a8,0x010000401);
99295 - pc0 = ra;
99296 -}
99297 -
99298 -void psxBios_sys_a0_4c() { // 0x4c GPU relate
99299 - psxHwWrite32(0x1f8010a8,0x00000401);
99300 - GPU_writeData(0x0400000);
99301 - GPU_writeData(0x0200000);
99302 - GPU_writeData(0x0100000);
99303 -
99304 - pc0 = ra;
99305 -}
99306 -
99307 -void psxBios_GPU_GetGPUStatus() { // 0x4d
99308 - v0 = GPU_readStatus();
99309 - pc0 = ra;
99310 -}
99311 -
99312 -#undef s_addr
99313 -
99314 -void psxBios_LoadExec() { // 51
99315 - EXEC *header = (EXEC*)PSXM(0xf000);
99316 - u32 s_addr, s_size;
99317 -
99318 -#ifdef PSXBIOS_LOG
99319 - PSXBIOS_LOG("psxBios_%s: %s: %x,%x\n", biosA0n[0x51], Ra0, a1, a2);
99320 -#endif
99321 - s_addr = a1; s_size = a2;
99322 -
99323 - a1 = 0xf000;
99324 - psxBios_Load();
99325 -
99326 - header->S_addr = s_addr;
99327 - header->s_size = s_size;
99328 -
99329 - a0 = 0xf000; a1 = 0; a2 = 0;
99330 - psxBios_Exec();
99331 -}
99332 -
99333 -void psxBios__bu_init() { // 70
99334 -#ifdef PSXBIOS_LOG
99335 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x70]);
99336 -#endif
99337 -
99338 - DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
99339 - DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
99340 -
99341 - pc0 = ra;
99342 -}
99343 -
99344 -void psxBios__96_init() { // 71
99345 -#ifdef PSXBIOS_LOG
99346 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x71]);
99347 -#endif
99348 -
99349 - pc0 = ra;
99350 -}
99351 -
99352 -void psxBios__96_remove() { // 72
99353 -#ifdef PSXBIOS_LOG
99354 - PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x72]);
99355 -#endif
99356 -
99357 - pc0 = ra;
99358 -}
99359 -
99360 -void psxBios_SetMem() { // 9f
99361 -#ifdef PSXBIOS_LOG
99362 - PSXBIOS_LOG("psxBios_%s: %x, %x\n", biosA0n[0x9f], a0, a1);
99363 -#endif
99364 -
99365 - u32 new = psxHu32(0x1060);
99366 - switch(a0) {
99367 - case 2:
99368 - psxHu32ref(0x1060) = SWAP32(new);
99369 - psxMu32ref(0x060) = a0;
99370 - SysPrintf("Change effective memory : %d MBytes\n",a0);
99371 - break;
99372 -
99373 - case 8:
99374 - psxHu32ref(0x1060) = SWAP32(new | 0x300);
99375 - psxMu32ref(0x060) = a0;
99376 - SysPrintf("Change effective memory : %d MBytes\n",a0);
99377 -
99378 - default:
99379 - SysPrintf("Effective memory must be 2/8 MBytes\n");
99380 - break;
99381 - }
99382 -
99383 - pc0 = ra;
99384 -}
99385 -
99386 -void psxBios__card_info() { // ab
99387 -#ifdef PSXBIOS_LOG
99388 - PSXBIOS_LOG("psxBios_%s: %x\n", biosA0n[0xab], a0);
99389 -#endif
99390 -
99391 -// DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
99392 - DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
99393 -
99394 - v0 = 1; pc0 = ra;
99395 -}
99396 -
99397 -void psxBios__card_load() { // ac
99398 -#ifdef PSXBIOS_LOG
99399 - PSXBIOS_LOG("psxBios_%s: %x\n", biosA0n[0xac], a0);
99400 -#endif
99401 -
99402 -// DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
99403 - DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
99404 -
99405 - v0 = 1; pc0 = ra;
99406 -}
99407 -
99408 -/* System calls B0 */
99409 -
99410 -void psxBios_SetRCnt() { // 02
99411 -#ifdef PSXBIOS_LOG
99412 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x02]);
99413 -#endif
99414 -
99415 - a0&= 0x3;
99416 - if (a0 != 3) {
99417 - u32 mode=0;
99418 -
99419 - psxRcntWtarget(a0, a1);
99420 - if (a2&0x1000) mode|= 0x050; // Interrupt Mode
99421 - if (a2&0x0100) mode|= 0x008; // Count to 0xffff
99422 - if (a2&0x0010) mode|= 0x001; // Timer stop mode
99423 - if (a0 == 2) { if (a2&0x0001) mode|= 0x200; } // System Clock mode
99424 - else { if (a2&0x0001) mode|= 0x100; } // System Clock mode
99425 -
99426 - psxRcntWmode(a0, mode);
99427 - }
99428 - pc0 = ra;
99429 -}
99430 -
99431 -void psxBios_GetRCnt() { // 03
99432 -#ifdef PSXBIOS_LOG
99433 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x03]);
99434 -#endif
99435 -
99436 - a0&= 0x3;
99437 - if (a0 != 3) v0 = psxRcntRcount(a0);
99438 - else v0 = 0;
99439 - pc0 = ra;
99440 -}
99441 -
99442 -void psxBios_StartRCnt() { // 04
99443 -#ifdef PSXBIOS_LOG
99444 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x04]);
99445 -#endif
99446 -
99447 - a0&= 0x3;
99448 - if (a0 != 3) psxHu32ref(0x1074)|= SWAP32((u32)((1<<(a0+4))));
99449 - else psxHu32ref(0x1074)|= SWAPu32(0x1);
99450 - v0 = 1; pc0 = ra;
99451 -}
99452 -
99453 -void psxBios_StopRCnt() { // 05
99454 -#ifdef PSXBIOS_LOG
99455 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x05]);
99456 -#endif
99457 -
99458 - a0&= 0x3;
99459 - if (a0 != 3) psxHu32ref(0x1074)&= SWAP32((u32)(~(1<<(a0+4))));
99460 - else psxHu32ref(0x1074)&= SWAPu32(~0x1);
99461 - pc0 = ra;
99462 -}
99463 -
99464 -void psxBios_ResetRCnt() { // 06
99465 -#ifdef PSXBIOS_LOG
99466 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x06]);
99467 -#endif
99468 -
99469 - a0&= 0x3;
99470 - if (a0 != 3) {
99471 - psxRcntWmode(a0, 0);
99472 - psxRcntWtarget(a0, 0);
99473 - psxRcntWcount(a0, 0);
99474 - }
99475 - pc0 = ra;
99476 -}
99477 -
99478 -
99479 -/* gets ev for use with Event */
99480 -#define GetEv() \
99481 - ev = (a0 >> 24) & 0xf; \
99482 - if (ev == 0xf) ev = 0x5; \
99483 - ev*= 32; \
99484 - ev+= a0&0x1f;
99485 -
99486 -/* gets spec for use with Event */
99487 -#define GetSpec() \
99488 - spec = 0; \
99489 - switch (a1) { \
99490 - case 0x0301: spec = 16; break; \
99491 - case 0x0302: spec = 17; break; \
99492 - default: \
99493 - for (i=0; i<16; i++) if (a1 & (1 << i)) { spec = i; break; } \
99494 - break; \
99495 - }
99496 -
99497 -void psxBios_DeliverEvent() { // 07
99498 - int ev, spec;
99499 - int i;
99500 -
99501 - GetEv();
99502 - GetSpec();
99503 -
99504 -#ifdef PSXBIOS_LOG
99505 - PSXBIOS_LOG("psxBios_%s %x,%x\n", biosB0n[0x07], ev, spec);
99506 -#endif
99507 -
99508 - DeliverEvent(ev, spec);
99509 -
99510 - pc0 = ra;
99511 -}
99512 -
99513 -void psxBios_OpenEvent() { // 08
99514 - int ev, spec;
99515 - int i;
99516 -
99517 - GetEv();
99518 - GetSpec();
99519 -
99520 -#ifdef PSXBIOS_LOG
99521 - PSXBIOS_LOG("psxBios_%s %x,%x (class:%x, spec:%x, mode:%x, func:%x)\n", biosB0n[0x08], ev, spec, a0, a1, a2, a3);
99522 -#endif
99523 -
99524 - Event[ev][spec].status = EvStWAIT;
99525 - Event[ev][spec].mode = a2;
99526 - Event[ev][spec].fhandler = a3;
99527 -
99528 - v0 = ev | (spec << 8);
99529 - pc0 = ra;
99530 -}
99531 -
99532 -void psxBios_CloseEvent() { // 09
99533 - int ev, spec;
99534 -
99535 - ev = a0 & 0xff;
99536 - spec = (a0 >> 8) & 0xff;
99537 -
99538 -#ifdef PSXBIOS_LOG
99539 - PSXBIOS_LOG("psxBios_%s %x,%x\n", biosB0n[0x09], ev, spec);
99540 -#endif
99541 -
99542 - Event[ev][spec].status = EvStUNUSED;
99543 -
99544 - v0 = 1; pc0 = ra;
99545 -}
99546 -
99547 -void psxBios_WaitEvent() { // 0a
99548 - int ev, spec;
99549 -
99550 - ev = a0 & 0xff;
99551 - spec = (a0 >> 8) & 0xff;
99552 -
99553 -#ifdef PSXBIOS_LOG
99554 - PSXBIOS_LOG("psxBios_%s %x,%x\n", biosB0n[0x0a], ev, spec);
99555 -#endif
99556 -
99557 - Event[ev][spec].status = EvStACTIVE;
99558 -
99559 - v0 = 1; pc0 = ra;
99560 -}
99561 -
99562 -void psxBios_TestEvent() { // 0b
99563 - int ev, spec;
99564 -
99565 - ev = a0 & 0xff;
99566 - spec = (a0 >> 8) & 0xff;
99567 -
99568 - if (Event[ev][spec].status == EvStALREADY) {
99569 - Event[ev][spec].status = EvStACTIVE; v0 = 1;
99570 - } else v0 = 0;
99571 -
99572 -#ifdef PSXBIOS_LOG
99573 - PSXBIOS_LOG("psxBios_%s %x,%x: %x\n", biosB0n[0x0b], ev, spec, v0);
99574 -#endif
99575 -
99576 - pc0 = ra;
99577 -}
99578 -
99579 -void psxBios_EnableEvent() { // 0c
99580 - int ev, spec;
99581 -
99582 - ev = a0 & 0xff;
99583 - spec = (a0 >> 8) & 0xff;
99584 -
99585 -#ifdef PSXBIOS_LOG
99586 - PSXBIOS_LOG("psxBios_%s %x,%x\n", biosB0n[0x0c], ev, spec);
99587 -#endif
99588 -
99589 - Event[ev][spec].status = EvStACTIVE;
99590 -
99591 - v0 = 1; pc0 = ra;
99592 -}
99593 -
99594 -void psxBios_DisableEvent() { // 0d
99595 - int ev, spec;
99596 -
99597 - ev = a0 & 0xff;
99598 - spec = (a0 >> 8) & 0xff;
99599 -
99600 -#ifdef PSXBIOS_LOG
99601 - PSXBIOS_LOG("psxBios_%s %x,%x\n", biosB0n[0x0d], ev, spec);
99602 -#endif
99603 -
99604 - Event[ev][spec].status = EvStWAIT;
99605 -
99606 - v0 = 1; pc0 = ra;
99607 -}
99608 -
99609 -/*
99610 - * long OpenTh(long (*func)(), unsigned long sp, unsigned long gp);
99611 - */
99612 -
99613 -void psxBios_OpenTh() { // 0e
99614 - int th;
99615 -
99616 - for (th=1; th<8; th++)
99617 - if (Thread[th].status == 0) break;
99618 -
99619 -#ifdef PSXBIOS_LOG
99620 - PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x0e], th);
99621 -#endif
99622 -
99623 - Thread[th].status = 1;
99624 - Thread[th].func = a0;
99625 - Thread[th].reg[29] = a1;
99626 - Thread[th].reg[28] = a2;
99627 -
99628 - v0 = th; pc0 = ra;
99629 -}
99630 -
99631 -/*
99632 - * int CloseTh(long thread);
99633 - */
99634 -
99635 -void psxBios_CloseTh() { // 0f
99636 - int th = a0 & 0xff;
99637 -
99638 -#ifdef PSXBIOS_LOG
99639 - PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x0f], th);
99640 -#endif
99641 -
99642 - if (Thread[th].status == 0) {
99643 - v0 = 0;
99644 - } else {
99645 - Thread[th].status = 0;
99646 - v0 = 1;
99647 - }
99648 -
99649 - pc0 = ra;
99650 -}
99651 -
99652 -/*
99653 - * int ChangeTh(long thread);
99654 - */
99655 -
99656 -void psxBios_ChangeTh() { // 10
99657 - int th = a0 & 0xff;
99658 -
99659 -#ifdef PSXBIOS_LOG
99660 -// PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x10], th);
99661 -#endif
99662 -
99663 - if (Thread[th].status == 0 || CurThread == th) {
99664 - v0 = 0;
99665 -
99666 - pc0 = ra;
99667 - } else {
99668 - v0 = 1;
99669 -
99670 - if (Thread[CurThread].status == 2) {
99671 - Thread[CurThread].status = 1;
99672 - Thread[CurThread].func = ra;
99673 - memcpy(Thread[CurThread].reg, psxRegs.GPR.r, 32*4);
99674 - }
99675 -
99676 - memcpy(psxRegs.GPR.r, Thread[th].reg, 32*4);
99677 - pc0 = Thread[th].func;
99678 - Thread[th].status = 2;
99679 - CurThread = th;
99680 - }
99681 -}
99682 -
99683 -void psxBios_InitPAD() { // 0x12
99684 -#ifdef PSXBIOS_LOG
99685 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x12]);
99686 -#endif
99687 -
99688 - pad_buf1 = (char*)Ra0;
99689 - pad_buf1len = a1;
99690 - pad_buf2 = (char*)Ra2;
99691 - pad_buf2len = a3;
99692 -
99693 - v0 = 1; pc0 = ra;
99694 -}
99695 -
99696 -void psxBios_StartPAD() { // 13
99697 -#ifdef PSXBIOS_LOG
99698 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x13]);
99699 -#endif
99700 -
99701 - psxHwWrite16(0x1f801074, (unsigned short)(psxHwRead16(0x1f801074) | 0x1));
99702 - psxRegs.CP0.n.Status |= 0x401;
99703 - pc0 = ra;
99704 -}
99705 -
99706 -void psxBios_StopPAD() { // 14
99707 -#ifdef PSXBIOS_LOG
99708 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x14]);
99709 -#endif
99710 -
99711 - pad_buf1 = NULL;
99712 - pad_buf2 = NULL;
99713 - pc0 = ra;
99714 -}
99715 -
99716 -void psxBios_PAD_init() { // 15
99717 -#ifdef PSXBIOS_LOG
99718 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x15]);
99719 -#endif
99720 -
99721 - psxHwWrite16(0x1f801074, (u16)(psxHwRead16(0x1f801074) | 0x1));
99722 - pad_buf = (int*)Ra1;
99723 - *pad_buf = -1;
99724 - psxRegs.CP0.n.Status |= 0x401;
99725 - pc0 = ra;
99726 -}
99727 -
99728 -void psxBios_PAD_dr() { // 16
99729 -#ifdef PSXBIOS_LOG
99730 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x16]);
99731 -#endif
99732 -
99733 - v0 = -1; pc0 = ra;
99734 -}
99735 -
99736 -void psxBios_ReturnFromException() { // 17
99737 - memcpy(psxRegs.GPR.r, regs, 32*4);
99738 - psxRegs.GPR.n.lo = regs[32];
99739 - psxRegs.GPR.n.hi = regs[33];
99740 -
99741 - pc0 = psxRegs.CP0.n.EPC;
99742 - if (psxRegs.CP0.n.Cause & 0x80000000) pc0+=4;
99743 -
99744 - psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status & 0xfffffff0) |
99745 - ((psxRegs.CP0.n.Status & 0x3c) >> 2);
99746 -}
99747 -
99748 -void psxBios_ResetEntryInt() { // 18
99749 -#ifdef PSXBIOS_LOG
99750 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x18]);
99751 -#endif
99752 -
99753 - jmp_int = NULL;
99754 - pc0 = ra;
99755 -}
99756 -
99757 -void psxBios_HookEntryInt() { // 19
99758 -#ifdef PSXBIOS_LOG
99759 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x19]);
99760 -#endif
99761 -
99762 - jmp_int = (u32*)Ra0;
99763 - pc0 = ra;
99764 -}
99765 -
99766 -void psxBios_UnDeliverEvent() { // 0x20
99767 - int ev, spec;
99768 - int i;
99769 -
99770 - GetEv();
99771 - GetSpec();
99772 -
99773 -#ifdef PSXBIOS_LOG
99774 - PSXBIOS_LOG("psxBios_%s %x,%x\n", biosB0n[0x20], ev, spec);
99775 -#endif
99776 -
99777 - if (Event[ev][spec].status == EvStALREADY &&
99778 - Event[ev][spec].mode == EvMdNOINTR)
99779 - Event[ev][spec].status = EvStACTIVE;
99780 -
99781 - pc0 = ra;
99782 -}
99783 -
99784 -#define buopen(mcd) { \
99785 - strcpy(FDesc[1 + mcd].name, Ra0+5); \
99786 - FDesc[1 + mcd].offset = 0; \
99787 - FDesc[1 + mcd].mode = a1; \
99788 - \
99789 - for (i=1; i<16; i++) { \
99790 - ptr = Mcd##mcd##Data + 128 * i; \
99791 - if ((*ptr & 0xF0) != 0x50) continue; \
99792 - if (strcmp(FDesc[1 + mcd].name, ptr+0xa)) continue; \
99793 - FDesc[1 + mcd].mcfile = i; \
99794 - SysPrintf("open %s\n", ptr+0xa); \
99795 - v0 = 1 + mcd; \
99796 - break; \
99797 - } \
99798 - if (a1 & 0x200 && v0 == -1) { /* FCREAT */ \
99799 - for (i=1; i<16; i++) { \
99800 - int j, xor = 0; \
99801 - \
99802 - ptr = Mcd##mcd##Data + 128 * i; \
99803 - if ((*ptr & 0xF0) == 0x50) continue; \
99804 - ptr[0] = 0x50 | (u8)(a1 >> 16); \
99805 - ptr[4] = 0x00; \
99806 - ptr[5] = 0x20; \
99807 - ptr[6] = 0x00; \
99808 - ptr[7] = 0x00; \
99809 - ptr[8] = 'B'; \
99810 - ptr[9] = 'I'; \
99811 - strcpy(ptr+0xa, FDesc[1 + mcd].name); \
99812 - for (j=0; j<127; j++) xor^= ptr[j]; \
99813 - ptr[127] = xor; \
99814 - FDesc[1 + mcd].mcfile = i; \
99815 - SysPrintf("openC %s\n", ptr); \
99816 - v0 = 1 + mcd; \
99817 - SaveMcd(Config.Mcd##mcd, Mcd##mcd##Data, 128 * i, 128); \
99818 - break; \
99819 - } \
99820 - } \
99821 -}
99822 -
99823 -/*
99824 - * int open(char *name , int mode);
99825 - */
99826 -
99827 -void psxBios_open() { // 0x32
99828 - int i;
99829 - char *ptr;
99830 -
99831 -#ifdef PSXBIOS_LOG
99832 - PSXBIOS_LOG("psxBios_%s: %s,%x\n", biosB0n[0x32], Ra0, a1);
99833 -#endif
99834 -
99835 - v0 = -1;
99836 -
99837 - if (!strncmp(Ra0, "bu00", 4)) {
99838 - buopen(1);
99839 - }
99840 -
99841 - if (!strncmp(Ra0, "bu10", 4)) {
99842 - buopen(2);
99843 - }
99844 -
99845 - pc0 = ra;
99846 -}
99847 -
99848 -/*
99849 - * int lseek(int fd , int offset , int whence);
99850 - */
99851 -
99852 -void psxBios_lseek() { // 0x33
99853 -#ifdef PSXBIOS_LOG
99854 - PSXBIOS_LOG("psxBios_%s: %x, %x, %x\n", biosB0n[0x33], a0, a1, a2);
99855 -#endif
99856 -
99857 - switch (a2) {
99858 - case 0: // SEEK_SET
99859 - FDesc[a0].offset = a1;
99860 - v0 = a1;
99861 -// DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
99862 -// DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
99863 - break;
99864 -
99865 - case 1: // SEEK_CUR
99866 - FDesc[a0].offset+= a1;
99867 - v0 = FDesc[a0].offset;
99868 - break;
99869 - }
99870 -
99871 - pc0 = ra;
99872 -}
99873 -
99874 -#define buread(mcd) { \
99875 - SysPrintf("read %d: %x,%x (%s)\n", FDesc[1 + mcd].mcfile, FDesc[1 + mcd].offset, a2, Mcd##mcd##Data + 128 * FDesc[1 + mcd].mcfile + 0xa); \
99876 - ptr = Mcd##mcd##Data + 8192 * FDesc[1 + mcd].mcfile + FDesc[1 + mcd].offset; \
99877 - memcpy(Ra1, ptr, a2); \
99878 - if (FDesc[1 + mcd].mode & 0x8000) v0 = 0; \
99879 - else v0 = a2; \
99880 - DeliverEvent(0x11, 0x2); /* 0xf0000011, 0x0004 */ \
99881 - DeliverEvent(0x81, 0x2); /* 0xf4000001, 0x0004 */ \
99882 -}
99883 -
99884 -/*
99885 - * int read(int fd , void *buf , int nbytes);
99886 - */
99887 -
99888 -void psxBios_read() { // 0x34
99889 - char *ptr;
99890 -
99891 -#ifdef PSXBIOS_LOG
99892 - PSXBIOS_LOG("psxBios_%s: %x, %x, %x\n", biosB0n[0x34], a0, a1, a2);
99893 -#endif
99894 -
99895 - v0 = -1;
99896 -
99897 - switch (a0) {
99898 - case 2: buread(1); break;
99899 - case 3: buread(2); break;
99900 - }
99901 -
99902 - pc0 = ra;
99903 -}
99904 -
99905 -#define buwrite(mcd) { \
99906 - u32 offset = + 8192 * FDesc[1 + mcd].mcfile + FDesc[1 + mcd].offset; \
99907 - SysPrintf("write %d: %x,%x\n", FDesc[1 + mcd].mcfile, FDesc[1 + mcd].offset, a2); \
99908 - ptr = Mcd##mcd##Data + offset; \
99909 - memcpy(ptr, Ra1, a2); \
99910 - SaveMcd(Config.Mcd##mcd, Mcd##mcd##Data, offset, a2); \
99911 - if (FDesc[1 + mcd].mode & 0x8000) v0 = 0; \
99912 - else v0 = a2; \
99913 - DeliverEvent(0x11, 0x2); /* 0xf0000011, 0x0004 */ \
99914 - DeliverEvent(0x81, 0x2); /* 0xf4000001, 0x0004 */ \
99915 -}
99916 -
99917 -/*
99918 - * int write(int fd , void *buf , int nbytes);
99919 - */
99920 -
99921 -void psxBios_write() { // 0x35/0x03
99922 - char *ptr;
99923 -
99924 - if (a0 == 1) { // stdout
99925 - char *ptr = Ra1;
99926 -
99927 - while (a2 > 0) {
99928 - SysPrintf("%c", *ptr++); a2--;
99929 - }
99930 - pc0 = ra; return;
99931 - }
99932 -#ifdef PSXBIOS_LOG
99933 - PSXBIOS_LOG("psxBios_%s: %x,%x,%x\n", biosB0n[0x35], a0, a1, a2);
99934 -#endif
99935 -
99936 - v0 = -1;
99937 -
99938 - switch (a0) {
99939 - case 2: buwrite(1); break;
99940 - case 3: buwrite(2); break;
99941 - }
99942 -
99943 - pc0 = ra;
99944 -}
99945 -
99946 -/*
99947 - * int close(int fd);
99948 - */
99949 -
99950 -void psxBios_close() { // 0x36
99951 -#ifdef PSXBIOS_LOG
99952 - PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x36], a0);
99953 -#endif
99954 -
99955 - v0 = a0; pc0 = ra;
99956 -}
99957 -
99958 -void psxBios_putchar () { // 3d
99959 - char tmp[12];
99960 -
99961 - sprintf (tmp,"%c",(char)a0);
99962 - SysPrintf(tmp);
99963 -
99964 - pc0 = ra;
99965 -}
99966 -
99967 -void psxBios_puts () { // 3e/3f
99968 - SysPrintf(Ra0);
99969 -
99970 - pc0 = ra;
99971 -}
99972 -
99973 -char ffile[64], *pfile;
99974 -int nfile;
99975 -
99976 -#define bufile(mcd) { \
99977 - while (nfile < 16) { \
99978 - int match=1; \
99979 - \
99980 - ptr = Mcd##mcd##Data + 128 * nfile; \
99981 - nfile++; \
99982 - if ((*ptr & 0xF0) != 0x50) continue; \
99983 - ptr+= 0xa; \
99984 - for (i=0; i<20; i++) { \
99985 - if (pfile[i] == ptr[i]) { \
99986 - dir->name[i] = ptr[i]; \
99987 - if (ptr[i] == 0) break; else continue; } \
99988 - if (pfile[i] == '?') { \
99989 - dir->name[i] = ptr[i]; continue; } \
99990 - if (pfile[i] == '*') { \
99991 - strcpy(dir->name+i, ptr+i); break; } \
99992 - match = 0; break; \
99993 - } \
99994 - SysPrintf("%d : %s = %s + %s (match=%d)\n", nfile, dir->name, pfile, ptr, match); \
99995 - if (match == 0) continue; \
99996 - dir->size = 8192; \
99997 - v0 = _dir; \
99998 - break; \
99999 - } \
100000 -}
100001 -
100002 -/*
100003 - * struct DIRENTRY* firstfile(char *name,struct DIRENTRY *dir);
100004 - */
100005 -
100006 -void psxBios_firstfile() { // 42
100007 - struct DIRENTRY *dir = (struct DIRENTRY *)Ra1;
100008 - u32 _dir = a1;
100009 - char *ptr;
100010 - int i;
100011 -
100012 -#ifdef PSXBIOS_LOG
100013 - PSXBIOS_LOG("psxBios_%s: %s\n", biosB0n[0x42], Ra0);
100014 -#endif
100015 -
100016 - v0 = 0;
100017 -
100018 - strcpy(ffile, Ra0);
100019 - pfile = ffile+5;
100020 - nfile = 1;
100021 - if (!strncmp(Ra0, "bu00", 4)) {
100022 - bufile(1);
100023 - v0 = _dir;
100024 - }
100025 -
100026 - if (!strncmp(Ra0, "bu10", 4)) {
100027 - bufile(2);
100028 - v0 = _dir;
100029 - }
100030 -
100031 - pc0 = ra;
100032 -}
100033 -
100034 -/*
100035 - * struct DIRENTRY* nextfile(struct DIRENTRY *dir);
100036 - */
100037 -
100038 -void psxBios_nextfile() { // 43
100039 - struct DIRENTRY *dir = (struct DIRENTRY *)Ra0;
100040 - u32 _dir = a0;
100041 - char *ptr;
100042 - int i;
100043 -
100044 -#ifdef PSXBIOS_LOG
100045 - PSXBIOS_LOG("psxBios_%s: %s\n", biosB0n[0x43], dir->name);
100046 -#endif
100047 -
100048 - v0 = 0;
100049 -
100050 - if (!strncmp(ffile, "bu00", 4)) {
100051 - bufile(1);
100052 - }
100053 -
100054 - if (!strncmp(ffile, "bu10", 4)) {
100055 - bufile(2);
100056 - }
100057 -
100058 - pc0 = ra;
100059 -}
100060 -
100061 -#define budelete(mcd) { \
100062 - for (i=1; i<16; i++) { \
100063 - ptr = Mcd##mcd##Data + 128 * i; \
100064 - if ((*ptr & 0xF0) != 0x50) continue; \
100065 - if (strcmp(Ra0+5, ptr+0xa)) continue; \
100066 - *ptr = (*ptr & 0xf) | 0xA0; \
100067 - SysPrintf("delete %s\n", ptr+0xa); \
100068 - v0 = 1; \
100069 - break; \
100070 - } \
100071 -}
100072 -
100073 -/*
100074 - * int delete(char *name);
100075 - */
100076 -
100077 -void psxBios_delete() { // 45
100078 - char *ptr;
100079 - int i;
100080 -
100081 -#ifdef PSXBIOS_LOG
100082 - PSXBIOS_LOG("psxBios_%s: %s\n", biosB0n[0x45], Ra0);
100083 -#endif
100084 -
100085 - v0 = 0;
100086 -
100087 - if (!strncmp(Ra0, "bu00", 4)) {
100088 - budelete(1);
100089 - }
100090 -
100091 - if (!strncmp(Ra0, "bu10", 4)) {
100092 - budelete(2);
100093 - }
100094 -
100095 - pc0 = ra;
100096 -}
100097 -
100098 -void psxBios_InitCARD() { // 4a
100099 -#ifdef PSXBIOS_LOG
100100 - PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x4a], a0);
100101 -#endif
100102 -
100103 - CardState = 0;
100104 -
100105 - pc0 = ra;
100106 -}
100107 -
100108 -void psxBios_StartCARD() { // 4b
100109 -#ifdef PSXBIOS_LOG
100110 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x4b]);
100111 -#endif
100112 -
100113 - if (CardState == 0) CardState = 1;
100114 -
100115 - pc0 = ra;
100116 -}
100117 -
100118 -void psxBios_StopCARD() { // 4c
100119 -#ifdef PSXBIOS_LOG
100120 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x4c]);
100121 -#endif
100122 -
100123 - if (CardState == 1) CardState = 0;
100124 -
100125 - pc0 = ra;
100126 -}
100127 -
100128 -void psxBios__card_write() { // 0x4e
100129 - int port;
100130 -
100131 -#ifdef PSXBIOS_LOG
100132 - PSXBIOS_LOG("psxBios_%s: %x,%x,%x\n", biosB0n[0x4e], a0, a1, a2);
100133 -#endif
100134 -
100135 - port = a0 >> 4;
100136 -
100137 - if (port == 0) {
100138 - memcpy(Mcd1Data + a1 * 128, Ra2, 128);
100139 - SaveMcd(Config.Mcd1, Mcd1Data, a1 * 128, 128);
100140 - } else {
100141 - memcpy(Mcd2Data + a1 * 128, Ra2, 128);
100142 - SaveMcd(Config.Mcd2, Mcd2Data, a1 * 128, 128);
100143 - }
100144 -
100145 - DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
100146 -// DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
100147 -
100148 - v0 = 1; pc0 = ra;
100149 -}
100150 -
100151 -void psxBios__card_read() { // 0x4f
100152 - int port;
100153 -
100154 -#ifdef PSXBIOS_LOG
100155 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x4f]);
100156 -#endif
100157 -
100158 - port = a0 >> 4;
100159 -
100160 - if (port == 0) {
100161 - memcpy(Ra2, Mcd1Data + a1 * 128, 128);
100162 - } else {
100163 - memcpy(Ra2, Mcd2Data + a1 * 128, 128);
100164 - }
100165 -
100166 - DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
100167 -// DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
100168 -
100169 - v0 = 1; pc0 = ra;
100170 -}
100171 -
100172 -void psxBios__new_card() { // 0x50
100173 -#ifdef PSXBIOS_LOG
100174 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x50]);
100175 -#endif
100176 -
100177 - pc0 = ra;
100178 -}
100179 -
100180 -void psxBios_GetC0Table() { // 56
100181 -#ifdef PSXBIOS_LOG
100182 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x56]);
100183 -#endif
100184 -
100185 - v0 = 0x674; pc0 = ra;
100186 -}
100187 -
100188 -void psxBios_GetB0Table() { // 57
100189 -#ifdef PSXBIOS_LOG
100190 - PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x57]);
100191 -#endif
100192 -
100193 - v0 = 0x874; pc0 = ra;
100194 -}
100195 -
100196 -void psxBios_ChangeClearPad() { // 5b
100197 -#ifdef PSXBIOS_LOG
100198 - PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x5b], a0);
100199 -#endif
100200 -
100201 - pc0 = ra;
100202 -}
100203 -
100204 -/* System calls C0 */
100205 -
100206 -/*
100207 - * int SysEnqIntRP(int index , long *queue);
100208 - */
100209 -
100210 -void psxBios_SysEnqIntRP() { // 02
100211 -#ifdef PSXBIOS_LOG
100212 - PSXBIOS_LOG("psxBios_%s: %x\n", biosC0n[0x02] ,a0);
100213 -#endif
100214 -
100215 - SysIntRP[a0] = a1;
100216 -
100217 - v0 = 0; pc0 = ra;
100218 -}
100219 -
100220 -/*
100221 - * int SysDeqIntRP(int index , long *queue);
100222 - */
100223 -
100224 -void psxBios_SysDeqIntRP() { // 03
100225 -#ifdef PSXBIOS_LOG
100226 - PSXBIOS_LOG("psxBios_%s: %x\n", biosC0n[0x03], a0);
100227 -#endif
100228 -
100229 - SysIntRP[a0] = 0;
100230 -
100231 - v0 = 0; pc0 = ra;
100232 -}
100233 -
100234 -void psxBios_ChangeClearRCnt() { // 0a
100235 - u32 *ptr;
100236 -
100237 -#ifdef PSXBIOS_LOG
100238 - PSXBIOS_LOG("psxBios_%s: %x, %x\n", biosC0n[0x0a], a0, a1);
100239 -#endif
100240 -
100241 - ptr = (u32*)PSXM((a0 << 2) + 0x8600);
100242 - v0 = *ptr;
100243 - *ptr = a1;
100244 -
100245 -// psxRegs.CP0.n.Status|= 0x404;
100246 - pc0 = ra;
100247 -}
100248 -
100249 -void psxBios_dummy() {
100250 -#ifdef PSXBIOS_LOG
100251 - PSXBIOS_LOG("unk %lx call: %lx\n", pc0 & 0x1fffff, t1);
100252 -#endif
100253 - pc0 = ra;
100254 -}
100255 -
100256 -void (*biosA0[256])();
100257 -void (*biosB0[256])();
100258 -void (*biosC0[256])();
100259 -
100260 -void psxBiosInit() {
100261 - u32 base, size;
100262 - u32 *ptr;
100263 - int i;
100264 -
100265 - for(i = 0; i < 256; i++) {
100266 - biosA0[i] = NULL;
100267 - biosB0[i] = NULL;
100268 - biosC0[i] = NULL;
100269 - }
100270 - biosA0[0x3e] = psxBios_puts;
100271 - biosA0[0x3f] = psxBios_printf;
100272 -
100273 - biosB0[0x3d] = psxBios_putchar;
100274 - biosB0[0x3f] = psxBios_puts;
100275 -
100276 - if (!Config.HLE) return;
100277 -
100278 - for(i = 0; i < 256; i++) {
100279 - if (biosA0[i] == NULL) biosA0[i] = psxBios_dummy;
100280 - if (biosB0[i] == NULL) biosB0[i] = psxBios_dummy;
100281 - if (biosC0[i] == NULL) biosC0[i] = psxBios_dummy;
100282 - }
100283 -
100284 - biosA0[0x00] = psxBios_open;
100285 - biosA0[0x01] = psxBios_lseek;
100286 - biosA0[0x02] = psxBios_read;
100287 - biosA0[0x03] = psxBios_write;
100288 - biosA0[0x04] = psxBios_close;
100289 - //biosA0[0x05] = psxBios_ioctl;
100290 - //biosA0[0x06] = psxBios_exit;
100291 - //biosA0[0x07] = psxBios_sys_a0_07;
100292 - //biosA0[0x08] = psxBios_getc;
100293 - //biosA0[0x09] = psxBios_putc;
100294 - //biosA0[0x0a] = psxBios_todigit;
100295 - //biosA0[0x0b] = psxBios_atof;
100296 - //biosA0[0x0c] = psxBios_strtoul;
100297 - //biosA0[0x0d] = psxBios_strtol;
100298 - biosA0[0x0e] = psxBios_abs;
100299 - biosA0[0x0f] = psxBios_labs;
100300 - biosA0[0x10] = psxBios_atoi;
100301 - biosA0[0x11] = psxBios_atol;
100302 - //biosA0[0x12] = psxBios_atob;
100303 - biosA0[0x13] = psxBios_setjmp;
100304 - biosA0[0x14] = psxBios_longjmp;
100305 - biosA0[0x15] = psxBios_strcat;
100306 - biosA0[0x16] = psxBios_strncat;
100307 - biosA0[0x17] = psxBios_strcmp;
100308 - biosA0[0x18] = psxBios_strncmp;
100309 - biosA0[0x19] = psxBios_strcpy;
100310 - biosA0[0x1a] = psxBios_strncpy;
100311 - biosA0[0x1b] = psxBios_strlen;
100312 - biosA0[0x1c] = psxBios_index;
100313 - biosA0[0x1d] = psxBios_rindex;
100314 - biosA0[0x1e] = psxBios_strchr;
100315 - biosA0[0x1f] = psxBios_strrchr;
100316 - biosA0[0x20] = psxBios_strpbrk;
100317 - biosA0[0x21] = psxBios_strspn;
100318 - biosA0[0x22] = psxBios_strcspn;
100319 - biosA0[0x23] = psxBios_strtok;
100320 - biosA0[0x24] = psxBios_strstr;
100321 - biosA0[0x25] = psxBios_toupper;
100322 - biosA0[0x26] = psxBios_tolower;
100323 - biosA0[0x27] = psxBios_bcopy;
100324 - biosA0[0x28] = psxBios_bzero;
100325 - biosA0[0x29] = psxBios_bcmp;
100326 - biosA0[0x2a] = psxBios_memcpy;
100327 - biosA0[0x2b] = psxBios_memset;
100328 - biosA0[0x2c] = psxBios_memmove;
100329 - biosA0[0x2d] = psxBios_memcmp;
100330 - biosA0[0x2e] = psxBios_memchr;
100331 - biosA0[0x2f] = psxBios_rand;
100332 - biosA0[0x30] = psxBios_srand;
100333 - //biosA0[0x31] = psxBios_qsort;
100334 - //biosA0[0x32] = psxBios_strtod;
100335 - biosA0[0x33] = psxBios_malloc;
100336 - biosA0[0x34] = psxBios_free;
100337 - //biosA0[0x35] = psxBios_lsearch;
100338 - //biosA0[0x36] = psxBios_bsearch;
100339 - biosA0[0x37] = psxBios_calloc;
100340 - biosA0[0x38] = psxBios_realloc;
100341 - biosA0[0x39] = psxBios_InitHeap;
100342 - //biosA0[0x3a] = psxBios__exit;
100343 - biosA0[0x3b] = psxBios_getchar;
100344 - biosA0[0x3c] = psxBios_putchar;
100345 - //biosA0[0x3d] = psxBios_gets;
100346 - //biosA0[0x40] = psxBios_sys_a0_40;
100347 - //biosA0[0x41] = psxBios_LoadTest;
100348 - biosA0[0x42] = psxBios_Load;
100349 - biosA0[0x43] = psxBios_Exec;
100350 - biosA0[0x44] = psxBios_FlushCache;
100351 - //biosA0[0x45] = psxBios_InstallInterruptHandler;
100352 - biosA0[0x46] = psxBios_GPU_dw;
100353 - biosA0[0x47] = psxBios_mem2vram;
100354 - biosA0[0x48] = psxBios_SendGPU;
100355 - biosA0[0x49] = psxBios_GPU_cw;
100356 - biosA0[0x4a] = psxBios_GPU_cwb;
100357 - biosA0[0x4b] = psxBios_GPU_SendPackets;
100358 - biosA0[0x4c] = psxBios_sys_a0_4c;
100359 - biosA0[0x4d] = psxBios_GPU_GetGPUStatus;
100360 - //biosA0[0x4e] = psxBios_GPU_sync;
100361 - //biosA0[0x4f] = psxBios_sys_a0_4f;
100362 - //biosA0[0x50] = psxBios_sys_a0_50;
100363 - biosA0[0x51] = psxBios_LoadExec;
100364 - //biosA0[0x52] = psxBios_GetSysSp;
100365 - //biosA0[0x53] = psxBios_sys_a0_53;
100366 - //biosA0[0x54] = psxBios__96_init_a54;
100367 - //biosA0[0x55] = psxBios__bu_init_a55;
100368 - //biosA0[0x56] = psxBios__96_remove_a56;
100369 - //biosA0[0x57] = psxBios_sys_a0_57;
100370 - //biosA0[0x58] = psxBios_sys_a0_58;
100371 - //biosA0[0x59] = psxBios_sys_a0_59;
100372 - //biosA0[0x5a] = psxBios_sys_a0_5a;
100373 - //biosA0[0x5b] = psxBios_dev_tty_init;
100374 - //biosA0[0x5c] = psxBios_dev_tty_open;
100375 - //biosA0[0x5d] = psxBios_sys_a0_5d;
100376 - //biosA0[0x5e] = psxBios_dev_tty_ioctl;
100377 - //biosA0[0x5f] = psxBios_dev_cd_open;
100378 - //biosA0[0x60] = psxBios_dev_cd_read;
100379 - //biosA0[0x61] = psxBios_dev_cd_close;
100380 - //biosA0[0x62] = psxBios_dev_cd_firstfile;
100381 - //biosA0[0x63] = psxBios_dev_cd_nextfile;
100382 - //biosA0[0x64] = psxBios_dev_cd_chdir;
100383 - //biosA0[0x65] = psxBios_dev_card_open;
100384 - //biosA0[0x66] = psxBios_dev_card_read;
100385 - //biosA0[0x67] = psxBios_dev_card_write;
100386 - //biosA0[0x68] = psxBios_dev_card_close;
100387 - //biosA0[0x69] = psxBios_dev_card_firstfile;
100388 - //biosA0[0x6a] = psxBios_dev_card_nextfile;
100389 - //biosA0[0x6b] = psxBios_dev_card_erase;
100390 - //biosA0[0x6c] = psxBios_dev_card_undelete;
100391 - //biosA0[0x6d] = psxBios_dev_card_format;
100392 - //biosA0[0x6e] = psxBios_dev_card_rename;
100393 - //biosA0[0x6f] = psxBios_dev_card_6f;
100394 - biosA0[0x70] = psxBios__bu_init;
100395 - biosA0[0x71] = psxBios__96_init;
100396 - biosA0[0x72] = psxBios__96_remove;
100397 - //biosA0[0x73] = psxBios_sys_a0_73;
100398 - //biosA0[0x74] = psxBios_sys_a0_74;
100399 - //biosA0[0x75] = psxBios_sys_a0_75;
100400 - //biosA0[0x76] = psxBios_sys_a0_76;
100401 - //biosA0[0x77] = psxBios_sys_a0_77;
100402 - //biosA0[0x78] = psxBios__96_CdSeekL;
100403 - //biosA0[0x79] = psxBios_sys_a0_79;
100404 - //biosA0[0x7a] = psxBios_sys_a0_7a;
100405 - //biosA0[0x7b] = psxBios_sys_a0_7b;
100406 - //biosA0[0x7c] = psxBios__96_CdGetStatus;
100407 - //biosA0[0x7d] = psxBios_sys_a0_7d;
100408 - //biosA0[0x7e] = psxBios__96_CdRead;
100409 - //biosA0[0x7f] = psxBios_sys_a0_7f;
100410 - //biosA0[0x80] = psxBios_sys_a0_80;
100411 - //biosA0[0x81] = psxBios_sys_a0_81;
100412 - //biosA0[0x82] = psxBios_sys_a0_82;
100413 - //biosA0[0x83] = psxBios_sys_a0_83;
100414 - //biosA0[0x84] = psxBios_sys_a0_84;
100415 - //biosA0[0x85] = psxBios__96_CdStop;
100416 - //biosA0[0x86] = psxBios_sys_a0_86;
100417 - //biosA0[0x87] = psxBios_sys_a0_87;
100418 - //biosA0[0x88] = psxBios_sys_a0_88;
100419 - //biosA0[0x89] = psxBios_sys_a0_89;
100420 - //biosA0[0x8a] = psxBios_sys_a0_8a;
100421 - //biosA0[0x8b] = psxBios_sys_a0_8b;
100422 - //biosA0[0x8c] = psxBios_sys_a0_8c;
100423 - //biosA0[0x8d] = psxBios_sys_a0_8d;
100424 - //biosA0[0x8e] = psxBios_sys_a0_8e;
100425 - //biosA0[0x8f] = psxBios_sys_a0_8f;
100426 - //biosA0[0x90] = psxBios_sys_a0_90;
100427 - //biosA0[0x91] = psxBios_sys_a0_91;
100428 - //biosA0[0x92] = psxBios_sys_a0_92;
100429 - //biosA0[0x93] = psxBios_sys_a0_93;
100430 - //biosA0[0x94] = psxBios_sys_a0_94;
100431 - //biosA0[0x95] = psxBios_sys_a0_95;
100432 - //biosA0[0x96] = psxBios_AddCDROMDevice;
100433 - //biosA0[0x97] = psxBios_AddMemCardDevide;
100434 - //biosA0[0x98] = psxBios_DisableKernelIORedirection;
100435 - //biosA0[0x99] = psxBios_EnableKernelIORedirection;
100436 - //biosA0[0x9a] = psxBios_sys_a0_9a;
100437 - //biosA0[0x9b] = psxBios_sys_a0_9b;
100438 - //biosA0[0x9c] = psxBios_SetConf;
100439 - //biosA0[0x9d] = psxBios_GetConf;
100440 - //biosA0[0x9e] = psxBios_sys_a0_9e;
100441 - biosA0[0x9f] = psxBios_SetMem;
100442 - //biosA0[0xa0] = psxBios__boot;
100443 - //biosA0[0xa1] = psxBios_SystemError;
100444 - //biosA0[0xa2] = psxBios_EnqueueCdIntr;
100445 - //biosA0[0xa3] = psxBios_DequeueCdIntr;
100446 - //biosA0[0xa4] = psxBios_sys_a0_a4;
100447 - //biosA0[0xa5] = psxBios_ReadSector;
100448 - //biosA0[0xa6] = psxBios_get_cd_status;
100449 - //biosA0[0xa7] = psxBios_bufs_cb_0;
100450 - //biosA0[0xa8] = psxBios_bufs_cb_1;
100451 - //biosA0[0xa9] = psxBios_bufs_cb_2;
100452 - //biosA0[0xaa] = psxBios_bufs_cb_3;
100453 - biosA0[0xab] = psxBios__card_info;
100454 - biosA0[0xac] = psxBios__card_load;
100455 - //biosA0[0axd] = psxBios__card_auto;
100456 - //biosA0[0xae] = psxBios_bufs_cd_4;
100457 - //biosA0[0xaf] = psxBios_sys_a0_af;
100458 - //biosA0[0xb0] = psxBios_sys_a0_b0;
100459 - //biosA0[0xb1] = psxBios_sys_a0_b1;
100460 - //biosA0[0xb2] = psxBios_do_a_long_jmp
100461 - //biosA0[0xb3] = psxBios_sys_a0_b3;
100462 - //biosA0[0xb4] = psxBios_sub_function;
100463 -//*******************B0 CALLS****************************
100464 - //biosB0[0x00] = psxBios_SysMalloc;
100465 - //biosB0[0x01] = psxBios_sys_b0_01;
100466 - biosB0[0x02] = psxBios_SetRCnt;
100467 - biosB0[0x03] = psxBios_GetRCnt;
100468 - biosB0[0x04] = psxBios_StartRCnt;
100469 - biosB0[0x05] = psxBios_StopRCnt;
100470 - biosB0[0x06] = psxBios_ResetRCnt;
100471 - biosB0[0x07] = psxBios_DeliverEvent;
100472 - biosB0[0x08] = psxBios_OpenEvent;
100473 - biosB0[0x09] = psxBios_CloseEvent;
100474 - biosB0[0x0a] = psxBios_WaitEvent;
100475 - biosB0[0x0b] = psxBios_TestEvent;
100476 - biosB0[0x0c] = psxBios_EnableEvent;
100477 - biosB0[0x0d] = psxBios_DisableEvent;
100478 - biosB0[0x0e] = psxBios_OpenTh;
100479 - biosB0[0x0f] = psxBios_CloseTh;
100480 - biosB0[0x10] = psxBios_ChangeTh;
100481 - //biosB0[0x11] = psxBios_psxBios_b0_11;
100482 - biosB0[0x12] = psxBios_InitPAD;
100483 - biosB0[0x13] = psxBios_StartPAD;
100484 - biosB0[0x14] = psxBios_StopPAD;
100485 - biosB0[0x15] = psxBios_PAD_init;
100486 - biosB0[0x16] = psxBios_PAD_dr;
100487 - biosB0[0x17] = psxBios_ReturnFromException;
100488 - biosB0[0x18] = psxBios_ResetEntryInt;
100489 - biosB0[0x19] = psxBios_HookEntryInt;
100490 - //biosB0[0x1a] = psxBios_sys_b0_1a;
100491 - //biosB0[0x1b] = psxBios_sys_b0_1b;
100492 - //biosB0[0x1c] = psxBios_sys_b0_1c;
100493 - //biosB0[0x1d] = psxBios_sys_b0_1d;
100494 - //biosB0[0x1e] = psxBios_sys_b0_1e;
100495 - //biosB0[0x1f] = psxBios_sys_b0_1f;
100496 - biosB0[0x20] = psxBios_UnDeliverEvent;
100497 - //biosB0[0x21] = psxBios_sys_b0_21;
100498 - //biosB0[0x22] = psxBios_sys_b0_22;
100499 - //biosB0[0x23] = psxBios_sys_b0_23;
100500 - //biosB0[0x24] = psxBios_sys_b0_24;
100501 - //biosB0[0x25] = psxBios_sys_b0_25;
100502 - //biosB0[0x26] = psxBios_sys_b0_26;
100503 - //biosB0[0x27] = psxBios_sys_b0_27;
100504 - //biosB0[0x28] = psxBios_sys_b0_28;
100505 - //biosB0[0x29] = psxBios_sys_b0_29;
100506 - //biosB0[0x2a] = psxBios_sys_b0_2a;
100507 - //biosB0[0x2b] = psxBios_sys_b0_2b;
100508 - //biosB0[0x2c] = psxBios_sys_b0_2c;
100509 - //biosB0[0x2d] = psxBios_sys_b0_2d;
100510 - //biosB0[0x2e] = psxBios_sys_b0_2e;
100511 - //biosB0[0x2f] = psxBios_sys_b0_2f;
100512 - //biosB0[0x30] = psxBios_sys_b0_30;
100513 - //biosB0[0x31] = psxBios_sys_b0_31;
100514 - biosB0[0x32] = psxBios_open;
100515 - biosB0[0x33] = psxBios_lseek;
100516 - biosB0[0x34] = psxBios_read;
100517 - biosB0[0x35] = psxBios_write;
100518 - biosB0[0x36] = psxBios_close;
100519 - //biosB0[0x37] = psxBios_ioctl;
100520 - //biosB0[0x38] = psxBios_exit;
100521 - //biosB0[0x39] = psxBios_sys_b0_39;
100522 - //biosB0[0x3a] = psxBios_getc;
100523 - //biosB0[0x3b] = psxBios_putc;
100524 - biosB0[0x3c] = psxBios_getchar;
100525 - //biosB0[0x3e] = psxBios_gets;
100526 - //biosB0[0x40] = psxBios_cd;
100527 - //biosB0[0x41] = psxBios_format;
100528 - biosB0[0x42] = psxBios_firstfile;
100529 - biosB0[0x43] = psxBios_nextfile;
100530 - //biosB0[0x44] = psxBios_rename;
100531 - biosB0[0x45] = psxBios_delete;
100532 - //biosB0[0x46] = psxBios_undelete;
100533 - //biosB0[0x47] = psxBios_AddDevice;
100534 - //biosB0[0x48] = psxBios_RemoteDevice;
100535 - //biosB0[0x49] = psxBios_PrintInstalledDevices;
100536 - biosB0[0x4a] = psxBios_InitCARD;
100537 - biosB0[0x4b] = psxBios_StartCARD;
100538 - biosB0[0x4c] = psxBios_StopCARD;
100539 - //biosB0[0x4d] = psxBios_sys_b0_4d;
100540 - biosB0[0x4e] = psxBios__card_write;
100541 - biosB0[0x4f] = psxBios__card_read;
100542 - biosB0[0x50] = psxBios__new_card;
100543 - //biosB0[0x51] = psxBios_Krom2RawAdd;
100544 - //biosB0[0x52] = psxBios_sys_b0_52;
100545 - //biosB0[0x53] = psxBios_sys_b0_53;
100546 - //biosB0[0x54] = psxBios__get_errno;
100547 - //biosB0[0x55] = psxBios__get_error;
100548 - biosB0[0x56] = psxBios_GetC0Table;
100549 - biosB0[0x57] = psxBios_GetB0Table;
100550 - //biosB0[0x58] = psxBios__card_chan;
100551 - //biosB0[0x59] = psxBios_sys_b0_59;
100552 - //biosB0[0x5a] = psxBios_sys_b0_5a;
100553 - biosB0[0x5b] = psxBios_ChangeClearPad;
100554 - //biosB0[0x5c] = psxBios__card_status;
100555 - //biosB0[0x5d] = psxBios__card_wait;
100556 -//*******************C0 CALLS****************************
100557 - //biosC0[0x00] = psxBios_InitRCnt;
100558 - //biosC0[0x01] = psxBios_InitException;
100559 - biosC0[0x02] = psxBios_SysEnqIntRP;
100560 - biosC0[0x03] = psxBios_SysDeqIntRP;
100561 - //biosC0[0x04] = psxBios_get_free_EvCB_slot;
100562 - //biosC0[0x05] = psxBios_get_free_TCB_slot;
100563 - //biosC0[0x06] = psxBios_ExceptionHandler;
100564 - //biosC0[0x07] = psxBios_InstallExeptionHandler;
100565 - //biosC0[0x08] = psxBios_SysInitMemory;
100566 - //biosC0[0x09] = psxBios_SysInitKMem;
100567 - biosC0[0x0a] = psxBios_ChangeClearRCnt;
100568 - //biosC0[0x0b] = psxBios_SystemError;
100569 - //biosC0[0x0c] = psxBios_InitDefInt;
100570 - //biosC0[0x0d] = psxBios_sys_c0_0d;
100571 - //biosC0[0x0e] = psxBios_sys_c0_0e;
100572 - //biosC0[0x0f] = psxBios_sys_c0_0f;
100573 - //biosC0[0x10] = psxBios_sys_c0_10;
100574 - //biosC0[0x11] = psxBios_sys_c0_11;
100575 - //biosC0[0x12] = psxBios_InstallDevices;
100576 - //biosC0[0x13] = psxBios_FlushStfInOutPut;
100577 - //biosC0[0x14] = psxBios_sys_c0_14;
100578 - //biosC0[0x15] = psxBios__cdevinput;
100579 - //biosC0[0x16] = psxBios__cdevscan;
100580 - //biosC0[0x17] = psxBios__circgetc;
100581 - //biosC0[0x18] = psxBios__circputc;
100582 - //biosC0[0x19] = psxBios_ioabort;
100583 - //biosC0[0x1a] = psxBios_sys_c0_1a
100584 - //biosC0[0x1b] = psxBios_KernelRedirect;
100585 - //biosC0[0x1c] = psxBios_PatchAOTable;
100586 -//************** THE END ***************************************
100587 -/**/
100588 - base = 0x1000;
100589 - size = sizeof(EvCB) * 32;
100590 - Event = (void *)&psxR[base]; base+= size*6;
100591 - memset(Event, 0, size * 6);
100592 - HwEV = Event;
100593 - EvEV = Event + 32;
100594 - RcEV = Event + 32*2;
100595 - UeEV = Event + 32*3;
100596 - SwEV = Event + 32*4;
100597 - ThEV = Event + 32*5;
100598 -
100599 - ptr = (u32*)&psxM[0x0874]; // b0 table
100600 - ptr[0] = SWAPu32(0x4c54 - 0x884);
100601 -
100602 - ptr = (u32*)&psxM[0x0674]; // c0 table
100603 - ptr[6] = SWAPu32(0xc80);
100604 -
100605 - memset(SysIntRP, 0, sizeof(SysIntRP));
100606 - memset(Thread, 0, sizeof(Thread));
100607 - Thread[0].status = 2; // main thread
100608 -
100609 - psxMu32ref(0x0150) = SWAPu32(0x160);
100610 - psxMu32ref(0x0154) = SWAPu32(0x320);
100611 - psxMu32ref(0x0160) = SWAPu32(0x248);
100612 - strcpy(&psxM[0x248], "bu");
100613 -/* psxMu32ref(0x0ca8) = SWAPu32(0x1f410004);
100614 - psxMu32ref(0x0cf0) = SWAPu32(0x3c020000);
100615 - psxMu32ref(0x0cf4) = SWAPu32(0x2442641c);
100616 - psxMu32ref(0x09e0) = SWAPu32(0x43d0);
100617 - psxMu32ref(0x4d98) = SWAPu32(0x946f000a);
100618 -*/
100619 - // opcode HLE
100620 - psxRu32ref(0x0000) = SWAPu32((0x3b << 26) | 4);
100621 - psxMu32ref(0x0000) = SWAPu32((0x3b << 26) | 0);
100622 - psxMu32ref(0x00a0) = SWAPu32((0x3b << 26) | 1);
100623 - psxMu32ref(0x00b0) = SWAPu32((0x3b << 26) | 2);
100624 - psxMu32ref(0x00c0) = SWAPu32((0x3b << 26) | 3);
100625 - psxMu32ref(0x4c54) = SWAPu32((0x3b << 26) | 0);
100626 - psxMu32ref(0x8000) = SWAPu32((0x3b << 26) | 5);
100627 - psxMu32ref(0x07a0) = SWAPu32((0x3b << 26) | 0);
100628 - psxMu32ref(0x0884) = SWAPu32((0x3b << 26) | 0);
100629 - psxMu32ref(0x0894) = SWAPu32((0x3b << 26) | 0);
100630 -
100631 - // memory size 2 MB
100632 - psxHu32ref(0x1060) = SWAPu32(0x00000b88);
100633 -}
100634 -
100635 -void psxBiosShutdown() {
100636 -}
100637 -
100638 -__inline void SaveRegs() {
100639 - memcpy(regs, psxRegs.GPR.r, 32*4);
100640 - regs[32] = psxRegs.GPR.n.lo;
100641 - regs[33] = psxRegs.GPR.n.hi;
100642 - regs[34] = psxRegs.pc;
100643 -}
100644 -
100645 -__inline void LoadRegs() {
100646 - memcpy(psxRegs.GPR.r, regs, 32*4);
100647 - psxRegs.GPR.n.lo = regs[32];
100648 - psxRegs.GPR.n.hi = regs[33];
100649 -}
100650 -
100651 -
100652 -#define psxBios_PADpoll(pad) { \
100653 - PAD##pad##_startPoll(pad); \
100654 - pad_buf##pad[0] = 0; \
100655 - pad_buf##pad[1] = PAD##pad##_poll(0x42); \
100656 - if (!(pad_buf##pad[1] & 0x0f)) { \
100657 - bufcount = 32; \
100658 - } else { \
100659 - bufcount = (pad_buf##pad[1] & 0x0f) * 2; \
100660 - } \
100661 - PAD##pad##_poll(0); \
100662 - i = 2; \
100663 - while (bufcount--) { \
100664 - pad_buf##pad[i++] = PAD##pad##_poll(0); \
100665 - } \
100666 -}
100667 -
100668 -void netError();
100669 -
100670 -void biosInterrupt() {
100671 - int i, bufcount;
100672 -
100673 -// if (psxHu32(0x1070) & 0x1) { // Vsync
100674 - if (pad_buf) {
100675 - u32 *buf = (u32*)pad_buf;
100676 -
100677 - if (!Config.UseNet) {
100678 - PAD1_startPoll(1);
100679 - if (PAD1_poll(0x42) == 0x23) {
100680 - PAD1_poll(0);
100681 - *buf = PAD1_poll(0) << 8;
100682 - *buf|= PAD1_poll(0);
100683 - PAD1_poll(0);
100684 - *buf&= ~((PAD1_poll(0)>0x20)?1<<6:0);
100685 - *buf&= ~((PAD1_poll(0)>0x20)?1<<7:0);
100686 - } else {
100687 - PAD1_poll(0);
100688 - *buf = PAD1_poll(0) << 8;
100689 - *buf|= PAD1_poll(0);
100690 - }
100691 -
100692 - PAD2_startPoll(2);
100693 - if (PAD2_poll(0x42) == 0x23) {
100694 - PAD2_poll(0);
100695 - *buf|= PAD2_poll(0) << 24;
100696 - *buf|= PAD2_poll(0) << 16;
100697 - PAD2_poll(0);
100698 - *buf&= ~((PAD2_poll(0)>0x20)?1<<22:0);
100699 - *buf&= ~((PAD2_poll(0)>0x20)?1<<23:0);
100700 - } else {
100701 - PAD2_poll(0);
100702 - *buf|= PAD2_poll(0) << 24;
100703 - *buf|= PAD2_poll(0) << 16;
100704 - }
100705 - } else {
100706 - u16 data;
100707 -
100708 - PAD1_startPoll(1);
100709 - PAD1_poll(0x42);
100710 - PAD1_poll(0);
100711 - data = PAD1_poll(0) << 8;
100712 - data|= PAD1_poll(0);
100713 -
100714 - if (NET_sendPadData(&data, 2) == -1)
100715 - netError();
100716 -
100717 - if (NET_recvPadData(&((u16*)buf)[0], 1) == -1)
100718 - netError();
100719 - if (NET_recvPadData(&((u16*)buf)[1], 2) == -1)
100720 - netError();
100721 - }
100722 -
100723 - }
100724 - if (Config.UseNet && pad_buf1 && pad_buf2) {
100725 - psxBios_PADpoll(1);
100726 -
100727 - if (NET_sendPadData(pad_buf1, i) == -1)
100728 - netError();
100729 -
100730 - if (NET_recvPadData(pad_buf1, 1) == -1)
100731 - netError();
100732 - if (NET_recvPadData(pad_buf2, 2) == -1)
100733 - netError();
100734 - } else {
100735 - if (pad_buf1) {
100736 - psxBios_PADpoll(1);
100737 - }
100738 -
100739 - if (pad_buf2) {
100740 - psxBios_PADpoll(2);
100741 - }
100742 - }
100743 -
100744 - if (psxHu32(0x1070) & 0x1) { // Vsync
100745 - if (RcEV[3][1].status == EvStACTIVE) {
100746 - softCall(RcEV[3][1].fhandler);
100747 -// hwWrite32(0x1f801070, ~(1));
100748 - }
100749 - }
100750 -
100751 - if (psxHu32(0x1070) & 0x70) { // Rcnt 0,1,2
100752 - int i;
100753 -
100754 - for (i=0; i<3; i++) {
100755 - if (psxHu32(0x1070) & (1 << (i+4))) {
100756 - if (RcEV[i][1].status == EvStACTIVE) {
100757 - softCall(RcEV[i][1].fhandler);
100758 - }
100759 - psxHwWrite32(0x1f801070, ~(1 << (i+4)));
100760 - }
100761 - }
100762 - }
100763 -}
100764 -
100765 -void psxBiosException() {
100766 - int i;
100767 -
100768 - switch (psxRegs.CP0.n.Cause & 0x3c) {
100769 - case 0x00: // Interrupt
100770 -#ifdef PSXCPU_LOG
100771 -// PSXCPU_LOG("interrupt\n");
100772 -#endif
100773 - SaveRegs();
100774 -
100775 - biosInterrupt();
100776 -
100777 - for (i=0; i<8; i++) {
100778 - if (SysIntRP[i]) {
100779 - u32 *queue = (u32*)PSXM(SysIntRP[i]);
100780 -
100781 - s0 = queue[2];
100782 - softCall(queue[1]);
100783 - }
100784 - }
100785 -
100786 - if (jmp_int != NULL) {
100787 - int i;
100788 -
100789 - psxHwWrite32(0x1f801070, 0xffffffff);
100790 -
100791 - ra = jmp_int[0];
100792 - sp = jmp_int[1];
100793 - fp = jmp_int[2];
100794 - for (i=0; i<8; i++) // s0-s7
100795 - psxRegs.GPR.r[16+i] = jmp_int[3+i];
100796 - gp = jmp_int[11];
100797 -
100798 - v0 = 1;
100799 - pc0 = ra;
100800 - return;
100801 - }
100802 - psxHwWrite16(0x1f801070, 0);
100803 - break;
100804 -
100805 - case 0x20: // Syscall
100806 -#ifdef PSXCPU_LOG
100807 - PSXCPU_LOG("syscall exp %x\n", a0);
100808 -#endif
100809 - switch (a0) {
100810 - case 1: // EnterCritical - disable irq's
100811 - psxRegs.CP0.n.Status&=~0x404;
100812 -v0=1; // HDHOSHY experimental patch: Spongebob, Coldblood, fearEffect, Medievil2, Martian Gothic
100813 - break;
100814 -
100815 - case 2: // ExitCritical - enable irq's
100816 - psxRegs.CP0.n.Status|= 0x404;
100817 - break;
100818 - }
100819 - pc0 = psxRegs.CP0.n.EPC + 4;
100820 -
100821 - psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status & 0xfffffff0) |
100822 - ((psxRegs.CP0.n.Status & 0x3c) >> 2);
100823 - return;
100824 -
100825 - default:
100826 -#ifdef PSXCPU_LOG
100827 - PSXCPU_LOG("unknown bios exception!\n");
100828 -#endif
100829 - break;
100830 - }
100831 -
100832 - pc0 = psxRegs.CP0.n.EPC;
100833 - if (psxRegs.CP0.n.Cause & 0x80000000) pc0+=4;
100834 -
100835 - psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status & 0xfffffff0) |
100836 - ((psxRegs.CP0.n.Status & 0x3c) >> 2);
100837 -}
100838 -
100839 -#define bfreeze(ptr, size) \
100840 - if (Mode == 1) memcpy(&psxR[base], ptr, size); \
100841 - if (Mode == 0) memcpy(ptr, &psxR[base], size); \
100842 - base+=size;
100843 -
100844 -#define bfreezes(ptr) bfreeze(ptr, sizeof(ptr))
100845 -#define bfreezel(ptr) bfreeze(ptr, sizeof(uintptr_t))
100846 -
100847 -#define bfreezepsxMptr(ptr) \
100848 - if (Mode == 1) { \
100849 - if (ptr) psxRu32ref(base) = SWAPu32((uintptr_t)ptr - (uintptr_t)psxM); \
100850 - else psxRu32ref(base) = 0; \
100851 - } else { \
100852 - if (psxRu32(base)) *(u8**)&ptr = (u8*)(psxM + psxRu32(base)); \
100853 - else ptr = NULL; \
100854 - } \
100855 - base+=sizeof(uintptr_t);
100856 -
100857 -void psxBiosFreeze(int Mode) {
100858 - u32 base = 0x40000;
100859 -
100860 - bfreezepsxMptr(jmp_int);
100861 - bfreezepsxMptr(pad_buf);
100862 - bfreezepsxMptr(pad_buf1);
100863 - bfreezepsxMptr(pad_buf2);
100864 - bfreezepsxMptr(heap_addr);
100865 - bfreezel(&pad_buf1len);
100866 - bfreezel(&pad_buf2len);
100867 - bfreezes(regs);
100868 - bfreezes(SysIntRP);
100869 - bfreezel(&CardState);
100870 - bfreezes(Thread);
100871 - bfreezel(&CurThread);
100872 - bfreezes(FDesc);
100873 -}
100874 -
100875 -
100876 -
100877 diff -rupN original/libpcsxcore/libpcsxcore/psxbios.h new/libpcsxcore/libpcsxcore/psxbios.h
100878 --- original/libpcsxcore/libpcsxcore/psxbios.h 2007-10-08 17:13:28.000000000 -0400
100879 +++ new/libpcsxcore/libpcsxcore/psxbios.h 1969-12-31 20:00:00.000000000 -0400
100880 @@ -1,43 +0,0 @@
100881 -/***************************************************************************
100882 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
100883 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
100884 - * *
100885 - * This program is free software; you can redistribute it and/or modify *
100886 - * it under the terms of the GNU General Public License as published by *
100887 - * the Free Software Foundation; either version 2 of the License, or *
100888 - * (at your option) any later version. *
100889 - * *
100890 - * This program is distributed in the hope that it will be useful, *
100891 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
100892 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
100893 - * GNU General Public License for more details. *
100894 - * *
100895 - * You should have received a copy of the GNU General Public License *
100896 - * along with this program; if not, write to the *
100897 - * Free Software Foundation, Inc., *
100898 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
100899 - ***************************************************************************/
100900 -
100901 -#ifndef __PSXBIOS_H__
100902 -#define __PSXBIOS_H__
100903 -
100904 -#include "psxcommon.h"
100905 -#include "r3000a.h"
100906 -#include "psxmem.h"
100907 -#include "misc.h"
100908 -#include "sio.h"
100909 -
100910 -extern char *biosA0n[256];
100911 -extern char *biosB0n[256];
100912 -extern char *biosC0n[256];
100913 -
100914 -void psxBiosInit();
100915 -void psxBiosShutdown();
100916 -void psxBiosException();
100917 -void psxBiosFreeze(int Mode);
100918 -
100919 -extern void (*biosA0[256])();
100920 -extern void (*biosB0[256])();
100921 -extern void (*biosC0[256])();
100922 -
100923 -#endif /* __PSXBIOS_H__ */
100924 diff -rupN original/libpcsxcore/libpcsxcore/psxbios.lo new/libpcsxcore/libpcsxcore/psxbios.lo
100925 --- original/libpcsxcore/libpcsxcore/psxbios.lo 2009-03-28 22:34:42.000000000 -0430
100926 +++ new/libpcsxcore/libpcsxcore/psxbios.lo 1969-12-31 20:00:00.000000000 -0400
100927 @@ -1,12 +0,0 @@
100928 -# psxbios.lo - a libtool object file
100929 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
100930 -#
100931 -# Please DO NOT delete this file!
100932 -# It is necessary for linking the library.
100933 -
100934 -# Name of the PIC object.
100935 -pic_object='.libs/psxbios.o'
100936 -
100937 -# Name of the non-PIC object.
100938 -non_pic_object='psxbios.o'
100939 -
100940 Los ficheros binarios original/libpcsxcore/libpcsxcore/psxbios.o y new/libpcsxcore/libpcsxcore/psxbios.o son distintos
100941 diff -rupN original/libpcsxcore/libpcsxcore/psxcommon.h new/libpcsxcore/libpcsxcore/psxcommon.h
100942 --- original/libpcsxcore/libpcsxcore/psxcommon.h 2008-11-29 01:59:36.000000000 -0430
100943 +++ new/libpcsxcore/libpcsxcore/psxcommon.h 1969-12-31 20:00:00.000000000 -0400
100944 @@ -1,146 +0,0 @@
100945 -/***************************************************************************
100946 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
100947 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
100948 - * *
100949 - * This program is free software; you can redistribute it and/or modify *
100950 - * it under the terms of the GNU General Public License as published by *
100951 - * the Free Software Foundation; either version 2 of the License, or *
100952 - * (at your option) any later version. *
100953 - * *
100954 - * This program is distributed in the hope that it will be useful, *
100955 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
100956 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
100957 - * GNU General Public License for more details. *
100958 - * *
100959 - * You should have received a copy of the GNU General Public License *
100960 - * along with this program; if not, write to the *
100961 - * Free Software Foundation, Inc., *
100962 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
100963 - ***************************************************************************/
100964 -
100965 -/*
100966 -* This file contains common definitions and includes for all parts of the
100967 -* emulator core.
100968 -*/
100969 -
100970 -#ifndef __PSXCOMMON_H__
100971 -#define __PSXCOMMON_H__
100972 -
100973 -#include "config.h"
100974 -
100975 -/* System includes */
100976 -#include <stdio.h>
100977 -#include <string.h>
100978 -#include <stdarg.h>
100979 -#include <stdint.h>
100980 -#include <stdlib.h>
100981 -#include <math.h>
100982 -#include <time.h>
100983 -#include <ctype.h>
100984 -#include <sys/types.h>
100985 -#include <zlib.h>
100986 -#include <glib.h>
100987 -
100988 -/* Define types */
100989 -typedef int8_t s8;
100990 -typedef int16_t s16;
100991 -typedef int32_t s32;
100992 -typedef int64_t s64;
100993 -typedef intptr_t sptr;
100994 -
100995 -typedef uint8_t u8;
100996 -typedef uint16_t u16;
100997 -typedef uint32_t u32;
100998 -typedef uint64_t u64;
100999 -typedef uintptr_t uptr;
101000 -
101001 -/* Local includes */
101002 -#include "system.h"
101003 -#include "debug.h"
101004 -
101005 -/* Ryan TODO WTF is this? */
101006 -#if defined (__LINUX__) || defined (__MACOSX__)
101007 -#define strnicmp strncasecmp
101008 -#endif
101009 -#define __inline inline
101010 -
101011 -/* Enables NLS/internationalization if active */
101012 -#ifdef ENABLE_NLS
101013 -
101014 -#include <libintl.h>
101015 -
101016 -#undef _
101017 -#define _(String) gettext(String)
101018 -#ifdef gettext_noop
101019 -# define N_(String) gettext_noop (String)
101020 -#else
101021 -# define N_(String) (String)
101022 -#endif
101023 -
101024 -#else
101025 -
101026 -#define _(msgid) msgid
101027 -#define N_(msgid) msgid
101028 -
101029 -#endif
101030 -
101031 -extern int Log;
101032 -void __Log(char *fmt, ...);
101033 -
101034 -typedef struct {
101035 - char Gpu[256];
101036 - char Spu[256];
101037 - char Cdr[256];
101038 - char Pad1[256];
101039 - char Pad2[256];
101040 - char Net[256];
101041 - char Mcd1[256];
101042 - char Mcd2[256];
101043 - char Bios[256];
101044 - char BiosDir[MAXPATHLEN];
101045 - char PluginsDir[MAXPATHLEN];
101046 - long Xa;
101047 - long Sio;
101048 - long Mdec;
101049 - long PsxAuto;
101050 - long PsxType; /* NTSC or PAL */
101051 - long Cdda;
101052 - long HLE;
101053 - long Cpu;
101054 - long Dbg;
101055 - long PsxOut;
101056 - long SpuIrq;
101057 - long RCntFix;
101058 - long UseNet;
101059 - long VSyncWA;
101060 -} PcsxConfig;
101061 -
101062 -PcsxConfig Config;
101063 -
101064 -extern long LoadCdBios;
101065 -extern int StatesC;
101066 -extern int cdOpenCase;
101067 -extern int NetOpened;
101068 -
101069 -#define gzfreeze(ptr, size) \
101070 - if (Mode == 1) gzwrite(f, ptr, size); \
101071 - if (Mode == 0) gzread(f, ptr, size);
101072 -
101073 -#define gzfreezel(ptr) gzfreeze(ptr, sizeof(ptr))
101074 -
101075 -//#define BIAS 4
101076 -#define BIAS 2
101077 -#define PSXCLK 33868800 /* 33.8688 Mhz */
101078 -
101079 -enum {
101080 - BIOS_USER_DEFINED,
101081 - BIOS_HLE
101082 -}; /* BIOS Types */
101083 -
101084 -enum {
101085 - PSX_TYPE_NTSC,
101086 - PSX_TYPE_PAL
101087 -}; /* PSX Type */
101088 -
101089 -
101090 -#endif /* __PSXCOMMON_H__ */
101091 diff -rupN original/libpcsxcore/libpcsxcore/psxcounters.c new/libpcsxcore/libpcsxcore/psxcounters.c
101092 --- original/libpcsxcore/libpcsxcore/psxcounters.c 2007-10-08 17:13:28.000000000 -0400
101093 +++ new/libpcsxcore/libpcsxcore/psxcounters.c 1969-12-31 20:00:00.000000000 -0400
101094 @@ -1,245 +0,0 @@
101095 -/***************************************************************************
101096 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
101097 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
101098 - * *
101099 - * This program is free software; you can redistribute it and/or modify *
101100 - * it under the terms of the GNU General Public License as published by *
101101 - * the Free Software Foundation; either version 2 of the License, or *
101102 - * (at your option) any later version. *
101103 - * *
101104 - * This program is distributed in the hope that it will be useful, *
101105 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
101106 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
101107 - * GNU General Public License for more details. *
101108 - * *
101109 - * You should have received a copy of the GNU General Public License *
101110 - * along with this program; if not, write to the *
101111 - * Free Software Foundation, Inc., *
101112 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
101113 - ***************************************************************************/
101114 -
101115 -/*
101116 -* Internal PSX counters.
101117 -*/
101118 -
101119 -#include "psxcounters.h"
101120 -
101121 -static int cnts = 4;
101122 -psxCounter psxCounters[5];
101123 -
101124 -static void psxRcntUpd(unsigned long index) {
101125 - psxCounters[index].sCycle = psxRegs.cycle;
101126 - if (((!(psxCounters[index].mode & 1)) || (index!=2)) &&
101127 - psxCounters[index].mode & 0x30) {
101128 - if (psxCounters[index].mode & 0x10) { // Interrupt on target
101129 - psxCounters[index].Cycle = ((psxCounters[index].target - psxCounters[index].count) * psxCounters[index].rate) / BIAS;
101130 - } else { // Interrupt on 0xffff
101131 - psxCounters[index].Cycle = ((0xffff - psxCounters[index].count) * psxCounters[index].rate) / BIAS;
101132 - }
101133 - } else psxCounters[index].Cycle = 0xffffffff;
101134 -// if (index == 2) SysPrintf("Cycle %x\n", psxCounters[index].Cycle);
101135 -}
101136 -
101137 -static void psxRcntReset(unsigned long index) {
101138 -// SysPrintf("psxRcntReset %x (mode=%x)\n", index, psxCounters[index].mode);
101139 - psxCounters[index].count = 0;
101140 - psxRcntUpd(index);
101141 -
101142 -// if (index == 2) SysPrintf("rcnt2 %x\n", psxCounters[index].mode);
101143 - psxHu32ref(0x1070)|= SWAPu32(psxCounters[index].interrupt);
101144 - psxRegs.interrupt|= 0x80000000;
101145 - if (!(psxCounters[index].mode & 0x40)) { // Only 1 interrupt
101146 - psxCounters[index].Cycle = 0xffffffff;
101147 - } // else Continuos interrupt mode
101148 -}
101149 -
101150 -static void psxRcntSet() {
101151 - int i;
101152 -
101153 - psxNextCounter = 0x7fffffff;
101154 - psxNextsCounter = psxRegs.cycle;
101155 -
101156 - for (i=0; i<cnts; i++) {
101157 - s32 count;
101158 -
101159 - if (psxCounters[i].Cycle == 0xffffffff) continue;
101160 -
101161 - count = psxCounters[i].Cycle - (psxRegs.cycle - psxCounters[i].sCycle);
101162 -
101163 - if (count < 0) {
101164 - psxNextCounter = 0; break;
101165 - }
101166 -
101167 - if (count < (s32)psxNextCounter) {
101168 - psxNextCounter = count;
101169 - }
101170 - }
101171 -}
101172 -
101173 -void psxRcntInit() {
101174 -
101175 - memset(psxCounters, 0, sizeof(psxCounters));
101176 -
101177 - psxCounters[0].rate = 1; psxCounters[0].interrupt = 0x10;
101178 - psxCounters[1].rate = 1; psxCounters[1].interrupt = 0x20;
101179 - psxCounters[2].rate = 1; psxCounters[2].interrupt = 0x40;
101180 -
101181 - psxCounters[3].interrupt = 1;
101182 - psxCounters[3].mode = 0x58; // The VSync counter mode
101183 - psxCounters[3].target = 1;
101184 - psxUpdateVSyncRate();
101185 -
101186 - if (SPU_async != NULL) {
101187 - cnts = 5;
101188 -
101189 - psxCounters[4].rate = 768 * 64;
101190 - psxCounters[4].target = 1;
101191 - psxCounters[4].mode = 0x58;
101192 - } else cnts = 4;
101193 -
101194 - psxRcntUpd(0); psxRcntUpd(1); psxRcntUpd(2); psxRcntUpd(3);
101195 - psxRcntSet();
101196 -}
101197 -
101198 -void psxUpdateVSyncRate() {
101199 - if (Config.PsxType) // ntsc - 0 | pal - 1
101200 - psxCounters[3].rate = (PSXCLK / 50);// / BIAS;
101201 - else psxCounters[3].rate = (PSXCLK / 60);// / BIAS;
101202 - psxCounters[3].rate-= (psxCounters[3].rate / 262) * 22;
101203 - if (Config.VSyncWA) psxCounters[3].rate/= 2;
101204 -}
101205 -
101206 -void psxUpdateVSyncRateEnd() {
101207 - if (Config.PsxType) // ntsc - 0 | pal - 1
101208 - psxCounters[3].rate = (PSXCLK / 50);// / BIAS;
101209 - else psxCounters[3].rate = (PSXCLK / 60);// / BIAS;
101210 - psxCounters[3].rate = (psxCounters[3].rate / 262) * 22;
101211 - if (Config.VSyncWA) psxCounters[3].rate/= 2;
101212 -}
101213 -
101214 -void psxRcntUpdate() {
101215 - if ((psxRegs.cycle - psxCounters[3].sCycle) >= psxCounters[3].Cycle) {
101216 - if (psxCounters[3].mode & 0x10000) { // VSync End (22 hsyncs)
101217 - psxCounters[3].mode&=~0x10000;
101218 - psxUpdateVSyncRate();
101219 - psxRcntUpd(3);
101220 - GPU_updateLace(); // updateGPU
101221 - SysUpdate();
101222 -#ifdef GTE_LOG
101223 - GTE_LOG("VSync\n");
101224 -#endif
101225 - } else { // VSync Start (240 hsyncs)
101226 - psxCounters[3].mode|= 0x10000;
101227 - psxUpdateVSyncRateEnd();
101228 - psxRcntUpd(3);
101229 - psxHu32ref(0x1070)|= SWAPu32(1);
101230 - psxRegs.interrupt|= 0x80000000;
101231 - }
101232 - }
101233 -
101234 - if ((psxRegs.cycle - psxCounters[0].sCycle) >= psxCounters[0].Cycle) {
101235 - psxRcntReset(0);
101236 - }
101237 -
101238 - if ((psxRegs.cycle - psxCounters[1].sCycle) >= psxCounters[1].Cycle) {
101239 - psxRcntReset(1);
101240 - }
101241 -
101242 - if ((psxRegs.cycle - psxCounters[2].sCycle) >= psxCounters[2].Cycle) {
101243 - psxRcntReset(2);
101244 - }
101245 -
101246 - if (cnts >= 5) {
101247 - if ((psxRegs.cycle - psxCounters[4].sCycle) >= psxCounters[4].Cycle) {
101248 - SPU_async((psxRegs.cycle - psxCounters[4].sCycle) * BIAS);
101249 - psxRcntReset(4);
101250 - }
101251 - }
101252 -
101253 - psxRcntSet();
101254 -}
101255 -
101256 -void psxRcntWcount(u32 index, u32 value) {
101257 -// SysPrintf("writeCcount[%d] = %x\n", index, value);
101258 -// PSXCPU_LOG("writeCcount[%d] = %x\n", index, value);
101259 - psxCounters[index].count = value;
101260 - psxRcntUpd(index);
101261 - psxRcntSet();
101262 -}
101263 -
101264 -void psxRcntWmode(u32 index, u32 value) {
101265 -// SysPrintf("writeCmode[%ld] = %lx\n", index, value);
101266 - psxCounters[index].mode = value;
101267 - psxCounters[index].count = 0;
101268 - if(index == 0) {
101269 - switch (value & 0x300) {
101270 - case 0x100:
101271 - psxCounters[index].rate = ((psxCounters[3].rate /** BIAS*/) / 386) / 262; // seems ok
101272 - break;
101273 - default:
101274 - psxCounters[index].rate = 1;
101275 - }
101276 - }
101277 - else if(index == 1) {
101278 - switch (value & 0x300) {
101279 - case 0x100:
101280 - psxCounters[index].rate = (psxCounters[3].rate /** BIAS*/) / 262; // seems ok
101281 - break;
101282 - default:
101283 - psxCounters[index].rate = 1;
101284 - }
101285 - }
101286 - else if(index == 2) {
101287 - switch (value & 0x300) {
101288 - case 0x200:
101289 - psxCounters[index].rate = 8; // 1/8 speed
101290 - break;
101291 - default:
101292 - psxCounters[index].rate = 1; // normal speed
101293 - }
101294 - }
101295 -
101296 - // Need to set a rate and target
101297 - psxRcntUpd(index);
101298 - psxRcntSet();
101299 -}
101300 -
101301 -void psxRcntWtarget(u32 index, u32 value) {
101302 -// SysPrintf("writeCtarget[%ld] = %lx\n", index, value);
101303 - psxCounters[index].target = value;
101304 - psxRcntUpd(index);
101305 - psxRcntSet();
101306 -}
101307 -
101308 -u32 psxRcntRcount(u32 index) {
101309 - u32 ret;
101310 -
101311 -// if ((!(psxCounters[index].mode & 1)) || (index!=2)) {
101312 - if (psxCounters[index].mode & 0x08) { // Wrap at target
101313 - if (Config.RCntFix) { // Parasite Eve 2
101314 - ret = (psxCounters[index].count + /*BIAS **/ ((psxRegs.cycle - psxCounters[index].sCycle) / psxCounters[index].rate)) & 0xffff;
101315 - } else {
101316 - ret = (psxCounters[index].count + BIAS * ((psxRegs.cycle - psxCounters[index].sCycle) / psxCounters[index].rate)) & 0xffff;
101317 - }
101318 - } else { // Wrap at 0xffff
101319 - ret = (psxCounters[index].count + BIAS * (psxRegs.cycle / psxCounters[index].rate)) & 0xffff;
101320 - if (Config.RCntFix) { // Vandal Hearts 1/2
101321 - ret/= 16;
101322 - }
101323 - }
101324 -// return (psxCounters[index].count + BIAS * ((psxRegs.cycle - psxCounters[index].sCycle) / psxCounters[index].rate)) & 0xffff;
101325 -// } else return 0;
101326 -
101327 -// SysPrintf("readCcount[%ld] = %lx (mode %lx, target %lx, cycle %lx)\n", index, ret, psxCounters[index].mode, psxCounters[index].target, psxRegs.cycle);
101328 -
101329 - return ret;
101330 -}
101331 -
101332 -int psxRcntFreeze(gzFile f, int Mode) {
101333 - char Unused[4096 - sizeof(psxCounter)];
101334 -
101335 - gzfreezel(psxCounters);
101336 - gzfreezel(Unused);
101337 -
101338 - return 0;
101339 -}
101340 diff -rupN original/libpcsxcore/libpcsxcore/psxcounters.h new/libpcsxcore/libpcsxcore/psxcounters.h
101341 --- original/libpcsxcore/libpcsxcore/psxcounters.h 2007-10-08 17:13:28.000000000 -0400
101342 +++ new/libpcsxcore/libpcsxcore/psxcounters.h 1969-12-31 20:00:00.000000000 -0400
101343 @@ -1,48 +0,0 @@
101344 -/***************************************************************************
101345 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
101346 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
101347 - * *
101348 - * This program is free software; you can redistribute it and/or modify *
101349 - * it under the terms of the GNU General Public License as published by *
101350 - * the Free Software Foundation; either version 2 of the License, or *
101351 - * (at your option) any later version. *
101352 - * *
101353 - * This program is distributed in the hope that it will be useful, *
101354 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
101355 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
101356 - * GNU General Public License for more details. *
101357 - * *
101358 - * You should have received a copy of the GNU General Public License *
101359 - * along with this program; if not, write to the *
101360 - * Free Software Foundation, Inc., *
101361 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
101362 - ***************************************************************************/
101363 -
101364 -#ifndef __PSXCOUNTERS_H__
101365 -#define __PSXCOUNTERS_H__
101366 -
101367 -#include "psxcommon.h"
101368 -#include "r3000a.h"
101369 -#include "psxmem.h"
101370 -#include "plugins.h"
101371 -
101372 -typedef struct {
101373 - u32 count, mode, target;
101374 - u32 sCycle, Cycle, rate, interrupt;
101375 -} psxCounter;
101376 -
101377 -extern psxCounter psxCounters[5];
101378 -
101379 -u32 psxNextCounter, psxNextsCounter;
101380 -
101381 -void psxRcntInit();
101382 -void psxRcntUpdate();
101383 -void psxRcntWcount(u32 index, u32 value);
101384 -void psxRcntWmode(u32 index, u32 value);
101385 -void psxRcntWtarget(u32 index, u32 value);
101386 -u32 psxRcntRcount(u32 index);
101387 -int psxRcntFreeze(gzFile f, int Mode);
101388 -
101389 -void psxUpdateVSyncRate();
101390 -
101391 -#endif /* __PSXCOUNTERS_H__ */
101392 diff -rupN original/libpcsxcore/libpcsxcore/psxcounters.lo new/libpcsxcore/libpcsxcore/psxcounters.lo
101393 --- original/libpcsxcore/libpcsxcore/psxcounters.lo 2009-03-28 22:34:44.000000000 -0430
101394 +++ new/libpcsxcore/libpcsxcore/psxcounters.lo 1969-12-31 20:00:00.000000000 -0400
101395 @@ -1,12 +0,0 @@
101396 -# psxcounters.lo - a libtool object file
101397 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
101398 -#
101399 -# Please DO NOT delete this file!
101400 -# It is necessary for linking the library.
101401 -
101402 -# Name of the PIC object.
101403 -pic_object='.libs/psxcounters.o'
101404 -
101405 -# Name of the non-PIC object.
101406 -non_pic_object='psxcounters.o'
101407 -
101408 Los ficheros binarios original/libpcsxcore/libpcsxcore/psxcounters.o y new/libpcsxcore/libpcsxcore/psxcounters.o son distintos
101409 diff -rupN original/libpcsxcore/libpcsxcore/psxdma.c new/libpcsxcore/libpcsxcore/psxdma.c
101410 --- original/libpcsxcore/libpcsxcore/psxdma.c 2007-10-08 17:13:27.000000000 -0400
101411 +++ new/libpcsxcore/libpcsxcore/psxdma.c 1969-12-31 20:00:00.000000000 -0400
101412 @@ -1,170 +0,0 @@
101413 -/***************************************************************************
101414 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
101415 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
101416 - * *
101417 - * This program is free software; you can redistribute it and/or modify *
101418 - * it under the terms of the GNU General Public License as published by *
101419 - * the Free Software Foundation; either version 2 of the License, or *
101420 - * (at your option) any later version. *
101421 - * *
101422 - * This program is distributed in the hope that it will be useful, *
101423 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
101424 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
101425 - * GNU General Public License for more details. *
101426 - * *
101427 - * You should have received a copy of the GNU General Public License *
101428 - * along with this program; if not, write to the *
101429 - * Free Software Foundation, Inc., *
101430 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
101431 - ***************************************************************************/
101432 -
101433 -/*
101434 -* Handles PSX DMA functions.
101435 -*/
101436 -
101437 -#include "psxdma.h"
101438 -
101439 -// Dma0/1 in Mdec.c
101440 -// Dma3 in CdRom.c
101441 -
101442 -void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
101443 - u16 *ptr;
101444 - u32 size;
101445 -
101446 - switch (chcr) {
101447 - case 0x01000201: //cpu to spu transfer
101448 -#ifdef PSXDMA_LOG
101449 - PSXDMA_LOG("*** DMA4 SPU - mem2spu *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101450 -#endif
101451 - ptr = (u16 *)PSXM(madr);
101452 - if (ptr == NULL) {
101453 -#ifdef CPU_LOG
101454 - CPU_LOG("*** DMA4 SPU - mem2spu *** NULL Pointer!!!\n");
101455 -#endif
101456 - break;
101457 - }
101458 - SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2);
101459 - break;
101460 -
101461 - case 0x01000200: //spu to cpu transfer
101462 -#ifdef PSXDMA_LOG
101463 - PSXDMA_LOG("*** DMA4 SPU - spu2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101464 -#endif
101465 - ptr = (u16 *)PSXM(madr);
101466 - if (ptr == NULL) {
101467 -#ifdef CPU_LOG
101468 - CPU_LOG("*** DMA4 SPU - spu2mem *** NULL Pointer!!!\n");
101469 -#endif
101470 - break;
101471 - }
101472 - size = (bcr >> 16) * (bcr & 0xffff) * 2;
101473 - SPU_readDMAMem(ptr, size);
101474 - psxCpu->Clear(madr, size);
101475 - break;
101476 -
101477 -#ifdef PSXDMA_LOG
101478 - default:
101479 - PSXDMA_LOG("*** DMA4 SPU - unknown *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101480 - break;
101481 -#endif
101482 - }
101483 -
101484 - HW_DMA4_CHCR &= SWAP32(~0x01000000);
101485 - DMA_INTERRUPT(4);
101486 -}
101487 -
101488 -void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
101489 - u32 *ptr;
101490 - u32 size;
101491 -
101492 - switch(chcr) {
101493 - case 0x01000200: // vram2mem
101494 -#ifdef PSXDMA_LOG
101495 - PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101496 -#endif
101497 - ptr = (u32 *)PSXM(madr);
101498 - if (ptr == NULL) {
101499 -#ifdef CPU_LOG
101500 - CPU_LOG("*** DMA2 GPU - vram2mem *** NULL Pointer!!!\n");
101501 -#endif
101502 - break;
101503 - }
101504 - size = (bcr >> 16) * (bcr & 0xffff);
101505 - GPU_readDataMem(ptr, size);
101506 - psxCpu->Clear(madr, size);
101507 - break;
101508 -
101509 - case 0x01000201: // mem2vram
101510 -#ifdef PSXDMA_LOG
101511 - PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101512 -#endif
101513 - ptr = (u32 *)PSXM(madr);
101514 - if (ptr == NULL) {
101515 -#ifdef CPU_LOG
101516 - CPU_LOG("*** DMA2 GPU - mem2vram *** NULL Pointer!!!\n");
101517 -#endif
101518 - break;
101519 - }
101520 - size = (bcr >> 16) * (bcr & 0xffff);
101521 - GPU_writeDataMem(ptr, size);
101522 - GPUDMA_INT((size / 4) / BIAS);
101523 - return;
101524 -// break;
101525 -
101526 - case 0x01000401: // dma chain
101527 -#ifdef PSXDMA_LOG
101528 - PSXDMA_LOG("*** DMA 2 - GPU dma chain *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101529 -#endif
101530 - GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
101531 - break;
101532 -
101533 -#ifdef PSXDMA_LOG
101534 - default:
101535 - PSXDMA_LOG("*** DMA 2 - GPU unknown *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101536 - break;
101537 -#endif
101538 - }
101539 -
101540 - HW_DMA2_CHCR &= SWAP32(~0x01000000);
101541 - DMA_INTERRUPT(2);
101542 -}
101543 -
101544 -void gpuInterrupt() {
101545 - HW_DMA2_CHCR &= SWAP32(~0x01000000);
101546 - DMA_INTERRUPT(2);
101547 -}
101548 -
101549 -void psxDma6(u32 madr, u32 bcr, u32 chcr) {
101550 - u32 *mem = (u32 *)PSXM(madr);
101551 -
101552 -#ifdef PSXDMA_LOG
101553 - PSXDMA_LOG("*** DMA6 OT *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101554 -#endif
101555 -
101556 - if (chcr == 0x11000002) {
101557 - if (mem == NULL) {
101558 -#ifdef CPU_LOG
101559 - CPU_LOG("*** DMA6 OT *** NULL Pointer!!!\n");
101560 -#endif
101561 - HW_DMA6_CHCR &= SWAP32(~0x01000000);
101562 - DMA_INTERRUPT(6);
101563 - return;
101564 - }
101565 -
101566 - while (bcr--) {
101567 - *mem-- = SWAP32((madr - 4) & 0xffffff);
101568 - madr -= 4;
101569 - }
101570 - mem++; *mem = 0xffffff;
101571 - }
101572 -#ifdef PSXDMA_LOG
101573 - else {
101574 - // Unknown option
101575 - PSXDMA_LOG("*** DMA6 OT - unknown *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
101576 - }
101577 -#endif
101578 -
101579 - HW_DMA6_CHCR &= SWAP32(~0x01000000);
101580 - DMA_INTERRUPT(6);
101581 -}
101582 -
101583 diff -rupN original/libpcsxcore/libpcsxcore/psxdma.h new/libpcsxcore/libpcsxcore/psxdma.h
101584 --- original/libpcsxcore/libpcsxcore/psxdma.h 2007-10-08 17:13:27.000000000 -0400
101585 +++ new/libpcsxcore/libpcsxcore/psxdma.h 1969-12-31 20:00:00.000000000 -0400
101586 @@ -1,47 +0,0 @@
101587 -/***************************************************************************
101588 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
101589 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
101590 - * *
101591 - * This program is free software; you can redistribute it and/or modify *
101592 - * it under the terms of the GNU General Public License as published by *
101593 - * the Free Software Foundation; either version 2 of the License, or *
101594 - * (at your option) any later version. *
101595 - * *
101596 - * This program is distributed in the hope that it will be useful, *
101597 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
101598 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
101599 - * GNU General Public License for more details. *
101600 - * *
101601 - * You should have received a copy of the GNU General Public License *
101602 - * along with this program; if not, write to the *
101603 - * Free Software Foundation, Inc., *
101604 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
101605 - ***************************************************************************/
101606 -
101607 -#ifndef __PSXDMA_H__
101608 -#define __PSXDMA_H__
101609 -
101610 -#include "psxcommon.h"
101611 -#include "r3000a.h"
101612 -#include "psxhw.h"
101613 -#include "psxmem.h"
101614 -
101615 -#define GPUDMA_INT(eCycle) { \
101616 - psxRegs.interrupt |= 0x01000000; \
101617 - psxRegs.intCycle[3+24+1] = eCycle; \
101618 - psxRegs.intCycle[3+24] = psxRegs.cycle; \
101619 -}
101620 -
101621 -#define MDECOUTDMA_INT(eCycle) { \
101622 - psxRegs.interrupt |= 0x02000000; \
101623 - psxRegs.intCycle[5+24+1] = eCycle; \
101624 - psxRegs.intCycle[5+24] = psxRegs.cycle; \
101625 -}
101626 -
101627 -void psxDma2(u32 madr, u32 bcr, u32 chcr);
101628 -void psxDma3(u32 madr, u32 bcr, u32 chcr);
101629 -void psxDma4(u32 madr, u32 bcr, u32 chcr);
101630 -void psxDma6(u32 madr, u32 bcr, u32 chcr);
101631 -void gpuInterrupt();
101632 -
101633 -#endif /* __PSXDMA_H__ */
101634 diff -rupN original/libpcsxcore/libpcsxcore/psxdma.lo new/libpcsxcore/libpcsxcore/psxdma.lo
101635 --- original/libpcsxcore/libpcsxcore/psxdma.lo 2009-03-28 22:34:44.000000000 -0430
101636 +++ new/libpcsxcore/libpcsxcore/psxdma.lo 1969-12-31 20:00:00.000000000 -0400
101637 @@ -1,12 +0,0 @@
101638 -# psxdma.lo - a libtool object file
101639 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
101640 -#
101641 -# Please DO NOT delete this file!
101642 -# It is necessary for linking the library.
101643 -
101644 -# Name of the PIC object.
101645 -pic_object='.libs/psxdma.o'
101646 -
101647 -# Name of the non-PIC object.
101648 -non_pic_object='psxdma.o'
101649 -
101650 Los ficheros binarios original/libpcsxcore/libpcsxcore/psxdma.o y new/libpcsxcore/libpcsxcore/psxdma.o son distintos
101651 diff -rupN original/libpcsxcore/libpcsxcore/psxhle.c new/libpcsxcore/libpcsxcore/psxhle.c
101652 --- original/libpcsxcore/libpcsxcore/psxhle.c 2008-02-25 14:10:45.000000000 -0430
101653 +++ new/libpcsxcore/libpcsxcore/psxhle.c 1969-12-31 20:00:00.000000000 -0400
101654 @@ -1,97 +0,0 @@
101655 -/***************************************************************************
101656 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
101657 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
101658 - * *
101659 - * This program is free software; you can redistribute it and/or modify *
101660 - * it under the terms of the GNU General Public License as published by *
101661 - * the Free Software Foundation; either version 2 of the License, or *
101662 - * (at your option) any later version. *
101663 - * *
101664 - * This program is distributed in the hope that it will be useful, *
101665 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
101666 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
101667 - * GNU General Public License for more details. *
101668 - * *
101669 - * You should have received a copy of the GNU General Public License *
101670 - * along with this program; if not, write to the *
101671 - * Free Software Foundation, Inc., *
101672 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
101673 - ***************************************************************************/
101674 -
101675 -/*
101676 -* Internal PSX HLE functions.
101677 -*/
101678 -
101679 -#include "psxhle.h"
101680 -
101681 -static void hleDummy() {
101682 - psxRegs.pc = psxRegs.GPR.n.ra;
101683 -
101684 - psxBranchTest();
101685 -}
101686 -
101687 -static void hleA0() {
101688 - u32 call = psxRegs.GPR.n.t1 & 0xff;
101689 -
101690 - if (biosA0[call]) biosA0[call]();
101691 -
101692 - psxBranchTest();
101693 -}
101694 -
101695 -static void hleB0() {
101696 - u32 call = psxRegs.GPR.n.t1 & 0xff;
101697 -
101698 - if (biosB0[call]) biosB0[call]();
101699 -
101700 - psxBranchTest();
101701 -}
101702 -
101703 -static void hleC0() {
101704 - u32 call = psxRegs.GPR.n.t1 & 0xff;
101705 -
101706 - if (biosC0[call]) biosC0[call]();
101707 -
101708 - psxBranchTest();
101709 -}
101710 -
101711 -static void hleBootstrap() { // 0xbfc00000
101712 - SysPrintf("hleBootstrap\n");
101713 - CheckCdrom();
101714 - LoadCdrom();
101715 - SysPrintf("CdromLabel: \"%s\": PC = %8.8lx (SP = %8.8lx)\n", CdromLabel, psxRegs.pc, psxRegs.GPR.n.sp);
101716 -}
101717 -
101718 -typedef struct {
101719 - u32 _pc0;
101720 - u32 gp0;
101721 - u32 t_addr;
101722 - u32 t_size;
101723 - u32 d_addr;
101724 - u32 d_size;
101725 - u32 b_addr;
101726 - u32 b_size;
101727 - u32 S_addr;
101728 - u32 s_size;
101729 - u32 _sp,_fp,_gp,ret,base;
101730 -} EXEC;
101731 -
101732 -static void hleExecRet() {
101733 - EXEC *header = (EXEC*)PSXM(psxRegs.GPR.n.s0);
101734 -
101735 - SysPrintf("ExecRet %x: %x\n", psxRegs.GPR.n.s0, header->ret);
101736 -
101737 - psxRegs.GPR.n.ra = header->ret;
101738 - psxRegs.GPR.n.sp = header->_sp;
101739 - psxRegs.GPR.n.s8 = header->_fp;
101740 - psxRegs.GPR.n.gp = header->_gp;
101741 - psxRegs.GPR.n.s0 = header->base;
101742 -
101743 - psxRegs.GPR.n.v0 = 1;
101744 - psxRegs.pc = psxRegs.GPR.n.ra;
101745 -}
101746 -
101747 -void (*psxHLEt[256])() = {
101748 - hleDummy, hleA0, hleB0, hleC0,
101749 - hleBootstrap, hleExecRet,
101750 - hleDummy, hleDummy
101751 -};
101752 diff -rupN original/libpcsxcore/libpcsxcore/psxhle.h new/libpcsxcore/libpcsxcore/psxhle.h
101753 --- original/libpcsxcore/libpcsxcore/psxhle.h 2007-10-08 17:13:27.000000000 -0400
101754 +++ new/libpcsxcore/libpcsxcore/psxhle.h 1969-12-31 20:00:00.000000000 -0400
101755 @@ -1,30 +0,0 @@
101756 -/***************************************************************************
101757 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
101758 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
101759 - * *
101760 - * This program is free software; you can redistribute it and/or modify *
101761 - * it under the terms of the GNU General Public License as published by *
101762 - * the Free Software Foundation; either version 2 of the License, or *
101763 - * (at your option) any later version. *
101764 - * *
101765 - * This program is distributed in the hope that it will be useful, *
101766 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
101767 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
101768 - * GNU General Public License for more details. *
101769 - * *
101770 - * You should have received a copy of the GNU General Public License *
101771 - * along with this program; if not, write to the *
101772 - * Free Software Foundation, Inc., *
101773 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
101774 - ***************************************************************************/
101775 -
101776 -#ifndef __PSXHLE_H__
101777 -#define __PSXHLE_H__
101778 -
101779 -#include "psxcommon.h"
101780 -#include "r3000a.h"
101781 -#include "plugins.h"
101782 -
101783 -extern void (*psxHLEt[256])();
101784 -
101785 -#endif /* __PSXHLE_H__ */
101786 diff -rupN original/libpcsxcore/libpcsxcore/psxhle.lo new/libpcsxcore/libpcsxcore/psxhle.lo
101787 --- original/libpcsxcore/libpcsxcore/psxhle.lo 2009-03-28 22:35:04.000000000 -0430
101788 +++ new/libpcsxcore/libpcsxcore/psxhle.lo 1969-12-31 20:00:00.000000000 -0400
101789 @@ -1,12 +0,0 @@
101790 -# psxhle.lo - a libtool object file
101791 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
101792 -#
101793 -# Please DO NOT delete this file!
101794 -# It is necessary for linking the library.
101795 -
101796 -# Name of the PIC object.
101797 -pic_object='.libs/psxhle.o'
101798 -
101799 -# Name of the non-PIC object.
101800 -non_pic_object='psxhle.o'
101801 -
101802 Los ficheros binarios original/libpcsxcore/libpcsxcore/psxhle.o y new/libpcsxcore/libpcsxcore/psxhle.o son distintos
101803 diff -rupN original/libpcsxcore/libpcsxcore/psxhw.c new/libpcsxcore/libpcsxcore/psxhw.c
101804 --- original/libpcsxcore/libpcsxcore/psxhw.c 2007-10-08 17:13:28.000000000 -0400
101805 +++ new/libpcsxcore/libpcsxcore/psxhw.c 1969-12-31 20:00:00.000000000 -0400
101806 @@ -1,721 +0,0 @@
101807 -/***************************************************************************
101808 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
101809 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
101810 - * *
101811 - * This program is free software; you can redistribute it and/or modify *
101812 - * it under the terms of the GNU General Public License as published by *
101813 - * the Free Software Foundation; either version 2 of the License, or *
101814 - * (at your option) any later version. *
101815 - * *
101816 - * This program is distributed in the hope that it will be useful, *
101817 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
101818 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
101819 - * GNU General Public License for more details. *
101820 - * *
101821 - * You should have received a copy of the GNU General Public License *
101822 - * along with this program; if not, write to the *
101823 - * Free Software Foundation, Inc., *
101824 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
101825 - ***************************************************************************/
101826 -
101827 -/*
101828 -* Functions for PSX hardware control.
101829 -*/
101830 -
101831 -#include "psxhw.h"
101832 -
101833 -void psxHwReset() {
101834 - if (Config.Sio) psxHu32ref(0x1070) |= SWAP32(0x80);
101835 - if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAP32(0x200);
101836 -
101837 - memset(psxH, 0, 0x10000);
101838 -
101839 - mdecInit(); //intialize mdec decoder
101840 - cdrReset();
101841 - psxRcntInit();
101842 -}
101843 -
101844 -u8 psxHwRead8(u32 add) {
101845 - unsigned char hard;
101846 -
101847 - switch (add) {
101848 - case 0x1f801040: hard = sioRead8();break;
101849 - // case 0x1f801050: hard = serial_read8(); break;//for use of serial port ignore for now
101850 - case 0x1f801800: hard = cdrRead0(); break;
101851 - case 0x1f801801: hard = cdrRead1(); break;
101852 - case 0x1f801802: hard = cdrRead2(); break;
101853 - case 0x1f801803: hard = cdrRead3(); break;
101854 - default:
101855 - hard = psxHu8(add);
101856 -#ifdef PSXHW_LOG
101857 - PSXHW_LOG("*Unkwnown 8bit read at address %lx\n", add);
101858 -#endif
101859 - return hard;
101860 - }
101861 -
101862 -#ifdef PSXHW_LOG
101863 - PSXHW_LOG("*Known 8bit read at address %lx value %x\n", add, hard);
101864 -#endif
101865 - return hard;
101866 -}
101867 -
101868 -u16 psxHwRead16(u32 add) {
101869 - unsigned short hard;
101870 -
101871 - switch (add) {
101872 -#ifdef PSXHW_LOG
101873 - case 0x1f801070: PSXHW_LOG("IREG 16bit read %x\n", psxHu16(0x1070));
101874 - return psxHu16(0x1070);
101875 -#endif
101876 -#ifdef PSXHW_LOG
101877 - case 0x1f801074: PSXHW_LOG("IMASK 16bit read %x\n", psxHu16(0x1074));
101878 - return psxHu16(0x1074);
101879 -#endif
101880 -
101881 - case 0x1f801040:
101882 - hard = sioRead8();
101883 - hard|= sioRead8() << 8;
101884 -#ifdef PAD_LOG
101885 - PAD_LOG("sio read16 %lx; ret = %x\n", add&0xf, hard);
101886 -#endif
101887 - return hard;
101888 - case 0x1f801044:
101889 - hard = StatReg;
101890 -#ifdef PAD_LOG
101891 - PAD_LOG("sio read16 %lx; ret = %x\n", add&0xf, hard);
101892 -#endif
101893 - return hard;
101894 - case 0x1f801048:
101895 - hard = ModeReg;
101896 -#ifdef PAD_LOG
101897 - PAD_LOG("sio read16 %lx; ret = %x\n", add&0xf, hard);
101898 -#endif
101899 - return hard;
101900 - case 0x1f80104a:
101901 - hard = CtrlReg;
101902 -#ifdef PAD_LOG
101903 - PAD_LOG("sio read16 %lx; ret = %x\n", add&0xf, hard);
101904 -#endif
101905 - return hard;
101906 - case 0x1f80104e:
101907 - hard = BaudReg;
101908 -#ifdef PAD_LOG
101909 - PAD_LOG("sio read16 %lx; ret = %x\n", add&0xf, hard);
101910 -#endif
101911 - return hard;
101912 -
101913 - //Serial port stuff not support now ;P
101914 - // case 0x1f801050: hard = serial_read16(); break;
101915 - // case 0x1f801054: hard = serial_status_read(); break;
101916 - // case 0x1f80105a: hard = serial_control_read(); break;
101917 - // case 0x1f80105e: hard = serial_baud_read(); break;
101918 -
101919 - case 0x1f801100:
101920 - hard = psxRcntRcount(0);
101921 -#ifdef PSXHW_LOG
101922 - PSXHW_LOG("T0 count read16: %x\n", hard);
101923 -#endif
101924 - return hard;
101925 - case 0x1f801104:
101926 - hard = psxCounters[0].mode;
101927 -#ifdef PSXHW_LOG
101928 - PSXHW_LOG("T0 mode read16: %x\n", hard);
101929 -#endif
101930 - return hard;
101931 - case 0x1f801108:
101932 - hard = psxCounters[0].target;
101933 -#ifdef PSXHW_LOG
101934 - PSXHW_LOG("T0 target read16: %x\n", hard);
101935 -#endif
101936 - return hard;
101937 - case 0x1f801110:
101938 - hard = psxRcntRcount(1);
101939 -#ifdef PSXHW_LOG
101940 - PSXHW_LOG("T1 count read16: %x\n", hard);
101941 -#endif
101942 - return hard;
101943 - case 0x1f801114:
101944 - hard = psxCounters[1].mode;
101945 -#ifdef PSXHW_LOG
101946 - PSXHW_LOG("T1 mode read16: %x\n", hard);
101947 -#endif
101948 - return hard;
101949 - case 0x1f801118:
101950 - hard = psxCounters[1].target;
101951 -#ifdef PSXHW_LOG
101952 - PSXHW_LOG("T1 target read16: %x\n", hard);
101953 -#endif
101954 - return hard;
101955 - case 0x1f801120:
101956 - hard = psxRcntRcount(2);
101957 -#ifdef PSXHW_LOG
101958 - PSXHW_LOG("T2 count read16: %x\n", hard);
101959 -#endif
101960 - return hard;
101961 - case 0x1f801124:
101962 - hard = psxCounters[2].mode;
101963 -#ifdef PSXHW_LOG
101964 - PSXHW_LOG("T2 mode read16: %x\n", hard);
101965 -#endif
101966 - return hard;
101967 - case 0x1f801128:
101968 - hard = psxCounters[2].target;
101969 -#ifdef PSXHW_LOG
101970 - PSXHW_LOG("T2 target read16: %x\n", hard);
101971 -#endif
101972 - return hard;
101973 -
101974 - //case 0x1f802030: hard = //int_2000????
101975 - //case 0x1f802040: hard =//dip switches...??
101976 -
101977 - default:
101978 - if (add>=0x1f801c00 && add<0x1f801e00) {
101979 - hard = SPU_readRegister(add);
101980 - } else {
101981 - hard = psxHu16(add);
101982 -#ifdef PSXHW_LOG
101983 - PSXHW_LOG("*Unkwnown 16bit read at address %lx\n", add);
101984 -#endif
101985 - }
101986 - return hard;
101987 - }
101988 -
101989 -#ifdef PSXHW_LOG
101990 - PSXHW_LOG("*Known 16bit read at address %lx value %x\n", add, hard);
101991 -#endif
101992 - return hard;
101993 -}
101994 -
101995 -u32 psxHwRead32(u32 add) {
101996 - u32 hard;
101997 -
101998 - switch (add) {
101999 - case 0x1f801040:
102000 - hard = sioRead8();
102001 - hard|= sioRead8() << 8;
102002 - hard|= sioRead8() << 16;
102003 - hard|= sioRead8() << 24;
102004 -#ifdef PAD_LOG
102005 - PAD_LOG("sio read32 ;ret = %lx\n", hard);
102006 -#endif
102007 - return hard;
102008 -
102009 - // case 0x1f801050: hard = serial_read32(); break;//serial port
102010 -#ifdef PSXHW_LOG
102011 - case 0x1f801060:
102012 - PSXHW_LOG("RAM size read %lx\n", psxHu32(0x1060));
102013 - return psxHu32(0x1060);
102014 -#endif
102015 -#ifdef PSXHW_LOG
102016 - case 0x1f801070: PSXHW_LOG("IREG 32bit read %x\n", psxHu32(0x1070));
102017 - return psxHu32(0x1070);
102018 -#endif
102019 -#ifdef PSXHW_LOG
102020 - case 0x1f801074: PSXHW_LOG("IMASK 32bit read %x\n", psxHu32(0x1074));
102021 - return psxHu32(0x1074);
102022 -#endif
102023 -
102024 - case 0x1f801810:
102025 - hard = GPU_readData();
102026 -#ifdef PSXHW_LOG
102027 - PSXHW_LOG("GPU DATA 32bit read %lx\n", hard);
102028 -#endif
102029 - return hard;
102030 - case 0x1f801814:
102031 - hard = GPU_readStatus();
102032 -#ifdef PSXHW_LOG
102033 - PSXHW_LOG("GPU STATUS 32bit read %lx\n", hard);
102034 -#endif
102035 - return hard;
102036 -
102037 - case 0x1f801820: hard = mdecRead0(); break;
102038 - case 0x1f801824: hard = mdecRead1(); break;
102039 -
102040 -#ifdef PSXHW_LOG
102041 - case 0x1f8010a0:
102042 - PSXHW_LOG("DMA2 MADR 32bit read %lx\n", psxHu32(0x10a0));
102043 - return SWAPu32(HW_DMA2_MADR);
102044 - case 0x1f8010a4:
102045 - PSXHW_LOG("DMA2 BCR 32bit read %lx\n", psxHu32(0x10a4));
102046 - return SWAPu32(HW_DMA2_BCR);
102047 - case 0x1f8010a8:
102048 - PSXHW_LOG("DMA2 CHCR 32bit read %lx\n", psxHu32(0x10a8));
102049 - return SWAPu32(HW_DMA2_CHCR);
102050 -#endif
102051 -
102052 -#ifdef PSXHW_LOG
102053 - case 0x1f8010b0:
102054 - PSXHW_LOG("DMA3 MADR 32bit read %lx\n", psxHu32(0x10b0));
102055 - return SWAPu32(HW_DMA3_MADR);
102056 - case 0x1f8010b4:
102057 - PSXHW_LOG("DMA3 BCR 32bit read %lx\n", psxHu32(0x10b4));
102058 - return SWAPu32(HW_DMA3_BCR);
102059 - case 0x1f8010b8:
102060 - PSXHW_LOG("DMA3 CHCR 32bit read %lx\n", psxHu32(0x10b8));
102061 - return SWAPu32(HW_DMA3_CHCR);
102062 -#endif
102063 -
102064 -#ifdef PSXHW_LOG
102065 -/* case 0x1f8010f0:
102066 - PSXHW_LOG("DMA PCR 32bit read %x\n", psxHu32(0x10f0));
102067 - return SWAPu32(HW_DMA_PCR); // dma rest channel
102068 - case 0x1f8010f4:
102069 - PSXHW_LOG("DMA ICR 32bit read %x\n", psxHu32(0x10f4));
102070 - return SWAPu32(HW_DMA_ICR); // interrupt enabler?*/
102071 -#endif
102072 -
102073 - // time for rootcounters :)
102074 - case 0x1f801100:
102075 - hard = psxRcntRcount(0);
102076 -#ifdef PSXHW_LOG
102077 - PSXHW_LOG("T0 count read32: %lx\n", hard);
102078 -#endif
102079 - return hard;
102080 - case 0x1f801104:
102081 - hard = psxCounters[0].mode;
102082 -#ifdef PSXHW_LOG
102083 - PSXHW_LOG("T0 mode read32: %lx\n", hard);
102084 -#endif
102085 - return hard;
102086 - case 0x1f801108:
102087 - hard = psxCounters[0].target;
102088 -#ifdef PSXHW_LOG
102089 - PSXHW_LOG("T0 target read32: %lx\n", hard);
102090 -#endif
102091 - return hard;
102092 - case 0x1f801110:
102093 - hard = psxRcntRcount(1);
102094 -#ifdef PSXHW_LOG
102095 - PSXHW_LOG("T1 count read32: %lx\n", hard);
102096 -#endif
102097 - return hard;
102098 - case 0x1f801114:
102099 - hard = psxCounters[1].mode;
102100 -#ifdef PSXHW_LOG
102101 - PSXHW_LOG("T1 mode read32: %lx\n", hard);
102102 -#endif
102103 - return hard;
102104 - case 0x1f801118:
102105 - hard = psxCounters[1].target;
102106 -#ifdef PSXHW_LOG
102107 - PSXHW_LOG("T1 target read32: %lx\n", hard);
102108 -#endif
102109 - return hard;
102110 - case 0x1f801120:
102111 - hard = psxRcntRcount(2);
102112 -#ifdef PSXHW_LOG
102113 - PSXHW_LOG("T2 count read32: %lx\n", hard);
102114 -#endif
102115 - return hard;
102116 - case 0x1f801124:
102117 - hard = psxCounters[2].mode;
102118 -#ifdef PSXHW_LOG
102119 - PSXHW_LOG("T2 mode read32: %lx\n", hard);
102120 -#endif
102121 - return hard;
102122 - case 0x1f801128:
102123 - hard = psxCounters[2].target;
102124 -#ifdef PSXHW_LOG
102125 - PSXHW_LOG("T2 target read32: %lx\n", hard);
102126 -#endif
102127 - return hard;
102128 -
102129 - default:
102130 - hard = psxHu32(add);
102131 -#ifdef PSXHW_LOG
102132 - PSXHW_LOG("*Unkwnown 32bit read at address %lx\n", add);
102133 -#endif
102134 - return hard;
102135 - }
102136 -#ifdef PSXHW_LOG
102137 - PSXHW_LOG("*Known 32bit read at address %lx\n", add);
102138 -#endif
102139 - return hard;
102140 -}
102141 -
102142 -void psxHwWrite8(u32 add, u8 value) {
102143 - switch (add) {
102144 - case 0x1f801040: sioWrite8(value); break;
102145 - // case 0x1f801050: serial_write8(value); break;//serial port
102146 - case 0x1f801800: cdrWrite0(value); break;
102147 - case 0x1f801801: cdrWrite1(value); break;
102148 - case 0x1f801802: cdrWrite2(value); break;
102149 - case 0x1f801803: cdrWrite3(value); break;
102150 -
102151 - default:
102152 - psxHu8(add) = value;
102153 -#ifdef PSXHW_LOG
102154 - PSXHW_LOG("*Unknown 8bit write at address %lx value %x\n", add, value);
102155 -#endif
102156 - return;
102157 - }
102158 - psxHu8(add) = value;
102159 -#ifdef PSXHW_LOG
102160 - PSXHW_LOG("*Known 8bit write at address %lx value %x\n", add, value);
102161 -#endif
102162 -}
102163 -
102164 -void psxHwWrite16(u32 add, u16 value) {
102165 - switch (add) {
102166 - case 0x1f801040:
102167 - sioWrite8((unsigned char)value);
102168 - sioWrite8((unsigned char)(value>>8));
102169 -#ifdef PAD_LOG
102170 - PAD_LOG ("sio write16 %lx, %x\n", add&0xf, value);
102171 -#endif
102172 - return;
102173 - case 0x1f801044:
102174 -#ifdef PAD_LOG
102175 - PAD_LOG ("sio write16 %lx, %x\n", add&0xf, value);
102176 -#endif
102177 - return;
102178 - case 0x1f801048:
102179 - ModeReg = value;
102180 -#ifdef PAD_LOG
102181 - PAD_LOG ("sio write16 %lx, %x\n", add&0xf, value);
102182 -#endif
102183 - return;
102184 - case 0x1f80104a: // control register
102185 - sioWriteCtrl16(value);
102186 -#ifdef PAD_LOG
102187 - PAD_LOG ("sio write16 %lx, %x\n", add&0xf, value);
102188 -#endif
102189 - return;
102190 - case 0x1f80104e: // baudrate register
102191 - BaudReg = value;
102192 -#ifdef PAD_LOG
102193 - PAD_LOG ("sio write16 %lx, %x\n", add&0xf, value);
102194 -#endif
102195 - return;
102196 -
102197 - //serial port ;P
102198 - // case 0x1f801050: serial_write16(value); break;
102199 - // case 0x1f80105a: serial_control_write(value);break;
102200 - // case 0x1f80105e: serial_baud_write(value); break;
102201 - // case 0x1f801054: serial_status_write(value); break;
102202 -
102203 - case 0x1f801070:
102204 -#ifdef PSXHW_LOG
102205 - PSXHW_LOG("IREG 16bit write %x\n", value);
102206 -#endif
102207 - if (Config.Sio) psxHu16ref(0x1070) |= SWAPu16(0x80);
102208 - if (Config.SpuIrq) psxHu16ref(0x1070) |= SWAPu16(0x200);
102209 - psxHu16ref(0x1070) &= SWAPu16((psxHu16(0x1074) & value));
102210 - return;
102211 -
102212 - case 0x1f801074:
102213 -#ifdef PSXHW_LOG
102214 - PSXHW_LOG("IMASK 16bit write %x\n", value);
102215 -#endif
102216 - psxHu16ref(0x1074) = SWAPu16(value);
102217 - psxRegs.interrupt|= 0x80000000;
102218 - return;
102219 -
102220 - case 0x1f801100:
102221 -#ifdef PSXHW_LOG
102222 - PSXHW_LOG("COUNTER 0 COUNT 16bit write %x\n", value);
102223 -#endif
102224 - psxRcntWcount(0, value); return;
102225 - case 0x1f801104:
102226 -#ifdef PSXHW_LOG
102227 - PSXHW_LOG("COUNTER 0 MODE 16bit write %x\n", value);
102228 -#endif
102229 - psxRcntWmode(0, value); return;
102230 - case 0x1f801108:
102231 -#ifdef PSXHW_LOG
102232 - PSXHW_LOG("COUNTER 0 TARGET 16bit write %x\n", value);
102233 -#endif
102234 - psxRcntWtarget(0, value); return;
102235 -
102236 - case 0x1f801110:
102237 -#ifdef PSXHW_LOG
102238 - PSXHW_LOG("COUNTER 1 COUNT 16bit write %x\n", value);
102239 -#endif
102240 - psxRcntWcount(1, value); return;
102241 - case 0x1f801114:
102242 -#ifdef PSXHW_LOG
102243 - PSXHW_LOG("COUNTER 1 MODE 16bit write %x\n", value);
102244 -#endif
102245 - psxRcntWmode(1, value); return;
102246 - case 0x1f801118:
102247 -#ifdef PSXHW_LOG
102248 - PSXHW_LOG("COUNTER 1 TARGET 16bit write %x\n", value);
102249 -#endif
102250 - psxRcntWtarget(1, value); return;
102251 -
102252 - case 0x1f801120:
102253 -#ifdef PSXHW_LOG
102254 - PSXHW_LOG("COUNTER 2 COUNT 16bit write %x\n", value);
102255 -#endif
102256 - psxRcntWcount(2, value); return;
102257 - case 0x1f801124:
102258 -#ifdef PSXHW_LOG
102259 - PSXHW_LOG("COUNTER 2 MODE 16bit write %x\n", value);
102260 -#endif
102261 - psxRcntWmode(2, value); return;
102262 - case 0x1f801128:
102263 -#ifdef PSXHW_LOG
102264 - PSXHW_LOG("COUNTER 2 TARGET 16bit write %x\n", value);
102265 -#endif
102266 - psxRcntWtarget(2, value); return;
102267 -
102268 - default:
102269 - if (add>=0x1f801c00 && add<0x1f801e00) {
102270 - SPU_writeRegister(add, value);
102271 - return;
102272 - }
102273 -
102274 - psxHu16ref(add) = SWAPu16(value);
102275 -#ifdef PSXHW_LOG
102276 - PSXHW_LOG("*Unknown 16bit write at address %lx value %x\n", add, value);
102277 -#endif
102278 - return;
102279 - }
102280 - psxHu16ref(add) = SWAPu16(value);
102281 -#ifdef PSXHW_LOG
102282 - PSXHW_LOG("*Known 16bit write at address %lx value %x\n", add, value);
102283 -#endif
102284 -}
102285 -
102286 -#define DmaExec(n) { \
102287 - if (SWAPu32(HW_DMA##n##_CHCR) & 0x01000000) return; \
102288 - HW_DMA##n##_CHCR = SWAPu32(value); \
102289 - \
102290 - if (SWAPu32(HW_DMA##n##_CHCR) & 0x01000000 && SWAPu32(HW_DMA_PCR) & (8 << (n * 4))) { \
102291 - psxDma##n(SWAPu32(HW_DMA##n##_MADR), SWAPu32(HW_DMA##n##_BCR), SWAPu32(HW_DMA##n##_CHCR)); \
102292 - } \
102293 -}
102294 -
102295 -void psxHwWrite32(u32 add, u32 value) {
102296 - switch (add) {
102297 - case 0x1f801040:
102298 - sioWrite8((unsigned char)value);
102299 - sioWrite8((unsigned char)((value&0xff) >> 8));
102300 - sioWrite8((unsigned char)((value&0xff) >> 16));
102301 - sioWrite8((unsigned char)((value&0xff) >> 24));
102302 -#ifdef PAD_LOG
102303 - PAD_LOG("sio write32 %lx\n", value);
102304 -#endif
102305 - return;
102306 - // case 0x1f801050: serial_write32(value); break;//serial port
102307 -#ifdef PSXHW_LOG
102308 - case 0x1f801060:
102309 - PSXHW_LOG("RAM size write %lx\n", value);
102310 - psxHu32ref(add) = SWAPu32(value);
102311 - return; // Ram size
102312 -#endif
102313 -
102314 - case 0x1f801070:
102315 -#ifdef PSXHW_LOG
102316 - PSXHW_LOG("IREG 32bit write %lx\n", value);
102317 -#endif
102318 - if (Config.Sio) psxHu32ref(0x1070) |= SWAPu32(0x80);
102319 - if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAPu32(0x200);
102320 - psxHu32ref(0x1070) &= SWAPu32((psxHu32(0x1074) & value));
102321 - return;
102322 - case 0x1f801074:
102323 -#ifdef PSXHW_LOG
102324 - PSXHW_LOG("IMASK 32bit write %lx\n", value);
102325 -#endif
102326 - psxHu32ref(0x1074) = SWAPu32(value);
102327 - psxRegs.interrupt|= 0x80000000;
102328 - return;
102329 -
102330 -#ifdef PSXHW_LOG
102331 - case 0x1f801080:
102332 - PSXHW_LOG("DMA0 MADR 32bit write %lx\n", value);
102333 - HW_DMA0_MADR = SWAPu32(value); return; // DMA0 madr
102334 - case 0x1f801084:
102335 - PSXHW_LOG("DMA0 BCR 32bit write %lx\n", value);
102336 - HW_DMA0_BCR = SWAPu32(value); return; // DMA0 bcr
102337 -#endif
102338 - case 0x1f801088:
102339 -#ifdef PSXHW_LOG
102340 - PSXHW_LOG("DMA0 CHCR 32bit write %lx\n", value);
102341 -#endif
102342 - DmaExec(0); // DMA0 chcr (MDEC in DMA)
102343 - return;
102344 -
102345 -#ifdef PSXHW_LOG
102346 - case 0x1f801090:
102347 - PSXHW_LOG("DMA1 MADR 32bit write %lx\n", value);
102348 - HW_DMA1_MADR = SWAPu32(value); return; // DMA1 madr
102349 - case 0x1f801094:
102350 - PSXHW_LOG("DMA1 BCR 32bit write %lx\n", value);
102351 - HW_DMA1_BCR = SWAPu32(value); return; // DMA1 bcr
102352 -#endif
102353 - case 0x1f801098:
102354 -#ifdef PSXHW_LOG
102355 - PSXHW_LOG("DMA1 CHCR 32bit write %lx\n", value);
102356 -#endif
102357 - DmaExec(1); // DMA1 chcr (MDEC out DMA)
102358 - return;
102359 -
102360 -#ifdef PSXHW_LOG
102361 - case 0x1f8010a0:
102362 - PSXHW_LOG("DMA2 MADR 32bit write %lx\n", value);
102363 - HW_DMA2_MADR = SWAPu32(value); return; // DMA2 madr
102364 - case 0x1f8010a4:
102365 - PSXHW_LOG("DMA2 BCR 32bit write %lx\n", value);
102366 - HW_DMA2_BCR = SWAPu32(value); return; // DMA2 bcr
102367 -#endif
102368 - case 0x1f8010a8:
102369 -#ifdef PSXHW_LOG
102370 - PSXHW_LOG("DMA2 CHCR 32bit write %lx\n", value);
102371 -#endif
102372 - DmaExec(2); // DMA2 chcr (GPU DMA)
102373 - return;
102374 -
102375 -#ifdef PSXHW_LOG
102376 - case 0x1f8010b0:
102377 - PSXHW_LOG("DMA3 MADR 32bit write %lx\n", value);
102378 - HW_DMA3_MADR = SWAPu32(value); return; // DMA3 madr
102379 - case 0x1f8010b4:
102380 - PSXHW_LOG("DMA3 BCR 32bit write %lx\n", value);
102381 - HW_DMA3_BCR = SWAPu32(value); return; // DMA3 bcr
102382 -#endif
102383 - case 0x1f8010b8:
102384 -#ifdef PSXHW_LOG
102385 - PSXHW_LOG("DMA3 CHCR 32bit write %lx\n", value);
102386 -#endif
102387 - DmaExec(3); // DMA3 chcr (CDROM DMA)
102388 -
102389 - return;
102390 -
102391 -#ifdef PSXHW_LOG
102392 - case 0x1f8010c0:
102393 - PSXHW_LOG("DMA4 MADR 32bit write %lx\n", value);
102394 - HW_DMA4_MADR = SWAPu32(value); return; // DMA4 madr
102395 - case 0x1f8010c4:
102396 - PSXHW_LOG("DMA4 BCR 32bit write %lx\n", value);
102397 - HW_DMA4_BCR = SWAPu32(value); return; // DMA4 bcr
102398 -#endif
102399 - case 0x1f8010c8:
102400 -#ifdef PSXHW_LOG
102401 - PSXHW_LOG("DMA4 CHCR 32bit write %lx\n", value);
102402 -#endif
102403 - DmaExec(4); // DMA4 chcr (SPU DMA)
102404 - return;
102405 -
102406 -#if 0
102407 - case 0x1f8010d0: break; //DMA5write_madr();
102408 - case 0x1f8010d4: break; //DMA5write_bcr();
102409 - case 0x1f8010d8: break; //DMA5write_chcr(); // Not needed
102410 -#endif
102411 -
102412 -#ifdef PSXHW_LOG
102413 - case 0x1f8010e0:
102414 - PSXHW_LOG("DMA6 MADR 32bit write %lx\n", value);
102415 - HW_DMA6_MADR = SWAPu32(value); return; // DMA6 bcr
102416 - case 0x1f8010e4:
102417 - PSXHW_LOG("DMA6 BCR 32bit write %lx\n", value);
102418 - HW_DMA6_BCR = SWAPu32(value); return; // DMA6 bcr
102419 -#endif
102420 - case 0x1f8010e8:
102421 -#ifdef PSXHW_LOG
102422 - PSXHW_LOG("DMA6 CHCR 32bit write %lx\n", value);
102423 -#endif
102424 - DmaExec(6); // DMA6 chcr (OT clear)
102425 - return;
102426 -
102427 -#ifdef PSXHW_LOG
102428 - case 0x1f8010f0:
102429 - PSXHW_LOG("DMA PCR 32bit write %lx\n", value);
102430 - HW_DMA_PCR = SWAPu32(value);
102431 - return;
102432 -#endif
102433 -
102434 - case 0x1f8010f4:
102435 -#ifdef PSXHW_LOG
102436 - PSXHW_LOG("DMA ICR 32bit write %lx\n", value);
102437 -#endif
102438 - {
102439 - u32 tmp = (~value) & SWAPu32(HW_DMA_ICR);
102440 - HW_DMA_ICR = SWAPu32(((tmp ^ value) & 0xffffff) ^ tmp);
102441 - return;
102442 - }
102443 -
102444 - case 0x1f801810:
102445 -#ifdef PSXHW_LOG
102446 - PSXHW_LOG("GPU DATA 32bit write %lx\n", value);
102447 -#endif
102448 - GPU_writeData(value); return;
102449 - case 0x1f801814:
102450 -#ifdef PSXHW_LOG
102451 - PSXHW_LOG("GPU STATUS 32bit write %lx\n", value);
102452 -#endif
102453 - GPU_writeStatus(value); return;
102454 -
102455 - case 0x1f801820:
102456 - mdecWrite0(value); break;
102457 - case 0x1f801824:
102458 - mdecWrite1(value); break;
102459 -
102460 - case 0x1f801100:
102461 -#ifdef PSXHW_LOG
102462 - PSXHW_LOG("COUNTER 0 COUNT 32bit write %lx\n", value);
102463 -#endif
102464 - psxRcntWcount(0, value & 0xffff); return;
102465 - case 0x1f801104:
102466 -#ifdef PSXHW_LOG
102467 - PSXHW_LOG("COUNTER 0 MODE 32bit write %lx\n", value);
102468 -#endif
102469 - psxRcntWmode(0, value); return;
102470 - case 0x1f801108:
102471 -#ifdef PSXHW_LOG
102472 - PSXHW_LOG("COUNTER 0 TARGET 32bit write %lx\n", value);
102473 -#endif
102474 - psxRcntWtarget(0, value & 0xffff); return; // HW_DMA_ICR&= SWAP32((~value)&0xff000000);
102475 -
102476 - case 0x1f801110:
102477 -#ifdef PSXHW_LOG
102478 - PSXHW_LOG("COUNTER 1 COUNT 32bit write %lx\n", value);
102479 -#endif
102480 - psxRcntWcount(1, value & 0xffff); return;
102481 - case 0x1f801114:
102482 -#ifdef PSXHW_LOG
102483 - PSXHW_LOG("COUNTER 1 MODE 32bit write %lx\n", value);
102484 -#endif
102485 - psxRcntWmode(1, value); return;
102486 - case 0x1f801118:
102487 -#ifdef PSXHW_LOG
102488 - PSXHW_LOG("COUNTER 1 TARGET 32bit write %lx\n", value);
102489 -#endif
102490 - psxRcntWtarget(1, value & 0xffff); return;
102491 -
102492 - case 0x1f801120:
102493 -#ifdef PSXHW_LOG
102494 - PSXHW_LOG("COUNTER 2 COUNT 32bit write %lx\n", value);
102495 -#endif
102496 - psxRcntWcount(2, value & 0xffff); return;
102497 - case 0x1f801124:
102498 -#ifdef PSXHW_LOG
102499 - PSXHW_LOG("COUNTER 2 MODE 32bit write %lx\n", value);
102500 -#endif
102501 - psxRcntWmode(2, value); return;
102502 - case 0x1f801128:
102503 -#ifdef PSXHW_LOG
102504 - PSXHW_LOG("COUNTER 2 TARGET 32bit write %lx\n", value);
102505 -#endif
102506 - psxRcntWtarget(2, value & 0xffff); return;
102507 -
102508 - default:
102509 - psxHu32ref(add) = SWAPu32(value);
102510 -#ifdef PSXHW_LOG
102511 - PSXHW_LOG("*Unknown 32bit write at address %lx value %lx\n", add, value);
102512 -#endif
102513 - return;
102514 - }
102515 - psxHu32ref(add) = SWAPu32(value);
102516 -#ifdef PSXHW_LOG
102517 - PSXHW_LOG("*Known 32bit write at address %lx value %lx\n", add, value);
102518 -#endif
102519 -}
102520 -
102521 -int psxHwFreeze(gzFile f, int Mode) {
102522 - char Unused[4096];
102523 -
102524 - gzfreezel(Unused);
102525 -
102526 - return 0;
102527 -}
102528 diff -rupN original/libpcsxcore/libpcsxcore/psxhw.h new/libpcsxcore/libpcsxcore/psxhw.h
102529 --- original/libpcsxcore/libpcsxcore/psxhw.h 2007-10-08 17:13:27.000000000 -0400
102530 +++ new/libpcsxcore/libpcsxcore/psxhw.h 1969-12-31 20:00:00.000000000 -0400
102531 @@ -1,74 +0,0 @@
102532 -/***************************************************************************
102533 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
102534 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
102535 - * *
102536 - * This program is free software; you can redistribute it and/or modify *
102537 - * it under the terms of the GNU General Public License as published by *
102538 - * the Free Software Foundation; either version 2 of the License, or *
102539 - * (at your option) any later version. *
102540 - * *
102541 - * This program is distributed in the hope that it will be useful, *
102542 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
102543 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
102544 - * GNU General Public License for more details. *
102545 - * *
102546 - * You should have received a copy of the GNU General Public License *
102547 - * along with this program; if not, write to the *
102548 - * Free Software Foundation, Inc., *
102549 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
102550 - ***************************************************************************/
102551 -
102552 -#ifndef __PSXHW_H__
102553 -#define __PSXHW_H__
102554 -
102555 -#include "psxcommon.h"
102556 -#include "r3000a.h"
102557 -#include "psxmem.h"
102558 -#include "sio.h"
102559 -#include "psxcounters.h"
102560 -
102561 -#define HW_DMA0_MADR (psxHu32ref(0x1080)) // MDEC in DMA
102562 -#define HW_DMA0_BCR (psxHu32ref(0x1084))
102563 -#define HW_DMA0_CHCR (psxHu32ref(0x1088))
102564 -
102565 -#define HW_DMA1_MADR (psxHu32ref(0x1090)) // MDEC out DMA
102566 -#define HW_DMA1_BCR (psxHu32ref(0x1094))
102567 -#define HW_DMA1_CHCR (psxHu32ref(0x1098))
102568 -
102569 -#define HW_DMA2_MADR (psxHu32ref(0x10a0)) // GPU DMA
102570 -#define HW_DMA2_BCR (psxHu32ref(0x10a4))
102571 -#define HW_DMA2_CHCR (psxHu32ref(0x10a8))
102572 -
102573 -#define HW_DMA3_MADR (psxHu32ref(0x10b0)) // CDROM DMA
102574 -#define HW_DMA3_BCR (psxHu32ref(0x10b4))
102575 -#define HW_DMA3_CHCR (psxHu32ref(0x10b8))
102576 -
102577 -#define HW_DMA4_MADR (psxHu32ref(0x10c0)) // SPU DMA
102578 -#define HW_DMA4_BCR (psxHu32ref(0x10c4))
102579 -#define HW_DMA4_CHCR (psxHu32ref(0x10c8))
102580 -
102581 -#define HW_DMA6_MADR (psxHu32ref(0x10e0)) // GPU DMA (OT)
102582 -#define HW_DMA6_BCR (psxHu32ref(0x10e4))
102583 -#define HW_DMA6_CHCR (psxHu32ref(0x10e8))
102584 -
102585 -#define HW_DMA_PCR (psxHu32ref(0x10f0))
102586 -#define HW_DMA_ICR (psxHu32ref(0x10f4))
102587 -
102588 -#define DMA_INTERRUPT(n) \
102589 - if (SWAPu32(HW_DMA_ICR) & (1 << (16 + n))) { \
102590 - HW_DMA_ICR|= SWAP32(1 << (24 + n)); \
102591 - psxHu32ref(0x1070) |= SWAP32(8); \
102592 - psxRegs.interrupt|= 0x80000000; \
102593 - }
102594 -
102595 -
102596 -void psxHwReset();
102597 -u8 psxHwRead8 (u32 add);
102598 -u16 psxHwRead16(u32 add);
102599 -u32 psxHwRead32(u32 add);
102600 -void psxHwWrite8 (u32 add, u8 value);
102601 -void psxHwWrite16(u32 add, u16 value);
102602 -void psxHwWrite32(u32 add, u32 value);
102603 -int psxHwFreeze(gzFile f, int Mode);
102604 -
102605 -#endif /* __PSXHW_H__ */
102606 diff -rupN original/libpcsxcore/libpcsxcore/psxhw.lo new/libpcsxcore/libpcsxcore/psxhw.lo
102607 --- original/libpcsxcore/libpcsxcore/psxhw.lo 2009-03-28 22:34:49.000000000 -0430
102608 +++ new/libpcsxcore/libpcsxcore/psxhw.lo 1969-12-31 20:00:00.000000000 -0400
102609 @@ -1,12 +0,0 @@
102610 -# psxhw.lo - a libtool object file
102611 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
102612 -#
102613 -# Please DO NOT delete this file!
102614 -# It is necessary for linking the library.
102615 -
102616 -# Name of the PIC object.
102617 -pic_object='.libs/psxhw.o'
102618 -
102619 -# Name of the non-PIC object.
102620 -non_pic_object='psxhw.o'
102621 -
102622 Los ficheros binarios original/libpcsxcore/libpcsxcore/psxhw.o y new/libpcsxcore/libpcsxcore/psxhw.o son distintos
102623 diff -rupN original/libpcsxcore/libpcsxcore/psxinterpreter.c new/libpcsxcore/libpcsxcore/psxinterpreter.c
102624 --- original/libpcsxcore/libpcsxcore/psxinterpreter.c 2008-02-25 14:10:45.000000000 -0430
102625 +++ new/libpcsxcore/libpcsxcore/psxinterpreter.c 1969-12-31 20:00:00.000000000 -0400
102626 @@ -1,851 +0,0 @@
102627 -/***************************************************************************
102628 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
102629 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
102630 - * *
102631 - * This program is free software; you can redistribute it and/or modify *
102632 - * it under the terms of the GNU General Public License as published by *
102633 - * the Free Software Foundation; either version 2 of the License, or *
102634 - * (at your option) any later version. *
102635 - * *
102636 - * This program is distributed in the hope that it will be useful, *
102637 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
102638 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
102639 - * GNU General Public License for more details. *
102640 - * *
102641 - * You should have received a copy of the GNU General Public License *
102642 - * along with this program; if not, write to the *
102643 - * Free Software Foundation, Inc., *
102644 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
102645 - ***************************************************************************/
102646 -
102647 -/*
102648 -* PSX assembly interpreter.
102649 -*/
102650 -
102651 -#include "psxcommon.h"
102652 -#include "r3000a.h"
102653 -#include "gte.h"
102654 -#include "psxhle.h"
102655 -/*FIXME*/
102656 -#include "../gui/hdebug.h"
102657 -
102658 -static int branch = 0;
102659 -static int branch2 = 0;
102660 -static u32 branchPC;
102661 -
102662 -// These macros are used to assemble the repassembler functions
102663 -
102664 -#ifdef PSXCPU_LOG
102665 -#define debugI() PSXCPU_LOG("%s\n", disR3000AF(psxRegs.code, psxRegs.pc));
102666 -#else
102667 -#define debugI()
102668 -#endif
102669 -
102670 -inline void execI();
102671 -
102672 -// Subsets
102673 -void (*psxBSC[64])();
102674 -void (*psxSPC[64])();
102675 -void (*psxREG[32])();
102676 -void (*psxCP0[32])();
102677 -void (*psxCP2[64])();
102678 -void (*psxCP2BSC[32])();
102679 -
102680 -static void delayRead(int reg, u32 bpc) {
102681 - u32 rold, rnew;
102682 -
102683 -// SysPrintf("delayRead at %x!\n", psxRegs.pc);
102684 -
102685 - rold = psxRegs.GPR.r[reg];
102686 - psxBSC[psxRegs.code >> 26](); // branch delay load
102687 - rnew = psxRegs.GPR.r[reg];
102688 -
102689 - psxRegs.pc = bpc;
102690 -
102691 - psxBranchTest();
102692 -
102693 - psxRegs.GPR.r[reg] = rold;
102694 - execI(); // first branch opcode
102695 - psxRegs.GPR.r[reg] = rnew;
102696 -
102697 - branch = 0;
102698 -}
102699 -
102700 -static void delayWrite(int reg, u32 bpc) {
102701 -
102702 -/* SysPrintf("delayWrite at %x!\n", psxRegs.pc);
102703 -
102704 - SysPrintf("%s\n", disR3000AF(psxRegs.code, psxRegs.pc-4));
102705 - SysPrintf("%s\n", disR3000AF(PSXMu32(bpc), bpc));*/
102706 -
102707 - // no changes from normal behavior
102708 -
102709 - psxBSC[psxRegs.code >> 26]();
102710 -
102711 - branch = 0;
102712 - psxRegs.pc = bpc;
102713 -
102714 - psxBranchTest();
102715 -}
102716 -
102717 -static void delayReadWrite(int reg, u32 bpc) {
102718 -
102719 -// SysPrintf("delayReadWrite at %x!\n", psxRegs.pc);
102720 -
102721 - // the branch delay load is skipped
102722 -
102723 - branch = 0;
102724 - psxRegs.pc = bpc;
102725 -
102726 - psxBranchTest();
102727 -}
102728 -
102729 -// this defines shall be used with the tmp
102730 -// of the next func (instead of _Funct_...)
102731 -#define _tFunct_ ((tmp ) & 0x3F) // The funct part of the instruction register
102732 -#define _tRd_ ((tmp >> 11) & 0x1F) // The rd part of the instruction register
102733 -#define _tRt_ ((tmp >> 16) & 0x1F) // The rt part of the instruction register
102734 -#define _tRs_ ((tmp >> 21) & 0x1F) // The rs part of the instruction register
102735 -#define _tSa_ ((tmp >> 6) & 0x1F) // The sa part of the instruction register
102736 -
102737 -int psxTestLoadDelay(int reg, u32 tmp) {
102738 - if (tmp == 0) return 0; // NOP
102739 - switch (tmp >> 26) {
102740 - case 0x00: // SPECIAL
102741 - switch (_tFunct_) {
102742 - case 0x00: // SLL
102743 - case 0x02: case 0x03: // SRL/SRA
102744 - if (_tRd_ == reg && _tRt_ == reg) return 1; else
102745 - if (_tRt_ == reg) return 2; else
102746 - if (_tRd_ == reg) return 3;
102747 - break;
102748 -
102749 - case 0x08: // JR
102750 - if (_tRs_ == reg) return 2;
102751 - break;
102752 - case 0x09: // JALR
102753 - if (_tRd_ == reg && _tRs_ == reg) return 1; else
102754 - if (_tRs_ == reg) return 2; else
102755 - if (_tRd_ == reg) return 3;
102756 - break;
102757 -
102758 - // SYSCALL/BREAK just a break;
102759 -
102760 - case 0x20: case 0x21: case 0x22: case 0x23:
102761 - case 0x24: case 0x25: case 0x26: case 0x27:
102762 - case 0x2a: case 0x2b: // ADD/ADDU...
102763 - case 0x04: case 0x06: case 0x07: // SLLV...
102764 - if (_tRd_ == reg && (_tRt_ == reg || _tRs_ == reg)) return 1; else
102765 - if (_tRt_ == reg || _tRs_ == reg) return 2; else
102766 - if (_tRd_ == reg) return 3;
102767 - break;
102768 -
102769 - case 0x10: case 0x12: // MFHI/MFLO
102770 - if (_tRd_ == reg) return 3;
102771 - break;
102772 - case 0x11: case 0x13: // MTHI/MTLO
102773 - if (_tRs_ == reg) return 2;
102774 - break;
102775 -
102776 - case 0x18: case 0x19:
102777 - case 0x1a: case 0x1b: // MULT/DIV...
102778 - if (_tRt_ == reg || _tRs_ == reg) return 2;
102779 - break;
102780 - }
102781 - break;
102782 -
102783 - case 0x01: // REGIMM
102784 - switch (_tRt_) {
102785 - case 0x00: case 0x02:
102786 - case 0x10: case 0x12: // BLTZ/BGEZ...
102787 - if (_tRs_ == reg) return 2;
102788 - break;
102789 - }
102790 - break;
102791 -
102792 - // J would be just a break;
102793 - case 0x03: // JAL
102794 - if (31 == reg) return 3;
102795 - break;
102796 -
102797 - case 0x04: case 0x05: // BEQ/BNE
102798 - if (_tRs_ == reg || _tRt_ == reg) return 2;
102799 - break;
102800 -
102801 - case 0x06: case 0x07: // BLEZ/BGTZ
102802 - if (_tRs_ == reg) return 2;
102803 - break;
102804 -
102805 - case 0x08: case 0x09: case 0x0a: case 0x0b:
102806 - case 0x0c: case 0x0d: case 0x0e: // ADDI/ADDIU...
102807 - if (_tRt_ == reg && _tRs_ == reg) return 1; else
102808 - if (_tRs_ == reg) return 2; else
102809 - if (_tRt_ == reg) return 3;
102810 - break;
102811 -
102812 - case 0x0f: // LUI
102813 - if (_tRt_ == reg) return 3;
102814 - break;
102815 -
102816 - case 0x10: // COP0
102817 - switch (_tFunct_) {
102818 - case 0x00: // MFC0
102819 - if (_tRt_ == reg) return 3;
102820 - break;
102821 - case 0x02: // CFC0
102822 - if (_tRt_ == reg) return 3;
102823 - break;
102824 - case 0x04: // MTC0
102825 - if (_tRt_ == reg) return 2;
102826 - break;
102827 - case 0x06: // CTC0
102828 - if (_tRt_ == reg) return 2;
102829 - break;
102830 - // RFE just a break;
102831 - }
102832 - break;
102833 -
102834 - case 0x12: // COP2
102835 - switch (_tFunct_) {
102836 - case 0x00:
102837 - switch (_tRs_) {
102838 - case 0x00: // MFC2
102839 - if (_tRt_ == reg) return 3;
102840 - break;
102841 - case 0x02: // CFC2
102842 - if (_tRt_ == reg) return 3;
102843 - break;
102844 - case 0x04: // MTC2
102845 - if (_tRt_ == reg) return 2;
102846 - break;
102847 - case 0x06: // CTC2
102848 - if (_tRt_ == reg) return 2;
102849 - break;
102850 - }
102851 - break;
102852 - // RTPS... break;
102853 - }
102854 - break;
102855 -
102856 - case 0x22: case 0x26: // LWL/LWR
102857 - if (_tRt_ == reg) return 3; else
102858 - if (_tRs_ == reg) return 2;
102859 - break;
102860 -
102861 - case 0x20: case 0x21: case 0x23:
102862 - case 0x24: case 0x25: // LB/LH/LW/LBU/LHU
102863 - if (_tRt_ == reg && _tRs_ == reg) return 1; else
102864 - if (_tRs_ == reg) return 2; else
102865 - if (_tRt_ == reg) return 3;
102866 - break;
102867 -
102868 - case 0x28: case 0x29: case 0x2a:
102869 - case 0x2b: case 0x2e: // SB/SH/SWL/SW/SWR
102870 - if (_tRt_ == reg || _tRs_ == reg) return 2;
102871 - break;
102872 -
102873 - case 0x32: case 0x3a: // LWC2/SWC2
102874 - if (_tRs_ == reg) return 2;
102875 - break;
102876 - }
102877 -
102878 - return 0;
102879 -}
102880 -
102881 -void psxDelayTest(int reg, u32 bpc) {
102882 - u32 *code;
102883 - u32 tmp;
102884 -
102885 - code = PSXM(bpc);
102886 - tmp = code == NULL ? 0 : SWAP32(*code);
102887 - branch = 1;
102888 -
102889 - switch (psxTestLoadDelay(reg, tmp)) {
102890 - case 1:
102891 - delayReadWrite(reg, bpc); return;
102892 - case 2:
102893 - delayRead(reg, bpc); return;
102894 - case 3:
102895 - delayWrite(reg, bpc); return;
102896 - }
102897 - psxBSC[psxRegs.code >> 26]();
102898 -
102899 - branch = 0;
102900 - psxRegs.pc = bpc;
102901 -
102902 - psxBranchTest();
102903 -}
102904 -
102905 -__inline void doBranch(u32 tar) {
102906 - u32 *code;
102907 - u32 tmp;
102908 -
102909 - branch2 = branch = 1;
102910 - branchPC = tar;
102911 -
102912 - code = PSXM(psxRegs.pc);
102913 - psxRegs.code = code == NULL ? 0 : SWAP32(*code);
102914 -
102915 - debugI();
102916 -
102917 - psxRegs.pc+= 4; psxRegs.cycle++;
102918 -
102919 - // check for load delay
102920 - tmp = psxRegs.code >> 26;
102921 - switch (tmp) {
102922 - case 0x10: // COP0
102923 - switch (_Rs_) {
102924 - case 0x00: // MFC0
102925 - case 0x02: // CFC0
102926 - psxDelayTest(_Rt_, branchPC);
102927 - return;
102928 - }
102929 - break;
102930 - case 0x12: // COP2
102931 - switch (_Funct_) {
102932 - case 0x00:
102933 - switch (_Rs_) {
102934 - case 0x00: // MFC2
102935 - case 0x02: // CFC2
102936 - psxDelayTest(_Rt_, branchPC);
102937 - return;
102938 - }
102939 - break;
102940 - }
102941 - break;
102942 - case 0x32: // LWC2
102943 - psxDelayTest(_Rt_, branchPC);
102944 - return;
102945 - default:
102946 - if (tmp >= 0x20 && tmp <= 0x26) { // LB/LH/LWL/LW/LBU/LHU/LWR
102947 - psxDelayTest(_Rt_, branchPC);
102948 - return;
102949 - }
102950 - break;
102951 - }
102952 -
102953 - psxBSC[psxRegs.code >> 26]();
102954 -
102955 - branch = 0;
102956 - psxRegs.pc = branchPC;
102957 -
102958 - psxBranchTest();
102959 -}
102960 -
102961 -/*********************************************************
102962 -* Arithmetic with immediate operand *
102963 -* Format: OP rt, rs, immediate *
102964 -*********************************************************/
102965 -void psxADDI() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) + _Imm_ ; } // Rt = Rs + Im (Exception on Integer Overflow)
102966 -void psxADDIU() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) + _Imm_ ; } // Rt = Rs + Im
102967 -void psxANDI() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) & _ImmU_; } // Rt = Rs And Im
102968 -void psxORI() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) | _ImmU_; } // Rt = Rs Or Im
102969 -void psxXORI() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) ^ _ImmU_; } // Rt = Rs Xor Im
102970 -void psxSLTI() { if (!_Rt_) return; _rRt_ = _i32(_rRs_) < _Imm_ ; } // Rt = Rs < Im (Signed)
102971 -void psxSLTIU() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) < ((u32)_Imm_); } // Rt = Rs < Im (Unsigned)
102972 -
102973 -/*********************************************************
102974 -* Register arithmetic *
102975 -* Format: OP rd, rs, rt *
102976 -*********************************************************/
102977 -void psxADD() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) + _u32(_rRt_); } // Rd = Rs + Rt (Exception on Integer Overflow)
102978 -void psxADDU() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) + _u32(_rRt_); } // Rd = Rs + Rt
102979 -void psxSUB() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) - _u32(_rRt_); } // Rd = Rs - Rt (Exception on Integer Overflow)
102980 -void psxSUBU() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) - _u32(_rRt_); } // Rd = Rs - Rt
102981 -void psxAND() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) & _u32(_rRt_); } // Rd = Rs And Rt
102982 -void psxOR() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) | _u32(_rRt_); } // Rd = Rs Or Rt
102983 -void psxXOR() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) ^ _u32(_rRt_); } // Rd = Rs Xor Rt
102984 -void psxNOR() { if (!_Rd_) return; _rRd_ =~(_u32(_rRs_) | _u32(_rRt_)); }// Rd = Rs Nor Rt
102985 -void psxSLT() { if (!_Rd_) return; _rRd_ = _i32(_rRs_) < _i32(_rRt_); } // Rd = Rs < Rt (Signed)
102986 -void psxSLTU() { if (!_Rd_) return; _rRd_ = _u32(_rRs_) < _u32(_rRt_); } // Rd = Rs < Rt (Unsigned)
102987 -
102988 -/*********************************************************
102989 -* Register mult/div & Register trap logic *
102990 -* Format: OP rs, rt *
102991 -*********************************************************/
102992 -void psxDIV() {
102993 - if (_i32(_rRt_) != 0) {
102994 - _i32(_rLo_) = _i32(_rRs_) / _i32(_rRt_);
102995 - _i32(_rHi_) = _i32(_rRs_) % _i32(_rRt_);
102996 - }
102997 -}
102998 -
102999 -void psxDIVU() {
103000 - if (_rRt_ != 0) {
103001 - _rLo_ = _rRs_ / _rRt_;
103002 - _rHi_ = _rRs_ % _rRt_;
103003 - }
103004 -}
103005 -
103006 -void psxMULT() {
103007 - u64 res = (s64)((s64)_i32(_rRs_) * (s64)_i32(_rRt_));
103008 -
103009 - psxRegs.GPR.n.lo = (u32)(res & 0xffffffff);
103010 - psxRegs.GPR.n.hi = (u32)((res >> 32) & 0xffffffff);
103011 -}
103012 -
103013 -void psxMULTU() {
103014 - u64 res = (u64)((u64)_u32(_rRs_) * (u64)_u32(_rRt_));
103015 -
103016 - psxRegs.GPR.n.lo = (u32)(res & 0xffffffff);
103017 - psxRegs.GPR.n.hi = (u32)((res >> 32) & 0xffffffff);
103018 -}
103019 -
103020 -/*********************************************************
103021 -* Register branch logic *
103022 -* Format: OP rs, offset *
103023 -*********************************************************/
103024 -#define RepZBranchi32(op) if(_i32(_rRs_) op 0) doBranch(_BranchTarget_);
103025 -#define RepZBranchLinki32(op) if(_i32(_rRs_) op 0) { _SetLink(31); doBranch(_BranchTarget_); }
103026 -
103027 -void psxBGEZ() { RepZBranchi32(>=) } // Branch if Rs >= 0
103028 -void psxBGEZAL() { RepZBranchLinki32(>=) } // Branch if Rs >= 0 and link
103029 -void psxBGTZ() { RepZBranchi32(>) } // Branch if Rs > 0
103030 -void psxBLEZ() { RepZBranchi32(<=) } // Branch if Rs <= 0
103031 -void psxBLTZ() { RepZBranchi32(<) } // Branch if Rs < 0
103032 -void psxBLTZAL() { RepZBranchLinki32(<) } // Branch if Rs < 0 and link
103033 -
103034 -/*********************************************************
103035 -* Shift arithmetic with constant shift *
103036 -* Format: OP rd, rt, sa *
103037 -*********************************************************/
103038 -void psxSLL() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) << _Sa_; } // Rd = Rt << sa
103039 -void psxSRA() { if (!_Rd_) return; _i32(_rRd_) = _i32(_rRt_) >> _Sa_; } // Rd = Rt >> sa (arithmetic)
103040 -void psxSRL() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) >> _Sa_; } // Rd = Rt >> sa (logical)
103041 -
103042 -/*********************************************************
103043 -* Shift arithmetic with variant register shift *
103044 -* Format: OP rd, rt, rs *
103045 -*********************************************************/
103046 -void psxSLLV() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) << _u32(_rRs_); } // Rd = Rt << rs
103047 -void psxSRAV() { if (!_Rd_) return; _i32(_rRd_) = _i32(_rRt_) >> _u32(_rRs_); } // Rd = Rt >> rs (arithmetic)
103048 -void psxSRLV() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) >> _u32(_rRs_); } // Rd = Rt >> rs (logical)
103049 -
103050 -/*********************************************************
103051 -* Load higher 16 bits of the first word in GPR with imm *
103052 -* Format: OP rt, immediate *
103053 -*********************************************************/
103054 -void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = psxRegs.code << 16; } // Upper halfword of Rt = Im
103055 -
103056 -/*********************************************************
103057 -* Move from HI/LO to GPR *
103058 -* Format: OP rd *
103059 -*********************************************************/
103060 -void psxMFHI() { if (!_Rd_) return; _rRd_ = _rHi_; } // Rd = Hi
103061 -void psxMFLO() { if (!_Rd_) return; _rRd_ = _rLo_; } // Rd = Lo
103062 -
103063 -/*********************************************************
103064 -* Move to GPR to HI/LO & Register jump *
103065 -* Format: OP rs *
103066 -*********************************************************/
103067 -void psxMTHI() { _rHi_ = _rRs_; } // Hi = Rs
103068 -void psxMTLO() { _rLo_ = _rRs_; } // Lo = Rs
103069 -
103070 -/*********************************************************
103071 -* Special purpose instructions *
103072 -* Format: OP *
103073 -*********************************************************/
103074 -void psxBREAK() {
103075 - // Break exception - psx rom doens't handles this
103076 -}
103077 -
103078 -void psxSYSCALL() {
103079 - psxRegs.pc -= 4;
103080 - psxException(0x20, branch);
103081 -}
103082 -
103083 -void psxRFE() {
103084 -// SysPrintf("psxRFE\n");
103085 - psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status & 0xfffffff0) |
103086 - ((psxRegs.CP0.n.Status & 0x3c) >> 2);
103087 -}
103088 -
103089 -/*********************************************************
103090 -* Register branch logic *
103091 -* Format: OP rs, rt, offset *
103092 -*********************************************************/
103093 -#define RepBranchi32(op) if(_i32(_rRs_) op _i32(_rRt_)) doBranch(_BranchTarget_);
103094 -
103095 -void psxBEQ() { RepBranchi32(==) } // Branch if Rs == Rt
103096 -void psxBNE() { RepBranchi32(!=) } // Branch if Rs != Rt
103097 -
103098 -/*********************************************************
103099 -* Jump to target *
103100 -* Format: OP target *
103101 -*********************************************************/
103102 -void psxJ() { doBranch(_JumpTarget_); }
103103 -void psxJAL() { _SetLink(31); doBranch(_JumpTarget_); }
103104 -
103105 -/*********************************************************
103106 -* Register jump *
103107 -* Format: OP rs, rd *
103108 -*********************************************************/
103109 -void psxJR() {
103110 - doBranch(_u32(_rRs_));
103111 - psxJumpTest();
103112 -}
103113 -
103114 -void psxJALR() {
103115 - u32 temp = _u32(_rRs_);
103116 - if (_Rd_) { _SetLink(_Rd_); }
103117 - doBranch(temp);
103118 -}
103119 -
103120 -/*********************************************************
103121 -* Load and store for GPR *
103122 -* Format: OP rt, offset(base) *
103123 -*********************************************************/
103124 -
103125 -#define _oB_ (_u32(_rRs_) + _Imm_)
103126 -
103127 -void psxLB() {
103128 - if (_Rt_) {
103129 - _i32(_rRt_) = (signed char)psxMemRead8(_oB_);
103130 - } else {
103131 - psxMemRead8(_oB_);
103132 - }
103133 -}
103134 -
103135 -void psxLBU() {
103136 - if (_Rt_) {
103137 - _u32(_rRt_) = psxMemRead8(_oB_);
103138 - } else {
103139 - psxMemRead8(_oB_);
103140 - }
103141 -}
103142 -
103143 -void psxLH() {
103144 - if (_Rt_) {
103145 - _i32(_rRt_) = (short)psxMemRead16(_oB_);
103146 - } else {
103147 - psxMemRead16(_oB_);
103148 - }
103149 -}
103150 -
103151 -void psxLHU() {
103152 - if (_Rt_) {
103153 - _u32(_rRt_) = psxMemRead16(_oB_);
103154 - } else {
103155 - psxMemRead16(_oB_);
103156 - }
103157 -}
103158 -
103159 -void psxLW() {
103160 - if (_Rt_) {
103161 - _u32(_rRt_) = psxMemRead32(_oB_);
103162 - } else {
103163 - psxMemRead32(_oB_);
103164 - }
103165 -}
103166 -
103167 -u32 LWL_MASK[4] = { 0xffffff, 0xffff, 0xff, 0 };
103168 -u32 LWL_SHIFT[4] = { 24, 16, 8, 0 };
103169 -
103170 -void psxLWL() {
103171 - u32 addr = _oB_;
103172 - u32 shift = addr & 3;
103173 - u32 mem = psxMemRead32(addr & ~3);
103174 -
103175 - if (!_Rt_) return;
103176 - _u32(_rRt_) = ( _u32(_rRt_) & LWL_MASK[shift]) |
103177 - ( mem << LWL_SHIFT[shift]);
103178 -
103179 - /*
103180 - Mem = 1234. Reg = abcd
103181 -
103182 - 0 4bcd (mem << 24) | (reg & 0x00ffffff)
103183 - 1 34cd (mem << 16) | (reg & 0x0000ffff)
103184 - 2 234d (mem << 8) | (reg & 0x000000ff)
103185 - 3 1234 (mem ) | (reg & 0x00000000)
103186 - */
103187 -}
103188 -
103189 -u32 LWR_MASK[4] = { 0, 0xff000000, 0xffff0000, 0xffffff00 };
103190 -u32 LWR_SHIFT[4] = { 0, 8, 16, 24 };
103191 -
103192 -void psxLWR() {
103193 - u32 addr = _oB_;
103194 - u32 shift = addr & 3;
103195 - u32 mem = psxMemRead32(addr & ~3);
103196 -
103197 - if (!_Rt_) return;
103198 - _u32(_rRt_) = ( _u32(_rRt_) & LWR_MASK[shift]) |
103199 - ( mem >> LWR_SHIFT[shift]);
103200 -
103201 - /*
103202 - Mem = 1234. Reg = abcd
103203 -
103204 - 0 1234 (mem ) | (reg & 0x00000000)
103205 - 1 a123 (mem >> 8) | (reg & 0xff000000)
103206 - 2 ab12 (mem >> 16) | (reg & 0xffff0000)
103207 - 3 abc1 (mem >> 24) | (reg & 0xffffff00)
103208 - */
103209 -}
103210 -
103211 -void psxSB() { psxMemWrite8 (_oB_, _u8 (_rRt_)); }
103212 -void psxSH() { psxMemWrite16(_oB_, _u16(_rRt_)); }
103213 -void psxSW() { psxMemWrite32(_oB_, _u32(_rRt_)); }
103214 -
103215 -u32 SWL_MASK[4] = { 0xffffff00, 0xffff0000, 0xff000000, 0 };
103216 -u32 SWL_SHIFT[4] = { 24, 16, 8, 0 };
103217 -
103218 -void psxSWL() {
103219 - u32 addr = _oB_;
103220 - u32 shift = addr & 3;
103221 - u32 mem = psxMemRead32(addr & ~3);
103222 -
103223 - psxMemWrite32(addr & ~3, (_u32(_rRt_) >> SWL_SHIFT[shift]) |
103224 - ( mem & SWL_MASK[shift]) );
103225 - /*
103226 - Mem = 1234. Reg = abcd
103227 -
103228 - 0 123a (reg >> 24) | (mem & 0xffffff00)
103229 - 1 12ab (reg >> 16) | (mem & 0xffff0000)
103230 - 2 1abc (reg >> 8) | (mem & 0xff000000)
103231 - 3 abcd (reg ) | (mem & 0x00000000)
103232 - */
103233 -}
103234 -
103235 -u32 SWR_MASK[4] = { 0, 0xff, 0xffff, 0xffffff };
103236 -u32 SWR_SHIFT[4] = { 0, 8, 16, 24 };
103237 -
103238 -void psxSWR() {
103239 - u32 addr = _oB_;
103240 - u32 shift = addr & 3;
103241 - u32 mem = psxMemRead32(addr & ~3);
103242 -
103243 - psxMemWrite32(addr & ~3, (_u32(_rRt_) << SWR_SHIFT[shift]) |
103244 - ( mem & SWR_MASK[shift]) );
103245 -
103246 - /*
103247 - Mem = 1234. Reg = abcd
103248 -
103249 - 0 abcd (reg ) | (mem & 0x00000000)
103250 - 1 bcd4 (reg << 8) | (mem & 0x000000ff)
103251 - 2 cd34 (reg << 16) | (mem & 0x0000ffff)
103252 - 3 d234 (reg << 24) | (mem & 0x00ffffff)
103253 - */
103254 -}
103255 -
103256 -/*********************************************************
103257 -* Moves between GPR and COPx *
103258 -* Format: OP rt, fs *
103259 -*********************************************************/
103260 -void psxMFC0() { if (!_Rt_) return; _i32(_rRt_) = (int)_rFs_; }
103261 -void psxCFC0() { if (!_Rt_) return; _i32(_rRt_) = (int)_rFs_; }
103262 -
103263 -void psxTestSWInts() {
103264 - // the next code is untested, if u know please
103265 - // tell me if it works ok or not (linuzappz)
103266 - if (psxRegs.CP0.n.Cause & psxRegs.CP0.n.Status & 0x0300 &&
103267 - psxRegs.CP0.n.Status & 0x1) {
103268 - psxException(psxRegs.CP0.n.Cause, branch);
103269 - }
103270 -}
103271 -
103272 -__inline void MTC0(int reg, u32 val) {
103273 -// SysPrintf("MTC0 %d: %x\n", reg, val);
103274 - switch (reg) {
103275 - case 12: // Status
103276 - psxRegs.CP0.r[12] = val;
103277 - psxTestSWInts();
103278 - psxRegs.interrupt|= 0x80000000;
103279 - break;
103280 -
103281 - case 13: // Cause
103282 - psxRegs.CP0.n.Cause = val & ~(0xfc00);
103283 - psxTestSWInts();
103284 - break;
103285 -
103286 - default:
103287 - psxRegs.CP0.r[reg] = val;
103288 - break;
103289 - }
103290 -}
103291 -
103292 -void psxMTC0() { MTC0(_Rd_, _u32(_rRt_)); }
103293 -void psxCTC0() { MTC0(_Rd_, _u32(_rRt_)); }
103294 -
103295 -/*********************************************************
103296 -* Unknow instruction (would generate an exception) *
103297 -* Format: ? *
103298 -*********************************************************/
103299 -void psxNULL() {
103300 -#ifdef PSXCPU_LOG
103301 - PSXCPU_LOG("psx: Unimplemented op %x\n", psxRegs.code);
103302 -#endif
103303 -}
103304 -
103305 -void psxSPECIAL() {
103306 - psxSPC[_Funct_]();
103307 -}
103308 -
103309 -void psxREGIMM() {
103310 - psxREG[_Rt_]();
103311 -}
103312 -
103313 -void psxCOP0() {
103314 - psxCP0[_Rs_]();
103315 -}
103316 -
103317 -void psxCOP2() {
103318 - psxCP2[_Funct_]();
103319 -}
103320 -
103321 -void psxBASIC() {
103322 - psxCP2BSC[_Rs_]();
103323 -}
103324 -
103325 -void psxHLE() {
103326 -// psxHLEt[psxRegs.code & 0xffff]();
103327 - psxHLEt[psxRegs.code & 0x07](); // HDHOSHY experimental patch
103328 -}
103329 -
103330 -void (*psxBSC[64])() = {
103331 - psxSPECIAL, psxREGIMM, psxJ , psxJAL , psxBEQ , psxBNE , psxBLEZ, psxBGTZ,
103332 - psxADDI , psxADDIU , psxSLTI, psxSLTIU, psxANDI, psxORI , psxXORI, psxLUI ,
103333 - psxCOP0 , psxNULL , psxCOP2, psxNULL , psxNULL, psxNULL, psxNULL, psxNULL,
103334 - psxNULL , psxNULL , psxNULL, psxNULL , psxNULL, psxNULL, psxNULL, psxNULL,
103335 - psxLB , psxLH , psxLWL , psxLW , psxLBU , psxLHU , psxLWR , psxNULL,
103336 - psxSB , psxSH , psxSWL , psxSW , psxNULL, psxNULL, psxSWR , psxNULL,
103337 - psxNULL , psxNULL , gteLWC2, psxNULL , psxNULL, psxNULL, psxNULL, psxNULL,
103338 - psxNULL , psxNULL , gteSWC2, psxHLE , psxNULL, psxNULL, psxNULL, psxNULL
103339 -};
103340 -
103341 -
103342 -void (*psxSPC[64])() = {
103343 - psxSLL , psxNULL , psxSRL , psxSRA , psxSLLV , psxNULL , psxSRLV, psxSRAV,
103344 - psxJR , psxJALR , psxNULL, psxNULL, psxSYSCALL, psxBREAK, psxNULL, psxNULL,
103345 - psxMFHI, psxMTHI , psxMFLO, psxMTLO, psxNULL , psxNULL , psxNULL, psxNULL,
103346 - psxMULT, psxMULTU, psxDIV , psxDIVU, psxNULL , psxNULL , psxNULL, psxNULL,
103347 - psxADD , psxADDU , psxSUB , psxSUBU, psxAND , psxOR , psxXOR , psxNOR ,
103348 - psxNULL, psxNULL , psxSLT , psxSLTU, psxNULL , psxNULL , psxNULL, psxNULL,
103349 - psxNULL, psxNULL , psxNULL, psxNULL, psxNULL , psxNULL , psxNULL, psxNULL,
103350 - psxNULL, psxNULL , psxNULL, psxNULL, psxNULL , psxNULL , psxNULL, psxNULL
103351 -};
103352 -
103353 -void (*psxREG[32])() = {
103354 - psxBLTZ , psxBGEZ , psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
103355 - psxNULL , psxNULL , psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
103356 - psxBLTZAL, psxBGEZAL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
103357 - psxNULL , psxNULL , psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL
103358 -};
103359 -
103360 -void (*psxCP0[32])() = {
103361 - psxMFC0, psxNULL, psxCFC0, psxNULL, psxMTC0, psxNULL, psxCTC0, psxNULL,
103362 - psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
103363 - psxRFE , psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
103364 - psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL
103365 -};
103366 -
103367 -void (*psxCP2[64])() = {
103368 - psxBASIC, gteRTPS , psxNULL , psxNULL, psxNULL, psxNULL , gteNCLIP, psxNULL, // 00
103369 - psxNULL , psxNULL , psxNULL , psxNULL, gteOP , psxNULL , psxNULL , psxNULL, // 08
103370 - gteDPCS , gteINTPL, gteMVMVA, gteNCDS, gteCDP , psxNULL , gteNCDT , psxNULL, // 10
103371 - psxNULL , psxNULL , psxNULL , gteNCCS, gteCC , psxNULL , gteNCS , psxNULL, // 18
103372 - gteNCT , psxNULL , psxNULL , psxNULL, psxNULL, psxNULL , psxNULL , psxNULL, // 20
103373 - gteSQR , gteDCPL , gteDPCT , psxNULL, psxNULL, gteAVSZ3, gteAVSZ4, psxNULL, // 28
103374 - gteRTPT , psxNULL , psxNULL , psxNULL, psxNULL, psxNULL , psxNULL , psxNULL, // 30
103375 - psxNULL , psxNULL , psxNULL , psxNULL, psxNULL, gteGPF , gteGPL , gteNCCT // 38
103376 -};
103377 -
103378 -void (*psxCP2BSC[32])() = {
103379 - gteMFC2, psxNULL, gteCFC2, psxNULL, gteMTC2, psxNULL, gteCTC2, psxNULL,
103380 - psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
103381 - psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
103382 - psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL
103383 -};
103384 -
103385 -
103386 -///////////////////////////////////////////
103387 -
103388 -static int intInit() {
103389 - return 0;
103390 -}
103391 -
103392 -static void intReset() {
103393 -}
103394 -
103395 -static void intExecute() {
103396 - for (;;)
103397 - execI();
103398 -}
103399 -
103400 -static void intExecuteDbg() {
103401 - for (;;)
103402 - execIDbg();
103403 -}
103404 -
103405 -static void intExecuteBlock() {
103406 - branch2 = 0;
103407 - while (!branch2) execI();
103408 -}
103409 -
103410 -static void intExecuteBlockDbg() {
103411 - branch2 = 0;
103412 - while (!branch2) execIDbg();
103413 -}
103414 -
103415 -static void intClear(u32 Addr, u32 Size) {
103416 -}
103417 -
103418 -static void intShutdown() {
103419 -}
103420 -
103421 -// interpreter execution
103422 -inline void execI() {
103423 - u32 *code = PSXM(psxRegs.pc);
103424 - psxRegs.code = code == NULL ? 0 : SWAP32(*code);
103425 -
103426 - debugI();
103427 -
103428 - psxRegs.pc+= 4; psxRegs.cycle++;
103429 - psxBSC[psxRegs.code >> 26]();
103430 -}
103431 -
103432 -/* debugger version */
103433 -inline void execIDbg() {
103434 - u32 *code = PSXM(psxRegs.pc);
103435 - psxRegs.code = code == NULL ? 0 : SWAP32(*code);
103436 -
103437 - // dump opcode when LOG_CPU is enabled
103438 - debugI();
103439 -
103440 - // normal execution
103441 - if(!hdb_pause) {
103442 - psxRegs.pc+= 4; psxRegs.cycle++;
103443 - psxBSC[psxRegs.code >> 26]();
103444 - }
103445 -
103446 - // trace one instruction
103447 - if(hdb_pause == 2) {
103448 - psxRegs.pc+= 4; psxRegs.cycle++;
103449 - psxBSC[psxRegs.code >> 26]();
103450 - hdb_pause = 1;
103451 - }
103452 -
103453 - // wait for breakpoint
103454 - if(hdb_pause == 3) {
103455 - psxRegs.pc+= 4; psxRegs.cycle++;
103456 - psxBSC[psxRegs.code >> 26]();
103457 - if(psxRegs.pc == hdb_break) hdb_pause = 1;
103458 - }
103459 -}
103460 -
103461 -R3000Acpu psxInt = {
103462 - intInit,
103463 - intReset,
103464 - intExecute,
103465 - intExecuteBlock,
103466 - intClear,
103467 - intShutdown
103468 -};
103469 -
103470 -R3000Acpu psxIntDbg = {
103471 - intInit,
103472 - intReset,
103473 - intExecuteDbg,
103474 - intExecuteBlockDbg,
103475 - intClear,
103476 - intShutdown
103477 -};
103478 diff -rupN original/libpcsxcore/libpcsxcore/psxinterpreter.lo new/libpcsxcore/libpcsxcore/psxinterpreter.lo
103479 --- original/libpcsxcore/libpcsxcore/psxinterpreter.lo 2009-03-28 22:34:58.000000000 -0430
103480 +++ new/libpcsxcore/libpcsxcore/psxinterpreter.lo 1969-12-31 20:00:00.000000000 -0400
103481 @@ -1,12 +0,0 @@
103482 -# psxinterpreter.lo - a libtool object file
103483 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
103484 -#
103485 -# Please DO NOT delete this file!
103486 -# It is necessary for linking the library.
103487 -
103488 -# Name of the PIC object.
103489 -pic_object='.libs/psxinterpreter.o'
103490 -
103491 -# Name of the non-PIC object.
103492 -non_pic_object='psxinterpreter.o'
103493 -
103494 Los ficheros binarios original/libpcsxcore/libpcsxcore/psxinterpreter.o y new/libpcsxcore/libpcsxcore/psxinterpreter.o son distintos
103495 diff -rupN original/libpcsxcore/libpcsxcore/psxmem.c new/libpcsxcore/libpcsxcore/psxmem.c
103496 --- original/libpcsxcore/libpcsxcore/psxmem.c 2007-12-29 17:48:00.000000000 -0430
103497 +++ new/libpcsxcore/libpcsxcore/psxmem.c 1969-12-31 20:00:00.000000000 -0400
103498 @@ -1,327 +0,0 @@
103499 -/***************************************************************************
103500 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
103501 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
103502 - * *
103503 - * This program is free software; you can redistribute it and/or modify *
103504 - * it under the terms of the GNU General Public License as published by *
103505 - * the Free Software Foundation; either version 2 of the License, or *
103506 - * (at your option) any later version. *
103507 - * *
103508 - * This program is distributed in the hope that it will be useful, *
103509 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
103510 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
103511 - * GNU General Public License for more details. *
103512 - * *
103513 - * You should have received a copy of the GNU General Public License *
103514 - * along with this program; if not, write to the *
103515 - * Free Software Foundation, Inc., *
103516 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
103517 - ***************************************************************************/
103518 -
103519 -/*
103520 -* PSX memory functions.
103521 -*/
103522 -
103523 -/* Ryan TODO: I'd rather not use GLib in here */
103524 -
103525 -#include "psxmem.h"
103526 -#include "r3000a.h"
103527 -#include <sys/mman.h>
103528 -
103529 -/* Playstation Memory Map (from Playstation doc by Joshua Walker)
103530 -0x0000_0000-0x0000_ffff Kernel (64K)
103531 -0x0001_0000-0x001f_ffff User Memory (1.9 Meg)
103532 -
103533 -0x1f00_0000-0x1f00_ffff Parallel Port (64K)
103534 -
103535 -0x1f80_0000-0x1f80_03ff Scratch Pad (1024 bytes)
103536 -
103537 -0x1f80_1000-0x1f80_2fff Hardware Registers (8K)
103538 -
103539 -0x8000_0000-0x801f_ffff Kernel and User Memory Mirror (2 Meg) Cached
103540 -
103541 -0xa000_0000-0xa01f_ffff Kernel and User Memory Mirror (2 Meg) Uncached
103542 -
103543 -0xbfc0_0000-0xbfc7_ffff BIOS (512K)
103544 -*/
103545 -
103546 -int psxMemInit() {
103547 - int i;
103548 -
103549 - psxMemRLUT = (u8**)malloc(0x10000 * sizeof(void*));
103550 - psxMemWLUT = (u8**)malloc(0x10000 * sizeof(void*));
103551 - memset(psxMemRLUT, 0, 0x10000 * sizeof(void*));
103552 - memset(psxMemWLUT, 0, 0x10000 * sizeof(void*));
103553 -
103554 -#ifdef __x86_64__
103555 - //Note: this has to be synced with the locations chosen in ix86_64/iR3000A-64.c
103556 - //Picked a spot somewhat close to a random function psxMemWrite32
103557 - psxM = mmap(&psxMemWrite32 - 0xc000000, 0x00220000,
103558 - PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
103559 -#else
103560 - psxM = mmap(0, 0x00220000,
103561 - PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
103562 -#endif
103563 - psxP = &psxM[0x200000];
103564 - psxH = &psxM[0x210000];
103565 - psxR = (char*)malloc(0x00080000);
103566 - if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
103567 - psxM == NULL || psxP == NULL || psxH == NULL) {
103568 - SysMessage(_("Error allocating memory!")); return -1;
103569 - }
103570 -
103571 -// MemR
103572 - for (i=0; i<0x80; i++) psxMemRLUT[i + 0x0000] = (u8*)&psxM[(i & 0x1f) << 16];
103573 -
103574 - memcpy(psxMemRLUT + 0x8000, psxMemRLUT, 0x80 * sizeof(void*));
103575 - memcpy(psxMemRLUT + 0xa000, psxMemRLUT, 0x80 * sizeof(void*));
103576 -
103577 - for (i=0; i<0x01; i++) psxMemRLUT[i + 0x1f00] = (u8*)&psxP[i << 16];
103578 -
103579 - for (i=0; i<0x01; i++) psxMemRLUT[i + 0x1f80] = (u8*)&psxH[i << 16];
103580 -
103581 - for (i=0; i<0x08; i++) psxMemRLUT[i + 0xbfc0] = (u8*)&psxR[i << 16];
103582 -
103583 -// MemW
103584 - for (i=0; i<0x80; i++) psxMemWLUT[i + 0x0000] = (u8*)&psxM[(i & 0x1f) << 16];
103585 - memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void*));
103586 - memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void*));
103587 -
103588 - for (i=0; i<0x01; i++) psxMemWLUT[i + 0x1f00] = (u8*)&psxP[i << 16];
103589 -
103590 - for (i=0; i<0x01; i++) psxMemWLUT[i + 0x1f80] = (u8*)&psxH[i << 16];
103591 -
103592 - return 0;
103593 -}
103594 -
103595 -void psxMemReset() {
103596 - FILE *f = NULL;
103597 - gchar *bios;
103598 -
103599 - memset(psxM, 0, 0x00200000);
103600 - memset(psxP, 0, 0x00010000);
103601 -
103602 - if (strcmp(Config.Bios, "HLE")) {
103603 - bios = g_build_filename (Config.BiosDir, Config.Bios, NULL);
103604 - f = fopen(bios, "rb");
103605 -
103606 - if (f == NULL) {
103607 - SysMessage (_("Could not open BIOS:\"%s\". Enabling HLE Bios!\n"), bios);
103608 - memset(psxR, 0, 0x80000);
103609 - Config.HLE = BIOS_HLE;
103610 - }
103611 - else {
103612 - fread(psxR, 1, 0x80000, f);
103613 - fclose(f);
103614 - Config.HLE = BIOS_USER_DEFINED;
103615 - }
103616 - g_free (bios);
103617 - } else Config.HLE = BIOS_HLE;
103618 -}
103619 -
103620 -void psxMemShutdown() {
103621 - //free(psxM);
103622 - munmap(psxM, 0x00220000);
103623 - //free(psxP);
103624 - //free(psxH);
103625 - free(psxR);
103626 - free(psxMemRLUT);
103627 - free(psxMemWLUT);
103628 -}
103629 -
103630 -static int writeok=1;
103631 -
103632 -u8 psxMemRead8(u32 mem) {
103633 - char *p;
103634 - u32 t;
103635 -
103636 - t = mem >> 16;
103637 - if (t == 0x1f80) {
103638 - if (mem < 0x1f801000)
103639 - return psxHu8(mem);
103640 - else
103641 - return psxHwRead8(mem);
103642 - } else {
103643 - p = (char *)(psxMemRLUT[t]);
103644 - if (p != NULL) {
103645 - return *(u8 *)(p + (mem & 0xffff));
103646 - } else {
103647 -#ifdef PSXMEM_LOG
103648 - PSXMEM_LOG("err lb %8.8lx\n", mem);
103649 -#endif
103650 - return 0;
103651 - }
103652 - }
103653 -}
103654 -
103655 -u16 psxMemRead16(u32 mem) {
103656 - char *p;
103657 - u32 t;
103658 -
103659 - t = mem >> 16;
103660 - if (t == 0x1f80) {
103661 - if (mem < 0x1f801000)
103662 - return psxHu16(mem);
103663 - else
103664 - return psxHwRead16(mem);
103665 - } else {
103666 - p = (char *)(psxMemRLUT[t]);
103667 - if (p != NULL) {
103668 - return SWAPu16(*(u16 *)(p + (mem & 0xffff)));
103669 - } else {
103670 -#ifdef PSXMEM_LOG
103671 - PSXMEM_LOG("err lh %8.8lx\n", mem);
103672 -#endif
103673 - return 0;
103674 - }
103675 - }
103676 -}
103677 -
103678 -u32 psxMemRead32(u32 mem) {
103679 - char *p;
103680 - u32 t;
103681 -
103682 - t = mem >> 16;
103683 - if (t == 0x1f80) {
103684 - if (mem < 0x1f801000)
103685 - return psxHu32(mem);
103686 - else
103687 - return psxHwRead32(mem);
103688 - } else {
103689 - p = (char *)(psxMemRLUT[t]);
103690 - if (p != NULL) {
103691 - return SWAPu32(*(u32 *)(p + (mem & 0xffff)));
103692 - } else {
103693 -#ifdef PSXMEM_LOG
103694 - if (writeok) { PSXMEM_LOG("err lw %8.8lx\n", mem); }
103695 -#endif
103696 - return 0;
103697 - }
103698 - }
103699 -}
103700 -
103701 -void psxMemWrite8(u32 mem, u8 value) {
103702 - char *p;
103703 - u32 t;
103704 -
103705 - t = mem >> 16;
103706 - if (t == 0x1f80) {
103707 - if (mem < 0x1f801000)
103708 - psxHu8(mem) = value;
103709 - else
103710 - psxHwWrite8(mem, value);
103711 - } else {
103712 - p = (char *)(psxMemWLUT[t]);
103713 - if (p != NULL) {
103714 - *(u8 *)(p + (mem & 0xffff)) = value;
103715 -#ifdef PSXREC
103716 - psxCpu->Clear((mem&(~3)), 1);
103717 -#endif
103718 - } else {
103719 -#ifdef PSXMEM_LOG
103720 - PSXMEM_LOG("err sb %8.8lx\n", mem);
103721 -#endif
103722 - }
103723 - }
103724 -}
103725 -
103726 -void psxMemWrite16(u32 mem, u16 value) {
103727 - char *p;
103728 - u32 t;
103729 -
103730 - t = mem >> 16;
103731 - if (t == 0x1f80) {
103732 - if (mem < 0x1f801000)
103733 - psxHu16ref(mem) = SWAPu16(value);
103734 - else
103735 - psxHwWrite16(mem, value);
103736 - } else {
103737 - p = (char *)(psxMemWLUT[t]);
103738 - if (p != NULL) {
103739 - *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
103740 -#ifdef PSXREC
103741 - psxCpu->Clear((mem&(~1)), 1);
103742 -#endif
103743 - } else {
103744 -#ifdef PSXMEM_LOG
103745 - PSXMEM_LOG("err sh %8.8lx\n", mem);
103746 -#endif
103747 - }
103748 - }
103749 -}
103750 -
103751 -void psxMemWrite32(u32 mem, u32 value) {
103752 - char *p;
103753 - u32 t;
103754 -
103755 -// if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
103756 - t = mem >> 16;
103757 - if (t == 0x1f80) {
103758 - if (mem < 0x1f801000)
103759 - psxHu32ref(mem) = SWAPu32(value);
103760 - else
103761 - psxHwWrite32(mem, value);
103762 - } else {
103763 - p = (char *)(psxMemWLUT[t]);
103764 - if (p != NULL) {
103765 - *(u32 *)(p + (mem & 0xffff)) = SWAPu32(value);
103766 -#ifdef PSXREC
103767 - psxCpu->Clear(mem, 1);
103768 -#endif
103769 - } else {
103770 - if (mem != 0xfffe0130) {
103771 -#ifdef PSXREC
103772 - if (!writeok)
103773 - psxCpu->Clear(mem, 1);
103774 -#endif
103775 -
103776 -#ifdef PSXMEM_LOG
103777 - if (writeok) { PSXMEM_LOG("err sw %8.8lx\n", mem); }
103778 -#endif
103779 - } else {
103780 - int i;
103781 -
103782 - switch (value) {
103783 - case 0x800: case 0x804:
103784 - if (writeok == 0) break;
103785 - writeok = 0;
103786 - memset(psxMemWLUT + 0x0000, 0, 0x80 * sizeof(void*));
103787 - memset(psxMemWLUT + 0x8000, 0, 0x80 * sizeof(void*));
103788 - memset(psxMemWLUT + 0xa000, 0, 0x80 * sizeof(void*));
103789 - break;
103790 - case 0x1e988:
103791 - if (writeok == 1) break;
103792 - writeok = 1;
103793 - for (i=0; i<0x80; i++) psxMemWLUT[i + 0x0000] = (void*)&psxM[(i & 0x1f) << 16];
103794 - memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void*));
103795 - memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void*));
103796 - break;
103797 - default:
103798 -#ifdef PSXMEM_LOG
103799 - PSXMEM_LOG("unk %8.8lx = %x\n", mem, value);
103800 -#endif
103801 - break;
103802 - }
103803 - }
103804 - }
103805 - }
103806 -}
103807 -
103808 -void *psxMemPointer(u32 mem) {
103809 - char *p;
103810 - u32 t;
103811 -
103812 - t = mem >> 16;
103813 - if (t == 0x1f80) {
103814 - if (mem < 0x1f801000)
103815 - return (void *)&psxH[mem];
103816 - else
103817 - return NULL;
103818 - } else {
103819 - p = (char *)(psxMemWLUT[t]);
103820 - if (p != NULL) {
103821 - return (void *)(p + (mem & 0xffff));
103822 - }
103823 - return NULL;
103824 - }
103825 -}
103826 diff -rupN original/libpcsxcore/libpcsxcore/psxmem.h new/libpcsxcore/libpcsxcore/psxmem.h
103827 --- original/libpcsxcore/libpcsxcore/psxmem.h 2007-10-08 17:13:27.000000000 -0400
103828 +++ new/libpcsxcore/libpcsxcore/psxmem.h 1969-12-31 20:00:00.000000000 -0400
103829 @@ -1,140 +0,0 @@
103830 -/***************************************************************************
103831 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
103832 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
103833 - * *
103834 - * This program is free software; you can redistribute it and/or modify *
103835 - * it under the terms of the GNU General Public License as published by *
103836 - * the Free Software Foundation; either version 2 of the License, or *
103837 - * (at your option) any later version. *
103838 - * *
103839 - * This program is distributed in the hope that it will be useful, *
103840 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
103841 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
103842 - * GNU General Public License for more details. *
103843 - * *
103844 - * You should have received a copy of the GNU General Public License *
103845 - * along with this program; if not, write to the *
103846 - * Free Software Foundation, Inc., *
103847 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
103848 - ***************************************************************************/
103849 -
103850 -#ifndef __PSXMEMORY_H__
103851 -#define __PSXMEMORY_H__
103852 -
103853 -#include "psxcommon.h"
103854 -
103855 -#if defined(__BIGENDIAN__)
103856 -
103857 -#define _SWAP16(b) ((((unsigned char*)&(b))[0]&0xff) | (((unsigned char*)&(b))[1]&0xff)<<8)
103858 -#define _SWAP32(b) ((((unsigned char*)&(b))[0]&0xff) | ((((unsigned char*)&(b))[1]&0xff)<<8) | ((((unsigned char*)&(b))[2]&0xff)<<16) | (((unsigned char*)&(b))[3]<<24))
103859 -
103860 -#define SWAP16(v) ((((v)&0xff00)>>8) +(((v)&0xff)<<8))
103861 -#define SWAP32(v) ((((v)&0xff000000ul)>>24) + (((v)&0xff0000ul)>>8) + (((v)&0xff00ul)<<8) +(((v)&0xfful)<<24))
103862 -#define SWAPu32(v) SWAP32((u32)(v))
103863 -#define SWAPs32(v) SWAP32((s32)(v))
103864 -
103865 -#define SWAPu16(v) SWAP16((u16)(v))
103866 -#define SWAPs16(v) SWAP16((s16)(v))
103867 -
103868 -#else
103869 -
103870 -#define SWAP16(b) (b)
103871 -#define SWAP32(b) (b)
103872 -
103873 -#define SWAPu16(b) (b)
103874 -#define SWAPu32(b) (b)
103875 -
103876 -#endif
103877 -
103878 -s8 *psxM;
103879 -#define psxMs8(mem) psxM[(mem) & 0x1fffff]
103880 -#define psxMs16(mem) (SWAP16(*(s16*)&psxM[(mem) & 0x1fffff]))
103881 -#define psxMs32(mem) (SWAP32(*(s32*)&psxM[(mem) & 0x1fffff]))
103882 -#define psxMu8(mem) (*(u8*)&psxM[(mem) & 0x1fffff]))
103883 -#define psxMu16(mem) (SWAP16(*(u16*)&psxM[(mem) & 0x1fffff]))
103884 -#define psxMu32(mem) (SWAP32(*(u32*)&psxM[(mem) & 0x1fffff]))
103885 -
103886 -#define psxMs8ref(mem) psxM[(mem) & 0x1fffff]
103887 -#define psxMs16ref(mem) (*(s16*)&psxM[(mem) & 0x1fffff])
103888 -#define psxMs32ref(mem) (*(s32*)&psxM[(mem) & 0x1fffff])
103889 -#define psxMu8ref(mem) (*(u8*) &psxM[(mem) & 0x1fffff])
103890 -#define psxMu16ref(mem) (*(u16*)&psxM[(mem) & 0x1fffff])
103891 -#define psxMu32ref(mem) (*(u32*)&psxM[(mem) & 0x1fffff])
103892 -
103893 -s8 *psxP;
103894 -#define psxPs8(mem) psxP[(mem) & 0xffff]
103895 -#define psxPs16(mem) (SWAP16(*(s16*)&psxP[(mem) & 0xffff]))
103896 -#define psxPs32(mem) (SWAP32(*(s32*)&psxP[(mem) & 0xffff]))
103897 -#define psxPu8(mem) (*(u8*) &psxP[(mem) & 0xffff])
103898 -#define psxPu16(mem) (SWAP16(*(u16*)&psxP[(mem) & 0xffff]))
103899 -#define psxPu32(mem) (SWAP32(*(u32*)&psxP[(mem) & 0xffff]))
103900 -
103901 -#define psxPs8ref(mem) psxP[(mem) & 0xffff]
103902 -#define psxPs16ref(mem) (*(s16*)&psxP[(mem) & 0xffff])
103903 -#define psxPs32ref(mem) (*(s32*)&psxP[(mem) & 0xffff])
103904 -#define psxPu8ref(mem) (*(u8*) &psxP[(mem) & 0xffff])
103905 -#define psxPu16ref(mem) (*(u16*)&psxP[(mem) & 0xffff])
103906 -#define psxPu32ref(mem) (*(u32*)&psxP[(mem) & 0xffff])
103907 -
103908 -s8 *psxR;
103909 -#define psxRs8(mem) psxR[(mem) & 0x7ffff]
103910 -#define psxRs16(mem) (SWAP16(*(s16*)&psxR[(mem) & 0x7ffff]))
103911 -#define psxRs32(mem) (SWAP32(*(s32*)&psxR[(mem) & 0x7ffff]))
103912 -#define psxRu8(mem) (*(u8* )&psxR[(mem) & 0x7ffff])
103913 -#define psxRu16(mem) (SWAP16(*(u16*)&psxR[(mem) & 0x7ffff]))
103914 -#define psxRu32(mem) (SWAP32(*(u32*)&psxR[(mem) & 0x7ffff]))
103915 -
103916 -#define psxRs8ref(mem) psxR[(mem) & 0x7ffff]
103917 -#define psxRs16ref(mem) (*(s16*)&psxR[(mem) & 0x7ffff])
103918 -#define psxRs32ref(mem) (*(s32*)&psxR[(mem) & 0x7ffff])
103919 -#define psxRu8ref(mem) (*(u8* )&psxR[(mem) & 0x7ffff])
103920 -#define psxRu16ref(mem) (*(u16*)&psxR[(mem) & 0x7ffff])
103921 -#define psxRu32ref(mem) (*(u32*)&psxR[(mem) & 0x7ffff])
103922 -
103923 -s8 *psxH;
103924 -#define psxHs8(mem) psxH[(mem) & 0xffff]
103925 -#define psxHs16(mem) (SWAP16(*(s16*)&psxH[(mem) & 0xffff]))
103926 -#define psxHs32(mem) (SWAP32(*(s32*)&psxH[(mem) & 0xffff]))
103927 -#define psxHu8(mem) (*(u8*) &psxH[(mem) & 0xffff])
103928 -#define psxHu16(mem) (SWAP16(*(u16*)&psxH[(mem) & 0xffff]))
103929 -#define psxHu32(mem) (SWAP32(*(u32*)&psxH[(mem) & 0xffff]))
103930 -
103931 -#define psxHs8ref(mem) psxH[(mem) & 0xffff]
103932 -#define psxHs16ref(mem) (*(s16*)&psxH[(mem) & 0xffff])
103933 -#define psxHs32ref(mem) (*(s32*)&psxH[(mem) & 0xffff])
103934 -#define psxHu8ref(mem) (*(u8*) &psxH[(mem) & 0xffff])
103935 -#define psxHu16ref(mem) (*(u16*)&psxH[(mem) & 0xffff])
103936 -#define psxHu32ref(mem) (*(u32*)&psxH[(mem) & 0xffff])
103937 -
103938 -u8** psxMemWLUT;
103939 -u8** psxMemRLUT;
103940 -
103941 -#define PSXM(mem) (psxMemRLUT[(mem) >> 16] == 0 ? NULL : (u8*)(psxMemRLUT[(mem) >> 16] + ((mem) & 0xffff)))
103942 -#define PSXMs8(mem) (*(s8 *)PSXM(mem))
103943 -#define PSXMs16(mem) (SWAP16(*(s16*)PSXM(mem)))
103944 -#define PSXMs32(mem) (SWAP32(*(s32*)PSXM(mem)))
103945 -#define PSXMu8(mem) (*(u8 *)PSXM(mem))
103946 -#define PSXMu16(mem) (SWAP16(*(u16*)PSXM(mem)))
103947 -#define PSXMu32(mem) (SWAP32(*(u32*)PSXM(mem)))
103948 -
103949 -#define PSXMu32ref(mem) (*(u32*)PSXM(mem))
103950 -
103951 -
103952 -#if !defined PSXREC && (defined(__x86_64__) || defined(__i386__) || defined(__sh__) || defined(__ppc__))
103953 -#define PSXREC
103954 -#endif
103955 -
103956 -int psxMemInit();
103957 -void psxMemReset();
103958 -void psxMemShutdown();
103959 -
103960 -u8 psxMemRead8 (u32 mem);
103961 -u16 psxMemRead16(u32 mem);
103962 -u32 psxMemRead32(u32 mem);
103963 -void psxMemWrite8 (u32 mem, u8 value);
103964 -void psxMemWrite16(u32 mem, u16 value);
103965 -void psxMemWrite32(u32 mem, u32 value);
103966 -void *psxMemPointer(u32 mem);
103967 -
103968 -#endif /* __PSXMEMORY_H__ */
103969 -
103970 diff -rupN original/libpcsxcore/libpcsxcore/psxmem.lo new/libpcsxcore/libpcsxcore/psxmem.lo
103971 --- original/libpcsxcore/libpcsxcore/psxmem.lo 2009-03-28 22:34:51.000000000 -0430
103972 +++ new/libpcsxcore/libpcsxcore/psxmem.lo 1969-12-31 20:00:00.000000000 -0400
103973 @@ -1,12 +0,0 @@
103974 -# psxmem.lo - a libtool object file
103975 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
103976 -#
103977 -# Please DO NOT delete this file!
103978 -# It is necessary for linking the library.
103979 -
103980 -# Name of the PIC object.
103981 -pic_object='.libs/psxmem.o'
103982 -
103983 -# Name of the non-PIC object.
103984 -non_pic_object='psxmem.o'
103985 -
103986 Los ficheros binarios original/libpcsxcore/libpcsxcore/psxmem.o y new/libpcsxcore/libpcsxcore/psxmem.o son distintos
103987 diff -rupN original/libpcsxcore/libpcsxcore/r3000a.c new/libpcsxcore/libpcsxcore/r3000a.c
103988 --- original/libpcsxcore/libpcsxcore/r3000a.c 2008-01-12 10:43:30.000000000 -0430
103989 +++ new/libpcsxcore/libpcsxcore/r3000a.c 1969-12-31 20:00:00.000000000 -0400
103990 @@ -1,198 +0,0 @@
103991 -/***************************************************************************
103992 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
103993 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
103994 - * *
103995 - * This program is free software; you can redistribute it and/or modify *
103996 - * it under the terms of the GNU General Public License as published by *
103997 - * the Free Software Foundation; either version 2 of the License, or *
103998 - * (at your option) any later version. *
103999 - * *
104000 - * This program is distributed in the hope that it will be useful, *
104001 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
104002 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
104003 - * GNU General Public License for more details. *
104004 - * *
104005 - * You should have received a copy of the GNU General Public License *
104006 - * along with this program; if not, write to the *
104007 - * Free Software Foundation, Inc., *
104008 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
104009 - ***************************************************************************/
104010 -
104011 -/*
104012 -* R3000A CPU functions.
104013 -*/
104014 -
104015 -#include "r3000a.h"
104016 -
104017 -psxRegisters psxRegs;
104018 -
104019 -int psxInit() {
104020 -
104021 - if(Config.Cpu) {
104022 - if(Config.Dbg) psxCpu = &psxIntDbg;
104023 - else psxCpu = &psxInt;
104024 - }
104025 -#if defined(__x86_64__) || defined(__i386__) || defined(__sh__) || defined(__ppc__)
104026 - if (!Config.Cpu) psxCpu = &psxRec;
104027 -#endif
104028 - Log=0;
104029 -
104030 - if (psxMemInit() == -1) return -1;
104031 -
104032 - return psxCpu->Init();
104033 -}
104034 -
104035 -void psxReset() {
104036 - psxCpu->Reset();
104037 -
104038 - psxMemReset();
104039 -
104040 - memset(&psxRegs, 0, sizeof(psxRegs));
104041 -
104042 - psxRegs.pc = 0xbfc00000; // Start in bootstrap
104043 -
104044 - psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
104045 - psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
104046 -
104047 - psxHwReset();
104048 - psxBiosInit();
104049 -
104050 - if (!Config.HLE) psxExecuteBios();
104051 -
104052 -#ifdef EMU_LOG
104053 - EMU_LOG("*BIOS END*\n");
104054 -#endif
104055 - Log=0;
104056 -}
104057 -
104058 -void psxShutdown() {
104059 - psxMemShutdown();
104060 - psxBiosShutdown();
104061 -
104062 - psxCpu->Shutdown();
104063 -}
104064 -
104065 -void psxException(u32 code, u32 bd) {
104066 - // Set the Cause
104067 - psxRegs.CP0.n.Cause = code;
104068 -
104069 - // Set the EPC & PC
104070 - if (bd) {
104071 -#ifdef PSXCPU_LOG
104072 - PSXCPU_LOG("bd set!!!\n");
104073 -#endif
104074 - SysPrintf("bd set!!!\n");
104075 - psxRegs.CP0.n.Cause|= 0x80000000;
104076 - psxRegs.CP0.n.EPC = (psxRegs.pc - 4);
104077 - } else
104078 - psxRegs.CP0.n.EPC = (psxRegs.pc);
104079 -
104080 - if (psxRegs.CP0.n.Status & 0x400000)
104081 - psxRegs.pc = 0xbfc00180;
104082 - else
104083 - psxRegs.pc = 0x80000080;
104084 -
104085 - // Set the Status
104086 - psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status &~0x3f) |
104087 - ((psxRegs.CP0.n.Status & 0xf) << 2);
104088 -
104089 - if (!Config.HLE && (((PSXMu32(psxRegs.CP0.n.EPC) >> 24) & 0xfe) == 0x4a)) {
104090 - // "hokuto no ken" / "Crash Bandicot 2" ... fix
104091 - PSXMu32ref(psxRegs.CP0.n.EPC)&= SWAPu32(~0x02000000);
104092 - }
104093 -
104094 - if (Config.HLE) psxBiosException();
104095 -}
104096 -
104097 -void psxBranchTest() {
104098 - if ((psxRegs.cycle - psxNextsCounter) >= psxNextCounter)
104099 - psxRcntUpdate();
104100 -
104101 - if (psxRegs.interrupt) {
104102 - if ((psxRegs.interrupt & 0x80) && (!Config.Sio)) { // sio
104103 - if ((psxRegs.cycle - psxRegs.intCycle[7]) >= psxRegs.intCycle[7+1]) {
104104 - psxRegs.interrupt&=~0x80;
104105 - sioInterrupt();
104106 - }
104107 - }
104108 - if (psxRegs.interrupt & 0x04) { // cdr
104109 - if ((psxRegs.cycle - psxRegs.intCycle[2]) >= psxRegs.intCycle[2+1]) {
104110 - psxRegs.interrupt&=~0x04;
104111 - cdrInterrupt();
104112 - }
104113 - }
104114 - if (psxRegs.interrupt & 0x040000) { // cdr read
104115 - if ((psxRegs.cycle - psxRegs.intCycle[2+16]) >= psxRegs.intCycle[2+16+1]) {
104116 - psxRegs.interrupt&=~0x040000;
104117 - cdrReadInterrupt();
104118 - }
104119 - }
104120 - if (psxRegs.interrupt & 0x01000000) { // gpu dma
104121 - if ((psxRegs.cycle - psxRegs.intCycle[3+24]) >= psxRegs.intCycle[3+24+1]) {
104122 - psxRegs.interrupt&=~0x01000000;
104123 - gpuInterrupt();
104124 - }
104125 - }
104126 - if (psxRegs.interrupt & 0x02000000) { // mdec out dma
104127 - if ((psxRegs.cycle - psxRegs.intCycle[5+24]) >= psxRegs.intCycle[5+24+1]) {
104128 - psxRegs.interrupt&=~0x02000000;
104129 - mdec1Interrupt();
104130 - }
104131 - }
104132 -
104133 - if (psxRegs.interrupt & 0x80000000) {
104134 - psxRegs.interrupt&=~0x80000000;
104135 - psxTestHWInts();
104136 - }
104137 - }
104138 -// if (psxRegs.cycle > 0xd29c6500) Log=1;
104139 -}
104140 -
104141 -void psxTestHWInts() {
104142 - if (psxHu32(0x1070) & psxHu32(0x1074)) {
104143 - if ((psxRegs.CP0.n.Status & 0x401) == 0x401) {
104144 -#ifdef PSXCPU_LOG
104145 - PSXCPU_LOG("Interrupt: %x %x\n", psxHu32(0x1070), psxHu32(0x1074));
104146 -#endif
104147 -// SysPrintf("Interrupt (%x): %x %x\n", psxRegs.cycle, psxHu32(0x1070), psxHu32(0x1074));
104148 - psxException(0x400, 0);
104149 - }
104150 - }
104151 -}
104152 -
104153 -void psxJumpTest() {
104154 - if (!Config.HLE && Config.PsxOut) {
104155 - u32 call = psxRegs.GPR.n.t1 & 0xff;
104156 - switch (psxRegs.pc & 0x1fffff) {
104157 - case 0xa0:
104158 -#ifdef PSXBIOS_LOG
104159 - if (call != 0x28 && call != 0xe) {
104160 - PSXBIOS_LOG("Bios call a0: %s (%x) %x,%x,%x,%x\n", biosA0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
104161 -#endif
104162 - if (biosA0[call])
104163 - biosA0[call]();
104164 - break;
104165 - case 0xb0:
104166 -#ifdef PSXBIOS_LOG
104167 - if (call != 0x17 && call != 0xb) {
104168 - PSXBIOS_LOG("Bios call b0: %s (%x) %x,%x,%x,%x\n", biosB0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
104169 -#endif
104170 - if (biosB0[call])
104171 - biosB0[call]();
104172 - break;
104173 - case 0xc0:
104174 -#ifdef PSXBIOS_LOG
104175 - PSXBIOS_LOG("Bios call c0: %s (%x) %x,%x,%x,%x\n", biosC0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3);
104176 -#endif
104177 - if (biosC0[call])
104178 - biosC0[call]();
104179 - break;
104180 - }
104181 - }
104182 -}
104183 -
104184 -void psxExecuteBios() {
104185 - while (psxRegs.pc != 0x80030000)
104186 - psxCpu->ExecuteBlock();
104187 -}
104188 -
104189 diff -rupN original/libpcsxcore/libpcsxcore/r3000a.h new/libpcsxcore/libpcsxcore/r3000a.h
104190 --- original/libpcsxcore/libpcsxcore/r3000a.h 2008-01-12 10:43:30.000000000 -0430
104191 +++ new/libpcsxcore/libpcsxcore/r3000a.h 1969-12-31 20:00:00.000000000 -0400
104192 @@ -1,224 +0,0 @@
104193 -/***************************************************************************
104194 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
104195 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
104196 - * *
104197 - * This program is free software; you can redistribute it and/or modify *
104198 - * it under the terms of the GNU General Public License as published by *
104199 - * the Free Software Foundation; either version 2 of the License, or *
104200 - * (at your option) any later version. *
104201 - * *
104202 - * This program is distributed in the hope that it will be useful, *
104203 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
104204 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
104205 - * GNU General Public License for more details. *
104206 - * *
104207 - * You should have received a copy of the GNU General Public License *
104208 - * along with this program; if not, write to the *
104209 - * Free Software Foundation, Inc., *
104210 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
104211 - ***************************************************************************/
104212 -
104213 -#ifndef __R3000A_H__
104214 -#define __R3000A_H__
104215 -
104216 -#include "psxcommon.h"
104217 -#include "psxmem.h"
104218 -#include "psxcounters.h"
104219 -#include "psxbios.h"
104220 -
104221 -typedef struct {
104222 - int (*Init)();
104223 - void (*Reset)();
104224 - void (*Execute)(); /* executes up to a break */
104225 - void (*ExecuteBlock)(); /* executes up to a jump */
104226 - void (*Clear)(u32 Addr, u32 Size);
104227 - void (*Shutdown)();
104228 -} R3000Acpu;
104229 -
104230 -R3000Acpu *psxCpu;
104231 -extern R3000Acpu psxInt;
104232 -extern R3000Acpu psxIntDbg;
104233 -#if defined(__x86_64__) || defined(__i386__) || defined(__sh__) || defined(__ppc__)
104234 -extern R3000Acpu psxRec;
104235 -#define PSXREC
104236 -#endif
104237 -
104238 -typedef union {
104239 - struct {
104240 - u32 r0, at, v0, v1, a0, a1, a2, a3,
104241 - t0, t1, t2, t3, t4, t5, t6, t7,
104242 - s0, s1, s2, s3, s4, s5, s6, s7,
104243 - t8, t9, k0, k1, gp, sp, s8, ra, lo, hi;
104244 - } n;
104245 - u32 r[34]; /* Lo, Hi in r[33] and r[34] */
104246 -} psxGPRRegs;
104247 -
104248 -typedef union {
104249 - struct {
104250 - u32 Index, Random, EntryLo0, EntryLo1,
104251 - Context, PageMask, Wired, Reserved0,
104252 - BadVAddr, Count, EntryHi, Compare,
104253 - Status, Cause, EPC, PRid,
104254 - Config, LLAddr, WatchLO, WatchHI,
104255 - XContext, Reserved1, Reserved2, Reserved3,
104256 - Reserved4, Reserved5, ECC, CacheErr,
104257 - TagLo, TagHi, ErrorEPC, Reserved6;
104258 - } n;
104259 - u32 r[32];
104260 -} psxCP0Regs;
104261 -
104262 -typedef struct {
104263 - short x, y;
104264 -} SVector2D;
104265 -
104266 -typedef struct {
104267 - short z, pad;
104268 -} SVector2Dz;
104269 -
104270 -typedef struct {
104271 - short x, y, z, pad;
104272 -} SVector3D;
104273 -
104274 -typedef struct {
104275 - short x, y, z, pad;
104276 -} LVector3D;
104277 -
104278 -typedef struct {
104279 - unsigned char r, g, b, c;
104280 -} CBGR;
104281 -
104282 -typedef struct {
104283 - short m11, m12, m13, m21, m22, m23, m31, m32, m33, pad;
104284 -} SMatrix3D;
104285 -
104286 -typedef union {
104287 - struct {
104288 - SVector3D v0, v1, v2;
104289 - CBGR rgb;
104290 - s32 otz;
104291 - s32 ir0, ir1, ir2, ir3;
104292 - SVector2D sxy0, sxy1, sxy2, sxyp;
104293 - SVector2Dz sz0, sz1, sz2, sz3;
104294 - CBGR rgb0, rgb1, rgb2;
104295 - s32 reserved;
104296 - s32 mac0, mac1, mac2, mac3;
104297 - u32 irgb, orgb;
104298 - s32 lzcs, lzcr;
104299 - } n;
104300 - u32 r[32];
104301 -} psxCP2Data;
104302 -
104303 -typedef union {
104304 - struct {
104305 - SMatrix3D rMatrix;
104306 - s32 trX, trY, trZ;
104307 - SMatrix3D lMatrix;
104308 - s32 rbk, gbk, bbk;
104309 - SMatrix3D cMatrix;
104310 - s32 rfc, gfc, bfc;
104311 - s32 ofx, ofy;
104312 - s32 h;
104313 - s32 dqa, dqb;
104314 - s32 zsf3, zsf4;
104315 - s32 flag;
104316 - } n;
104317 - u32 r[32];
104318 -} psxCP2Ctrl;
104319 -
104320 -typedef struct {
104321 - psxGPRRegs GPR; /* General Purpose Registers */
104322 - psxCP0Regs CP0; /* Coprocessor0 Registers */
104323 - psxCP2Data CP2D; /* Cop2 data registers */
104324 - psxCP2Ctrl CP2C; /* Cop2 control registers */
104325 - u32 pc; /* Program counter */
104326 - u32 code; /* The instruction */
104327 - u32 cycle;
104328 - u32 interrupt;
104329 - u32 intCycle[32];
104330 -} psxRegisters;
104331 -
104332 -extern psxRegisters psxRegs;
104333 -
104334 -#if defined(__BIGENDIAN__)
104335 -
104336 -#define _i32(x) *(s32 *)&x
104337 -#define _u32(x) x
104338 -
104339 -#define _i16(x) (((short *)&x)[1])
104340 -#define _u16(x) (((unsigned short *)&x)[1])
104341 -
104342 -#define _i8(x) (((char *)&x)[3])
104343 -#define _u8(x) (((unsigned char *)&x)[3])
104344 -
104345 -#else
104346 -
104347 -#define _i32(x) *(s32 *)&x
104348 -#define _u32(x) x
104349 -
104350 -#define _i16(x) *(short *)&x
104351 -#define _u16(x) *(unsigned short *)&x
104352 -
104353 -#define _i8(x) *(char *)&x
104354 -#define _u8(x) *(unsigned char *)&x
104355 -
104356 -#endif
104357 -
104358 -/**** R3000A Instruction Macros ****/
104359 -#define _PC_ psxRegs.pc // The next PC to be executed
104360 -
104361 -#define _fOp_(code) ((code >> 26) ) // The opcode part of the instruction register
104362 -#define _fFunct_(code) ((code ) & 0x3F) // The funct part of the instruction register
104363 -#define _fRd_(code) ((code >> 11) & 0x1F) // The rd part of the instruction register
104364 -#define _fRt_(code) ((code >> 16) & 0x1F) // The rt part of the instruction register
104365 -#define _fRs_(code) ((code >> 21) & 0x1F) // The rs part of the instruction register
104366 -#define _fSa_(code) ((code >> 6) & 0x1F) // The sa part of the instruction register
104367 -#define _fIm_(code) ((u16)code) // The immediate part of the instruction register
104368 -#define _fTarget_(code) (code & 0x03ffffff) // The target part of the instruction register
104369 -
104370 -#define _fImm_(code) ((s16)code) // sign-extended immediate
104371 -#define _fImmU_(code) (code&0xffff) // zero-extended immediate
104372 -
104373 -#define _Op_ _fOp_(psxRegs.code)
104374 -#define _Funct_ _fFunct_(psxRegs.code)
104375 -#define _Rd_ _fRd_(psxRegs.code)
104376 -#define _Rt_ _fRt_(psxRegs.code)
104377 -#define _Rs_ _fRs_(psxRegs.code)
104378 -#define _Sa_ _fSa_(psxRegs.code)
104379 -#define _Im_ _fIm_(psxRegs.code)
104380 -#define _Target_ _fTarget_(psxRegs.code)
104381 -
104382 -#define _Imm_ _fImm_(psxRegs.code)
104383 -#define _ImmU_ _fImmU_(psxRegs.code)
104384 -
104385 -#define _rRs_ psxRegs.GPR.r[_Rs_] // Rs register
104386 -#define _rRt_ psxRegs.GPR.r[_Rt_] // Rt register
104387 -#define _rRd_ psxRegs.GPR.r[_Rd_] // Rd register
104388 -#define _rSa_ psxRegs.GPR.r[_Sa_] // Sa register
104389 -#define _rFs_ psxRegs.CP0.r[_Rd_] // Fs register
104390 -
104391 -#define _c2dRs_ psxRegs.CP2D.r[_Rs_] // Rs cop2 data register
104392 -#define _c2dRt_ psxRegs.CP2D.r[_Rt_] // Rt cop2 data register
104393 -#define _c2dRd_ psxRegs.CP2D.r[_Rd_] // Rd cop2 data register
104394 -#define _c2dSa_ psxRegs.CP2D.r[_Sa_] // Sa cop2 data register
104395 -
104396 -#define _rHi_ psxRegs.GPR.n.hi // The HI register
104397 -#define _rLo_ psxRegs.GPR.n.lo // The LO register
104398 -
104399 -#define _JumpTarget_ ((_Target_ * 4) + (_PC_ & 0xf0000000)) // Calculates the target during a jump instruction
104400 -#define _BranchTarget_ ((s16)_Im_ * 4 + _PC_) // Calculates the target during a branch instruction
104401 -
104402 -#define _SetLink(x) psxRegs.GPR.r[x] = _PC_ + 4; // Sets the return address in the link register
104403 -
104404 -int psxInit();
104405 -void psxReset();
104406 -void psxShutdown();
104407 -void psxException(u32 code, u32 bd);
104408 -void psxBranchTest();
104409 -void psxExecuteBios();
104410 -int psxTestLoadDelay(int reg, u32 tmp);
104411 -void psxDelayTest(int reg, u32 bpc);
104412 -void psxTestSWInts();
104413 -void psxTestHWInts();
104414 -void psxJumpTest();
104415 -
104416 -#endif /* __R3000A_H__ */
104417 diff -rupN original/libpcsxcore/libpcsxcore/r3000a.lo new/libpcsxcore/libpcsxcore/r3000a.lo
104418 --- original/libpcsxcore/libpcsxcore/r3000a.lo 2009-03-28 22:34:56.000000000 -0430
104419 +++ new/libpcsxcore/libpcsxcore/r3000a.lo 1969-12-31 20:00:00.000000000 -0400
104420 @@ -1,12 +0,0 @@
104421 -# r3000a.lo - a libtool object file
104422 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
104423 -#
104424 -# Please DO NOT delete this file!
104425 -# It is necessary for linking the library.
104426 -
104427 -# Name of the PIC object.
104428 -pic_object='.libs/r3000a.o'
104429 -
104430 -# Name of the non-PIC object.
104431 -non_pic_object='r3000a.o'
104432 -
104433 Los ficheros binarios original/libpcsxcore/libpcsxcore/r3000a.o y new/libpcsxcore/libpcsxcore/r3000a.o son distintos
104434 diff -rupN original/libpcsxcore/libpcsxcore/sio.c new/libpcsxcore/libpcsxcore/sio.c
104435 --- original/libpcsxcore/libpcsxcore/sio.c 2008-11-29 23:50:19.000000000 -0430
104436 +++ new/libpcsxcore/libpcsxcore/sio.c 1969-12-31 20:00:00.000000000 -0400
104437 @@ -1,629 +0,0 @@
104438 -/***************************************************************************
104439 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
104440 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
104441 - * *
104442 - * This program is free software; you can redistribute it and/or modify *
104443 - * it under the terms of the GNU General Public License as published by *
104444 - * the Free Software Foundation; either version 2 of the License, or *
104445 - * (at your option) any later version. *
104446 - * *
104447 - * This program is distributed in the hope that it will be useful, *
104448 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
104449 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
104450 - * GNU General Public License for more details. *
104451 - * *
104452 - * You should have received a copy of the GNU General Public License *
104453 - * along with this program; if not, write to the *
104454 - * Free Software Foundation, Inc., *
104455 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
104456 - ***************************************************************************/
104457 -
104458 -/*
104459 -* SIO functions.
104460 -*/
104461 -
104462 -#include "sio.h"
104463 -#include <sys/stat.h>
104464 -
104465 -// *** FOR WORKS ON PADS AND MEMORY CARDS *****
104466 -
104467 -static unsigned char buf[256];
104468 -unsigned char cardh[4] = { 0x00, 0x00, 0x5a, 0x5d };
104469 -
104470 -//static unsigned short StatReg = 0x002b;
104471 -// Transfer Ready and the Buffer is Empty
104472 -unsigned short StatReg = TX_RDY | TX_EMPTY;
104473 -unsigned short ModeReg;
104474 -unsigned short CtrlReg;
104475 -unsigned short BaudReg;
104476 -
104477 -static unsigned int bufcount;
104478 -static unsigned int parp;
104479 -static unsigned int mcdst,rdwr;
104480 -static unsigned char adrH,adrL;
104481 -static unsigned int padst;
104482 -
104483 -PadDataS pad;
104484 -
104485 -char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
104486 -
104487 -// clk cycle byte
104488 -// 4us * 8bits = ((PSXCLK / 1000000) * 32) / BIAS; (linuzappz)
104489 -#define SIO_INT() { \
104490 - if (!Config.Sio) { \
104491 - psxRegs.interrupt|= 0x80; \
104492 - psxRegs.intCycle[7+1] = 200; /*270;*/ \
104493 - psxRegs.intCycle[7] = psxRegs.cycle; \
104494 - } \
104495 -}
104496 -
104497 -unsigned char sioRead8() {
104498 - unsigned char ret = 0;
104499 -
104500 - if ((StatReg & RX_RDY)/* && (CtrlReg & RX_PERM)*/) {
104501 -// StatReg &= ~RX_OVERRUN;
104502 - ret = buf[parp];
104503 - if (parp == bufcount) {
104504 - StatReg &= ~RX_RDY; // Receive is not Ready now
104505 - if (mcdst == 5) {
104506 - mcdst = 0;
104507 - if (rdwr == 2) {
104508 - switch (CtrlReg&0x2002) {
104509 - case 0x0002:
104510 - memcpy(Mcd1Data + (adrL | (adrH << 8)) * 128, &buf[1], 128);
104511 - SaveMcd(Config.Mcd1, Mcd1Data, (adrL | (adrH << 8)) * 128, 128);
104512 - break;
104513 - case 0x2002:
104514 - memcpy(Mcd2Data + (adrL | (adrH << 8)) * 128, &buf[1], 128);
104515 - SaveMcd(Config.Mcd2, Mcd2Data, (adrL | (adrH << 8)) * 128, 128);
104516 - break;
104517 - }
104518 - }
104519 - }
104520 - if (padst == 2) padst = 0;
104521 - if (mcdst == 1) {
104522 - mcdst = 2;
104523 - StatReg|= RX_RDY;
104524 - }
104525 - }
104526 - }
104527 -
104528 -#ifdef PAD_LOG
104529 - PAD_LOG("sio read8 ;ret = %x\n", ret);
104530 -#endif
104531 - return ret;
104532 -}
104533 -
104534 -void netError() {
104535 - ClosePlugins();
104536 - SysMessage(_("Connection closed!\n"));
104537 - SysRunGui();
104538 -}
104539 -
104540 -void sioWrite8(unsigned char value) {
104541 -#ifdef PAD_LOG
104542 - PAD_LOG("sio write8 %x\n", value);
104543 -#endif
104544 - switch (padst) {
104545 - case 1: SIO_INT();
104546 - if ((value&0x40) == 0x40) {
104547 - padst = 2; parp = 1;
104548 - if (!Config.UseNet) {
104549 - switch (CtrlReg&0x2002) {
104550 - case 0x0002:
104551 - buf[parp] = PAD1_poll(value);
104552 - break;
104553 - case 0x2002:
104554 - buf[parp] = PAD2_poll(value);
104555 - break;
104556 - }
104557 - }/* else {
104558 -// SysPrintf("%x: %x, %x, %x, %x\n", CtrlReg&0x2002, buf[2], buf[3], buf[4], buf[5]);
104559 - }*/
104560 -
104561 - if (!(buf[parp] & 0x0f)) {
104562 - bufcount = 2 + 32;
104563 - } else {
104564 - bufcount = 2 + (buf[parp] & 0x0f) * 2;
104565 - }
104566 - if (buf[parp] == 0x41) {
104567 - switch (value) {
104568 - case 0x43:
104569 - buf[1] = 0x43;
104570 - break;
104571 - case 0x45:
104572 - buf[1] = 0xf3;
104573 - break;
104574 - }
104575 - }
104576 - }
104577 - else padst = 0;
104578 - return;
104579 - case 2:
104580 - parp++;
104581 -/* if (buf[1] == 0x45) {
104582 - buf[parp] = 0;
104583 - SIO_INT();
104584 - return;
104585 - }*/
104586 - if (!Config.UseNet) {
104587 - switch (CtrlReg&0x2002) {
104588 - case 0x0002: buf[parp] = PAD1_poll(value); break;
104589 - case 0x2002: buf[parp] = PAD2_poll(value); break;
104590 - }
104591 - }
104592 -
104593 - if (parp == bufcount) { padst = 0; return; }
104594 - SIO_INT();
104595 - return;
104596 - }
104597 -
104598 - switch (mcdst) {
104599 - case 1:
104600 - SIO_INT();
104601 - if (rdwr) { parp++; return; }
104602 - parp = 1;
104603 - switch (value) {
104604 - case 0x52: rdwr = 1; break;
104605 - case 0x57: rdwr = 2; break;
104606 - default: mcdst = 0;
104607 - }
104608 - return;
104609 - case 2: // address H
104610 - SIO_INT();
104611 - adrH = value;
104612 - *buf = 0;
104613 - parp = 0;
104614 - bufcount = 1;
104615 - mcdst = 3;
104616 - return;
104617 - case 3: // address L
104618 - SIO_INT();
104619 - adrL = value;
104620 - *buf = adrH;
104621 - parp = 0;
104622 - bufcount = 1;
104623 - mcdst = 4;
104624 - return;
104625 - case 4:
104626 - SIO_INT();
104627 - parp = 0;
104628 - switch (rdwr) {
104629 - case 1: // read
104630 - buf[0] = 0x5c;
104631 - buf[1] = 0x5d;
104632 - buf[2] = adrH;
104633 - buf[3] = adrL;
104634 - switch (CtrlReg&0x2002) {
104635 - case 0x0002:
104636 - memcpy(&buf[4], Mcd1Data + (adrL | (adrH << 8)) * 128, 128);
104637 - break;
104638 - case 0x2002:
104639 - memcpy(&buf[4], Mcd2Data + (adrL | (adrH << 8)) * 128, 128);
104640 - break;
104641 - }
104642 - {
104643 - char xor = 0;
104644 - int i;
104645 - for (i=2;i<128+4;i++)
104646 - xor^=buf[i];
104647 - buf[132] = xor;
104648 - }
104649 - buf[133] = 0x47;
104650 - bufcount = 133;
104651 - break;
104652 - case 2: // write
104653 - buf[0] = adrL;
104654 - buf[1] = value;
104655 - buf[129] = 0x5c;
104656 - buf[130] = 0x5d;
104657 - buf[131] = 0x47;
104658 - bufcount = 131;
104659 - break;
104660 - }
104661 - mcdst = 5;
104662 - return;
104663 - case 5:
104664 - parp++;
104665 - if (rdwr == 2) {
104666 - if (parp < 128) buf[parp+1] = value;
104667 - }
104668 - SIO_INT();
104669 - return;
104670 - }
104671 -
104672 - switch (value) {
104673 - case 0x01: // start pad
104674 - StatReg |= RX_RDY; // Transfer is Ready
104675 -
104676 - if (!Config.UseNet) {
104677 - switch (CtrlReg&0x2002) {
104678 - case 0x0002: buf[0] = PAD1_startPoll(1); break;
104679 - case 0x2002: buf[0] = PAD2_startPoll(2); break;
104680 - }
104681 - } else {
104682 - if ((CtrlReg & 0x2002) == 0x0002) {
104683 - int i, j;
104684 -
104685 - PAD1_startPoll(1);
104686 - buf[0] = 0;
104687 - buf[1] = PAD1_poll(0x42);
104688 - if (!(buf[1] & 0x0f)) {
104689 - bufcount = 32;
104690 - } else {
104691 - bufcount = (buf[1] & 0x0f) * 2;
104692 - }
104693 - buf[2] = PAD1_poll(0);
104694 - i = 3;
104695 - j = bufcount;
104696 - while (j--) {
104697 - buf[i++] = PAD1_poll(0);
104698 - }
104699 - bufcount+= 3;
104700 -
104701 - if (NET_sendPadData(buf, bufcount) == -1)
104702 - netError();
104703 -
104704 - if (NET_recvPadData(buf, 1) == -1)
104705 - netError();
104706 - if (NET_recvPadData(buf+128, 2) == -1)
104707 - netError();
104708 - } else {
104709 - memcpy(buf, buf+128, 32);
104710 - }
104711 - }
104712 -
104713 - bufcount = 2;
104714 - parp = 0;
104715 - padst = 1;
104716 - SIO_INT();
104717 - return;
104718 - case 0x81: // start memcard
104719 - StatReg |= RX_RDY;
104720 - memcpy(buf, cardh, 4);
104721 - parp = 0;
104722 - bufcount = 3;
104723 - mcdst = 1;
104724 - rdwr = 0;
104725 - SIO_INT();
104726 - return;
104727 - }
104728 -}
104729 -
104730 -void sioWriteCtrl16(unsigned short value) {
104731 - CtrlReg = value & ~RESET_ERR;
104732 - if (value & RESET_ERR) StatReg &= ~IRQ;
104733 - if ((CtrlReg & SIO_RESET) || (!CtrlReg)) {
104734 - padst = 0; mcdst = 0; parp = 0;
104735 - StatReg = TX_RDY | TX_EMPTY;
104736 - psxRegs.interrupt&=~0x80;
104737 - }
104738 -}
104739 -
104740 -void sioInterrupt() {
104741 -#ifdef PAD_LOG
104742 - PAD_LOG("Sio Interrupt (CP0.Status = %x)\n", psxRegs.CP0.n.Status);
104743 -#endif
104744 -// SysPrintf("Sio Interrupt\n");
104745 - StatReg|= IRQ;
104746 - psxHu32ref(0x1070)|= SWAPu32(0x80);
104747 - psxRegs.interrupt|= 0x80000000;
104748 -}
104749 -
104750 -void LoadMcd(int mcd, char *str) {
104751 - FILE *f;
104752 - char *data = NULL;
104753 -
104754 - if (mcd == 1) data = Mcd1Data;
104755 - if (mcd == 2) data = Mcd2Data;
104756 -
104757 - if (*str == 0) {
104758 - sprintf(str, "memcards/card%d.mcd", mcd);
104759 - printf ("No memory card value was specified - creating a default card %s\n", str);
104760 - }
104761 - f = fopen(str, "rb");
104762 - if (f == NULL) {
104763 - printf ("The memory card %s doesn't exist - creating it\n", str);
104764 - CreateMcd(str);
104765 - f = fopen(str, "rb");
104766 - if (f != NULL) {
104767 - struct stat buf;
104768 -
104769 - if (stat(str, &buf) != -1) {
104770 - if (buf.st_size == MCD_SIZE + 64)
104771 - fseek(f, 64, SEEK_SET);
104772 - else if(buf.st_size == MCD_SIZE + 3904)
104773 - fseek(f, 3904, SEEK_SET);
104774 - }
104775 - fread(data, 1, MCD_SIZE, f);
104776 - fclose(f);
104777 - }
104778 - else SysMessage(_("Memory card %s failed to load!\n"), str);
104779 - }
104780 - else {
104781 - struct stat buf;
104782 - printf ("Loading memory card %s\n", str);
104783 - if (stat(str, &buf) != -1) {
104784 - if (buf.st_size == MCD_SIZE + 64)
104785 - fseek(f, 64, SEEK_SET);
104786 - else if(buf.st_size == MCD_SIZE + 3904)
104787 - fseek(f, 3904, SEEK_SET);
104788 - }
104789 - fread(data, 1, MCD_SIZE, f);
104790 - fclose(f);
104791 - }
104792 -}
104793 -
104794 -void LoadMcds(char *mcd1, char *mcd2) {
104795 - LoadMcd(1, mcd1);
104796 - LoadMcd(2, mcd2);
104797 -}
104798 -
104799 -void SaveMcd(char *mcd, char *data, uint32_t adr, int size) {
104800 - FILE *f;
104801 -
104802 - f = fopen(mcd, "r+b");
104803 - if (f != NULL) {
104804 - struct stat buf;
104805 -
104806 - if (stat(mcd, &buf) != -1) {
104807 - if (buf.st_size == MCD_SIZE + 64)
104808 - fseek(f, adr + 64, SEEK_SET);
104809 - else if (buf.st_size == MCD_SIZE + 3904)
104810 - fseek(f, adr + 3904, SEEK_SET);
104811 - else
104812 - fseek(f, adr, SEEK_SET);
104813 - } else fseek(f, adr, SEEK_SET);
104814 -
104815 - fwrite(data + adr, 1, size, f);
104816 - fclose(f);
104817 - return;
104818 - }
104819 -
104820 - // try to create it again if we can't open it
104821 - /*f = fopen(mcd, "wb");
104822 - if (f != NULL) {
104823 - fwrite(data, 1, MCD_SIZE, f);
104824 - fclose(f);
104825 - }*/
104826 - ConvertMcd(mcd, data);
104827 -}
104828 -
104829 -void CreateMcd(char *mcd) {
104830 - FILE *f;
104831 - struct stat buf;
104832 - int s = MCD_SIZE;
104833 - int i=0, j;
104834 -
104835 - f = fopen(mcd, "wb");
104836 - if (f == NULL) return;
104837 -
104838 - if(stat(mcd, &buf)!=-1) {
104839 - if ((buf.st_size == MCD_SIZE + 3904) || strstr(mcd, ".gme")) {
104840 - s = s + 3904;
104841 - fputc('1', f); s--;
104842 - fputc('2', f); s--;
104843 - fputc('3', f); s--;
104844 - fputc('-', f); s--;
104845 - fputc('4', f); s--;
104846 - fputc('5', f); s--;
104847 - fputc('6', f); s--;
104848 - fputc('-', f); s--;
104849 - fputc('S', f); s--;
104850 - fputc('T', f); s--;
104851 - fputc('D', f); s--;
104852 - for(i=0;i<7;i++) {
104853 - fputc(0, f); s--;
104854 - }
104855 - fputc(1, f); s--;
104856 - fputc(0, f); s--;
104857 - fputc(1, f); s--;
104858 - fputc('M', f); s--;
104859 - fputc('Q', f); s--;
104860 - for(i=0;i<14;i++) {
104861 - fputc(0xa0, f); s--;
104862 - }
104863 - fputc(0, f); s--;
104864 - fputc(0xff, f);
104865 - while (s-- > (MCD_SIZE+1)) fputc(0, f);
104866 - } else if ((buf.st_size == MCD_SIZE + 64) || strstr(mcd, ".mem") || strstr(mcd, ".vgs")) {
104867 - s = s + 64;
104868 - fputc('V', f); s--;
104869 - fputc('g', f); s--;
104870 - fputc('s', f); s--;
104871 - fputc('M', f); s--;
104872 - for(i=0;i<3;i++) {
104873 - fputc(1, f); s--;
104874 - fputc(0, f); s--;
104875 - fputc(0, f); s--;
104876 - fputc(0, f); s--;
104877 - }
104878 - fputc(0, f); s--;
104879 - fputc(2, f);
104880 - while (s-- > (MCD_SIZE+1)) fputc(0, f);
104881 - }
104882 - }
104883 - fputc('M', f); s--;
104884 - fputc('C', f); s--;
104885 - while (s-- > (MCD_SIZE-127)) fputc(0, f);
104886 - fputc(0xe, f); s--;
104887 -
104888 - for(i=0;i<15;i++) { // 15 blocks
104889 - fputc(0xa0, f); s--;
104890 - for(j=0;j<126;j++) {
104891 - fputc(0x00, f); s--;
104892 - }
104893 - fputc(0xa0, f); s--;
104894 - }
104895 -
104896 - while ((s--)>=0) fputc(0, f);
104897 - fclose(f);
104898 -}
104899 -
104900 -void ConvertMcd(char *mcd, char *data) {
104901 - FILE *f;
104902 - int i=0;
104903 - int s = MCD_SIZE;
104904 -
104905 - if (strstr(mcd, ".gme")) {
104906 - f = fopen(mcd, "wb");
104907 - if (f != NULL) {
104908 - fwrite(data-3904, 1, MCD_SIZE+3904, f);
104909 - fclose(f);
104910 - }
104911 - f = fopen(mcd, "r+");
104912 - s = s + 3904;
104913 - fputc('1', f); s--;
104914 - fputc('2', f); s--;
104915 - fputc('3', f); s--;
104916 - fputc('-', f); s--;
104917 - fputc('4', f); s--;
104918 - fputc('5', f); s--;
104919 - fputc('6', f); s--;
104920 - fputc('-', f); s--;
104921 - fputc('S', f); s--;
104922 - fputc('T', f); s--;
104923 - fputc('D', f); s--;
104924 - for(i=0;i<7;i++) {
104925 - fputc(0, f); s--;
104926 - }
104927 - fputc(1, f); s--;
104928 - fputc(0, f); s--;
104929 - fputc(1, f); s--;
104930 - fputc('M', f); s--;
104931 - fputc('Q', f); s--;
104932 - for(i=0;i<14;i++) {
104933 - fputc(0xa0, f); s--;
104934 - }
104935 - fputc(0, f); s--;
104936 - fputc(0xff, f);
104937 - while (s-- > (MCD_SIZE+1)) fputc(0, f);
104938 - fclose(f);
104939 - } else if(strstr(mcd, ".mem") || strstr(mcd,".vgs")) {
104940 - f = fopen(mcd, "wb");
104941 - if (f != NULL) {
104942 - fwrite(data-64, 1, MCD_SIZE+64, f);
104943 - fclose(f);
104944 - }
104945 - f = fopen(mcd, "r+");
104946 - s = s + 64;
104947 - fputc('V', f); s--;
104948 - fputc('g', f); s--;
104949 - fputc('s', f); s--;
104950 - fputc('M', f); s--;
104951 - for(i=0;i<3;i++) {
104952 - fputc(1, f); s--;
104953 - fputc(0, f); s--;
104954 - fputc(0, f); s--;
104955 - fputc(0, f); s--;
104956 - }
104957 - fputc(0, f); s--;
104958 - fputc(2, f);
104959 - while (s-- > (MCD_SIZE+1)) fputc(0, f);
104960 - fclose(f);
104961 - } else {
104962 - f = fopen(mcd, "wb");
104963 - if (f != NULL) {
104964 - fwrite(data, 1, MCD_SIZE, f);
104965 - fclose(f);
104966 - }
104967 - }
104968 -}
104969 -
104970 -void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
104971 - unsigned char *data = NULL, *ptr, *str;
104972 - unsigned short clut[16];
104973 - unsigned short c;
104974 - int i, x;
104975 -
104976 - memset(Info, 0, sizeof(McdBlock));
104977 -
104978 - str = Info->Title;
104979 -
104980 - if (mcd == 1) data = Mcd1Data;
104981 - if (mcd == 2) data = Mcd2Data;
104982 -
104983 - ptr = data + block * 8192 + 2;
104984 -
104985 - Info->IconCount = *ptr & 0x3;
104986 -
104987 - ptr+= 2;
104988 -
104989 - i=0;
104990 - memcpy(Info->sTitle, ptr, 48*2);
104991 -
104992 - for (i=0; i < 48; i++) {
104993 - c = *(ptr) << 8;
104994 - c|= *(ptr+1);
104995 - if (!c) break;
104996 -
104997 - if (c >= 0x8281 && c <= 0x8298)
104998 - c = (c - 0x8281) + 'a';
104999 - else if (c >= 0x824F && c <= 0x827A)
105000 - c = (c - 0x824F) + '0';
105001 - else if (c == 0x8144) c = '.';
105002 - else if (c == 0x8146) c = ':';
105003 - else if (c == 0x8168) c = '"';
105004 - else if (c == 0x8169) c = '(';
105005 - else if (c == 0x816A) c = ')';
105006 - else if (c == 0x816D) c = '[';
105007 - else if (c == 0x816E) c = ']';
105008 - else if (c == 0x817C) c = '-';
105009 - else {
105010 - c = ' ';
105011 - }
105012 -
105013 - str[i] = c;
105014 - ptr+=2;
105015 - }
105016 - str[i] = 0;
105017 -
105018 - ptr = data + block * 8192 + 0x60; // icon palete data
105019 -
105020 - for (i=0; i<16; i++) {
105021 - clut[i] = *((unsigned short*)ptr);
105022 - ptr+=2;
105023 - }
105024 -
105025 - for (i=0; i<Info->IconCount; i++) {
105026 - short *icon = &Info->Icon[i*16*16];
105027 -
105028 - ptr = data + block * 8192 + 128 + 128 * i; // icon data
105029 -
105030 - for (x=0; x<16*16; x++) {
105031 - icon[x++] = clut[*ptr & 0xf];
105032 - icon[x] = clut[*ptr >> 4];
105033 - ptr++;
105034 - }
105035 - }
105036 -
105037 - ptr = data + block * 128;
105038 -
105039 - Info->Flags = *ptr;
105040 -
105041 - ptr+= 0xa;
105042 - strncpy(Info->ID, ptr, 12);
105043 - Info->ID[12] = 0;
105044 - ptr+= 12;
105045 - strncpy(Info->Name, ptr, 16);
105046 -}
105047 -
105048 -int sioFreeze(gzFile f, int Mode) {
105049 - char Unused[4096];
105050 -
105051 - gzfreezel(buf);
105052 - gzfreezel(&StatReg);
105053 - gzfreezel(&ModeReg);
105054 - gzfreezel(&CtrlReg);
105055 - gzfreezel(&BaudReg);
105056 - gzfreezel(&bufcount);
105057 - gzfreezel(&parp);
105058 - gzfreezel(&mcdst);
105059 - gzfreezel(&rdwr);
105060 - gzfreezel(&adrH);
105061 - gzfreezel(&adrL);
105062 - gzfreezel(&padst);
105063 - gzfreezel(Unused);
105064 -
105065 - return 0;
105066 -}
105067 diff -rupN original/libpcsxcore/libpcsxcore/sio.h new/libpcsxcore/libpcsxcore/sio.h
105068 --- original/libpcsxcore/libpcsxcore/sio.h 2007-10-08 17:13:27.000000000 -0400
105069 +++ new/libpcsxcore/libpcsxcore/sio.h 1969-12-31 20:00:00.000000000 -0400
105070 @@ -1,85 +0,0 @@
105071 -/***************************************************************************
105072 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
105073 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
105074 - * *
105075 - * This program is free software; you can redistribute it and/or modify *
105076 - * it under the terms of the GNU General Public License as published by *
105077 - * the Free Software Foundation; either version 2 of the License, or *
105078 - * (at your option) any later version. *
105079 - * *
105080 - * This program is distributed in the hope that it will be useful, *
105081 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
105082 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
105083 - * GNU General Public License for more details. *
105084 - * *
105085 - * You should have received a copy of the GNU General Public License *
105086 - * along with this program; if not, write to the *
105087 - * Free Software Foundation, Inc., *
105088 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
105089 - ***************************************************************************/
105090 -
105091 -
105092 -#ifndef _SIO_H_
105093 -#define _SIO_H_
105094 -
105095 -#include "psxcommon.h"
105096 -#include "r3000a.h"
105097 -#include "psxmem.h"
105098 -#include "plugins.h"
105099 -#include "psemu_plugin_defs.h"
105100 -
105101 -#define MCD_SIZE (1024 * 8 * 16)
105102 -
105103 -// Status Flags
105104 -#define TX_RDY 0x0001
105105 -#define RX_RDY 0x0002
105106 -#define TX_EMPTY 0x0004
105107 -#define PARITY_ERR 0x0008
105108 -#define RX_OVERRUN 0x0010
105109 -#define FRAMING_ERR 0x0020
105110 -#define SYNC_DETECT 0x0040
105111 -#define DSR 0x0080
105112 -#define CTS 0x0100
105113 -#define IRQ 0x0200
105114 -
105115 -// Control Flags
105116 -#define TX_PERM 0x0001
105117 -#define DTR 0x0002
105118 -#define RX_PERM 0x0004
105119 -#define BREAK 0x0008
105120 -#define RESET_ERR 0x0010
105121 -#define RTS 0x0020
105122 -#define SIO_RESET 0x0040
105123 -
105124 -extern unsigned short StatReg;
105125 -extern unsigned short ModeReg;
105126 -extern unsigned short CtrlReg;
105127 -extern unsigned short BaudReg;
105128 -
105129 -extern char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
105130 -
105131 -unsigned char sioRead8();
105132 -void sioWrite8(unsigned char value);
105133 -void sioWriteCtrl16(unsigned short value);
105134 -void sioInterrupt();
105135 -int sioFreeze(gzFile f, int Mode);
105136 -
105137 -void LoadMcd(int mcd, char *str);
105138 -void LoadMcds(char *mcd1, char *mcd2);
105139 -void SaveMcd(char *mcd, char *data, uint32_t adr, int size);
105140 -void CreateMcd(char *mcd);
105141 -void ConvertMcd(char *mcd, char *data);
105142 -
105143 -typedef struct {
105144 - char Title[48];
105145 - short sTitle[48];
105146 - char ID[14];
105147 - char Name[16];
105148 - int IconCount;
105149 - short Icon[16*16*3];
105150 - unsigned char Flags;
105151 -} McdBlock;
105152 -
105153 -void GetMcdBlockInfo(int mcd, int block, McdBlock *info);
105154 -
105155 -#endif
105156 diff -rupN original/libpcsxcore/libpcsxcore/sio.lo new/libpcsxcore/libpcsxcore/sio.lo
105157 --- original/libpcsxcore/libpcsxcore/sio.lo 2009-03-28 22:34:48.000000000 -0430
105158 +++ new/libpcsxcore/libpcsxcore/sio.lo 1969-12-31 20:00:00.000000000 -0400
105159 @@ -1,12 +0,0 @@
105160 -# sio.lo - a libtool object file
105161 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
105162 -#
105163 -# Please DO NOT delete this file!
105164 -# It is necessary for linking the library.
105165 -
105166 -# Name of the PIC object.
105167 -pic_object='.libs/sio.o'
105168 -
105169 -# Name of the non-PIC object.
105170 -non_pic_object='sio.o'
105171 -
105172 Los ficheros binarios original/libpcsxcore/libpcsxcore/sio.o y new/libpcsxcore/libpcsxcore/sio.o son distintos
105173 diff -rupN original/libpcsxcore/libpcsxcore/spu.c new/libpcsxcore/libpcsxcore/spu.c
105174 --- original/libpcsxcore/libpcsxcore/spu.c 2007-10-08 17:13:28.000000000 -0400
105175 +++ new/libpcsxcore/libpcsxcore/spu.c 1969-12-31 20:00:00.000000000 -0400
105176 @@ -1,30 +0,0 @@
105177 -/***************************************************************************
105178 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
105179 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
105180 - * *
105181 - * This program is free software; you can redistribute it and/or modify *
105182 - * it under the terms of the GNU General Public License as published by *
105183 - * the Free Software Foundation; either version 2 of the License, or *
105184 - * (at your option) any later version. *
105185 - * *
105186 - * This program is distributed in the hope that it will be useful, *
105187 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
105188 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
105189 - * GNU General Public License for more details. *
105190 - * *
105191 - * You should have received a copy of the GNU General Public License *
105192 - * along with this program; if not, write to the *
105193 - * Free Software Foundation, Inc., *
105194 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
105195 - ***************************************************************************/
105196 -
105197 -/*
105198 -* Sound (SPU) functions.
105199 -*/
105200 -
105201 -#include "spu.h"
105202 -
105203 -void CALLBACK SPUirq(void) {
105204 - psxHu32ref(0x1070)|= SWAPu32(0x200);
105205 - psxRegs.interrupt|= 0x80000000;
105206 -}
105207 diff -rupN original/libpcsxcore/libpcsxcore/spu.h new/libpcsxcore/libpcsxcore/spu.h
105208 --- original/libpcsxcore/libpcsxcore/spu.h 2007-10-08 17:13:28.000000000 -0400
105209 +++ new/libpcsxcore/libpcsxcore/spu.h 1969-12-31 20:00:00.000000000 -0400
105210 @@ -1,43 +0,0 @@
105211 -/***************************************************************************
105212 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
105213 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
105214 - * *
105215 - * This program is free software; you can redistribute it and/or modify *
105216 - * it under the terms of the GNU General Public License as published by *
105217 - * the Free Software Foundation; either version 2 of the License, or *
105218 - * (at your option) any later version. *
105219 - * *
105220 - * This program is distributed in the hope that it will be useful, *
105221 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
105222 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
105223 - * GNU General Public License for more details. *
105224 - * *
105225 - * You should have received a copy of the GNU General Public License *
105226 - * along with this program; if not, write to the *
105227 - * Free Software Foundation, Inc., *
105228 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
105229 - ***************************************************************************/
105230 -
105231 -#ifndef __SPU_H__
105232 -#define __SPU_H__
105233 -
105234 -#include "psxcommon.h"
105235 -#include "plugins.h"
105236 -#include "r3000a.h"
105237 -#include "psxmem.h"
105238 -
105239 -#define CALLBACK
105240 -
105241 -#define H_SPUirqAddr 0x0da4
105242 -#define H_SPUaddr 0x0da6
105243 -#define H_SPUdata 0x0da8
105244 -#define H_SPUctrl 0x0daa
105245 -#define H_SPUstat 0x0dae
105246 -#define H_SPUon1 0x0d88
105247 -#define H_SPUon2 0x0d8a
105248 -#define H_SPUoff1 0x0d8c
105249 -#define H_SPUoff2 0x0d8e
105250 -
105251 -void CALLBACK SPUirq(void);
105252 -
105253 -#endif /* __SPU_H__ */
105254 diff -rupN original/libpcsxcore/libpcsxcore/spu.lo new/libpcsxcore/libpcsxcore/spu.lo
105255 --- original/libpcsxcore/libpcsxcore/spu.lo 2009-03-28 22:34:47.000000000 -0430
105256 +++ new/libpcsxcore/libpcsxcore/spu.lo 1969-12-31 20:00:00.000000000 -0400
105257 @@ -1,12 +0,0 @@
105258 -# spu.lo - a libtool object file
105259 -# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18)
105260 -#
105261 -# Please DO NOT delete this file!
105262 -# It is necessary for linking the library.
105263 -
105264 -# Name of the PIC object.
105265 -pic_object='.libs/spu.o'
105266 -
105267 -# Name of the non-PIC object.
105268 -non_pic_object='spu.o'
105269 -
105270 Los ficheros binarios original/libpcsxcore/libpcsxcore/spu.o y new/libpcsxcore/libpcsxcore/spu.o son distintos
105271 diff -rupN original/libpcsxcore/libpcsxcore/system.h new/libpcsxcore/libpcsxcore/system.h
105272 --- original/libpcsxcore/libpcsxcore/system.h 2007-10-08 17:13:27.000000000 -0400
105273 +++ new/libpcsxcore/libpcsxcore/system.h 1969-12-31 20:00:00.000000000 -0400
105274 @@ -1,36 +0,0 @@
105275 -/***************************************************************************
105276 - * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
105277 - * schultz.ryan@gmail.com, http://rschultz.ath.cx/code.php *
105278 - * *
105279 - * This program is free software; you can redistribute it and/or modify *
105280 - * it under the terms of the GNU General Public License as published by *
105281 - * the Free Software Foundation; either version 2 of the License, or *
105282 - * (at your option) any later version. *
105283 - * *
105284 - * This program is distributed in the hope that it will be useful, *
105285 - * but WITHOUT ANY WARRANTY; without even the implied warranty of *
105286 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
105287 - * GNU General Public License for more details. *
105288 - * *
105289 - * You should have received a copy of the GNU General Public License *
105290 - * along with this program; if not, write to the *
105291 - * Free Software Foundation, Inc., *
105292 - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
105293 - ***************************************************************************/
105294 -
105295 -#ifndef __SYSTEM_H__
105296 -#define __SYSTEM_H__
105297 -
105298 -int SysInit(); // Init mem and plugins
105299 -void SysReset(); // Resets mem
105300 -void SysPrintf(char *fmt, ...); // Printf used by bios syscalls
105301 -void SysMessage(char *fmt, ...); // Message used to print msg to users
105302 -void *SysLoadLibrary(char *lib); // Loads Library
105303 -void *SysLoadSym(void *lib, char *sym); // Loads Symbol from Library
105304 -const char *SysLibError(); // Gets previous error loading sysbols
105305 -void SysCloseLibrary(void *lib); // Closes Library
105306 -void SysUpdate(); // Called on VBlank (to update i.e. pads)
105307 -void SysRunGui(); // Returns to the Gui
105308 -void SysClose(); // Close mem and plugins
105309 -
105310 -#endif /* __SYSTEM_H__ */
105311 diff -rupN original/ltmain.sh new/ltmain.sh
105312 --- original/ltmain.sh 2008-04-29 17:03:55.000000000 -0430
105313 +++ new/ltmain.sh 1969-12-31 20:00:00.000000000 -0400
105314 @@ -1,6964 +0,0 @@
105315 -# ltmain.sh - Provide generalized library-building support services.
105316 -# NOTE: Changing this file will not affect anything until you rerun configure.
105317 -#
105318 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
105319 -# 2007, 2008 Free Software Foundation, Inc.
105320 -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
105321 -#
105322 -# This program is free software; you can redistribute it and/or modify
105323 -# it under the terms of the GNU General Public License as published by
105324 -# the Free Software Foundation; either version 2 of the License, or
105325 -# (at your option) any later version.
105326 -#
105327 -# This program is distributed in the hope that it will be useful, but
105328 -# WITHOUT ANY WARRANTY; without even the implied warranty of
105329 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
105330 -# General Public License for more details.
105331 -#
105332 -# You should have received a copy of the GNU General Public License
105333 -# along with this program; if not, write to the Free Software
105334 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
105335 -#
105336 -# As a special exception to the GNU General Public License, if you
105337 -# distribute this file as part of a program that contains a
105338 -# configuration script generated by Autoconf, you may include it under
105339 -# the same distribution terms that you use for the rest of that program.
105340 -
105341 -basename="s,^.*/,,g"
105342 -
105343 -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
105344 -# is ksh but when the shell is invoked as "sh" and the current value of
105345 -# the _XPG environment variable is not equal to 1 (one), the special
105346 -# positional parameter $0, within a function call, is the name of the
105347 -# function.
105348 -progpath="$0"
105349 -
105350 -# The name of this program:
105351 -progname=`echo "$progpath" | $SED $basename`
105352 -modename="$progname"
105353 -
105354 -# Global variables:
105355 -EXIT_SUCCESS=0
105356 -EXIT_FAILURE=1
105357 -
105358 -PROGRAM=ltmain.sh
105359 -PACKAGE=libtool
105360 -VERSION="1.5.26 Debian 1.5.26-4"
105361 -TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
105362 -
105363 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
105364 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
105365 - emulate sh
105366 - NULLCMD=:
105367 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
105368 - # is contrary to our usage. Disable this feature.
105369 - alias -g '${1+"$@"}'='"$@"'
105370 - setopt NO_GLOB_SUBST
105371 -else
105372 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
105373 -fi
105374 -BIN_SH=xpg4; export BIN_SH # for Tru64
105375 -DUALCASE=1; export DUALCASE # for MKS sh
105376 -
105377 -# Check that we have a working $echo.
105378 -if test "X$1" = X--no-reexec; then
105379 - # Discard the --no-reexec flag, and continue.
105380 - shift
105381 -elif test "X$1" = X--fallback-echo; then
105382 - # Avoid inline document here, it may be left over
105383 - :
105384 -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
105385 - # Yippee, $echo works!
105386 - :
105387 -else
105388 - # Restart under the correct shell, and then maybe $echo will work.
105389 - exec $SHELL "$progpath" --no-reexec ${1+"$@"}
105390 -fi
105391 -
105392 -if test "X$1" = X--fallback-echo; then
105393 - # used as fallback echo
105394 - shift
105395 - cat <<EOF
105396 -$*
105397 -EOF
105398 - exit $EXIT_SUCCESS
105399 -fi
105400 -
105401 -default_mode=
105402 -help="Try \`$progname --help' for more information."
105403 -magic="%%%MAGIC variable%%%"
105404 -mkdir="mkdir"
105405 -mv="mv -f"
105406 -rm="rm -f"
105407 -
105408 -# Sed substitution that helps us do robust quoting. It backslashifies
105409 -# metacharacters that are still active within double-quoted strings.
105410 -Xsed="${SED}"' -e 1s/^X//'
105411 -sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
105412 -# test EBCDIC or ASCII
105413 -case `echo X|tr X '\101'` in
105414 - A) # ASCII based system
105415 - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
105416 - SP2NL='tr \040 \012'
105417 - NL2SP='tr \015\012 \040\040'
105418 - ;;
105419 - *) # EBCDIC based system
105420 - SP2NL='tr \100 \n'
105421 - NL2SP='tr \r\n \100\100'
105422 - ;;
105423 -esac
105424 -
105425 -# NLS nuisances.
105426 -# Only set LANG and LC_ALL to C if already set.
105427 -# These must not be set unconditionally because not all systems understand
105428 -# e.g. LANG=C (notably SCO).
105429 -# We save the old values to restore during execute mode.
105430 -lt_env=
105431 -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
105432 -do
105433 - eval "if test \"\${$lt_var+set}\" = set; then
105434 - save_$lt_var=\$$lt_var
105435 - lt_env=\"$lt_var=\$$lt_var \$lt_env\"
105436 - $lt_var=C
105437 - export $lt_var
105438 - fi"
105439 -done
105440 -
105441 -if test -n "$lt_env"; then
105442 - lt_env="env $lt_env"
105443 -fi
105444 -
105445 -# Make sure IFS has a sensible default
105446 -lt_nl='
105447 -'
105448 -IFS=" $lt_nl"
105449 -
105450 -if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
105451 - $echo "$modename: not configured to build any kind of library" 1>&2
105452 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
105453 - exit $EXIT_FAILURE
105454 -fi
105455 -
105456 -# Global variables.
105457 -mode=$default_mode
105458 -nonopt=
105459 -prev=
105460 -prevopt=
105461 -run=
105462 -show="$echo"
105463 -show_help=
105464 -execute_dlfiles=
105465 -duplicate_deps=no
105466 -preserve_args=
105467 -lo2o="s/\\.lo\$/.${objext}/"
105468 -o2lo="s/\\.${objext}\$/.lo/"
105469 -extracted_archives=
105470 -extracted_serial=0
105471 -
105472 -#####################################
105473 -# Shell function definitions:
105474 -# This seems to be the best place for them
105475 -
105476 -# func_mktempdir [string]
105477 -# Make a temporary directory that won't clash with other running
105478 -# libtool processes, and avoids race conditions if possible. If
105479 -# given, STRING is the basename for that directory.
105480 -func_mktempdir ()
105481 -{
105482 - my_template="${TMPDIR-/tmp}/${1-$progname}"
105483 -
105484 - if test "$run" = ":"; then
105485 - # Return a directory name, but don't create it in dry-run mode
105486 - my_tmpdir="${my_template}-$$"
105487 - else
105488 -
105489 - # If mktemp works, use that first and foremost
105490 - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
105491 -
105492 - if test ! -d "$my_tmpdir"; then
105493 - # Failing that, at least try and use $RANDOM to avoid a race
105494 - my_tmpdir="${my_template}-${RANDOM-0}$$"
105495 -
105496 - save_mktempdir_umask=`umask`
105497 - umask 0077
105498 - $mkdir "$my_tmpdir"
105499 - umask $save_mktempdir_umask
105500 - fi
105501 -
105502 - # If we're not in dry-run mode, bomb out on failure
105503 - test -d "$my_tmpdir" || {
105504 - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
105505 - exit $EXIT_FAILURE
105506 - }
105507 - fi
105508 -
105509 - $echo "X$my_tmpdir" | $Xsed
105510 -}
105511 -
105512 -
105513 -# func_win32_libid arg
105514 -# return the library type of file 'arg'
105515 -#
105516 -# Need a lot of goo to handle *both* DLLs and import libs
105517 -# Has to be a shell function in order to 'eat' the argument
105518 -# that is supplied when $file_magic_command is called.
105519 -func_win32_libid ()
105520 -{
105521 - win32_libid_type="unknown"
105522 - win32_fileres=`file -L $1 2>/dev/null`
105523 - case $win32_fileres in
105524 - *ar\ archive\ import\ library*) # definitely import
105525 - win32_libid_type="x86 archive import"
105526 - ;;
105527 - *ar\ archive*) # could be an import, or static
105528 - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
105529 - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
105530 - win32_nmres=`eval $NM -f posix -A $1 | \
105531 - $SED -n -e '1,100{
105532 - / I /{
105533 - s,.*,import,
105534 - p
105535 - q
105536 - }
105537 - }'`
105538 - case $win32_nmres in
105539 - import*) win32_libid_type="x86 archive import";;
105540 - *) win32_libid_type="x86 archive static";;
105541 - esac
105542 - fi
105543 - ;;
105544 - *DLL*)
105545 - win32_libid_type="x86 DLL"
105546 - ;;
105547 - *executable*) # but shell scripts are "executable" too...
105548 - case $win32_fileres in
105549 - *MS\ Windows\ PE\ Intel*)
105550 - win32_libid_type="x86 DLL"
105551 - ;;
105552 - esac
105553 - ;;
105554 - esac
105555 - $echo $win32_libid_type
105556 -}
105557 -
105558 -
105559 -# func_infer_tag arg
105560 -# Infer tagged configuration to use if any are available and
105561 -# if one wasn't chosen via the "--tag" command line option.
105562 -# Only attempt this if the compiler in the base compile
105563 -# command doesn't match the default compiler.
105564 -# arg is usually of the form 'gcc ...'
105565 -func_infer_tag ()
105566 -{
105567 - if test -n "$available_tags" && test -z "$tagname"; then
105568 - CC_quoted=
105569 - for arg in $CC; do
105570 - case $arg in
105571 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
105572 - arg="\"$arg\""
105573 - ;;
105574 - esac
105575 - CC_quoted="$CC_quoted $arg"
105576 - done
105577 - case $@ in
105578 - # Blanks in the command may have been stripped by the calling shell,
105579 - # but not from the CC environment variable when configure was run.
105580 - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
105581 - # Blanks at the start of $base_compile will cause this to fail
105582 - # if we don't check for them as well.
105583 - *)
105584 - for z in $available_tags; do
105585 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
105586 - # Evaluate the configuration.
105587 - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
105588 - CC_quoted=
105589 - for arg in $CC; do
105590 - # Double-quote args containing other shell metacharacters.
105591 - case $arg in
105592 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
105593 - arg="\"$arg\""
105594 - ;;
105595 - esac
105596 - CC_quoted="$CC_quoted $arg"
105597 - done
105598 - case "$@ " in
105599 - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
105600 - # The compiler in the base compile command matches
105601 - # the one in the tagged configuration.
105602 - # Assume this is the tagged configuration we want.
105603 - tagname=$z
105604 - break
105605 - ;;
105606 - esac
105607 - fi
105608 - done
105609 - # If $tagname still isn't set, then no tagged configuration
105610 - # was found and let the user know that the "--tag" command
105611 - # line option must be used.
105612 - if test -z "$tagname"; then
105613 - $echo "$modename: unable to infer tagged configuration"
105614 - $echo "$modename: specify a tag with \`--tag'" 1>&2
105615 - exit $EXIT_FAILURE
105616 -# else
105617 -# $echo "$modename: using $tagname tagged configuration"
105618 - fi
105619 - ;;
105620 - esac
105621 - fi
105622 -}
105623 -
105624 -
105625 -# func_extract_an_archive dir oldlib
105626 -func_extract_an_archive ()
105627 -{
105628 - f_ex_an_ar_dir="$1"; shift
105629 - f_ex_an_ar_oldlib="$1"
105630 -
105631 - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
105632 - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
105633 - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
105634 - :
105635 - else
105636 - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
105637 - exit $EXIT_FAILURE
105638 - fi
105639 -}
105640 -
105641 -# func_extract_archives gentop oldlib ...
105642 -func_extract_archives ()
105643 -{
105644 - my_gentop="$1"; shift
105645 - my_oldlibs=${1+"$@"}
105646 - my_oldobjs=""
105647 - my_xlib=""
105648 - my_xabs=""
105649 - my_xdir=""
105650 - my_status=""
105651 -
105652 - $show "${rm}r $my_gentop"
105653 - $run ${rm}r "$my_gentop"
105654 - $show "$mkdir $my_gentop"
105655 - $run $mkdir "$my_gentop"
105656 - my_status=$?
105657 - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
105658 - exit $my_status
105659 - fi
105660 -
105661 - for my_xlib in $my_oldlibs; do
105662 - # Extract the objects.
105663 - case $my_xlib in
105664 - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
105665 - *) my_xabs=`pwd`"/$my_xlib" ;;
105666 - esac
105667 - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
105668 - my_xlib_u=$my_xlib
105669 - while :; do
105670 - case " $extracted_archives " in
105671 - *" $my_xlib_u "*)
105672 - extracted_serial=`expr $extracted_serial + 1`
105673 - my_xlib_u=lt$extracted_serial-$my_xlib ;;
105674 - *) break ;;
105675 - esac
105676 - done
105677 - extracted_archives="$extracted_archives $my_xlib_u"
105678 - my_xdir="$my_gentop/$my_xlib_u"
105679 -
105680 - $show "${rm}r $my_xdir"
105681 - $run ${rm}r "$my_xdir"
105682 - $show "$mkdir $my_xdir"
105683 - $run $mkdir "$my_xdir"
105684 - exit_status=$?
105685 - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
105686 - exit $exit_status
105687 - fi
105688 - case $host in
105689 - *-darwin*)
105690 - $show "Extracting $my_xabs"
105691 - # Do not bother doing anything if just a dry run
105692 - if test -z "$run"; then
105693 - darwin_orig_dir=`pwd`
105694 - cd $my_xdir || exit $?
105695 - darwin_archive=$my_xabs
105696 - darwin_curdir=`pwd`
105697 - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
105698 - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
105699 - if test -n "$darwin_arches"; then
105700 - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
105701 - darwin_arch=
105702 - $show "$darwin_base_archive has multiple architectures $darwin_arches"
105703 - for darwin_arch in $darwin_arches ; do
105704 - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
105705 - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
105706 - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
105707 - func_extract_an_archive "`pwd`" "${darwin_base_archive}"
105708 - cd "$darwin_curdir"
105709 - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
105710 - done # $darwin_arches
105711 - ## Okay now we have a bunch of thin objects, gotta fatten them up :)
105712 - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
105713 - darwin_file=
105714 - darwin_files=
105715 - for darwin_file in $darwin_filelist; do
105716 - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
105717 - lipo -create -output "$darwin_file" $darwin_files
105718 - done # $darwin_filelist
105719 - ${rm}r unfat-$$
105720 - cd "$darwin_orig_dir"
105721 - else
105722 - cd "$darwin_orig_dir"
105723 - func_extract_an_archive "$my_xdir" "$my_xabs"
105724 - fi # $darwin_arches
105725 - fi # $run
105726 - ;;
105727 - *)
105728 - func_extract_an_archive "$my_xdir" "$my_xabs"
105729 - ;;
105730 - esac
105731 - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
105732 - done
105733 - func_extract_archives_result="$my_oldobjs"
105734 -}
105735 -# End of Shell function definitions
105736 -#####################################
105737 -
105738 -# Darwin sucks
105739 -eval std_shrext=\"$shrext_cmds\"
105740 -
105741 -disable_libs=no
105742 -
105743 -# Parse our command line options once, thoroughly.
105744 -while test "$#" -gt 0
105745 -do
105746 - arg="$1"
105747 - shift
105748 -
105749 - case $arg in
105750 - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
105751 - *) optarg= ;;
105752 - esac
105753 -
105754 - # If the previous option needs an argument, assign it.
105755 - if test -n "$prev"; then
105756 - case $prev in
105757 - execute_dlfiles)
105758 - execute_dlfiles="$execute_dlfiles $arg"
105759 - ;;
105760 - tag)
105761 - tagname="$arg"
105762 - preserve_args="${preserve_args}=$arg"
105763 -
105764 - # Check whether tagname contains only valid characters
105765 - case $tagname in
105766 - *[!-_A-Za-z0-9,/]*)
105767 - $echo "$progname: invalid tag name: $tagname" 1>&2
105768 - exit $EXIT_FAILURE
105769 - ;;
105770 - esac
105771 -
105772 - case $tagname in
105773 - CC)
105774 - # Don't test for the "default" C tag, as we know, it's there, but
105775 - # not specially marked.
105776 - ;;
105777 - *)
105778 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
105779 - taglist="$taglist $tagname"
105780 - # Evaluate the configuration.
105781 - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
105782 - else
105783 - $echo "$progname: ignoring unknown tag $tagname" 1>&2
105784 - fi
105785 - ;;
105786 - esac
105787 - ;;
105788 - *)
105789 - eval "$prev=\$arg"
105790 - ;;
105791 - esac
105792 -
105793 - prev=
105794 - prevopt=
105795 - continue
105796 - fi
105797 -
105798 - # Have we seen a non-optional argument yet?
105799 - case $arg in
105800 - --help)
105801 - show_help=yes
105802 - ;;
105803 -
105804 - --version)
105805 - echo "\
105806 -$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
105807 -
105808 -Copyright (C) 2008 Free Software Foundation, Inc.
105809 -This is free software; see the source for copying conditions. There is NO
105810 -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
105811 - exit $?
105812 - ;;
105813 -
105814 - --config)
105815 - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
105816 - # Now print the configurations for the tags.
105817 - for tagname in $taglist; do
105818 - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
105819 - done
105820 - exit $?
105821 - ;;
105822 -
105823 - --debug)
105824 - $echo "$progname: enabling shell trace mode"
105825 - set -x
105826 - preserve_args="$preserve_args $arg"
105827 - ;;
105828 -
105829 - --dry-run | -n)
105830 - run=:
105831 - ;;
105832 -
105833 - --features)
105834 - $echo "host: $host"
105835 - if test "$build_libtool_libs" = yes; then
105836 - $echo "enable shared libraries"
105837 - else
105838 - $echo "disable shared libraries"
105839 - fi
105840 - if test "$build_old_libs" = yes; then
105841 - $echo "enable static libraries"
105842 - else
105843 - $echo "disable static libraries"
105844 - fi
105845 - exit $?
105846 - ;;
105847 -
105848 - --finish) mode="finish" ;;
105849 -
105850 - --mode) prevopt="--mode" prev=mode ;;
105851 - --mode=*) mode="$optarg" ;;
105852 -
105853 - --preserve-dup-deps) duplicate_deps="yes" ;;
105854 -
105855 - --quiet | --silent)
105856 - show=:
105857 - preserve_args="$preserve_args $arg"
105858 - ;;
105859 -
105860 - --tag)
105861 - prevopt="--tag"
105862 - prev=tag
105863 - preserve_args="$preserve_args --tag"
105864 - ;;
105865 - --tag=*)
105866 - set tag "$optarg" ${1+"$@"}
105867 - shift
105868 - prev=tag
105869 - preserve_args="$preserve_args --tag"
105870 - ;;
105871 -
105872 - -dlopen)
105873 - prevopt="-dlopen"
105874 - prev=execute_dlfiles
105875 - ;;
105876 -
105877 - -*)
105878 - $echo "$modename: unrecognized option \`$arg'" 1>&2
105879 - $echo "$help" 1>&2
105880 - exit $EXIT_FAILURE
105881 - ;;
105882 -
105883 - *)
105884 - nonopt="$arg"
105885 - break
105886 - ;;
105887 - esac
105888 -done
105889 -
105890 -if test -n "$prevopt"; then
105891 - $echo "$modename: option \`$prevopt' requires an argument" 1>&2
105892 - $echo "$help" 1>&2
105893 - exit $EXIT_FAILURE
105894 -fi
105895 -
105896 -case $disable_libs in
105897 -no)
105898 - ;;
105899 -shared)
105900 - build_libtool_libs=no
105901 - build_old_libs=yes
105902 - ;;
105903 -static)
105904 - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
105905 - ;;
105906 -esac
105907 -
105908 -# If this variable is set in any of the actions, the command in it
105909 -# will be execed at the end. This prevents here-documents from being
105910 -# left over by shells.
105911 -exec_cmd=
105912 -
105913 -if test -z "$show_help"; then
105914 -
105915 - # Infer the operation mode.
105916 - if test -z "$mode"; then
105917 - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
105918 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
105919 - case $nonopt in
105920 - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
105921 - mode=link
105922 - for arg
105923 - do
105924 - case $arg in
105925 - -c)
105926 - mode=compile
105927 - break
105928 - ;;
105929 - esac
105930 - done
105931 - ;;
105932 - *db | *dbx | *strace | *truss)
105933 - mode=execute
105934 - ;;
105935 - *install*|cp|mv)
105936 - mode=install
105937 - ;;
105938 - *rm)
105939 - mode=uninstall
105940 - ;;
105941 - *)
105942 - # If we have no mode, but dlfiles were specified, then do execute mode.
105943 - test -n "$execute_dlfiles" && mode=execute
105944 -
105945 - # Just use the default operation mode.
105946 - if test -z "$mode"; then
105947 - if test -n "$nonopt"; then
105948 - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
105949 - else
105950 - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
105951 - fi
105952 - fi
105953 - ;;
105954 - esac
105955 - fi
105956 -
105957 - # Only execute mode is allowed to have -dlopen flags.
105958 - if test -n "$execute_dlfiles" && test "$mode" != execute; then
105959 - $echo "$modename: unrecognized option \`-dlopen'" 1>&2
105960 - $echo "$help" 1>&2
105961 - exit $EXIT_FAILURE
105962 - fi
105963 -
105964 - # Change the help message to a mode-specific one.
105965 - generic_help="$help"
105966 - help="Try \`$modename --help --mode=$mode' for more information."
105967 -
105968 - # These modes are in order of execution frequency so that they run quickly.
105969 - case $mode in
105970 - # libtool compile mode
105971 - compile)
105972 - modename="$modename: compile"
105973 - # Get the compilation command and the source file.
105974 - base_compile=
105975 - srcfile="$nonopt" # always keep a non-empty value in "srcfile"
105976 - suppress_opt=yes
105977 - suppress_output=
105978 - arg_mode=normal
105979 - libobj=
105980 - later=
105981 -
105982 - for arg
105983 - do
105984 - case $arg_mode in
105985 - arg )
105986 - # do not "continue". Instead, add this to base_compile
105987 - lastarg="$arg"
105988 - arg_mode=normal
105989 - ;;
105990 -
105991 - target )
105992 - libobj="$arg"
105993 - arg_mode=normal
105994 - continue
105995 - ;;
105996 -
105997 - normal )
105998 - # Accept any command-line options.
105999 - case $arg in
106000 - -o)
106001 - if test -n "$libobj" ; then
106002 - $echo "$modename: you cannot specify \`-o' more than once" 1>&2
106003 - exit $EXIT_FAILURE
106004 - fi
106005 - arg_mode=target
106006 - continue
106007 - ;;
106008 -
106009 - -static | -prefer-pic | -prefer-non-pic)
106010 - later="$later $arg"
106011 - continue
106012 - ;;
106013 -
106014 - -no-suppress)
106015 - suppress_opt=no
106016 - continue
106017 - ;;
106018 -
106019 - -Xcompiler)
106020 - arg_mode=arg # the next one goes into the "base_compile" arg list
106021 - continue # The current "srcfile" will either be retained or
106022 - ;; # replaced later. I would guess that would be a bug.
106023 -
106024 - -Wc,*)
106025 - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
106026 - lastarg=
106027 - save_ifs="$IFS"; IFS=','
106028 - for arg in $args; do
106029 - IFS="$save_ifs"
106030 -
106031 - # Double-quote args containing other shell metacharacters.
106032 - # Many Bourne shells cannot handle close brackets correctly
106033 - # in scan sets, so we specify it separately.
106034 - case $arg in
106035 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
106036 - arg="\"$arg\""
106037 - ;;
106038 - esac
106039 - lastarg="$lastarg $arg"
106040 - done
106041 - IFS="$save_ifs"
106042 - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
106043 -
106044 - # Add the arguments to base_compile.
106045 - base_compile="$base_compile $lastarg"
106046 - continue
106047 - ;;
106048 -
106049 - * )
106050 - # Accept the current argument as the source file.
106051 - # The previous "srcfile" becomes the current argument.
106052 - #
106053 - lastarg="$srcfile"
106054 - srcfile="$arg"
106055 - ;;
106056 - esac # case $arg
106057 - ;;
106058 - esac # case $arg_mode
106059 -
106060 - # Aesthetically quote the previous argument.
106061 - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
106062 -
106063 - case $lastarg in
106064 - # Double-quote args containing other shell metacharacters.
106065 - # Many Bourne shells cannot handle close brackets correctly
106066 - # in scan sets, and some SunOS ksh mistreat backslash-escaping
106067 - # in scan sets (worked around with variable expansion),
106068 - # and furthermore cannot handle '|' '&' '(' ')' in scan sets
106069 - # at all, so we specify them separately.
106070 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
106071 - lastarg="\"$lastarg\""
106072 - ;;
106073 - esac
106074 -
106075 - base_compile="$base_compile $lastarg"
106076 - done # for arg
106077 -
106078 - case $arg_mode in
106079 - arg)
106080 - $echo "$modename: you must specify an argument for -Xcompile"
106081 - exit $EXIT_FAILURE
106082 - ;;
106083 - target)
106084 - $echo "$modename: you must specify a target with \`-o'" 1>&2
106085 - exit $EXIT_FAILURE
106086 - ;;
106087 - *)
106088 - # Get the name of the library object.
106089 - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
106090 - ;;
106091 - esac
106092 -
106093 - # Recognize several different file suffixes.
106094 - # If the user specifies -o file.o, it is replaced with file.lo
106095 - xform='[cCFSifmso]'
106096 - case $libobj in
106097 - *.ada) xform=ada ;;
106098 - *.adb) xform=adb ;;
106099 - *.ads) xform=ads ;;
106100 - *.asm) xform=asm ;;
106101 - *.c++) xform=c++ ;;
106102 - *.cc) xform=cc ;;
106103 - *.ii) xform=ii ;;
106104 - *.class) xform=class ;;
106105 - *.cpp) xform=cpp ;;
106106 - *.cxx) xform=cxx ;;
106107 - *.[fF][09]?) xform=[fF][09]. ;;
106108 - *.for) xform=for ;;
106109 - *.java) xform=java ;;
106110 - *.obj) xform=obj ;;
106111 - *.sx) xform=sx ;;
106112 - esac
106113 -
106114 - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
106115 -
106116 - case $libobj in
106117 - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
106118 - *)
106119 - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
106120 - exit $EXIT_FAILURE
106121 - ;;
106122 - esac
106123 -
106124 - func_infer_tag $base_compile
106125 -
106126 - for arg in $later; do
106127 - case $arg in
106128 - -static)
106129 - build_old_libs=yes
106130 - continue
106131 - ;;
106132 -
106133 - -prefer-pic)
106134 - pic_mode=yes
106135 - continue
106136 - ;;
106137 -
106138 - -prefer-non-pic)
106139 - pic_mode=no
106140 - continue
106141 - ;;
106142 - esac
106143 - done
106144 -
106145 - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
106146 - case $qlibobj in
106147 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
106148 - qlibobj="\"$qlibobj\"" ;;
106149 - esac
106150 - test "X$libobj" != "X$qlibobj" \
106151 - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
106152 - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
106153 - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
106154 - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
106155 - if test "X$xdir" = "X$obj"; then
106156 - xdir=
106157 - else
106158 - xdir=$xdir/
106159 - fi
106160 - lobj=${xdir}$objdir/$objname
106161 -
106162 - if test -z "$base_compile"; then
106163 - $echo "$modename: you must specify a compilation command" 1>&2
106164 - $echo "$help" 1>&2
106165 - exit $EXIT_FAILURE
106166 - fi
106167 -
106168 - # Delete any leftover library objects.
106169 - if test "$build_old_libs" = yes; then
106170 - removelist="$obj $lobj $libobj ${libobj}T"
106171 - else
106172 - removelist="$lobj $libobj ${libobj}T"
106173 - fi
106174 -
106175 - $run $rm $removelist
106176 - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
106177 -
106178 - # On Cygwin there's no "real" PIC flag so we must build both object types
106179 - case $host_os in
106180 - cygwin* | mingw* | pw32* | os2*)
106181 - pic_mode=default
106182 - ;;
106183 - esac
106184 - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
106185 - # non-PIC code in shared libraries is not supported
106186 - pic_mode=default
106187 - fi
106188 -
106189 - # Calculate the filename of the output object if compiler does
106190 - # not support -o with -c
106191 - if test "$compiler_c_o" = no; then
106192 - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
106193 - lockfile="$output_obj.lock"
106194 - removelist="$removelist $output_obj $lockfile"
106195 - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
106196 - else
106197 - output_obj=
106198 - need_locks=no
106199 - lockfile=
106200 - fi
106201 -
106202 - # Lock this critical section if it is needed
106203 - # We use this script file to make the link, it avoids creating a new file
106204 - if test "$need_locks" = yes; then
106205 - until $run ln "$progpath" "$lockfile" 2>/dev/null; do
106206 - $show "Waiting for $lockfile to be removed"
106207 - sleep 2
106208 - done
106209 - elif test "$need_locks" = warn; then
106210 - if test -f "$lockfile"; then
106211 - $echo "\
106212 -*** ERROR, $lockfile exists and contains:
106213 -`cat $lockfile 2>/dev/null`
106214 -
106215 -This indicates that another process is trying to use the same
106216 -temporary object file, and libtool could not work around it because
106217 -your compiler does not support \`-c' and \`-o' together. If you
106218 -repeat this compilation, it may succeed, by chance, but you had better
106219 -avoid parallel builds (make -j) in this platform, or get a better
106220 -compiler."
106221 -
106222 - $run $rm $removelist
106223 - exit $EXIT_FAILURE
106224 - fi
106225 - $echo "$srcfile" > "$lockfile"
106226 - fi
106227 -
106228 - if test -n "$fix_srcfile_path"; then
106229 - eval srcfile=\"$fix_srcfile_path\"
106230 - fi
106231 - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
106232 - case $qsrcfile in
106233 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
106234 - qsrcfile="\"$qsrcfile\"" ;;
106235 - esac
106236 -
106237 - $run $rm "$libobj" "${libobj}T"
106238 -
106239 - # Create a libtool object file (analogous to a ".la" file),
106240 - # but don't create it if we're doing a dry run.
106241 - test -z "$run" && cat > ${libobj}T <<EOF
106242 -# $libobj - a libtool object file
106243 -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
106244 -#
106245 -# Please DO NOT delete this file!
106246 -# It is necessary for linking the library.
106247 -
106248 -# Name of the PIC object.
106249 -EOF
106250 -
106251 - # Only build a PIC object if we are building libtool libraries.
106252 - if test "$build_libtool_libs" = yes; then
106253 - # Without this assignment, base_compile gets emptied.
106254 - fbsd_hideous_sh_bug=$base_compile
106255 -
106256 - if test "$pic_mode" != no; then
106257 - command="$base_compile $qsrcfile $pic_flag"
106258 - else
106259 - # Don't build PIC code
106260 - command="$base_compile $qsrcfile"
106261 - fi
106262 -
106263 - if test ! -d "${xdir}$objdir"; then
106264 - $show "$mkdir ${xdir}$objdir"
106265 - $run $mkdir ${xdir}$objdir
106266 - exit_status=$?
106267 - if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
106268 - exit $exit_status
106269 - fi
106270 - fi
106271 -
106272 - if test -z "$output_obj"; then
106273 - # Place PIC objects in $objdir
106274 - command="$command -o $lobj"
106275 - fi
106276 -
106277 - $run $rm "$lobj" "$output_obj"
106278 -
106279 - $show "$command"
106280 - if $run eval $lt_env "$command"; then :
106281 - else
106282 - test -n "$output_obj" && $run $rm $removelist
106283 - exit $EXIT_FAILURE
106284 - fi
106285 -
106286 - if test "$need_locks" = warn &&
106287 - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
106288 - $echo "\
106289 -*** ERROR, $lockfile contains:
106290 -`cat $lockfile 2>/dev/null`
106291 -
106292 -but it should contain:
106293 -$srcfile
106294 -
106295 -This indicates that another process is trying to use the same
106296 -temporary object file, and libtool could not work around it because
106297 -your compiler does not support \`-c' and \`-o' together. If you
106298 -repeat this compilation, it may succeed, by chance, but you had better
106299 -avoid parallel builds (make -j) in this platform, or get a better
106300 -compiler."
106301 -
106302 - $run $rm $removelist
106303 - exit $EXIT_FAILURE
106304 - fi
106305 -
106306 - # Just move the object if needed, then go on to compile the next one
106307 - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
106308 - $show "$mv $output_obj $lobj"
106309 - if $run $mv $output_obj $lobj; then :
106310 - else
106311 - error=$?
106312 - $run $rm $removelist
106313 - exit $error
106314 - fi
106315 - fi
106316 -
106317 - # Append the name of the PIC object to the libtool object file.
106318 - test -z "$run" && cat >> ${libobj}T <<EOF
106319 -pic_object='$objdir/$objname'
106320 -
106321 -EOF
106322 -
106323 - # Allow error messages only from the first compilation.
106324 - if test "$suppress_opt" = yes; then
106325 - suppress_output=' >/dev/null 2>&1'
106326 - fi
106327 - else
106328 - # No PIC object so indicate it doesn't exist in the libtool
106329 - # object file.
106330 - test -z "$run" && cat >> ${libobj}T <<EOF
106331 -pic_object=none
106332 -
106333 -EOF
106334 - fi
106335 -
106336 - # Only build a position-dependent object if we build old libraries.
106337 - if test "$build_old_libs" = yes; then
106338 - if test "$pic_mode" != yes; then
106339 - # Don't build PIC code
106340 - command="$base_compile $qsrcfile"
106341 - else
106342 - command="$base_compile $qsrcfile $pic_flag"
106343 - fi
106344 - if test "$compiler_c_o" = yes; then
106345 - command="$command -o $obj"
106346 - fi
106347 -
106348 - # Suppress compiler output if we already did a PIC compilation.
106349 - command="$command$suppress_output"
106350 - $run $rm "$obj" "$output_obj"
106351 - $show "$command"
106352 - if $run eval $lt_env "$command"; then :
106353 - else
106354 - $run $rm $removelist
106355 - exit $EXIT_FAILURE
106356 - fi
106357 -
106358 - if test "$need_locks" = warn &&
106359 - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
106360 - $echo "\
106361 -*** ERROR, $lockfile contains:
106362 -`cat $lockfile 2>/dev/null`
106363 -
106364 -but it should contain:
106365 -$srcfile
106366 -
106367 -This indicates that another process is trying to use the same
106368 -temporary object file, and libtool could not work around it because
106369 -your compiler does not support \`-c' and \`-o' together. If you
106370 -repeat this compilation, it may succeed, by chance, but you had better
106371 -avoid parallel builds (make -j) in this platform, or get a better
106372 -compiler."
106373 -
106374 - $run $rm $removelist
106375 - exit $EXIT_FAILURE
106376 - fi
106377 -
106378 - # Just move the object if needed
106379 - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
106380 - $show "$mv $output_obj $obj"
106381 - if $run $mv $output_obj $obj; then :
106382 - else
106383 - error=$?
106384 - $run $rm $removelist
106385 - exit $error
106386 - fi
106387 - fi
106388 -
106389 - # Append the name of the non-PIC object the libtool object file.
106390 - # Only append if the libtool object file exists.
106391 - test -z "$run" && cat >> ${libobj}T <<EOF
106392 -# Name of the non-PIC object.
106393 -non_pic_object='$objname'
106394 -
106395 -EOF
106396 - else
106397 - # Append the name of the non-PIC object the libtool object file.
106398 - # Only append if the libtool object file exists.
106399 - test -z "$run" && cat >> ${libobj}T <<EOF
106400 -# Name of the non-PIC object.
106401 -non_pic_object=none
106402 -
106403 -EOF
106404 - fi
106405 -
106406 - $run $mv "${libobj}T" "${libobj}"
106407 -
106408 - # Unlock the critical section if it was locked
106409 - if test "$need_locks" != no; then
106410 - $run $rm "$lockfile"
106411 - fi
106412 -
106413 - exit $EXIT_SUCCESS
106414 - ;;
106415 -
106416 - # libtool link mode
106417 - link | relink)
106418 - modename="$modename: link"
106419 - case $host in
106420 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
106421 - # It is impossible to link a dll without this setting, and
106422 - # we shouldn't force the makefile maintainer to figure out
106423 - # which system we are compiling for in order to pass an extra
106424 - # flag for every libtool invocation.
106425 - # allow_undefined=no
106426 -
106427 - # FIXME: Unfortunately, there are problems with the above when trying
106428 - # to make a dll which has undefined symbols, in which case not
106429 - # even a static library is built. For now, we need to specify
106430 - # -no-undefined on the libtool link line when we can be certain
106431 - # that all symbols are satisfied, otherwise we get a static library.
106432 - allow_undefined=yes
106433 - ;;
106434 - *)
106435 - allow_undefined=yes
106436 - ;;
106437 - esac
106438 - libtool_args="$nonopt"
106439 - base_compile="$nonopt $@"
106440 - compile_command="$nonopt"
106441 - finalize_command="$nonopt"
106442 -
106443 - compile_rpath=
106444 - finalize_rpath=
106445 - compile_shlibpath=
106446 - finalize_shlibpath=
106447 - convenience=
106448 - old_convenience=
106449 - deplibs=
106450 - old_deplibs=
106451 - compiler_flags=
106452 - linker_flags=
106453 - dllsearchpath=
106454 - lib_search_path=`pwd`
106455 - inst_prefix_dir=
106456 -
106457 - avoid_version=no
106458 - dlfiles=
106459 - dlprefiles=
106460 - dlself=no
106461 - export_dynamic=no
106462 - export_symbols=
106463 - export_symbols_regex=
106464 - generated=
106465 - libobjs=
106466 - ltlibs=
106467 - module=no
106468 - no_install=no
106469 - objs=
106470 - non_pic_objects=
106471 - notinst_path= # paths that contain not-installed libtool libraries
106472 - precious_files_regex=
106473 - prefer_static_libs=no
106474 - preload=no
106475 - prev=
106476 - prevarg=
106477 - release=
106478 - rpath=
106479 - xrpath=
106480 - perm_rpath=
106481 - temp_rpath=
106482 - thread_safe=no
106483 - vinfo=
106484 - vinfo_number=no
106485 - single_module="${wl}-single_module"
106486 -
106487 - func_infer_tag $base_compile
106488 -
106489 - # We need to know -static, to get the right output filenames.
106490 - for arg
106491 - do
106492 - case $arg in
106493 - -all-static | -static | -static-libtool-libs)
106494 - case $arg in
106495 - -all-static)
106496 - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
106497 - $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
106498 - fi
106499 - if test -n "$link_static_flag"; then
106500 - dlopen_self=$dlopen_self_static
106501 - fi
106502 - prefer_static_libs=yes
106503 - ;;
106504 - -static)
106505 - if test -z "$pic_flag" && test -n "$link_static_flag"; then
106506 - dlopen_self=$dlopen_self_static
106507 - fi
106508 - prefer_static_libs=built
106509 - ;;
106510 - -static-libtool-libs)
106511 - if test -z "$pic_flag" && test -n "$link_static_flag"; then
106512 - dlopen_self=$dlopen_self_static
106513 - fi
106514 - prefer_static_libs=yes
106515 - ;;
106516 - esac
106517 - build_libtool_libs=no
106518 - build_old_libs=yes
106519 - break
106520 - ;;
106521 - esac
106522 - done
106523 -
106524 - # See if our shared archives depend on static archives.
106525 - test -n "$old_archive_from_new_cmds" && build_old_libs=yes
106526 -
106527 - # Go through the arguments, transforming them on the way.
106528 - while test "$#" -gt 0; do
106529 - arg="$1"
106530 - shift
106531 - case $arg in
106532 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
106533 - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
106534 - ;;
106535 - *) qarg=$arg ;;
106536 - esac
106537 - libtool_args="$libtool_args $qarg"
106538 -
106539 - # If the previous option needs an argument, assign it.
106540 - if test -n "$prev"; then
106541 - case $prev in
106542 - output)
106543 - compile_command="$compile_command @OUTPUT@"
106544 - finalize_command="$finalize_command @OUTPUT@"
106545 - ;;
106546 - esac
106547 -
106548 - case $prev in
106549 - dlfiles|dlprefiles)
106550 - if test "$preload" = no; then
106551 - # Add the symbol object into the linking commands.
106552 - compile_command="$compile_command @SYMFILE@"
106553 - finalize_command="$finalize_command @SYMFILE@"
106554 - preload=yes
106555 - fi
106556 - case $arg in
106557 - *.la | *.lo) ;; # We handle these cases below.
106558 - force)
106559 - if test "$dlself" = no; then
106560 - dlself=needless
106561 - export_dynamic=yes
106562 - fi
106563 - prev=
106564 - continue
106565 - ;;
106566 - self)
106567 - if test "$prev" = dlprefiles; then
106568 - dlself=yes
106569 - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
106570 - dlself=yes
106571 - else
106572 - dlself=needless
106573 - export_dynamic=yes
106574 - fi
106575 - prev=
106576 - continue
106577 - ;;
106578 - *)
106579 - if test "$prev" = dlfiles; then
106580 - dlfiles="$dlfiles $arg"
106581 - else
106582 - dlprefiles="$dlprefiles $arg"
106583 - fi
106584 - prev=
106585 - continue
106586 - ;;
106587 - esac
106588 - ;;
106589 - expsyms)
106590 - export_symbols="$arg"
106591 - if test ! -f "$arg"; then
106592 - $echo "$modename: symbol file \`$arg' does not exist"
106593 - exit $EXIT_FAILURE
106594 - fi
106595 - prev=
106596 - continue
106597 - ;;
106598 - expsyms_regex)
106599 - export_symbols_regex="$arg"
106600 - prev=
106601 - continue
106602 - ;;
106603 - inst_prefix)
106604 - inst_prefix_dir="$arg"
106605 - prev=
106606 - continue
106607 - ;;
106608 - precious_regex)
106609 - precious_files_regex="$arg"
106610 - prev=
106611 - continue
106612 - ;;
106613 - release)
106614 - release="-$arg"
106615 - prev=
106616 - continue
106617 - ;;
106618 - objectlist)
106619 - if test -f "$arg"; then
106620 - save_arg=$arg
106621 - moreargs=
106622 - for fil in `cat $save_arg`
106623 - do
106624 -# moreargs="$moreargs $fil"
106625 - arg=$fil
106626 - # A libtool-controlled object.
106627 -
106628 - # Check to see that this really is a libtool object.
106629 - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
106630 - pic_object=
106631 - non_pic_object=
106632 -
106633 - # Read the .lo file
106634 - # If there is no directory component, then add one.
106635 - case $arg in
106636 - */* | *\\*) . $arg ;;
106637 - *) . ./$arg ;;
106638 - esac
106639 -
106640 - if test -z "$pic_object" || \
106641 - test -z "$non_pic_object" ||
106642 - test "$pic_object" = none && \
106643 - test "$non_pic_object" = none; then
106644 - $echo "$modename: cannot find name of object for \`$arg'" 1>&2
106645 - exit $EXIT_FAILURE
106646 - fi
106647 -
106648 - # Extract subdirectory from the argument.
106649 - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
106650 - if test "X$xdir" = "X$arg"; then
106651 - xdir=
106652 - else
106653 - xdir="$xdir/"
106654 - fi
106655 -
106656 - if test "$pic_object" != none; then
106657 - # Prepend the subdirectory the object is found in.
106658 - pic_object="$xdir$pic_object"
106659 -
106660 - if test "$prev" = dlfiles; then
106661 - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
106662 - dlfiles="$dlfiles $pic_object"
106663 - prev=
106664 - continue
106665 - else
106666 - # If libtool objects are unsupported, then we need to preload.
106667 - prev=dlprefiles
106668 - fi
106669 - fi
106670 -
106671 - # CHECK ME: I think I busted this. -Ossama
106672 - if test "$prev" = dlprefiles; then
106673 - # Preload the old-style object.
106674 - dlprefiles="$dlprefiles $pic_object"
106675 - prev=
106676 - fi
106677 -
106678 - # A PIC object.
106679 - libobjs="$libobjs $pic_object"
106680 - arg="$pic_object"
106681 - fi
106682 -
106683 - # Non-PIC object.
106684 - if test "$non_pic_object" != none; then
106685 - # Prepend the subdirectory the object is found in.
106686 - non_pic_object="$xdir$non_pic_object"
106687 -
106688 - # A standard non-PIC object
106689 - non_pic_objects="$non_pic_objects $non_pic_object"
106690 - if test -z "$pic_object" || test "$pic_object" = none ; then
106691 - arg="$non_pic_object"
106692 - fi
106693 - else
106694 - # If the PIC object exists, use it instead.
106695 - # $xdir was prepended to $pic_object above.
106696 - non_pic_object="$pic_object"
106697 - non_pic_objects="$non_pic_objects $non_pic_object"
106698 - fi
106699 - else
106700 - # Only an error if not doing a dry-run.
106701 - if test -z "$run"; then
106702 - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
106703 - exit $EXIT_FAILURE
106704 - else
106705 - # Dry-run case.
106706 -
106707 - # Extract subdirectory from the argument.
106708 - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
106709 - if test "X$xdir" = "X$arg"; then
106710 - xdir=
106711 - else
106712 - xdir="$xdir/"
106713 - fi
106714 -
106715 - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
106716 - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
106717 - libobjs="$libobjs $pic_object"
106718 - non_pic_objects="$non_pic_objects $non_pic_object"
106719 - fi
106720 - fi
106721 - done
106722 - else
106723 - $echo "$modename: link input file \`$save_arg' does not exist"
106724 - exit $EXIT_FAILURE
106725 - fi
106726 - arg=$save_arg
106727 - prev=
106728 - continue
106729 - ;;
106730 - rpath | xrpath)
106731 - # We need an absolute path.
106732 - case $arg in
106733 - [\\/]* | [A-Za-z]:[\\/]*) ;;
106734 - *)
106735 - $echo "$modename: only absolute run-paths are allowed" 1>&2
106736 - exit $EXIT_FAILURE
106737 - ;;
106738 - esac
106739 - if test "$prev" = rpath; then
106740 - case "$rpath " in
106741 - *" $arg "*) ;;
106742 - *) rpath="$rpath $arg" ;;
106743 - esac
106744 - else
106745 - case "$xrpath " in
106746 - *" $arg "*) ;;
106747 - *) xrpath="$xrpath $arg" ;;
106748 - esac
106749 - fi
106750 - prev=
106751 - continue
106752 - ;;
106753 - xcompiler)
106754 - compiler_flags="$compiler_flags $qarg"
106755 - prev=
106756 - compile_command="$compile_command $qarg"
106757 - finalize_command="$finalize_command $qarg"
106758 - continue
106759 - ;;
106760 - xlinker)
106761 - linker_flags="$linker_flags $qarg"
106762 - compiler_flags="$compiler_flags $wl$qarg"
106763 - prev=
106764 - compile_command="$compile_command $wl$qarg"
106765 - finalize_command="$finalize_command $wl$qarg"
106766 - continue
106767 - ;;
106768 - xcclinker)
106769 - linker_flags="$linker_flags $qarg"
106770 - compiler_flags="$compiler_flags $qarg"
106771 - prev=
106772 - compile_command="$compile_command $qarg"
106773 - finalize_command="$finalize_command $qarg"
106774 - continue
106775 - ;;
106776 - shrext)
106777 - shrext_cmds="$arg"
106778 - prev=
106779 - continue
106780 - ;;
106781 - darwin_framework|darwin_framework_skip)
106782 - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
106783 - compile_command="$compile_command $arg"
106784 - finalize_command="$finalize_command $arg"
106785 - prev=
106786 - continue
106787 - ;;
106788 - *)
106789 - eval "$prev=\"\$arg\""
106790 - prev=
106791 - continue
106792 - ;;
106793 - esac
106794 - fi # test -n "$prev"
106795 -
106796 - prevarg="$arg"
106797 -
106798 - case $arg in
106799 - -all-static)
106800 - if test -n "$link_static_flag"; then
106801 - compile_command="$compile_command $link_static_flag"
106802 - finalize_command="$finalize_command $link_static_flag"
106803 - fi
106804 - continue
106805 - ;;
106806 -
106807 - -allow-undefined)
106808 - # FIXME: remove this flag sometime in the future.
106809 - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
106810 - continue
106811 - ;;
106812 -
106813 - -avoid-version)
106814 - avoid_version=yes
106815 - continue
106816 - ;;
106817 -
106818 - -dlopen)
106819 - prev=dlfiles
106820 - continue
106821 - ;;
106822 -
106823 - -dlpreopen)
106824 - prev=dlprefiles
106825 - continue
106826 - ;;
106827 -
106828 - -export-dynamic)
106829 - export_dynamic=yes
106830 - continue
106831 - ;;
106832 -
106833 - -export-symbols | -export-symbols-regex)
106834 - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
106835 - $echo "$modename: more than one -exported-symbols argument is not allowed"
106836 - exit $EXIT_FAILURE
106837 - fi
106838 - if test "X$arg" = "X-export-symbols"; then
106839 - prev=expsyms
106840 - else
106841 - prev=expsyms_regex
106842 - fi
106843 - continue
106844 - ;;
106845 -
106846 - -framework|-arch|-isysroot)
106847 - case " $CC " in
106848 - *" ${arg} ${1} "* | *" ${arg} ${1} "*)
106849 - prev=darwin_framework_skip ;;
106850 - *) compiler_flags="$compiler_flags $arg"
106851 - prev=darwin_framework ;;
106852 - esac
106853 - compile_command="$compile_command $arg"
106854 - finalize_command="$finalize_command $arg"
106855 - continue
106856 - ;;
106857 -
106858 - -inst-prefix-dir)
106859 - prev=inst_prefix
106860 - continue
106861 - ;;
106862 -
106863 - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
106864 - # so, if we see these flags be careful not to treat them like -L
106865 - -L[A-Z][A-Z]*:*)
106866 - case $with_gcc/$host in
106867 - no/*-*-irix* | /*-*-irix*)
106868 - compile_command="$compile_command $arg"
106869 - finalize_command="$finalize_command $arg"
106870 - ;;
106871 - esac
106872 - continue
106873 - ;;
106874 -
106875 - -L*)
106876 - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
106877 - # We need an absolute path.
106878 - case $dir in
106879 - [\\/]* | [A-Za-z]:[\\/]*) ;;
106880 - *)
106881 - absdir=`cd "$dir" && pwd`
106882 - if test -z "$absdir"; then
106883 - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
106884 - absdir="$dir"
106885 - notinst_path="$notinst_path $dir"
106886 - fi
106887 - dir="$absdir"
106888 - ;;
106889 - esac
106890 - case "$deplibs " in
106891 - *" -L$dir "*) ;;
106892 - *)
106893 - deplibs="$deplibs -L$dir"
106894 - lib_search_path="$lib_search_path $dir"
106895 - ;;
106896 - esac
106897 - case $host in
106898 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
106899 - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
106900 - case :$dllsearchpath: in
106901 - *":$dir:"*) ;;
106902 - *) dllsearchpath="$dllsearchpath:$dir";;
106903 - esac
106904 - case :$dllsearchpath: in
106905 - *":$testbindir:"*) ;;
106906 - *) dllsearchpath="$dllsearchpath:$testbindir";;
106907 - esac
106908 - ;;
106909 - esac
106910 - continue
106911 - ;;
106912 -
106913 - -l*)
106914 - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
106915 - case $host in
106916 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
106917 - # These systems don't actually have a C or math library (as such)
106918 - continue
106919 - ;;
106920 - *-*-os2*)
106921 - # These systems don't actually have a C library (as such)
106922 - test "X$arg" = "X-lc" && continue
106923 - ;;
106924 - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
106925 - # Do not include libc due to us having libc/libc_r.
106926 - test "X$arg" = "X-lc" && continue
106927 - ;;
106928 - *-*-rhapsody* | *-*-darwin1.[012])
106929 - # Rhapsody C and math libraries are in the System framework
106930 - deplibs="$deplibs -framework System"
106931 - continue
106932 - ;;
106933 - *-*-sco3.2v5* | *-*-sco5v6*)
106934 - # Causes problems with __ctype
106935 - test "X$arg" = "X-lc" && continue
106936 - ;;
106937 - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
106938 - # Compiler inserts libc in the correct place for threads to work
106939 - test "X$arg" = "X-lc" && continue
106940 - ;;
106941 - esac
106942 - elif test "X$arg" = "X-lc_r"; then
106943 - case $host in
106944 - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
106945 - # Do not include libc_r directly, use -pthread flag.
106946 - continue
106947 - ;;
106948 - esac
106949 - fi
106950 - deplibs="$deplibs $arg"
106951 - continue
106952 - ;;
106953 -
106954 - # Tru64 UNIX uses -model [arg] to determine the layout of C++
106955 - # classes, name mangling, and exception handling.
106956 - -model)
106957 - compile_command="$compile_command $arg"
106958 - compiler_flags="$compiler_flags $arg"
106959 - finalize_command="$finalize_command $arg"
106960 - prev=xcompiler
106961 - continue
106962 - ;;
106963 -
106964 - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
106965 - compiler_flags="$compiler_flags $arg"
106966 - compile_command="$compile_command $arg"
106967 - finalize_command="$finalize_command $arg"
106968 - continue
106969 - ;;
106970 -
106971 - -multi_module)
106972 - single_module="${wl}-multi_module"
106973 - continue
106974 - ;;
106975 -
106976 - -module)
106977 - module=yes
106978 - continue
106979 - ;;
106980 -
106981 - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
106982 - # -r[0-9][0-9]* specifies the processor on the SGI compiler
106983 - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
106984 - # +DA*, +DD* enable 64-bit mode on the HP compiler
106985 - # -q* pass through compiler args for the IBM compiler
106986 - # -m* pass through architecture-specific compiler args for GCC
106987 - # -m*, -t[45]*, -txscale* pass through architecture-specific
106988 - # compiler args for GCC
106989 - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
106990 - # -F/path gives path to uninstalled frameworks, gcc on darwin
106991 - # @file GCC response files
106992 - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
106993 - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
106994 -
106995 - # Unknown arguments in both finalize_command and compile_command need
106996 - # to be aesthetically quoted because they are evaled later.
106997 - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
106998 - case $arg in
106999 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
107000 - arg="\"$arg\""
107001 - ;;
107002 - esac
107003 - compile_command="$compile_command $arg"
107004 - finalize_command="$finalize_command $arg"
107005 - compiler_flags="$compiler_flags $arg"
107006 - continue
107007 - ;;
107008 -
107009 - -shrext)
107010 - prev=shrext
107011 - continue
107012 - ;;
107013 -
107014 - -no-fast-install)
107015 - fast_install=no
107016 - continue
107017 - ;;
107018 -
107019 - -no-install)
107020 - case $host in
107021 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
107022 - # The PATH hackery in wrapper scripts is required on Windows
107023 - # and Darwin in order for the loader to find any dlls it needs.
107024 - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
107025 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
107026 - fast_install=no
107027 - ;;
107028 - *) no_install=yes ;;
107029 - esac
107030 - continue
107031 - ;;
107032 -
107033 - -no-undefined)
107034 - allow_undefined=no
107035 - continue
107036 - ;;
107037 -
107038 - -objectlist)
107039 - prev=objectlist
107040 - continue
107041 - ;;
107042 -
107043 - -o) prev=output ;;
107044 -
107045 - -precious-files-regex)
107046 - prev=precious_regex
107047 - continue
107048 - ;;
107049 -
107050 - -release)
107051 - prev=release
107052 - continue
107053 - ;;
107054 -
107055 - -rpath)
107056 - prev=rpath
107057 - continue
107058 - ;;
107059 -
107060 - -R)
107061 - prev=xrpath
107062 - continue
107063 - ;;
107064 -
107065 - -R*)
107066 - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
107067 - # We need an absolute path.
107068 - case $dir in
107069 - [\\/]* | [A-Za-z]:[\\/]*) ;;
107070 - *)
107071 - $echo "$modename: only absolute run-paths are allowed" 1>&2
107072 - exit $EXIT_FAILURE
107073 - ;;
107074 - esac
107075 - case "$xrpath " in
107076 - *" $dir "*) ;;
107077 - *) xrpath="$xrpath $dir" ;;
107078 - esac
107079 - continue
107080 - ;;
107081 -
107082 - -static | -static-libtool-libs)
107083 - # The effects of -static are defined in a previous loop.
107084 - # We used to do the same as -all-static on platforms that
107085 - # didn't have a PIC flag, but the assumption that the effects
107086 - # would be equivalent was wrong. It would break on at least
107087 - # Digital Unix and AIX.
107088 - continue
107089 - ;;
107090 -
107091 - -thread-safe)
107092 - thread_safe=yes
107093 - continue
107094 - ;;
107095 -
107096 - -version-info)
107097 - prev=vinfo
107098 - continue
107099 - ;;
107100 - -version-number)
107101 - prev=vinfo
107102 - vinfo_number=yes
107103 - continue
107104 - ;;
107105 -
107106 - -Wc,*)
107107 - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
107108 - arg=
107109 - save_ifs="$IFS"; IFS=','
107110 - for flag in $args; do
107111 - IFS="$save_ifs"
107112 - case $flag in
107113 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
107114 - flag="\"$flag\""
107115 - ;;
107116 - esac
107117 - arg="$arg $wl$flag"
107118 - compiler_flags="$compiler_flags $flag"
107119 - done
107120 - IFS="$save_ifs"
107121 - arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
107122 - ;;
107123 -
107124 - -Wl,*)
107125 - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
107126 - arg=
107127 - save_ifs="$IFS"; IFS=','
107128 - for flag in $args; do
107129 - IFS="$save_ifs"
107130 - case $flag in
107131 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
107132 - flag="\"$flag\""
107133 - ;;
107134 - esac
107135 - arg="$arg $wl$flag"
107136 - compiler_flags="$compiler_flags $wl$flag"
107137 - linker_flags="$linker_flags $flag"
107138 - done
107139 - IFS="$save_ifs"
107140 - arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
107141 - ;;
107142 -
107143 - -Xcompiler)
107144 - prev=xcompiler
107145 - continue
107146 - ;;
107147 -
107148 - -Xlinker)
107149 - prev=xlinker
107150 - continue
107151 - ;;
107152 -
107153 - -XCClinker)
107154 - prev=xcclinker
107155 - continue
107156 - ;;
107157 -
107158 - # Some other compiler flag.
107159 - -* | +*)
107160 - # Unknown arguments in both finalize_command and compile_command need
107161 - # to be aesthetically quoted because they are evaled later.
107162 - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
107163 - case $arg in
107164 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
107165 - arg="\"$arg\""
107166 - ;;
107167 - esac
107168 - ;;
107169 -
107170 - *.$objext)
107171 - # A standard object.
107172 - objs="$objs $arg"
107173 - ;;
107174 -
107175 - *.lo)
107176 - # A libtool-controlled object.
107177 -
107178 - # Check to see that this really is a libtool object.
107179 - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
107180 - pic_object=
107181 - non_pic_object=
107182 -
107183 - # Read the .lo file
107184 - # If there is no directory component, then add one.
107185 - case $arg in
107186 - */* | *\\*) . $arg ;;
107187 - *) . ./$arg ;;
107188 - esac
107189 -
107190 - if test -z "$pic_object" || \
107191 - test -z "$non_pic_object" ||
107192 - test "$pic_object" = none && \
107193 - test "$non_pic_object" = none; then
107194 - $echo "$modename: cannot find name of object for \`$arg'" 1>&2
107195 - exit $EXIT_FAILURE
107196 - fi
107197 -
107198 - # Extract subdirectory from the argument.
107199 - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
107200 - if test "X$xdir" = "X$arg"; then
107201 - xdir=
107202 - else
107203 - xdir="$xdir/"
107204 - fi
107205 -
107206 - if test "$pic_object" != none; then
107207 - # Prepend the subdirectory the object is found in.
107208 - pic_object="$xdir$pic_object"
107209 -
107210 - if test "$prev" = dlfiles; then
107211 - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
107212 - dlfiles="$dlfiles $pic_object"
107213 - prev=
107214 - continue
107215 - else
107216 - # If libtool objects are unsupported, then we need to preload.
107217 - prev=dlprefiles
107218 - fi
107219 - fi
107220 -
107221 - # CHECK ME: I think I busted this. -Ossama
107222 - if test "$prev" = dlprefiles; then
107223 - # Preload the old-style object.
107224 - dlprefiles="$dlprefiles $pic_object"
107225 - prev=
107226 - fi
107227 -
107228 - # A PIC object.
107229 - libobjs="$libobjs $pic_object"
107230 - arg="$pic_object"
107231 - fi
107232 -
107233 - # Non-PIC object.
107234 - if test "$non_pic_object" != none; then
107235 - # Prepend the subdirectory the object is found in.
107236 - non_pic_object="$xdir$non_pic_object"
107237 -
107238 - # A standard non-PIC object
107239 - non_pic_objects="$non_pic_objects $non_pic_object"
107240 - if test -z "$pic_object" || test "$pic_object" = none ; then
107241 - arg="$non_pic_object"
107242 - fi
107243 - else
107244 - # If the PIC object exists, use it instead.
107245 - # $xdir was prepended to $pic_object above.
107246 - non_pic_object="$pic_object"
107247 - non_pic_objects="$non_pic_objects $non_pic_object"
107248 - fi
107249 - else
107250 - # Only an error if not doing a dry-run.
107251 - if test -z "$run"; then
107252 - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
107253 - exit $EXIT_FAILURE
107254 - else
107255 - # Dry-run case.
107256 -
107257 - # Extract subdirectory from the argument.
107258 - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
107259 - if test "X$xdir" = "X$arg"; then
107260 - xdir=
107261 - else
107262 - xdir="$xdir/"
107263 - fi
107264 -
107265 - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
107266 - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
107267 - libobjs="$libobjs $pic_object"
107268 - non_pic_objects="$non_pic_objects $non_pic_object"
107269 - fi
107270 - fi
107271 - ;;
107272 -
107273 - *.$libext)
107274 - # An archive.
107275 - deplibs="$deplibs $arg"
107276 - old_deplibs="$old_deplibs $arg"
107277 - continue
107278 - ;;
107279 -
107280 - *.la)
107281 - # A libtool-controlled library.
107282 -
107283 - if test "$prev" = dlfiles; then
107284 - # This library was specified with -dlopen.
107285 - dlfiles="$dlfiles $arg"
107286 - prev=
107287 - elif test "$prev" = dlprefiles; then
107288 - # The library was specified with -dlpreopen.
107289 - dlprefiles="$dlprefiles $arg"
107290 - prev=
107291 - else
107292 - deplibs="$deplibs $arg"
107293 - fi
107294 - continue
107295 - ;;
107296 -
107297 - # Some other compiler argument.
107298 - *)
107299 - # Unknown arguments in both finalize_command and compile_command need
107300 - # to be aesthetically quoted because they are evaled later.
107301 - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
107302 - case $arg in
107303 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
107304 - arg="\"$arg\""
107305 - ;;
107306 - esac
107307 - ;;
107308 - esac # arg
107309 -
107310 - # Now actually substitute the argument into the commands.
107311 - if test -n "$arg"; then
107312 - compile_command="$compile_command $arg"
107313 - finalize_command="$finalize_command $arg"
107314 - fi
107315 - done # argument parsing loop
107316 -
107317 - if test -n "$prev"; then
107318 - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
107319 - $echo "$help" 1>&2
107320 - exit $EXIT_FAILURE
107321 - fi
107322 -
107323 - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
107324 - eval arg=\"$export_dynamic_flag_spec\"
107325 - compile_command="$compile_command $arg"
107326 - finalize_command="$finalize_command $arg"
107327 - fi
107328 -
107329 - oldlibs=
107330 - # calculate the name of the file, without its directory
107331 - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
107332 - libobjs_save="$libobjs"
107333 -
107334 - if test -n "$shlibpath_var"; then
107335 - # get the directories listed in $shlibpath_var
107336 - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
107337 - else
107338 - shlib_search_path=
107339 - fi
107340 - eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
107341 - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
107342 -
107343 - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
107344 - if test "X$output_objdir" = "X$output"; then
107345 - output_objdir="$objdir"
107346 - else
107347 - output_objdir="$output_objdir/$objdir"
107348 - fi
107349 - # Create the object directory.
107350 - if test ! -d "$output_objdir"; then
107351 - $show "$mkdir $output_objdir"
107352 - $run $mkdir $output_objdir
107353 - exit_status=$?
107354 - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
107355 - exit $exit_status
107356 - fi
107357 - fi
107358 -
107359 - # Determine the type of output
107360 - case $output in
107361 - "")
107362 - $echo "$modename: you must specify an output file" 1>&2
107363 - $echo "$help" 1>&2
107364 - exit $EXIT_FAILURE
107365 - ;;
107366 - *.$libext) linkmode=oldlib ;;
107367 - *.lo | *.$objext) linkmode=obj ;;
107368 - *.la) linkmode=lib ;;
107369 - *) linkmode=prog ;; # Anything else should be a program.
107370 - esac
107371 -
107372 - case $host in
107373 - *cygwin* | *mingw* | *pw32*)
107374 - # don't eliminate duplications in $postdeps and $predeps
107375 - duplicate_compiler_generated_deps=yes
107376 - ;;
107377 - *)
107378 - duplicate_compiler_generated_deps=$duplicate_deps
107379 - ;;
107380 - esac
107381 - specialdeplibs=
107382 -
107383 - libs=
107384 - # Find all interdependent deplibs by searching for libraries
107385 - # that are linked more than once (e.g. -la -lb -la)
107386 - for deplib in $deplibs; do
107387 - if test "X$duplicate_deps" = "Xyes" ; then
107388 - case "$libs " in
107389 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
107390 - esac
107391 - fi
107392 - libs="$libs $deplib"
107393 - done
107394 -
107395 - if test "$linkmode" = lib; then
107396 - libs="$predeps $libs $compiler_lib_search_path $postdeps"
107397 -
107398 - # Compute libraries that are listed more than once in $predeps
107399 - # $postdeps and mark them as special (i.e., whose duplicates are
107400 - # not to be eliminated).
107401 - pre_post_deps=
107402 - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
107403 - for pre_post_dep in $predeps $postdeps; do
107404 - case "$pre_post_deps " in
107405 - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
107406 - esac
107407 - pre_post_deps="$pre_post_deps $pre_post_dep"
107408 - done
107409 - fi
107410 - pre_post_deps=
107411 - fi
107412 -
107413 - deplibs=
107414 - newdependency_libs=
107415 - newlib_search_path=
107416 - need_relink=no # whether we're linking any uninstalled libtool libraries
107417 - notinst_deplibs= # not-installed libtool libraries
107418 - case $linkmode in
107419 - lib)
107420 - passes="conv link"
107421 - for file in $dlfiles $dlprefiles; do
107422 - case $file in
107423 - *.la) ;;
107424 - *)
107425 - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
107426 - exit $EXIT_FAILURE
107427 - ;;
107428 - esac
107429 - done
107430 - ;;
107431 - prog)
107432 - compile_deplibs=
107433 - finalize_deplibs=
107434 - alldeplibs=no
107435 - newdlfiles=
107436 - newdlprefiles=
107437 - passes="conv scan dlopen dlpreopen link"
107438 - ;;
107439 - *) passes="conv"
107440 - ;;
107441 - esac
107442 - for pass in $passes; do
107443 - if test "$linkmode,$pass" = "lib,link" ||
107444 - test "$linkmode,$pass" = "prog,scan"; then
107445 - libs="$deplibs"
107446 - deplibs=
107447 - fi
107448 - if test "$linkmode" = prog; then
107449 - case $pass in
107450 - dlopen) libs="$dlfiles" ;;
107451 - dlpreopen) libs="$dlprefiles" ;;
107452 - link)
107453 - libs="$deplibs %DEPLIBS%"
107454 - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
107455 - ;;
107456 - esac
107457 - fi
107458 - if test "$pass" = dlopen; then
107459 - # Collect dlpreopened libraries
107460 - save_deplibs="$deplibs"
107461 - deplibs=
107462 - fi
107463 - for deplib in $libs; do
107464 - lib=
107465 - found=no
107466 - case $deplib in
107467 - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
107468 - if test "$linkmode,$pass" = "prog,link"; then
107469 - compile_deplibs="$deplib $compile_deplibs"
107470 - finalize_deplibs="$deplib $finalize_deplibs"
107471 - else
107472 - compiler_flags="$compiler_flags $deplib"
107473 - fi
107474 - continue
107475 - ;;
107476 - -l*)
107477 - if test "$linkmode" != lib && test "$linkmode" != prog; then
107478 - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
107479 - continue
107480 - fi
107481 - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
107482 - if test "$linkmode" = lib; then
107483 - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
107484 - else
107485 - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
107486 - fi
107487 - for searchdir in $searchdirs; do
107488 - for search_ext in .la $std_shrext .so .a; do
107489 - # Search the libtool library
107490 - lib="$searchdir/lib${name}${search_ext}"
107491 - if test -f "$lib"; then
107492 - if test "$search_ext" = ".la"; then
107493 - found=yes
107494 - else
107495 - found=no
107496 - fi
107497 - break 2
107498 - fi
107499 - done
107500 - done
107501 - if test "$found" != yes; then
107502 - # deplib doesn't seem to be a libtool library
107503 - if test "$linkmode,$pass" = "prog,link"; then
107504 - compile_deplibs="$deplib $compile_deplibs"
107505 - finalize_deplibs="$deplib $finalize_deplibs"
107506 - else
107507 - deplibs="$deplib $deplibs"
107508 - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
107509 - fi
107510 - continue
107511 - else # deplib is a libtool library
107512 - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
107513 - # We need to do some special things here, and not later.
107514 - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
107515 - case " $predeps $postdeps " in
107516 - *" $deplib "*)
107517 - if (${SED} -e '2q' $lib |
107518 - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
107519 - library_names=
107520 - old_library=
107521 - case $lib in
107522 - */* | *\\*) . $lib ;;
107523 - *) . ./$lib ;;
107524 - esac
107525 - for l in $old_library $library_names; do
107526 - ll="$l"
107527 - done
107528 - if test "X$ll" = "X$old_library" ; then # only static version available
107529 - found=no
107530 - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
107531 - test "X$ladir" = "X$lib" && ladir="."
107532 - lib=$ladir/$old_library
107533 - if test "$linkmode,$pass" = "prog,link"; then
107534 - compile_deplibs="$deplib $compile_deplibs"
107535 - finalize_deplibs="$deplib $finalize_deplibs"
107536 - else
107537 - deplibs="$deplib $deplibs"
107538 - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
107539 - fi
107540 - continue
107541 - fi
107542 - fi
107543 - ;;
107544 - *) ;;
107545 - esac
107546 - fi
107547 - fi
107548 - ;; # -l
107549 - -L*)
107550 - case $linkmode in
107551 - lib)
107552 - deplibs="$deplib $deplibs"
107553 - test "$pass" = conv && continue
107554 - newdependency_libs="$deplib $newdependency_libs"
107555 - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
107556 - ;;
107557 - prog)
107558 - if test "$pass" = conv; then
107559 - deplibs="$deplib $deplibs"
107560 - continue
107561 - fi
107562 - if test "$pass" = scan; then
107563 - deplibs="$deplib $deplibs"
107564 - else
107565 - compile_deplibs="$deplib $compile_deplibs"
107566 - finalize_deplibs="$deplib $finalize_deplibs"
107567 - fi
107568 - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
107569 - ;;
107570 - *)
107571 - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
107572 - ;;
107573 - esac # linkmode
107574 - continue
107575 - ;; # -L
107576 - -R*)
107577 - if test "$pass" = link; then
107578 - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
107579 - # Make sure the xrpath contains only unique directories.
107580 - case "$xrpath " in
107581 - *" $dir "*) ;;
107582 - *) xrpath="$xrpath $dir" ;;
107583 - esac
107584 - fi
107585 - deplibs="$deplib $deplibs"
107586 - continue
107587 - ;;
107588 - *.la) lib="$deplib" ;;
107589 - *.$libext)
107590 - if test "$pass" = conv; then
107591 - deplibs="$deplib $deplibs"
107592 - continue
107593 - fi
107594 - case $linkmode in
107595 - lib)
107596 - valid_a_lib=no
107597 - case $deplibs_check_method in
107598 - match_pattern*)
107599 - set dummy $deplibs_check_method
107600 - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
107601 - if eval $echo \"$deplib\" 2>/dev/null \
107602 - | $SED 10q \
107603 - | $EGREP "$match_pattern_regex" > /dev/null; then
107604 - valid_a_lib=yes
107605 - fi
107606 - ;;
107607 - pass_all)
107608 - valid_a_lib=yes
107609 - ;;
107610 - esac
107611 - if test "$valid_a_lib" != yes; then
107612 - $echo
107613 - $echo "*** Warning: Trying to link with static lib archive $deplib."
107614 - $echo "*** I have the capability to make that library automatically link in when"
107615 - $echo "*** you link to this library. But I can only do this if you have a"
107616 - $echo "*** shared version of the library, which you do not appear to have"
107617 - $echo "*** because the file extensions .$libext of this argument makes me believe"
107618 - $echo "*** that it is just a static archive that I should not used here."
107619 - else
107620 - $echo
107621 - $echo "*** Warning: Linking the shared library $output against the"
107622 - $echo "*** static library $deplib is not portable!"
107623 - deplibs="$deplib $deplibs"
107624 - fi
107625 - continue
107626 - ;;
107627 - prog)
107628 - if test "$pass" != link; then
107629 - deplibs="$deplib $deplibs"
107630 - else
107631 - compile_deplibs="$deplib $compile_deplibs"
107632 - finalize_deplibs="$deplib $finalize_deplibs"
107633 - fi
107634 - continue
107635 - ;;
107636 - esac # linkmode
107637 - ;; # *.$libext
107638 - *.lo | *.$objext)
107639 - if test "$pass" = conv; then
107640 - deplibs="$deplib $deplibs"
107641 - elif test "$linkmode" = prog; then
107642 - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
107643 - # If there is no dlopen support or we're linking statically,
107644 - # we need to preload.
107645 - newdlprefiles="$newdlprefiles $deplib"
107646 - compile_deplibs="$deplib $compile_deplibs"
107647 - finalize_deplibs="$deplib $finalize_deplibs"
107648 - else
107649 - newdlfiles="$newdlfiles $deplib"
107650 - fi
107651 - fi
107652 - continue
107653 - ;;
107654 - %DEPLIBS%)
107655 - alldeplibs=yes
107656 - continue
107657 - ;;
107658 - esac # case $deplib
107659 - if test "$found" = yes || test -f "$lib"; then :
107660 - else
107661 - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
107662 - exit $EXIT_FAILURE
107663 - fi
107664 -
107665 - # Check to see that this really is a libtool archive.
107666 - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
107667 - else
107668 - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
107669 - exit $EXIT_FAILURE
107670 - fi
107671 -
107672 - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
107673 - test "X$ladir" = "X$lib" && ladir="."
107674 -
107675 - dlname=
107676 - dlopen=
107677 - dlpreopen=
107678 - libdir=
107679 - library_names=
107680 - old_library=
107681 - # If the library was installed with an old release of libtool,
107682 - # it will not redefine variables installed, or shouldnotlink
107683 - installed=yes
107684 - shouldnotlink=no
107685 - avoidtemprpath=
107686 -
107687 -
107688 - # Read the .la file
107689 - case $lib in
107690 - */* | *\\*) . $lib ;;
107691 - *) . ./$lib ;;
107692 - esac
107693 -
107694 - if test "$linkmode,$pass" = "lib,link" ||
107695 - test "$linkmode,$pass" = "prog,scan" ||
107696 - { test "$linkmode" != prog && test "$linkmode" != lib; }; then
107697 - test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
107698 - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
107699 - fi
107700 -
107701 - if test "$pass" = conv; then
107702 - # Only check for convenience libraries
107703 - deplibs="$lib $deplibs"
107704 - if test -z "$libdir"; then
107705 - if test -z "$old_library"; then
107706 - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
107707 - exit $EXIT_FAILURE
107708 - fi
107709 - # It is a libtool convenience library, so add in its objects.
107710 - convenience="$convenience $ladir/$objdir/$old_library"
107711 - old_convenience="$old_convenience $ladir/$objdir/$old_library"
107712 - tmp_libs=
107713 - for deplib in $dependency_libs; do
107714 - deplibs="$deplib $deplibs"
107715 - if test "X$duplicate_deps" = "Xyes" ; then
107716 - case "$tmp_libs " in
107717 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
107718 - esac
107719 - fi
107720 - tmp_libs="$tmp_libs $deplib"
107721 - done
107722 - elif test "$linkmode" != prog && test "$linkmode" != lib; then
107723 - $echo "$modename: \`$lib' is not a convenience library" 1>&2
107724 - exit $EXIT_FAILURE
107725 - fi
107726 - continue
107727 - fi # $pass = conv
107728 -
107729 -
107730 - # Get the name of the library we link against.
107731 - linklib=
107732 - for l in $old_library $library_names; do
107733 - linklib="$l"
107734 - done
107735 - if test -z "$linklib"; then
107736 - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
107737 - exit $EXIT_FAILURE
107738 - fi
107739 -
107740 - # This library was specified with -dlopen.
107741 - if test "$pass" = dlopen; then
107742 - if test -z "$libdir"; then
107743 - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
107744 - exit $EXIT_FAILURE
107745 - fi
107746 - if test -z "$dlname" ||
107747 - test "$dlopen_support" != yes ||
107748 - test "$build_libtool_libs" = no; then
107749 - # If there is no dlname, no dlopen support or we're linking
107750 - # statically, we need to preload. We also need to preload any
107751 - # dependent libraries so libltdl's deplib preloader doesn't
107752 - # bomb out in the load deplibs phase.
107753 - dlprefiles="$dlprefiles $lib $dependency_libs"
107754 - else
107755 - newdlfiles="$newdlfiles $lib"
107756 - fi
107757 - continue
107758 - fi # $pass = dlopen
107759 -
107760 - # We need an absolute path.
107761 - case $ladir in
107762 - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
107763 - *)
107764 - abs_ladir=`cd "$ladir" && pwd`
107765 - if test -z "$abs_ladir"; then
107766 - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
107767 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
107768 - abs_ladir="$ladir"
107769 - fi
107770 - ;;
107771 - esac
107772 - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
107773 -
107774 - # Find the relevant object directory and library name.
107775 - if test "X$installed" = Xyes; then
107776 - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
107777 - $echo "$modename: warning: library \`$lib' was moved." 1>&2
107778 - dir="$ladir"
107779 - absdir="$abs_ladir"
107780 - libdir="$abs_ladir"
107781 - else
107782 - dir="$libdir"
107783 - absdir="$libdir"
107784 - fi
107785 - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
107786 - else
107787 - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
107788 - dir="$ladir"
107789 - absdir="$abs_ladir"
107790 - # Remove this search path later
107791 - notinst_path="$notinst_path $abs_ladir"
107792 - else
107793 - dir="$ladir/$objdir"
107794 - absdir="$abs_ladir/$objdir"
107795 - # Remove this search path later
107796 - notinst_path="$notinst_path $abs_ladir"
107797 - fi
107798 - fi # $installed = yes
107799 - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
107800 -
107801 - # This library was specified with -dlpreopen.
107802 - if test "$pass" = dlpreopen; then
107803 - if test -z "$libdir"; then
107804 - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
107805 - exit $EXIT_FAILURE
107806 - fi
107807 - # Prefer using a static library (so that no silly _DYNAMIC symbols
107808 - # are required to link).
107809 - if test -n "$old_library"; then
107810 - newdlprefiles="$newdlprefiles $dir/$old_library"
107811 - # Otherwise, use the dlname, so that lt_dlopen finds it.
107812 - elif test -n "$dlname"; then
107813 - newdlprefiles="$newdlprefiles $dir/$dlname"
107814 - else
107815 - newdlprefiles="$newdlprefiles $dir/$linklib"
107816 - fi
107817 - fi # $pass = dlpreopen
107818 -
107819 - if test -z "$libdir"; then
107820 - # Link the convenience library
107821 - if test "$linkmode" = lib; then
107822 - deplibs="$dir/$old_library $deplibs"
107823 - elif test "$linkmode,$pass" = "prog,link"; then
107824 - compile_deplibs="$dir/$old_library $compile_deplibs"
107825 - finalize_deplibs="$dir/$old_library $finalize_deplibs"
107826 - else
107827 - deplibs="$lib $deplibs" # used for prog,scan pass
107828 - fi
107829 - continue
107830 - fi
107831 -
107832 -
107833 - if test "$linkmode" = prog && test "$pass" != link; then
107834 - newlib_search_path="$newlib_search_path $ladir"
107835 - deplibs="$lib $deplibs"
107836 -
107837 - linkalldeplibs=no
107838 - if test "$link_all_deplibs" != no || test -z "$library_names" ||
107839 - test "$build_libtool_libs" = no; then
107840 - linkalldeplibs=yes
107841 - fi
107842 -
107843 - tmp_libs=
107844 - for deplib in $dependency_libs; do
107845 - case $deplib in
107846 - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
107847 - esac
107848 - # Need to link against all dependency_libs?
107849 - if test "$linkalldeplibs" = yes; then
107850 - deplibs="$deplib $deplibs"
107851 - else
107852 - # Need to hardcode shared library paths
107853 - # or/and link against static libraries
107854 - newdependency_libs="$deplib $newdependency_libs"
107855 - fi
107856 - if test "X$duplicate_deps" = "Xyes" ; then
107857 - case "$tmp_libs " in
107858 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
107859 - esac
107860 - fi
107861 - tmp_libs="$tmp_libs $deplib"
107862 - done # for deplib
107863 - continue
107864 - fi # $linkmode = prog...
107865 -
107866 - if test "$linkmode,$pass" = "prog,link"; then
107867 - if test -n "$library_names" &&
107868 - { { test "$prefer_static_libs" = no ||
107869 - test "$prefer_static_libs,$installed" = "built,yes"; } ||
107870 - test -z "$old_library"; }; then
107871 - # We need to hardcode the library path
107872 - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
107873 - # Make sure the rpath contains only unique directories.
107874 - case "$temp_rpath " in
107875 - *" $dir "*) ;;
107876 - *" $absdir "*) ;;
107877 - *) temp_rpath="$temp_rpath $absdir" ;;
107878 - esac
107879 - fi
107880 -
107881 - # Hardcode the library path.
107882 - # Skip directories that are in the system default run-time
107883 - # search path.
107884 - case " $sys_lib_dlsearch_path " in
107885 - *" $absdir "*) ;;
107886 - *)
107887 - case "$compile_rpath " in
107888 - *" $absdir "*) ;;
107889 - *) compile_rpath="$compile_rpath $absdir"
107890 - esac
107891 - ;;
107892 - esac
107893 - case " $sys_lib_dlsearch_path " in
107894 - *" $libdir "*) ;;
107895 - *)
107896 - case "$finalize_rpath " in
107897 - *" $libdir "*) ;;
107898 - *) finalize_rpath="$finalize_rpath $libdir"
107899 - esac
107900 - ;;
107901 - esac
107902 - fi # $linkmode,$pass = prog,link...
107903 -
107904 - if test "$alldeplibs" = yes &&
107905 - { test "$deplibs_check_method" = pass_all ||
107906 - { test "$build_libtool_libs" = yes &&
107907 - test -n "$library_names"; }; }; then
107908 - # We only need to search for static libraries
107909 - continue
107910 - fi
107911 - fi
107912 -
107913 - link_static=no # Whether the deplib will be linked statically
107914 - use_static_libs=$prefer_static_libs
107915 - if test "$use_static_libs" = built && test "$installed" = yes ; then
107916 - use_static_libs=no
107917 - fi
107918 - if test -n "$library_names" &&
107919 - { test "$use_static_libs" = no || test -z "$old_library"; }; then
107920 - if test "$installed" = no; then
107921 - notinst_deplibs="$notinst_deplibs $lib"
107922 - need_relink=yes
107923 - fi
107924 - # This is a shared library
107925 -
107926 - # Warn about portability, can't link against -module's on
107927 - # some systems (darwin)
107928 - if test "$shouldnotlink" = yes && test "$pass" = link ; then
107929 - $echo
107930 - if test "$linkmode" = prog; then
107931 - $echo "*** Warning: Linking the executable $output against the loadable module"
107932 - else
107933 - $echo "*** Warning: Linking the shared library $output against the loadable module"
107934 - fi
107935 - $echo "*** $linklib is not portable!"
107936 - fi
107937 - if test "$linkmode" = lib &&
107938 - test "$hardcode_into_libs" = yes; then
107939 - # Hardcode the library path.
107940 - # Skip directories that are in the system default run-time
107941 - # search path.
107942 - case " $sys_lib_dlsearch_path " in
107943 - *" $absdir "*) ;;
107944 - *)
107945 - case "$compile_rpath " in
107946 - *" $absdir "*) ;;
107947 - *) compile_rpath="$compile_rpath $absdir"
107948 - esac
107949 - ;;
107950 - esac
107951 - case " $sys_lib_dlsearch_path " in
107952 - *" $libdir "*) ;;
107953 - *)
107954 - case "$finalize_rpath " in
107955 - *" $libdir "*) ;;
107956 - *) finalize_rpath="$finalize_rpath $libdir"
107957 - esac
107958 - ;;
107959 - esac
107960 - fi
107961 -
107962 - if test -n "$old_archive_from_expsyms_cmds"; then
107963 - # figure out the soname
107964 - set dummy $library_names
107965 - realname="$2"
107966 - shift; shift
107967 - libname=`eval \\$echo \"$libname_spec\"`
107968 - # use dlname if we got it. it's perfectly good, no?
107969 - if test -n "$dlname"; then
107970 - soname="$dlname"
107971 - elif test -n "$soname_spec"; then
107972 - # bleh windows
107973 - case $host in
107974 - *cygwin* | mingw*)
107975 - major=`expr $current - $age`
107976 - versuffix="-$major"
107977 - ;;
107978 - esac
107979 - eval soname=\"$soname_spec\"
107980 - else
107981 - soname="$realname"
107982 - fi
107983 -
107984 - # Make a new name for the extract_expsyms_cmds to use
107985 - soroot="$soname"
107986 - soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
107987 - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
107988 -
107989 - # If the library has no export list, then create one now
107990 - if test -f "$output_objdir/$soname-def"; then :
107991 - else
107992 - $show "extracting exported symbol list from \`$soname'"
107993 - save_ifs="$IFS"; IFS='~'
107994 - cmds=$extract_expsyms_cmds
107995 - for cmd in $cmds; do
107996 - IFS="$save_ifs"
107997 - eval cmd=\"$cmd\"
107998 - $show "$cmd"
107999 - $run eval "$cmd" || exit $?
108000 - done
108001 - IFS="$save_ifs"
108002 - fi
108003 -
108004 - # Create $newlib
108005 - if test -f "$output_objdir/$newlib"; then :; else
108006 - $show "generating import library for \`$soname'"
108007 - save_ifs="$IFS"; IFS='~'
108008 - cmds=$old_archive_from_expsyms_cmds
108009 - for cmd in $cmds; do
108010 - IFS="$save_ifs"
108011 - eval cmd=\"$cmd\"
108012 - $show "$cmd"
108013 - $run eval "$cmd" || exit $?
108014 - done
108015 - IFS="$save_ifs"
108016 - fi
108017 - # make sure the library variables are pointing to the new library
108018 - dir=$output_objdir
108019 - linklib=$newlib
108020 - fi # test -n "$old_archive_from_expsyms_cmds"
108021 -
108022 - if test "$linkmode" = prog || test "$mode" != relink; then
108023 - add_shlibpath=
108024 - add_dir=
108025 - add=
108026 - lib_linked=yes
108027 - case $hardcode_action in
108028 - immediate | unsupported)
108029 - if test "$hardcode_direct" = no; then
108030 - add="$dir/$linklib"
108031 - case $host in
108032 - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
108033 - *-*-sysv4*uw2*) add_dir="-L$dir" ;;
108034 - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
108035 - *-*-unixware7*) add_dir="-L$dir" ;;
108036 - *-*-darwin* )
108037 - # if the lib is a module then we can not link against
108038 - # it, someone is ignoring the new warnings I added
108039 - if /usr/bin/file -L $add 2> /dev/null |
108040 - $EGREP ": [^:]* bundle" >/dev/null ; then
108041 - $echo "** Warning, lib $linklib is a module, not a shared library"
108042 - if test -z "$old_library" ; then
108043 - $echo
108044 - $echo "** And there doesn't seem to be a static archive available"
108045 - $echo "** The link will probably fail, sorry"
108046 - else
108047 - add="$dir/$old_library"
108048 - fi
108049 - fi
108050 - esac
108051 - elif test "$hardcode_minus_L" = no; then
108052 - case $host in
108053 - *-*-sunos*) add_shlibpath="$dir" ;;
108054 - esac
108055 - add_dir="-L$dir"
108056 - add="-l$name"
108057 - elif test "$hardcode_shlibpath_var" = no; then
108058 - add_shlibpath="$dir"
108059 - add="-l$name"
108060 - else
108061 - lib_linked=no
108062 - fi
108063 - ;;
108064 - relink)
108065 - if test "$hardcode_direct" = yes; then
108066 - add="$dir/$linklib"
108067 - elif test "$hardcode_minus_L" = yes; then
108068 - add_dir="-L$dir"
108069 - # Try looking first in the location we're being installed to.
108070 - if test -n "$inst_prefix_dir"; then
108071 - case $libdir in
108072 - [\\/]*)
108073 - add_dir="$add_dir -L$inst_prefix_dir$libdir"
108074 - ;;
108075 - esac
108076 - fi
108077 - add="-l$name"
108078 - elif test "$hardcode_shlibpath_var" = yes; then
108079 - add_shlibpath="$dir"
108080 - add="-l$name"
108081 - else
108082 - lib_linked=no
108083 - fi
108084 - ;;
108085 - *) lib_linked=no ;;
108086 - esac
108087 -
108088 - if test "$lib_linked" != yes; then
108089 - $echo "$modename: configuration error: unsupported hardcode properties"
108090 - exit $EXIT_FAILURE
108091 - fi
108092 -
108093 - if test -n "$add_shlibpath"; then
108094 - case :$compile_shlibpath: in
108095 - *":$add_shlibpath:"*) ;;
108096 - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
108097 - esac
108098 - fi
108099 - if test "$linkmode" = prog; then
108100 - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
108101 - test -n "$add" && compile_deplibs="$add $compile_deplibs"
108102 - else
108103 - test -n "$add_dir" && deplibs="$add_dir $deplibs"
108104 - test -n "$add" && deplibs="$add $deplibs"
108105 - if test "$hardcode_direct" != yes && \
108106 - test "$hardcode_minus_L" != yes && \
108107 - test "$hardcode_shlibpath_var" = yes; then
108108 - case :$finalize_shlibpath: in
108109 - *":$libdir:"*) ;;
108110 - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
108111 - esac
108112 - fi
108113 - fi
108114 - fi
108115 -
108116 - if test "$linkmode" = prog || test "$mode" = relink; then
108117 - add_shlibpath=
108118 - add_dir=
108119 - add=
108120 - # Finalize command for both is simple: just hardcode it.
108121 - if test "$hardcode_direct" = yes; then
108122 - add="$libdir/$linklib"
108123 - elif test "$hardcode_minus_L" = yes; then
108124 - add_dir="-L$libdir"
108125 - add="-l$name"
108126 - elif test "$hardcode_shlibpath_var" = yes; then
108127 - case :$finalize_shlibpath: in
108128 - *":$libdir:"*) ;;
108129 - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
108130 - esac
108131 - add="-l$name"
108132 - elif test "$hardcode_automatic" = yes; then
108133 - if test -n "$inst_prefix_dir" &&
108134 - test -f "$inst_prefix_dir$libdir/$linklib" ; then
108135 - add="$inst_prefix_dir$libdir/$linklib"
108136 - else
108137 - add="$libdir/$linklib"
108138 - fi
108139 - else
108140 - # We cannot seem to hardcode it, guess we'll fake it.
108141 - add_dir="-L$libdir"
108142 - # Try looking first in the location we're being installed to.
108143 - if test -n "$inst_prefix_dir"; then
108144 - case $libdir in
108145 - [\\/]*)
108146 - add_dir="$add_dir -L$inst_prefix_dir$libdir"
108147 - ;;
108148 - esac
108149 - fi
108150 - add="-l$name"
108151 - fi
108152 -
108153 - if test "$linkmode" = prog; then
108154 - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
108155 - test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
108156 - else
108157 - test -n "$add_dir" && deplibs="$add_dir $deplibs"
108158 - test -n "$add" && deplibs="$add $deplibs"
108159 - fi
108160 - fi
108161 - elif test "$linkmode" = prog; then
108162 - # Here we assume that one of hardcode_direct or hardcode_minus_L
108163 - # is not unsupported. This is valid on all known static and
108164 - # shared platforms.
108165 - if test "$hardcode_direct" != unsupported; then
108166 - test -n "$old_library" && linklib="$old_library"
108167 - compile_deplibs="$dir/$linklib $compile_deplibs"
108168 - finalize_deplibs="$dir/$linklib $finalize_deplibs"
108169 - else
108170 - compile_deplibs="-l$name -L$dir $compile_deplibs"
108171 - finalize_deplibs="-l$name -L$dir $finalize_deplibs"
108172 - fi
108173 - elif test "$build_libtool_libs" = yes; then
108174 - # Not a shared library
108175 - if test "$deplibs_check_method" != pass_all; then
108176 - # We're trying link a shared library against a static one
108177 - # but the system doesn't support it.
108178 -
108179 - # Just print a warning and add the library to dependency_libs so
108180 - # that the program can be linked against the static library.
108181 - $echo
108182 - $echo "*** Warning: This system can not link to static lib archive $lib."
108183 - $echo "*** I have the capability to make that library automatically link in when"
108184 - $echo "*** you link to this library. But I can only do this if you have a"
108185 - $echo "*** shared version of the library, which you do not appear to have."
108186 - if test "$module" = yes; then
108187 - $echo "*** But as you try to build a module library, libtool will still create "
108188 - $echo "*** a static module, that should work as long as the dlopening application"
108189 - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
108190 - if test -z "$global_symbol_pipe"; then
108191 - $echo
108192 - $echo "*** However, this would only work if libtool was able to extract symbol"
108193 - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
108194 - $echo "*** not find such a program. So, this module is probably useless."
108195 - $echo "*** \`nm' from GNU binutils and a full rebuild may help."
108196 - fi
108197 - if test "$build_old_libs" = no; then
108198 - build_libtool_libs=module
108199 - build_old_libs=yes
108200 - else
108201 - build_libtool_libs=no
108202 - fi
108203 - fi
108204 - else
108205 - deplibs="$dir/$old_library $deplibs"
108206 - link_static=yes
108207 - fi
108208 - fi # link shared/static library?
108209 -
108210 - if test "$linkmode" = lib; then
108211 - if test -n "$dependency_libs" &&
108212 - { test "$hardcode_into_libs" != yes ||
108213 - test "$build_old_libs" = yes ||
108214 - test "$link_static" = yes; }; then
108215 - # Extract -R from dependency_libs
108216 - temp_deplibs=
108217 - for libdir in $dependency_libs; do
108218 - case $libdir in
108219 - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
108220 - case " $xrpath " in
108221 - *" $temp_xrpath "*) ;;
108222 - *) xrpath="$xrpath $temp_xrpath";;
108223 - esac;;
108224 - *) temp_deplibs="$temp_deplibs $libdir";;
108225 - esac
108226 - done
108227 - dependency_libs="$temp_deplibs"
108228 - fi
108229 -
108230 - newlib_search_path="$newlib_search_path $absdir"
108231 - # Link against this library
108232 - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
108233 - # ... and its dependency_libs
108234 - tmp_libs=
108235 - for deplib in $dependency_libs; do
108236 - newdependency_libs="$deplib $newdependency_libs"
108237 - if test "X$duplicate_deps" = "Xyes" ; then
108238 - case "$tmp_libs " in
108239 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
108240 - esac
108241 - fi
108242 - tmp_libs="$tmp_libs $deplib"
108243 - done
108244 -
108245 - if test "$link_all_deplibs" != no; then
108246 - # Add the search paths of all dependency libraries
108247 - for deplib in $dependency_libs; do
108248 - case $deplib in
108249 - -L*) path="$deplib" ;;
108250 - *.la)
108251 - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
108252 - test "X$dir" = "X$deplib" && dir="."
108253 - # We need an absolute path.
108254 - case $dir in
108255 - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
108256 - *)
108257 - absdir=`cd "$dir" && pwd`
108258 - if test -z "$absdir"; then
108259 - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
108260 - absdir="$dir"
108261 - fi
108262 - ;;
108263 - esac
108264 - if grep "^installed=no" $deplib > /dev/null; then
108265 - path="$absdir/$objdir"
108266 - else
108267 - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
108268 - if test -z "$libdir"; then
108269 - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
108270 - exit $EXIT_FAILURE
108271 - fi
108272 - if test "$absdir" != "$libdir"; then
108273 - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
108274 - fi
108275 - path="$absdir"
108276 - fi
108277 - depdepl=
108278 - case $host in
108279 - *-*-darwin*)
108280 - # we do not want to link against static libs,
108281 - # but need to link against shared
108282 - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
108283 - eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
108284 - if test -n "$deplibrary_names" ; then
108285 - for tmp in $deplibrary_names ; do
108286 - depdepl=$tmp
108287 - done
108288 - if test -f "$deplibdir/$depdepl" ; then
108289 - depdepl="$deplibdir/$depdepl"
108290 - elif test -f "$path/$depdepl" ; then
108291 - depdepl="$path/$depdepl"
108292 - else
108293 - # Can't find it, oh well...
108294 - depdepl=
108295 - fi
108296 - # do not add paths which are already there
108297 - case " $newlib_search_path " in
108298 - *" $path "*) ;;
108299 - *) newlib_search_path="$newlib_search_path $path";;
108300 - esac
108301 - fi
108302 - path=""
108303 - ;;
108304 - *)
108305 - path="-L$path"
108306 - ;;
108307 - esac
108308 - ;;
108309 - -l*)
108310 - case $host in
108311 - *-*-darwin*)
108312 - # Again, we only want to link against shared libraries
108313 - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
108314 - for tmp in $newlib_search_path ; do
108315 - if test -f "$tmp/lib$tmp_libs.dylib" ; then
108316 - eval depdepl="$tmp/lib$tmp_libs.dylib"
108317 - break
108318 - fi
108319 - done
108320 - path=""
108321 - ;;
108322 - *) continue ;;
108323 - esac
108324 - ;;
108325 - *) continue ;;
108326 - esac
108327 - case " $deplibs " in
108328 - *" $path "*) ;;
108329 - *) deplibs="$path $deplibs" ;;
108330 - esac
108331 - case " $deplibs " in
108332 - *" $depdepl "*) ;;
108333 - *) deplibs="$depdepl $deplibs" ;;
108334 - esac
108335 - done
108336 - fi # link_all_deplibs != no
108337 - fi # linkmode = lib
108338 - done # for deplib in $libs
108339 - dependency_libs="$newdependency_libs"
108340 - if test "$pass" = dlpreopen; then
108341 - # Link the dlpreopened libraries before other libraries
108342 - for deplib in $save_deplibs; do
108343 - deplibs="$deplib $deplibs"
108344 - done
108345 - fi
108346 - if test "$pass" != dlopen; then
108347 - if test "$pass" != conv; then
108348 - # Make sure lib_search_path contains only unique directories.
108349 - lib_search_path=
108350 - for dir in $newlib_search_path; do
108351 - case "$lib_search_path " in
108352 - *" $dir "*) ;;
108353 - *) lib_search_path="$lib_search_path $dir" ;;
108354 - esac
108355 - done
108356 - newlib_search_path=
108357 - fi
108358 -
108359 - if test "$linkmode,$pass" != "prog,link"; then
108360 - vars="deplibs"
108361 - else
108362 - vars="compile_deplibs finalize_deplibs"
108363 - fi
108364 - for var in $vars dependency_libs; do
108365 - # Add libraries to $var in reverse order
108366 - eval tmp_libs=\"\$$var\"
108367 - new_libs=
108368 - for deplib in $tmp_libs; do
108369 - # FIXME: Pedantically, this is the right thing to do, so
108370 - # that some nasty dependency loop isn't accidentally
108371 - # broken:
108372 - #new_libs="$deplib $new_libs"
108373 - # Pragmatically, this seems to cause very few problems in
108374 - # practice:
108375 - case $deplib in
108376 - -L*) new_libs="$deplib $new_libs" ;;
108377 - -R*) ;;
108378 - *)
108379 - # And here is the reason: when a library appears more
108380 - # than once as an explicit dependence of a library, or
108381 - # is implicitly linked in more than once by the
108382 - # compiler, it is considered special, and multiple
108383 - # occurrences thereof are not removed. Compare this
108384 - # with having the same library being listed as a
108385 - # dependency of multiple other libraries: in this case,
108386 - # we know (pedantically, we assume) the library does not
108387 - # need to be listed more than once, so we keep only the
108388 - # last copy. This is not always right, but it is rare
108389 - # enough that we require users that really mean to play
108390 - # such unportable linking tricks to link the library
108391 - # using -Wl,-lname, so that libtool does not consider it
108392 - # for duplicate removal.
108393 - case " $specialdeplibs " in
108394 - *" $deplib "*) new_libs="$deplib $new_libs" ;;
108395 - *)
108396 - case " $new_libs " in
108397 - *" $deplib "*) ;;
108398 - *) new_libs="$deplib $new_libs" ;;
108399 - esac
108400 - ;;
108401 - esac
108402 - ;;
108403 - esac
108404 - done
108405 - tmp_libs=
108406 - for deplib in $new_libs; do
108407 - case $deplib in
108408 - -L*)
108409 - case " $tmp_libs " in
108410 - *" $deplib "*) ;;
108411 - *) tmp_libs="$tmp_libs $deplib" ;;
108412 - esac
108413 - ;;
108414 - *) tmp_libs="$tmp_libs $deplib" ;;
108415 - esac
108416 - done
108417 - eval $var=\"$tmp_libs\"
108418 - done # for var
108419 - fi
108420 - # Last step: remove runtime libs from dependency_libs
108421 - # (they stay in deplibs)
108422 - tmp_libs=
108423 - for i in $dependency_libs ; do
108424 - case " $predeps $postdeps $compiler_lib_search_path " in
108425 - *" $i "*)
108426 - i=""
108427 - ;;
108428 - esac
108429 - if test -n "$i" ; then
108430 - tmp_libs="$tmp_libs $i"
108431 - fi
108432 - done
108433 - dependency_libs=$tmp_libs
108434 - done # for pass
108435 - if test "$linkmode" = prog; then
108436 - dlfiles="$newdlfiles"
108437 - dlprefiles="$newdlprefiles"
108438 - fi
108439 -
108440 - case $linkmode in
108441 - oldlib)
108442 - case " $deplibs" in
108443 - *\ -l* | *\ -L*)
108444 - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
108445 - esac
108446 -
108447 - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
108448 - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
108449 - fi
108450 -
108451 - if test -n "$rpath"; then
108452 - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
108453 - fi
108454 -
108455 - if test -n "$xrpath"; then
108456 - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
108457 - fi
108458 -
108459 - if test -n "$vinfo"; then
108460 - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
108461 - fi
108462 -
108463 - if test -n "$release"; then
108464 - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
108465 - fi
108466 -
108467 - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
108468 - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
108469 - fi
108470 -
108471 - # Now set the variables for building old libraries.
108472 - build_libtool_libs=no
108473 - oldlibs="$output"
108474 - objs="$objs$old_deplibs"
108475 - ;;
108476 -
108477 - lib)
108478 - # Make sure we only generate libraries of the form `libNAME.la'.
108479 - case $outputname in
108480 - lib*)
108481 - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
108482 - eval shared_ext=\"$shrext_cmds\"
108483 - eval libname=\"$libname_spec\"
108484 - ;;
108485 - *)
108486 - if test "$module" = no; then
108487 - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
108488 - $echo "$help" 1>&2
108489 - exit $EXIT_FAILURE
108490 - fi
108491 - if test "$need_lib_prefix" != no; then
108492 - # Add the "lib" prefix for modules if required
108493 - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
108494 - eval shared_ext=\"$shrext_cmds\"
108495 - eval libname=\"$libname_spec\"
108496 - else
108497 - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
108498 - fi
108499 - ;;
108500 - esac
108501 -
108502 - if test -n "$objs"; then
108503 - if test "$deplibs_check_method" != pass_all; then
108504 - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
108505 - exit $EXIT_FAILURE
108506 - else
108507 - $echo
108508 - $echo "*** Warning: Linking the shared library $output against the non-libtool"
108509 - $echo "*** objects $objs is not portable!"
108510 - libobjs="$libobjs $objs"
108511 - fi
108512 - fi
108513 -
108514 - if test "$dlself" != no; then
108515 - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
108516 - fi
108517 -
108518 - set dummy $rpath
108519 - if test "$#" -gt 2; then
108520 - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
108521 - fi
108522 - install_libdir="$2"
108523 -
108524 - oldlibs=
108525 - if test -z "$rpath"; then
108526 - if test "$build_libtool_libs" = yes; then
108527 - # Building a libtool convenience library.
108528 - # Some compilers have problems with a `.al' extension so
108529 - # convenience libraries should have the same extension an
108530 - # archive normally would.
108531 - oldlibs="$output_objdir/$libname.$libext $oldlibs"
108532 - build_libtool_libs=convenience
108533 - build_old_libs=yes
108534 - fi
108535 -
108536 - if test -n "$vinfo"; then
108537 - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
108538 - fi
108539 -
108540 - if test -n "$release"; then
108541 - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
108542 - fi
108543 - else
108544 -
108545 - # Parse the version information argument.
108546 - save_ifs="$IFS"; IFS=':'
108547 - set dummy $vinfo 0 0 0
108548 - IFS="$save_ifs"
108549 -
108550 - if test -n "$8"; then
108551 - $echo "$modename: too many parameters to \`-version-info'" 1>&2
108552 - $echo "$help" 1>&2
108553 - exit $EXIT_FAILURE
108554 - fi
108555 -
108556 - # convert absolute version numbers to libtool ages
108557 - # this retains compatibility with .la files and attempts
108558 - # to make the code below a bit more comprehensible
108559 -
108560 - case $vinfo_number in
108561 - yes)
108562 - number_major="$2"
108563 - number_minor="$3"
108564 - number_revision="$4"
108565 - #
108566 - # There are really only two kinds -- those that
108567 - # use the current revision as the major version
108568 - # and those that subtract age and use age as
108569 - # a minor version. But, then there is irix
108570 - # which has an extra 1 added just for fun
108571 - #
108572 - case $version_type in
108573 - darwin|linux|osf|windows|none)
108574 - current=`expr $number_major + $number_minor`
108575 - age="$number_minor"
108576 - revision="$number_revision"
108577 - ;;
108578 - freebsd-aout|freebsd-elf|sunos)
108579 - current="$number_major"
108580 - revision="$number_minor"
108581 - age="0"
108582 - ;;
108583 - irix|nonstopux)
108584 - current=`expr $number_major + $number_minor`
108585 - age="$number_minor"
108586 - revision="$number_minor"
108587 - lt_irix_increment=no
108588 - ;;
108589 - *)
108590 - $echo "$modename: unknown library version type \`$version_type'" 1>&2
108591 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
108592 - exit $EXIT_FAILURE
108593 - ;;
108594 - esac
108595 - ;;
108596 - no)
108597 - current="$2"
108598 - revision="$3"
108599 - age="$4"
108600 - ;;
108601 - esac
108602 -
108603 - # Check that each of the things are valid numbers.
108604 - case $current in
108605 - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
108606 - *)
108607 - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
108608 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2
108609 - exit $EXIT_FAILURE
108610 - ;;
108611 - esac
108612 -
108613 - case $revision in
108614 - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
108615 - *)
108616 - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
108617 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2
108618 - exit $EXIT_FAILURE
108619 - ;;
108620 - esac
108621 -
108622 - case $age in
108623 - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
108624 - *)
108625 - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
108626 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2
108627 - exit $EXIT_FAILURE
108628 - ;;
108629 - esac
108630 -
108631 - if test "$age" -gt "$current"; then
108632 - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
108633 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2
108634 - exit $EXIT_FAILURE
108635 - fi
108636 -
108637 - # Calculate the version variables.
108638 - major=
108639 - versuffix=
108640 - verstring=
108641 - case $version_type in
108642 - none) ;;
108643 -
108644 - darwin)
108645 - # Like Linux, but with the current version available in
108646 - # verstring for coding it into the library header
108647 - major=.`expr $current - $age`
108648 - versuffix="$major.$age.$revision"
108649 - # Darwin ld doesn't like 0 for these options...
108650 - minor_current=`expr $current + 1`
108651 - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
108652 - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
108653 - ;;
108654 -
108655 - freebsd-aout)
108656 - major=".$current"
108657 - versuffix=".$current.$revision";
108658 - ;;
108659 -
108660 - freebsd-elf)
108661 - major=".$current"
108662 - versuffix=".$current";
108663 - ;;
108664 -
108665 - irix | nonstopux)
108666 - if test "X$lt_irix_increment" = "Xno"; then
108667 - major=`expr $current - $age`
108668 - else
108669 - major=`expr $current - $age + 1`
108670 - fi
108671 - case $version_type in
108672 - nonstopux) verstring_prefix=nonstopux ;;
108673 - *) verstring_prefix=sgi ;;
108674 - esac
108675 - verstring="$verstring_prefix$major.$revision"
108676 -
108677 - # Add in all the interfaces that we are compatible with.
108678 - loop=$revision
108679 - while test "$loop" -ne 0; do
108680 - iface=`expr $revision - $loop`
108681 - loop=`expr $loop - 1`
108682 - verstring="$verstring_prefix$major.$iface:$verstring"
108683 - done
108684 -
108685 - # Before this point, $major must not contain `.'.
108686 - major=.$major
108687 - versuffix="$major.$revision"
108688 - ;;
108689 -
108690 - linux)
108691 - major=.`expr $current - $age`
108692 - versuffix="$major.$age.$revision"
108693 - ;;
108694 -
108695 - osf)
108696 - major=.`expr $current - $age`
108697 - versuffix=".$current.$age.$revision"
108698 - verstring="$current.$age.$revision"
108699 -
108700 - # Add in all the interfaces that we are compatible with.
108701 - loop=$age
108702 - while test "$loop" -ne 0; do
108703 - iface=`expr $current - $loop`
108704 - loop=`expr $loop - 1`
108705 - verstring="$verstring:${iface}.0"
108706 - done
108707 -
108708 - # Make executables depend on our current version.
108709 - verstring="$verstring:${current}.0"
108710 - ;;
108711 -
108712 - sunos)
108713 - major=".$current"
108714 - versuffix=".$current.$revision"
108715 - ;;
108716 -
108717 - windows)
108718 - # Use '-' rather than '.', since we only want one
108719 - # extension on DOS 8.3 filesystems.
108720 - major=`expr $current - $age`
108721 - versuffix="-$major"
108722 - ;;
108723 -
108724 - *)
108725 - $echo "$modename: unknown library version type \`$version_type'" 1>&2
108726 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
108727 - exit $EXIT_FAILURE
108728 - ;;
108729 - esac
108730 -
108731 - # Clear the version info if we defaulted, and they specified a release.
108732 - if test -z "$vinfo" && test -n "$release"; then
108733 - major=
108734 - case $version_type in
108735 - darwin)
108736 - # we can't check for "0.0" in archive_cmds due to quoting
108737 - # problems, so we reset it completely
108738 - verstring=
108739 - ;;
108740 - *)
108741 - verstring="0.0"
108742 - ;;
108743 - esac
108744 - if test "$need_version" = no; then
108745 - versuffix=
108746 - else
108747 - versuffix=".0.0"
108748 - fi
108749 - fi
108750 -
108751 - # Remove version info from name if versioning should be avoided
108752 - if test "$avoid_version" = yes && test "$need_version" = no; then
108753 - major=
108754 - versuffix=
108755 - verstring=""
108756 - fi
108757 -
108758 - # Check to see if the archive will have undefined symbols.
108759 - if test "$allow_undefined" = yes; then
108760 - if test "$allow_undefined_flag" = unsupported; then
108761 - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
108762 - build_libtool_libs=no
108763 - build_old_libs=yes
108764 - fi
108765 - else
108766 - # Don't allow undefined symbols.
108767 - allow_undefined_flag="$no_undefined_flag"
108768 - fi
108769 - fi
108770 -
108771 - if test "$mode" != relink; then
108772 - # Remove our outputs, but don't remove object files since they
108773 - # may have been created when compiling PIC objects.
108774 - removelist=
108775 - tempremovelist=`$echo "$output_objdir/*"`
108776 - for p in $tempremovelist; do
108777 - case $p in
108778 - *.$objext)
108779 - ;;
108780 - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
108781 - if test "X$precious_files_regex" != "X"; then
108782 - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
108783 - then
108784 - continue
108785 - fi
108786 - fi
108787 - removelist="$removelist $p"
108788 - ;;
108789 - *) ;;
108790 - esac
108791 - done
108792 - if test -n "$removelist"; then
108793 - $show "${rm}r $removelist"
108794 - $run ${rm}r $removelist
108795 - fi
108796 - fi
108797 -
108798 - # Now set the variables for building old libraries.
108799 - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
108800 - oldlibs="$oldlibs $output_objdir/$libname.$libext"
108801 -
108802 - # Transform .lo files to .o files.
108803 - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
108804 - fi
108805 -
108806 - # Eliminate all temporary directories.
108807 - #for path in $notinst_path; do
108808 - # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
108809 - # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
108810 - # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
108811 - #done
108812 -
108813 - if test -n "$xrpath"; then
108814 - # If the user specified any rpath flags, then add them.
108815 - temp_xrpath=
108816 - for libdir in $xrpath; do
108817 - temp_xrpath="$temp_xrpath -R$libdir"
108818 - case "$finalize_rpath " in
108819 - *" $libdir "*) ;;
108820 - *) finalize_rpath="$finalize_rpath $libdir" ;;
108821 - esac
108822 - done
108823 - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
108824 - dependency_libs="$temp_xrpath $dependency_libs"
108825 - fi
108826 - fi
108827 -
108828 - # Make sure dlfiles contains only unique files that won't be dlpreopened
108829 - old_dlfiles="$dlfiles"
108830 - dlfiles=
108831 - for lib in $old_dlfiles; do
108832 - case " $dlprefiles $dlfiles " in
108833 - *" $lib "*) ;;
108834 - *) dlfiles="$dlfiles $lib" ;;
108835 - esac
108836 - done
108837 -
108838 - # Make sure dlprefiles contains only unique files
108839 - old_dlprefiles="$dlprefiles"
108840 - dlprefiles=
108841 - for lib in $old_dlprefiles; do
108842 - case "$dlprefiles " in
108843 - *" $lib "*) ;;
108844 - *) dlprefiles="$dlprefiles $lib" ;;
108845 - esac
108846 - done
108847 -
108848 - if test "$build_libtool_libs" = yes; then
108849 - if test -n "$rpath"; then
108850 - case $host in
108851 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
108852 - # these systems don't actually have a c library (as such)!
108853 - ;;
108854 - *-*-rhapsody* | *-*-darwin1.[012])
108855 - # Rhapsody C library is in the System framework
108856 - deplibs="$deplibs -framework System"
108857 - ;;
108858 - *-*-netbsd*)
108859 - # Don't link with libc until the a.out ld.so is fixed.
108860 - ;;
108861 - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
108862 - # Do not include libc due to us having libc/libc_r.
108863 - ;;
108864 - *-*-sco3.2v5* | *-*-sco5v6*)
108865 - # Causes problems with __ctype
108866 - ;;
108867 - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
108868 - # Compiler inserts libc in the correct place for threads to work
108869 - ;;
108870 - *)
108871 - # Add libc to deplibs on all other systems if necessary.
108872 - if test "$build_libtool_need_lc" = "yes"; then
108873 - deplibs="$deplibs -lc"
108874 - fi
108875 - ;;
108876 - esac
108877 - fi
108878 -
108879 - # Transform deplibs into only deplibs that can be linked in shared.
108880 - name_save=$name
108881 - libname_save=$libname
108882 - release_save=$release
108883 - versuffix_save=$versuffix
108884 - major_save=$major
108885 - # I'm not sure if I'm treating the release correctly. I think
108886 - # release should show up in the -l (ie -lgmp5) so we don't want to
108887 - # add it in twice. Is that correct?
108888 - release=""
108889 - versuffix=""
108890 - major=""
108891 - newdeplibs=
108892 - droppeddeps=no
108893 - case $deplibs_check_method in
108894 - pass_all)
108895 - # Don't check for shared/static. Everything works.
108896 - # This might be a little naive. We might want to check
108897 - # whether the library exists or not. But this is on
108898 - # osf3 & osf4 and I'm not really sure... Just
108899 - # implementing what was already the behavior.
108900 - newdeplibs=$deplibs
108901 - ;;
108902 - test_compile)
108903 - # This code stresses the "libraries are programs" paradigm to its
108904 - # limits. Maybe even breaks it. We compile a program, linking it
108905 - # against the deplibs as a proxy for the library. Then we can check
108906 - # whether they linked in statically or dynamically with ldd.
108907 - $rm conftest.c
108908 - cat > conftest.c <<EOF
108909 - int main() { return 0; }
108910 -EOF
108911 - $rm conftest
108912 - if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
108913 - ldd_output=`ldd conftest`
108914 - for i in $deplibs; do
108915 - name=`expr $i : '-l\(.*\)'`
108916 - # If $name is empty we are operating on a -L argument.
108917 - if test "$name" != "" && test "$name" != "0"; then
108918 - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
108919 - case " $predeps $postdeps " in
108920 - *" $i "*)
108921 - newdeplibs="$newdeplibs $i"
108922 - i=""
108923 - ;;
108924 - esac
108925 - fi
108926 - if test -n "$i" ; then
108927 - libname=`eval \\$echo \"$libname_spec\"`
108928 - deplib_matches=`eval \\$echo \"$library_names_spec\"`
108929 - set dummy $deplib_matches
108930 - deplib_match=$2
108931 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
108932 - newdeplibs="$newdeplibs $i"
108933 - else
108934 - droppeddeps=yes
108935 - $echo
108936 - $echo "*** Warning: dynamic linker does not accept needed library $i."
108937 - $echo "*** I have the capability to make that library automatically link in when"
108938 - $echo "*** you link to this library. But I can only do this if you have a"
108939 - $echo "*** shared version of the library, which I believe you do not have"
108940 - $echo "*** because a test_compile did reveal that the linker did not use it for"
108941 - $echo "*** its dynamic dependency list that programs get resolved with at runtime."
108942 - fi
108943 - fi
108944 - else
108945 - newdeplibs="$newdeplibs $i"
108946 - fi
108947 - done
108948 - else
108949 - # Error occurred in the first compile. Let's try to salvage
108950 - # the situation: Compile a separate program for each library.
108951 - for i in $deplibs; do
108952 - name=`expr $i : '-l\(.*\)'`
108953 - # If $name is empty we are operating on a -L argument.
108954 - if test "$name" != "" && test "$name" != "0"; then
108955 - $rm conftest
108956 - if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
108957 - ldd_output=`ldd conftest`
108958 - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
108959 - case " $predeps $postdeps " in
108960 - *" $i "*)
108961 - newdeplibs="$newdeplibs $i"
108962 - i=""
108963 - ;;
108964 - esac
108965 - fi
108966 - if test -n "$i" ; then
108967 - libname=`eval \\$echo \"$libname_spec\"`
108968 - deplib_matches=`eval \\$echo \"$library_names_spec\"`
108969 - set dummy $deplib_matches
108970 - deplib_match=$2
108971 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
108972 - newdeplibs="$newdeplibs $i"
108973 - else
108974 - droppeddeps=yes
108975 - $echo
108976 - $echo "*** Warning: dynamic linker does not accept needed library $i."
108977 - $echo "*** I have the capability to make that library automatically link in when"
108978 - $echo "*** you link to this library. But I can only do this if you have a"
108979 - $echo "*** shared version of the library, which you do not appear to have"
108980 - $echo "*** because a test_compile did reveal that the linker did not use this one"
108981 - $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
108982 - fi
108983 - fi
108984 - else
108985 - droppeddeps=yes
108986 - $echo
108987 - $echo "*** Warning! Library $i is needed by this library but I was not able to"
108988 - $echo "*** make it link in! You will probably need to install it or some"
108989 - $echo "*** library that it depends on before this library will be fully"
108990 - $echo "*** functional. Installing it before continuing would be even better."
108991 - fi
108992 - else
108993 - newdeplibs="$newdeplibs $i"
108994 - fi
108995 - done
108996 - fi
108997 - ;;
108998 - file_magic*)
108999 - set dummy $deplibs_check_method
109000 - file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
109001 - for a_deplib in $deplibs; do
109002 - name=`expr $a_deplib : '-l\(.*\)'`
109003 - # If $name is empty we are operating on a -L argument.
109004 - if test "$name" != "" && test "$name" != "0"; then
109005 - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
109006 - case " $predeps $postdeps " in
109007 - *" $a_deplib "*)
109008 - newdeplibs="$newdeplibs $a_deplib"
109009 - a_deplib=""
109010 - ;;
109011 - esac
109012 - fi
109013 - if test -n "$a_deplib" ; then
109014 - libname=`eval \\$echo \"$libname_spec\"`
109015 - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
109016 - potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
109017 - for potent_lib in $potential_libs; do
109018 - # Follow soft links.
109019 - if ls -lLd "$potent_lib" 2>/dev/null \
109020 - | grep " -> " >/dev/null; then
109021 - continue
109022 - fi
109023 - # The statement above tries to avoid entering an
109024 - # endless loop below, in case of cyclic links.
109025 - # We might still enter an endless loop, since a link
109026 - # loop can be closed while we follow links,
109027 - # but so what?
109028 - potlib="$potent_lib"
109029 - while test -h "$potlib" 2>/dev/null; do
109030 - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
109031 - case $potliblink in
109032 - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
109033 - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
109034 - esac
109035 - done
109036 - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
109037 - | ${SED} 10q \
109038 - | $EGREP "$file_magic_regex" > /dev/null; then
109039 - newdeplibs="$newdeplibs $a_deplib"
109040 - a_deplib=""
109041 - break 2
109042 - fi
109043 - done
109044 - done
109045 - fi
109046 - if test -n "$a_deplib" ; then
109047 - droppeddeps=yes
109048 - $echo
109049 - $echo "*** Warning: linker path does not have real file for library $a_deplib."
109050 - $echo "*** I have the capability to make that library automatically link in when"
109051 - $echo "*** you link to this library. But I can only do this if you have a"
109052 - $echo "*** shared version of the library, which you do not appear to have"
109053 - $echo "*** because I did check the linker path looking for a file starting"
109054 - if test -z "$potlib" ; then
109055 - $echo "*** with $libname but no candidates were found. (...for file magic test)"
109056 - else
109057 - $echo "*** with $libname and none of the candidates passed a file format test"
109058 - $echo "*** using a file magic. Last file checked: $potlib"
109059 - fi
109060 - fi
109061 - else
109062 - # Add a -L argument.
109063 - newdeplibs="$newdeplibs $a_deplib"
109064 - fi
109065 - done # Gone through all deplibs.
109066 - ;;
109067 - match_pattern*)
109068 - set dummy $deplibs_check_method
109069 - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
109070 - for a_deplib in $deplibs; do
109071 - name=`expr $a_deplib : '-l\(.*\)'`
109072 - # If $name is empty we are operating on a -L argument.
109073 - if test -n "$name" && test "$name" != "0"; then
109074 - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
109075 - case " $predeps $postdeps " in
109076 - *" $a_deplib "*)
109077 - newdeplibs="$newdeplibs $a_deplib"
109078 - a_deplib=""
109079 - ;;
109080 - esac
109081 - fi
109082 - if test -n "$a_deplib" ; then
109083 - libname=`eval \\$echo \"$libname_spec\"`
109084 - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
109085 - potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
109086 - for potent_lib in $potential_libs; do
109087 - potlib="$potent_lib" # see symlink-check above in file_magic test
109088 - if eval $echo \"$potent_lib\" 2>/dev/null \
109089 - | ${SED} 10q \
109090 - | $EGREP "$match_pattern_regex" > /dev/null; then
109091 - newdeplibs="$newdeplibs $a_deplib"
109092 - a_deplib=""
109093 - break 2
109094 - fi
109095 - done
109096 - done
109097 - fi
109098 - if test -n "$a_deplib" ; then
109099 - droppeddeps=yes
109100 - $echo
109101 - $echo "*** Warning: linker path does not have real file for library $a_deplib."
109102 - $echo "*** I have the capability to make that library automatically link in when"
109103 - $echo "*** you link to this library. But I can only do this if you have a"
109104 - $echo "*** shared version of the library, which you do not appear to have"
109105 - $echo "*** because I did check the linker path looking for a file starting"
109106 - if test -z "$potlib" ; then
109107 - $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
109108 - else
109109 - $echo "*** with $libname and none of the candidates passed a file format test"
109110 - $echo "*** using a regex pattern. Last file checked: $potlib"
109111 - fi
109112 - fi
109113 - else
109114 - # Add a -L argument.
109115 - newdeplibs="$newdeplibs $a_deplib"
109116 - fi
109117 - done # Gone through all deplibs.
109118 - ;;
109119 - none | unknown | *)
109120 - newdeplibs=""
109121 - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
109122 - -e 's/ -[LR][^ ]*//g'`
109123 - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
109124 - for i in $predeps $postdeps ; do
109125 - # can't use Xsed below, because $i might contain '/'
109126 - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
109127 - done
109128 - fi
109129 - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
109130 - | grep . >/dev/null; then
109131 - $echo
109132 - if test "X$deplibs_check_method" = "Xnone"; then
109133 - $echo "*** Warning: inter-library dependencies are not supported in this platform."
109134 - else
109135 - $echo "*** Warning: inter-library dependencies are not known to be supported."
109136 - fi
109137 - $echo "*** All declared inter-library dependencies are being dropped."
109138 - droppeddeps=yes
109139 - fi
109140 - ;;
109141 - esac
109142 - versuffix=$versuffix_save
109143 - major=$major_save
109144 - release=$release_save
109145 - libname=$libname_save
109146 - name=$name_save
109147 -
109148 - case $host in
109149 - *-*-rhapsody* | *-*-darwin1.[012])
109150 - # On Rhapsody replace the C library is the System framework
109151 - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
109152 - ;;
109153 - esac
109154 -
109155 - if test "$droppeddeps" = yes; then
109156 - if test "$module" = yes; then
109157 - $echo
109158 - $echo "*** Warning: libtool could not satisfy all declared inter-library"
109159 - $echo "*** dependencies of module $libname. Therefore, libtool will create"
109160 - $echo "*** a static module, that should work as long as the dlopening"
109161 - $echo "*** application is linked with the -dlopen flag."
109162 - if test -z "$global_symbol_pipe"; then
109163 - $echo
109164 - $echo "*** However, this would only work if libtool was able to extract symbol"
109165 - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
109166 - $echo "*** not find such a program. So, this module is probably useless."
109167 - $echo "*** \`nm' from GNU binutils and a full rebuild may help."
109168 - fi
109169 - if test "$build_old_libs" = no; then
109170 - oldlibs="$output_objdir/$libname.$libext"
109171 - build_libtool_libs=module
109172 - build_old_libs=yes
109173 - else
109174 - build_libtool_libs=no
109175 - fi
109176 - else
109177 - $echo "*** The inter-library dependencies that have been dropped here will be"
109178 - $echo "*** automatically added whenever a program is linked with this library"
109179 - $echo "*** or is declared to -dlopen it."
109180 -
109181 - if test "$allow_undefined" = no; then
109182 - $echo
109183 - $echo "*** Since this library must not contain undefined symbols,"
109184 - $echo "*** because either the platform does not support them or"
109185 - $echo "*** it was explicitly requested with -no-undefined,"
109186 - $echo "*** libtool will only create a static version of it."
109187 - if test "$build_old_libs" = no; then
109188 - oldlibs="$output_objdir/$libname.$libext"
109189 - build_libtool_libs=module
109190 - build_old_libs=yes
109191 - else
109192 - build_libtool_libs=no
109193 - fi
109194 - fi
109195 - fi
109196 - fi
109197 - # Done checking deplibs!
109198 - deplibs=$newdeplibs
109199 - fi
109200 -
109201 -
109202 - # move library search paths that coincide with paths to not yet
109203 - # installed libraries to the beginning of the library search list
109204 - new_libs=
109205 - for path in $notinst_path; do
109206 - case " $new_libs " in
109207 - *" -L$path/$objdir "*) ;;
109208 - *)
109209 - case " $deplibs " in
109210 - *" -L$path/$objdir "*)
109211 - new_libs="$new_libs -L$path/$objdir" ;;
109212 - esac
109213 - ;;
109214 - esac
109215 - done
109216 - for deplib in $deplibs; do
109217 - case $deplib in
109218 - -L*)
109219 - case " $new_libs " in
109220 - *" $deplib "*) ;;
109221 - *) new_libs="$new_libs $deplib" ;;
109222 - esac
109223 - ;;
109224 - *) new_libs="$new_libs $deplib" ;;
109225 - esac
109226 - done
109227 - deplibs="$new_libs"
109228 -
109229 -
109230 - # All the library-specific variables (install_libdir is set above).
109231 - library_names=
109232 - old_library=
109233 - dlname=
109234 -
109235 - # Test again, we may have decided not to build it any more
109236 - if test "$build_libtool_libs" = yes; then
109237 - if test "$hardcode_into_libs" = yes; then
109238 - # Hardcode the library paths
109239 - hardcode_libdirs=
109240 - dep_rpath=
109241 - rpath="$finalize_rpath"
109242 - test "$mode" != relink && rpath="$compile_rpath$rpath"
109243 - for libdir in $rpath; do
109244 - if test -n "$hardcode_libdir_flag_spec"; then
109245 - if test -n "$hardcode_libdir_separator"; then
109246 - if test -z "$hardcode_libdirs"; then
109247 - hardcode_libdirs="$libdir"
109248 - else
109249 - # Just accumulate the unique libdirs.
109250 - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
109251 - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
109252 - ;;
109253 - *)
109254 - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
109255 - ;;
109256 - esac
109257 - fi
109258 - else
109259 - eval flag=\"$hardcode_libdir_flag_spec\"
109260 - dep_rpath="$dep_rpath $flag"
109261 - fi
109262 - elif test -n "$runpath_var"; then
109263 - case "$perm_rpath " in
109264 - *" $libdir "*) ;;
109265 - *) perm_rpath="$perm_rpath $libdir" ;;
109266 - esac
109267 - fi
109268 - done
109269 - # Substitute the hardcoded libdirs into the rpath.
109270 - if test -n "$hardcode_libdir_separator" &&
109271 - test -n "$hardcode_libdirs"; then
109272 - libdir="$hardcode_libdirs"
109273 - if test -n "$hardcode_libdir_flag_spec_ld"; then
109274 - case $archive_cmds in
109275 - *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
109276 - *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
109277 - esac
109278 - else
109279 - eval dep_rpath=\"$hardcode_libdir_flag_spec\"
109280 - fi
109281 - fi
109282 - if test -n "$runpath_var" && test -n "$perm_rpath"; then
109283 - # We should set the runpath_var.
109284 - rpath=
109285 - for dir in $perm_rpath; do
109286 - rpath="$rpath$dir:"
109287 - done
109288 - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
109289 - fi
109290 - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
109291 - fi
109292 -
109293 - shlibpath="$finalize_shlibpath"
109294 - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
109295 - if test -n "$shlibpath"; then
109296 - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
109297 - fi
109298 -
109299 - # Get the real and link names of the library.
109300 - eval shared_ext=\"$shrext_cmds\"
109301 - eval library_names=\"$library_names_spec\"
109302 - set dummy $library_names
109303 - realname="$2"
109304 - shift; shift
109305 -
109306 - if test -n "$soname_spec"; then
109307 - eval soname=\"$soname_spec\"
109308 - else
109309 - soname="$realname"
109310 - fi
109311 - if test -z "$dlname"; then
109312 - dlname=$soname
109313 - fi
109314 -
109315 - lib="$output_objdir/$realname"
109316 - linknames=
109317 - for link
109318 - do
109319 - linknames="$linknames $link"
109320 - done
109321 -
109322 - # Use standard objects if they are pic
109323 - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
109324 -
109325 - # Prepare the list of exported symbols
109326 - if test -z "$export_symbols"; then
109327 - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
109328 - $show "generating symbol list for \`$libname.la'"
109329 - export_symbols="$output_objdir/$libname.exp"
109330 - $run $rm $export_symbols
109331 - cmds=$export_symbols_cmds
109332 - save_ifs="$IFS"; IFS='~'
109333 - for cmd in $cmds; do
109334 - IFS="$save_ifs"
109335 - eval cmd=\"$cmd\"
109336 - if len=`expr "X$cmd" : ".*"` &&
109337 - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
109338 - $show "$cmd"
109339 - $run eval "$cmd" || exit $?
109340 - skipped_export=false
109341 - else
109342 - # The command line is too long to execute in one step.
109343 - $show "using reloadable object file for export list..."
109344 - skipped_export=:
109345 - # Break out early, otherwise skipped_export may be
109346 - # set to false by a later but shorter cmd.
109347 - break
109348 - fi
109349 - done
109350 - IFS="$save_ifs"
109351 - if test -n "$export_symbols_regex"; then
109352 - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
109353 - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
109354 - $show "$mv \"${export_symbols}T\" \"$export_symbols\""
109355 - $run eval '$mv "${export_symbols}T" "$export_symbols"'
109356 - fi
109357 - fi
109358 - fi
109359 -
109360 - if test -n "$export_symbols" && test -n "$include_expsyms"; then
109361 - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
109362 - fi
109363 -
109364 - tmp_deplibs=
109365 - for test_deplib in $deplibs; do
109366 - case " $convenience " in
109367 - *" $test_deplib "*) ;;
109368 - *)
109369 - tmp_deplibs="$tmp_deplibs $test_deplib"
109370 - ;;
109371 - esac
109372 - done
109373 - deplibs="$tmp_deplibs"
109374 -
109375 - if test -n "$convenience"; then
109376 - if test -n "$whole_archive_flag_spec"; then
109377 - save_libobjs=$libobjs
109378 - eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
109379 - else
109380 - gentop="$output_objdir/${outputname}x"
109381 - generated="$generated $gentop"
109382 -
109383 - func_extract_archives $gentop $convenience
109384 - libobjs="$libobjs $func_extract_archives_result"
109385 - fi
109386 - fi
109387 -
109388 - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
109389 - eval flag=\"$thread_safe_flag_spec\"
109390 - linker_flags="$linker_flags $flag"
109391 - fi
109392 -
109393 - # Make a backup of the uninstalled library when relinking
109394 - if test "$mode" = relink; then
109395 - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
109396 - fi
109397 -
109398 - # Do each of the archive commands.
109399 - if test "$module" = yes && test -n "$module_cmds" ; then
109400 - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
109401 - eval test_cmds=\"$module_expsym_cmds\"
109402 - cmds=$module_expsym_cmds
109403 - else
109404 - eval test_cmds=\"$module_cmds\"
109405 - cmds=$module_cmds
109406 - fi
109407 - else
109408 - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
109409 - eval test_cmds=\"$archive_expsym_cmds\"
109410 - cmds=$archive_expsym_cmds
109411 - else
109412 - eval test_cmds=\"$archive_cmds\"
109413 - cmds=$archive_cmds
109414 - fi
109415 - fi
109416 -
109417 - if test "X$skipped_export" != "X:" &&
109418 - len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
109419 - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
109420 - :
109421 - else
109422 - # The command line is too long to link in one step, link piecewise.
109423 - $echo "creating reloadable object files..."
109424 -
109425 - # Save the value of $output and $libobjs because we want to
109426 - # use them later. If we have whole_archive_flag_spec, we
109427 - # want to use save_libobjs as it was before
109428 - # whole_archive_flag_spec was expanded, because we can't
109429 - # assume the linker understands whole_archive_flag_spec.
109430 - # This may have to be revisited, in case too many
109431 - # convenience libraries get linked in and end up exceeding
109432 - # the spec.
109433 - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
109434 - save_libobjs=$libobjs
109435 - fi
109436 - save_output=$output
109437 - output_la=`$echo "X$output" | $Xsed -e "$basename"`
109438 -
109439 - # Clear the reloadable object creation command queue and
109440 - # initialize k to one.
109441 - test_cmds=
109442 - concat_cmds=
109443 - objlist=
109444 - delfiles=
109445 - last_robj=
109446 - k=1
109447 - output=$output_objdir/$output_la-${k}.$objext
109448 - # Loop over the list of objects to be linked.
109449 - for obj in $save_libobjs
109450 - do
109451 - eval test_cmds=\"$reload_cmds $objlist $last_robj\"
109452 - if test "X$objlist" = X ||
109453 - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
109454 - test "$len" -le "$max_cmd_len"; }; then
109455 - objlist="$objlist $obj"
109456 - else
109457 - # The command $test_cmds is almost too long, add a
109458 - # command to the queue.
109459 - if test "$k" -eq 1 ; then
109460 - # The first file doesn't have a previous command to add.
109461 - eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
109462 - else
109463 - # All subsequent reloadable object files will link in
109464 - # the last one created.
109465 - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
109466 - fi
109467 - last_robj=$output_objdir/$output_la-${k}.$objext
109468 - k=`expr $k + 1`
109469 - output=$output_objdir/$output_la-${k}.$objext
109470 - objlist=$obj
109471 - len=1
109472 - fi
109473 - done
109474 - # Handle the remaining objects by creating one last
109475 - # reloadable object file. All subsequent reloadable object
109476 - # files will link in the last one created.
109477 - test -z "$concat_cmds" || concat_cmds=$concat_cmds~
109478 - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
109479 -
109480 - if ${skipped_export-false}; then
109481 - $show "generating symbol list for \`$libname.la'"
109482 - export_symbols="$output_objdir/$libname.exp"
109483 - $run $rm $export_symbols
109484 - libobjs=$output
109485 - # Append the command to create the export file.
109486 - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
109487 - fi
109488 -
109489 - # Set up a command to remove the reloadable object files
109490 - # after they are used.
109491 - i=0
109492 - while test "$i" -lt "$k"
109493 - do
109494 - i=`expr $i + 1`
109495 - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
109496 - done
109497 -
109498 - $echo "creating a temporary reloadable object file: $output"
109499 -
109500 - # Loop through the commands generated above and execute them.
109501 - save_ifs="$IFS"; IFS='~'
109502 - for cmd in $concat_cmds; do
109503 - IFS="$save_ifs"
109504 - $show "$cmd"
109505 - $run eval "$cmd" || exit $?
109506 - done
109507 - IFS="$save_ifs"
109508 -
109509 - libobjs=$output
109510 - # Restore the value of output.
109511 - output=$save_output
109512 -
109513 - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
109514 - eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
109515 - fi
109516 - # Expand the library linking commands again to reset the
109517 - # value of $libobjs for piecewise linking.
109518 -
109519 - # Do each of the archive commands.
109520 - if test "$module" = yes && test -n "$module_cmds" ; then
109521 - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
109522 - cmds=$module_expsym_cmds
109523 - else
109524 - cmds=$module_cmds
109525 - fi
109526 - else
109527 - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
109528 - cmds=$archive_expsym_cmds
109529 - else
109530 - cmds=$archive_cmds
109531 - fi
109532 - fi
109533 -
109534 - # Append the command to remove the reloadable object files
109535 - # to the just-reset $cmds.
109536 - eval cmds=\"\$cmds~\$rm $delfiles\"
109537 - fi
109538 - save_ifs="$IFS"; IFS='~'
109539 - for cmd in $cmds; do
109540 - IFS="$save_ifs"
109541 - eval cmd=\"$cmd\"
109542 - $show "$cmd"
109543 - $run eval "$cmd" || {
109544 - lt_exit=$?
109545 -
109546 - # Restore the uninstalled library and exit
109547 - if test "$mode" = relink; then
109548 - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
109549 - fi
109550 -
109551 - exit $lt_exit
109552 - }
109553 - done
109554 - IFS="$save_ifs"
109555 -
109556 - # Restore the uninstalled library and exit
109557 - if test "$mode" = relink; then
109558 - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
109559 -
109560 - if test -n "$convenience"; then
109561 - if test -z "$whole_archive_flag_spec"; then
109562 - $show "${rm}r $gentop"
109563 - $run ${rm}r "$gentop"
109564 - fi
109565 - fi
109566 -
109567 - exit $EXIT_SUCCESS
109568 - fi
109569 -
109570 - # Create links to the real library.
109571 - for linkname in $linknames; do
109572 - if test "$realname" != "$linkname"; then
109573 - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
109574 - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
109575 - fi
109576 - done
109577 -
109578 - # If -module or -export-dynamic was specified, set the dlname.
109579 - if test "$module" = yes || test "$export_dynamic" = yes; then
109580 - # On all known operating systems, these are identical.
109581 - dlname="$soname"
109582 - fi
109583 - fi
109584 - ;;
109585 -
109586 - obj)
109587 - case " $deplibs" in
109588 - *\ -l* | *\ -L*)
109589 - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
109590 - esac
109591 -
109592 - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
109593 - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
109594 - fi
109595 -
109596 - if test -n "$rpath"; then
109597 - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
109598 - fi
109599 -
109600 - if test -n "$xrpath"; then
109601 - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
109602 - fi
109603 -
109604 - if test -n "$vinfo"; then
109605 - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
109606 - fi
109607 -
109608 - if test -n "$release"; then
109609 - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
109610 - fi
109611 -
109612 - case $output in
109613 - *.lo)
109614 - if test -n "$objs$old_deplibs"; then
109615 - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
109616 - exit $EXIT_FAILURE
109617 - fi
109618 - libobj="$output"
109619 - obj=`$echo "X$output" | $Xsed -e "$lo2o"`
109620 - ;;
109621 - *)
109622 - libobj=
109623 - obj="$output"
109624 - ;;
109625 - esac
109626 -
109627 - # Delete the old objects.
109628 - $run $rm $obj $libobj
109629 -
109630 - # Objects from convenience libraries. This assumes
109631 - # single-version convenience libraries. Whenever we create
109632 - # different ones for PIC/non-PIC, this we'll have to duplicate
109633 - # the extraction.
109634 - reload_conv_objs=
109635 - gentop=
109636 - # reload_cmds runs $LD directly, so let us get rid of
109637 - # -Wl from whole_archive_flag_spec and hope we can get by with
109638 - # turning comma into space..
109639 - wl=
109640 -
109641 - if test -n "$convenience"; then
109642 - if test -n "$whole_archive_flag_spec"; then
109643 - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
109644 - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
109645 - else
109646 - gentop="$output_objdir/${obj}x"
109647 - generated="$generated $gentop"
109648 -
109649 - func_extract_archives $gentop $convenience
109650 - reload_conv_objs="$reload_objs $func_extract_archives_result"
109651 - fi
109652 - fi
109653 -
109654 - # Create the old-style object.
109655 - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
109656 -
109657 - output="$obj"
109658 - cmds=$reload_cmds
109659 - save_ifs="$IFS"; IFS='~'
109660 - for cmd in $cmds; do
109661 - IFS="$save_ifs"
109662 - eval cmd=\"$cmd\"
109663 - $show "$cmd"
109664 - $run eval "$cmd" || exit $?
109665 - done
109666 - IFS="$save_ifs"
109667 -
109668 - # Exit if we aren't doing a library object file.
109669 - if test -z "$libobj"; then
109670 - if test -n "$gentop"; then
109671 - $show "${rm}r $gentop"
109672 - $run ${rm}r $gentop
109673 - fi
109674 -
109675 - exit $EXIT_SUCCESS
109676 - fi
109677 -
109678 - if test "$build_libtool_libs" != yes; then
109679 - if test -n "$gentop"; then
109680 - $show "${rm}r $gentop"
109681 - $run ${rm}r $gentop
109682 - fi
109683 -
109684 - # Create an invalid libtool object if no PIC, so that we don't
109685 - # accidentally link it into a program.
109686 - # $show "echo timestamp > $libobj"
109687 - # $run eval "echo timestamp > $libobj" || exit $?
109688 - exit $EXIT_SUCCESS
109689 - fi
109690 -
109691 - if test -n "$pic_flag" || test "$pic_mode" != default; then
109692 - # Only do commands if we really have different PIC objects.
109693 - reload_objs="$libobjs $reload_conv_objs"
109694 - output="$libobj"
109695 - cmds=$reload_cmds
109696 - save_ifs="$IFS"; IFS='~'
109697 - for cmd in $cmds; do
109698 - IFS="$save_ifs"
109699 - eval cmd=\"$cmd\"
109700 - $show "$cmd"
109701 - $run eval "$cmd" || exit $?
109702 - done
109703 - IFS="$save_ifs"
109704 - fi
109705 -
109706 - if test -n "$gentop"; then
109707 - $show "${rm}r $gentop"
109708 - $run ${rm}r $gentop
109709 - fi
109710 -
109711 - exit $EXIT_SUCCESS
109712 - ;;
109713 -
109714 - prog)
109715 - case $host in
109716 - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
109717 - esac
109718 - if test -n "$vinfo"; then
109719 - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
109720 - fi
109721 -
109722 - if test -n "$release"; then
109723 - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
109724 - fi
109725 -
109726 - if test "$preload" = yes; then
109727 - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
109728 - test "$dlopen_self_static" = unknown; then
109729 - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
109730 - fi
109731 - fi
109732 -
109733 - case $host in
109734 - *-*-rhapsody* | *-*-darwin1.[012])
109735 - # On Rhapsody replace the C library is the System framework
109736 - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
109737 - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
109738 - ;;
109739 - esac
109740 -
109741 - case $host in
109742 - *darwin*)
109743 - # Don't allow lazy linking, it breaks C++ global constructors
109744 - if test "$tagname" = CXX ; then
109745 - compile_command="$compile_command ${wl}-bind_at_load"
109746 - finalize_command="$finalize_command ${wl}-bind_at_load"
109747 - fi
109748 - ;;
109749 - esac
109750 -
109751 -
109752 - # move library search paths that coincide with paths to not yet
109753 - # installed libraries to the beginning of the library search list
109754 - new_libs=
109755 - for path in $notinst_path; do
109756 - case " $new_libs " in
109757 - *" -L$path/$objdir "*) ;;
109758 - *)
109759 - case " $compile_deplibs " in
109760 - *" -L$path/$objdir "*)
109761 - new_libs="$new_libs -L$path/$objdir" ;;
109762 - esac
109763 - ;;
109764 - esac
109765 - done
109766 - for deplib in $compile_deplibs; do
109767 - case $deplib in
109768 - -L*)
109769 - case " $new_libs " in
109770 - *" $deplib "*) ;;
109771 - *) new_libs="$new_libs $deplib" ;;
109772 - esac
109773 - ;;
109774 - *) new_libs="$new_libs $deplib" ;;
109775 - esac
109776 - done
109777 - compile_deplibs="$new_libs"
109778 -
109779 -
109780 - compile_command="$compile_command $compile_deplibs"
109781 - finalize_command="$finalize_command $finalize_deplibs"
109782 -
109783 - if test -n "$rpath$xrpath"; then
109784 - # If the user specified any rpath flags, then add them.
109785 - for libdir in $rpath $xrpath; do
109786 - # This is the magic to use -rpath.
109787 - case "$finalize_rpath " in
109788 - *" $libdir "*) ;;
109789 - *) finalize_rpath="$finalize_rpath $libdir" ;;
109790 - esac
109791 - done
109792 - fi
109793 -
109794 - # Now hardcode the library paths
109795 - rpath=
109796 - hardcode_libdirs=
109797 - for libdir in $compile_rpath $finalize_rpath; do
109798 - if test -n "$hardcode_libdir_flag_spec"; then
109799 - if test -n "$hardcode_libdir_separator"; then
109800 - if test -z "$hardcode_libdirs"; then
109801 - hardcode_libdirs="$libdir"
109802 - else
109803 - # Just accumulate the unique libdirs.
109804 - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
109805 - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
109806 - ;;
109807 - *)
109808 - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
109809 - ;;
109810 - esac
109811 - fi
109812 - else
109813 - eval flag=\"$hardcode_libdir_flag_spec\"
109814 - rpath="$rpath $flag"
109815 - fi
109816 - elif test -n "$runpath_var"; then
109817 - case "$perm_rpath " in
109818 - *" $libdir "*) ;;
109819 - *) perm_rpath="$perm_rpath $libdir" ;;
109820 - esac
109821 - fi
109822 - case $host in
109823 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
109824 - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
109825 - case :$dllsearchpath: in
109826 - *":$libdir:"*) ;;
109827 - *) dllsearchpath="$dllsearchpath:$libdir";;
109828 - esac
109829 - case :$dllsearchpath: in
109830 - *":$testbindir:"*) ;;
109831 - *) dllsearchpath="$dllsearchpath:$testbindir";;
109832 - esac
109833 - ;;
109834 - esac
109835 - done
109836 - # Substitute the hardcoded libdirs into the rpath.
109837 - if test -n "$hardcode_libdir_separator" &&
109838 - test -n "$hardcode_libdirs"; then
109839 - libdir="$hardcode_libdirs"
109840 - eval rpath=\" $hardcode_libdir_flag_spec\"
109841 - fi
109842 - compile_rpath="$rpath"
109843 -
109844 - rpath=
109845 - hardcode_libdirs=
109846 - for libdir in $finalize_rpath; do
109847 - if test -n "$hardcode_libdir_flag_spec"; then
109848 - if test -n "$hardcode_libdir_separator"; then
109849 - if test -z "$hardcode_libdirs"; then
109850 - hardcode_libdirs="$libdir"
109851 - else
109852 - # Just accumulate the unique libdirs.
109853 - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
109854 - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
109855 - ;;
109856 - *)
109857 - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
109858 - ;;
109859 - esac
109860 - fi
109861 - else
109862 - eval flag=\"$hardcode_libdir_flag_spec\"
109863 - rpath="$rpath $flag"
109864 - fi
109865 - elif test -n "$runpath_var"; then
109866 - case "$finalize_perm_rpath " in
109867 - *" $libdir "*) ;;
109868 - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
109869 - esac
109870 - fi
109871 - done
109872 - # Substitute the hardcoded libdirs into the rpath.
109873 - if test -n "$hardcode_libdir_separator" &&
109874 - test -n "$hardcode_libdirs"; then
109875 - libdir="$hardcode_libdirs"
109876 - eval rpath=\" $hardcode_libdir_flag_spec\"
109877 - fi
109878 - finalize_rpath="$rpath"
109879 -
109880 - if test -n "$libobjs" && test "$build_old_libs" = yes; then
109881 - # Transform all the library objects into standard objects.
109882 - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
109883 - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
109884 - fi
109885 -
109886 - dlsyms=
109887 - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
109888 - if test -n "$NM" && test -n "$global_symbol_pipe"; then
109889 - dlsyms="${outputname}S.c"
109890 - else
109891 - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
109892 - fi
109893 - fi
109894 -
109895 - if test -n "$dlsyms"; then
109896 - case $dlsyms in
109897 - "") ;;
109898 - *.c)
109899 - # Discover the nlist of each of the dlfiles.
109900 - nlist="$output_objdir/${outputname}.nm"
109901 -
109902 - $show "$rm $nlist ${nlist}S ${nlist}T"
109903 - $run $rm "$nlist" "${nlist}S" "${nlist}T"
109904 -
109905 - # Parse the name list into a source file.
109906 - $show "creating $output_objdir/$dlsyms"
109907 -
109908 - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
109909 -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
109910 -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
109911 -
109912 -#ifdef __cplusplus
109913 -extern \"C\" {
109914 -#endif
109915 -
109916 -/* Prevent the only kind of declaration conflicts we can make. */
109917 -#define lt_preloaded_symbols some_other_symbol
109918 -
109919 -/* External symbol declarations for the compiler. */\
109920 -"
109921 -
109922 - if test "$dlself" = yes; then
109923 - $show "generating symbol list for \`$output'"
109924 -
109925 - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
109926 -
109927 - # Add our own program objects to the symbol list.
109928 - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
109929 - for arg in $progfiles; do
109930 - $show "extracting global C symbols from \`$arg'"
109931 - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
109932 - done
109933 -
109934 - if test -n "$exclude_expsyms"; then
109935 - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
109936 - $run eval '$mv "$nlist"T "$nlist"'
109937 - fi
109938 -
109939 - if test -n "$export_symbols_regex"; then
109940 - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
109941 - $run eval '$mv "$nlist"T "$nlist"'
109942 - fi
109943 -
109944 - # Prepare the list of exported symbols
109945 - if test -z "$export_symbols"; then
109946 - export_symbols="$output_objdir/$outputname.exp"
109947 - $run $rm $export_symbols
109948 - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
109949 - case $host in
109950 - *cygwin* | *mingw* )
109951 - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
109952 - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
109953 - ;;
109954 - esac
109955 - else
109956 - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
109957 - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
109958 - $run eval 'mv "$nlist"T "$nlist"'
109959 - case $host in
109960 - *cygwin* | *mingw* )
109961 - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
109962 - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
109963 - ;;
109964 - esac
109965 - fi
109966 - fi
109967 -
109968 - for arg in $dlprefiles; do
109969 - $show "extracting global C symbols from \`$arg'"
109970 - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
109971 - $run eval '$echo ": $name " >> "$nlist"'
109972 - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
109973 - done
109974 -
109975 - if test -z "$run"; then
109976 - # Make sure we have at least an empty file.
109977 - test -f "$nlist" || : > "$nlist"
109978 -
109979 - if test -n "$exclude_expsyms"; then
109980 - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
109981 - $mv "$nlist"T "$nlist"
109982 - fi
109983 -
109984 - # Try sorting and uniquifying the output.
109985 - if grep -v "^: " < "$nlist" |
109986 - if sort -k 3 </dev/null >/dev/null 2>&1; then
109987 - sort -k 3
109988 - else
109989 - sort +2
109990 - fi |
109991 - uniq > "$nlist"S; then
109992 - :
109993 - else
109994 - grep -v "^: " < "$nlist" > "$nlist"S
109995 - fi
109996 -
109997 - if test -f "$nlist"S; then
109998 - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
109999 - else
110000 - $echo '/* NONE */' >> "$output_objdir/$dlsyms"
110001 - fi
110002 -
110003 - $echo >> "$output_objdir/$dlsyms" "\
110004 -
110005 -#undef lt_preloaded_symbols
110006 -
110007 -#if defined (__STDC__) && __STDC__
110008 -# define lt_ptr void *
110009 -#else
110010 -# define lt_ptr char *
110011 -# define const
110012 -#endif
110013 -
110014 -/* The mapping between symbol names and symbols. */
110015 -"
110016 -
110017 - case $host in
110018 - *cygwin* | *mingw* )
110019 - $echo >> "$output_objdir/$dlsyms" "\
110020 -/* DATA imports from DLLs on WIN32 can't be const, because
110021 - runtime relocations are performed -- see ld's documentation
110022 - on pseudo-relocs */
110023 -struct {
110024 -"
110025 - ;;
110026 - * )
110027 - $echo >> "$output_objdir/$dlsyms" "\
110028 -const struct {
110029 -"
110030 - ;;
110031 - esac
110032 -
110033 -
110034 - $echo >> "$output_objdir/$dlsyms" "\
110035 - const char *name;
110036 - lt_ptr address;
110037 -}
110038 -lt_preloaded_symbols[] =
110039 -{\
110040 -"
110041 -
110042 - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
110043 -
110044 - $echo >> "$output_objdir/$dlsyms" "\
110045 - {0, (lt_ptr) 0}
110046 -};
110047 -
110048 -/* This works around a problem in FreeBSD linker */
110049 -#ifdef FREEBSD_WORKAROUND
110050 -static const void *lt_preloaded_setup() {
110051 - return lt_preloaded_symbols;
110052 -}
110053 -#endif
110054 -
110055 -#ifdef __cplusplus
110056 -}
110057 -#endif\
110058 -"
110059 - fi
110060 -
110061 - pic_flag_for_symtable=
110062 - case $host in
110063 - # compiling the symbol table file with pic_flag works around
110064 - # a FreeBSD bug that causes programs to crash when -lm is
110065 - # linked before any other PIC object. But we must not use
110066 - # pic_flag when linking with -static. The problem exists in
110067 - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
110068 - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
110069 - case "$compile_command " in
110070 - *" -static "*) ;;
110071 - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
110072 - esac;;
110073 - *-*-hpux*)
110074 - case "$compile_command " in
110075 - *" -static "*) ;;
110076 - *) pic_flag_for_symtable=" $pic_flag";;
110077 - esac
110078 - esac
110079 -
110080 - # Now compile the dynamic symbol file.
110081 - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
110082 - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
110083 -
110084 - # Clean up the generated files.
110085 - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
110086 - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
110087 -
110088 - # Transform the symbol file into the correct name.
110089 - case $host in
110090 - *cygwin* | *mingw* )
110091 - if test -f "$output_objdir/${outputname}.def" ; then
110092 - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
110093 - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
110094 - else
110095 - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
110096 - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
110097 - fi
110098 - ;;
110099 - * )
110100 - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
110101 - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
110102 - ;;
110103 - esac
110104 - ;;
110105 - *)
110106 - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
110107 - exit $EXIT_FAILURE
110108 - ;;
110109 - esac
110110 - else
110111 - # We keep going just in case the user didn't refer to
110112 - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
110113 - # really was required.
110114 -
110115 - # Nullify the symbol file.
110116 - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
110117 - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
110118 - fi
110119 -
110120 - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
110121 - # Replace the output file specification.
110122 - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
110123 - link_command="$compile_command$compile_rpath"
110124 -
110125 - # We have no uninstalled library dependencies, so finalize right now.
110126 - $show "$link_command"
110127 - $run eval "$link_command"
110128 - exit_status=$?
110129 -
110130 - # Delete the generated files.
110131 - if test -n "$dlsyms"; then
110132 - $show "$rm $output_objdir/${outputname}S.${objext}"
110133 - $run $rm "$output_objdir/${outputname}S.${objext}"
110134 - fi
110135 -
110136 - exit $exit_status
110137 - fi
110138 -
110139 - if test -n "$shlibpath_var"; then
110140 - # We should set the shlibpath_var
110141 - rpath=
110142 - for dir in $temp_rpath; do
110143 - case $dir in
110144 - [\\/]* | [A-Za-z]:[\\/]*)
110145 - # Absolute path.
110146 - rpath="$rpath$dir:"
110147 - ;;
110148 - *)
110149 - # Relative path: add a thisdir entry.
110150 - rpath="$rpath\$thisdir/$dir:"
110151 - ;;
110152 - esac
110153 - done
110154 - temp_rpath="$rpath"
110155 - fi
110156 -
110157 - if test -n "$compile_shlibpath$finalize_shlibpath"; then
110158 - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
110159 - fi
110160 - if test -n "$finalize_shlibpath"; then
110161 - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
110162 - fi
110163 -
110164 - compile_var=
110165 - finalize_var=
110166 - if test -n "$runpath_var"; then
110167 - if test -n "$perm_rpath"; then
110168 - # We should set the runpath_var.
110169 - rpath=
110170 - for dir in $perm_rpath; do
110171 - rpath="$rpath$dir:"
110172 - done
110173 - compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
110174 - fi
110175 - if test -n "$finalize_perm_rpath"; then
110176 - # We should set the runpath_var.
110177 - rpath=
110178 - for dir in $finalize_perm_rpath; do
110179 - rpath="$rpath$dir:"
110180 - done
110181 - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
110182 - fi
110183 - fi
110184 -
110185 - if test "$no_install" = yes; then
110186 - # We don't need to create a wrapper script.
110187 - link_command="$compile_var$compile_command$compile_rpath"
110188 - # Replace the output file specification.
110189 - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
110190 - # Delete the old output file.
110191 - $run $rm $output
110192 - # Link the executable and exit
110193 - $show "$link_command"
110194 - $run eval "$link_command" || exit $?
110195 - exit $EXIT_SUCCESS
110196 - fi
110197 -
110198 - if test "$hardcode_action" = relink; then
110199 - # Fast installation is not supported
110200 - link_command="$compile_var$compile_command$compile_rpath"
110201 - relink_command="$finalize_var$finalize_command$finalize_rpath"
110202 -
110203 - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
110204 - $echo "$modename: \`$output' will be relinked during installation" 1>&2
110205 - else
110206 - if test "$fast_install" != no; then
110207 - link_command="$finalize_var$compile_command$finalize_rpath"
110208 - if test "$fast_install" = yes; then
110209 - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
110210 - else
110211 - # fast_install is set to needless
110212 - relink_command=
110213 - fi
110214 - else
110215 - link_command="$compile_var$compile_command$compile_rpath"
110216 - relink_command="$finalize_var$finalize_command$finalize_rpath"
110217 - fi
110218 - fi
110219 -
110220 - # Replace the output file specification.
110221 - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
110222 -
110223 - # Delete the old output files.
110224 - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
110225 -
110226 - $show "$link_command"
110227 - $run eval "$link_command" || exit $?
110228 -
110229 - # Now create the wrapper script.
110230 - $show "creating $output"
110231 -
110232 - # Quote the relink command for shipping.
110233 - if test -n "$relink_command"; then
110234 - # Preserve any variables that may affect compiler behavior
110235 - for var in $variables_saved_for_relink; do
110236 - if eval test -z \"\${$var+set}\"; then
110237 - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
110238 - elif eval var_value=\$$var; test -z "$var_value"; then
110239 - relink_command="$var=; export $var; $relink_command"
110240 - else
110241 - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
110242 - relink_command="$var=\"$var_value\"; export $var; $relink_command"
110243 - fi
110244 - done
110245 - relink_command="(cd `pwd`; $relink_command)"
110246 - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
110247 - fi
110248 -
110249 - # Quote $echo for shipping.
110250 - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
110251 - case $progpath in
110252 - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
110253 - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
110254 - esac
110255 - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
110256 - else
110257 - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
110258 - fi
110259 -
110260 - # Only actually do things if our run command is non-null.
110261 - if test -z "$run"; then
110262 - # win32 will think the script is a binary if it has
110263 - # a .exe suffix, so we strip it off here.
110264 - case $output in
110265 - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
110266 - esac
110267 - # test for cygwin because mv fails w/o .exe extensions
110268 - case $host in
110269 - *cygwin*)
110270 - exeext=.exe
110271 - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
110272 - *) exeext= ;;
110273 - esac
110274 - case $host in
110275 - *cygwin* | *mingw* )
110276 - output_name=`basename $output`
110277 - output_path=`dirname $output`
110278 - cwrappersource="$output_path/$objdir/lt-$output_name.c"
110279 - cwrapper="$output_path/$output_name.exe"
110280 - $rm $cwrappersource $cwrapper
110281 - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
110282 -
110283 - cat > $cwrappersource <<EOF
110284 -
110285 -/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
110286 - Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
110287 -
110288 - The $output program cannot be directly executed until all the libtool
110289 - libraries that it depends on are installed.
110290 -
110291 - This wrapper executable should never be moved out of the build directory.
110292 - If it is, it will not operate correctly.
110293 -
110294 - Currently, it simply execs the wrapper *script* "/bin/sh $output",
110295 - but could eventually absorb all of the scripts functionality and
110296 - exec $objdir/$outputname directly.
110297 -*/
110298 -EOF
110299 - cat >> $cwrappersource<<"EOF"
110300 -#include <stdio.h>
110301 -#include <stdlib.h>
110302 -#include <unistd.h>
110303 -#include <malloc.h>
110304 -#include <stdarg.h>
110305 -#include <assert.h>
110306 -#include <string.h>
110307 -#include <ctype.h>
110308 -#include <sys/stat.h>
110309 -
110310 -#if defined(PATH_MAX)
110311 -# define LT_PATHMAX PATH_MAX
110312 -#elif defined(MAXPATHLEN)
110313 -# define LT_PATHMAX MAXPATHLEN
110314 -#else
110315 -# define LT_PATHMAX 1024
110316 -#endif
110317 -
110318 -#ifndef DIR_SEPARATOR
110319 -# define DIR_SEPARATOR '/'
110320 -# define PATH_SEPARATOR ':'
110321 -#endif
110322 -
110323 -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
110324 - defined (__OS2__)
110325 -# define HAVE_DOS_BASED_FILE_SYSTEM
110326 -# ifndef DIR_SEPARATOR_2
110327 -# define DIR_SEPARATOR_2 '\\'
110328 -# endif
110329 -# ifndef PATH_SEPARATOR_2
110330 -# define PATH_SEPARATOR_2 ';'
110331 -# endif
110332 -#endif
110333 -
110334 -#ifndef DIR_SEPARATOR_2
110335 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
110336 -#else /* DIR_SEPARATOR_2 */
110337 -# define IS_DIR_SEPARATOR(ch) \
110338 - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
110339 -#endif /* DIR_SEPARATOR_2 */
110340 -
110341 -#ifndef PATH_SEPARATOR_2
110342 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
110343 -#else /* PATH_SEPARATOR_2 */
110344 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
110345 -#endif /* PATH_SEPARATOR_2 */
110346 -
110347 -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
110348 -#define XFREE(stale) do { \
110349 - if (stale) { free ((void *) stale); stale = 0; } \
110350 -} while (0)
110351 -
110352 -/* -DDEBUG is fairly common in CFLAGS. */
110353 -#undef DEBUG
110354 -#if defined DEBUGWRAPPER
110355 -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
110356 -#else
110357 -# define DEBUG(format, ...)
110358 -#endif
110359 -
110360 -const char *program_name = NULL;
110361 -
110362 -void * xmalloc (size_t num);
110363 -char * xstrdup (const char *string);
110364 -const char * base_name (const char *name);
110365 -char * find_executable(const char *wrapper);
110366 -int check_executable(const char *path);
110367 -char * strendzap(char *str, const char *pat);
110368 -void lt_fatal (const char *message, ...);
110369 -
110370 -int
110371 -main (int argc, char *argv[])
110372 -{
110373 - char **newargz;
110374 - int i;
110375 -
110376 - program_name = (char *) xstrdup (base_name (argv[0]));
110377 - DEBUG("(main) argv[0] : %s\n",argv[0]);
110378 - DEBUG("(main) program_name : %s\n",program_name);
110379 - newargz = XMALLOC(char *, argc+2);
110380 -EOF
110381 -
110382 - cat >> $cwrappersource <<EOF
110383 - newargz[0] = (char *) xstrdup("$SHELL");
110384 -EOF
110385 -
110386 - cat >> $cwrappersource <<"EOF"
110387 - newargz[1] = find_executable(argv[0]);
110388 - if (newargz[1] == NULL)
110389 - lt_fatal("Couldn't find %s", argv[0]);
110390 - DEBUG("(main) found exe at : %s\n",newargz[1]);
110391 - /* we know the script has the same name, without the .exe */
110392 - /* so make sure newargz[1] doesn't end in .exe */
110393 - strendzap(newargz[1],".exe");
110394 - for (i = 1; i < argc; i++)
110395 - newargz[i+1] = xstrdup(argv[i]);
110396 - newargz[argc+1] = NULL;
110397 -
110398 - for (i=0; i<argc+1; i++)
110399 - {
110400 - DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
110401 - ;
110402 - }
110403 -
110404 -EOF
110405 -
110406 - case $host_os in
110407 - mingw*)
110408 - cat >> $cwrappersource <<EOF
110409 - execv("$SHELL",(char const **)newargz);
110410 -EOF
110411 - ;;
110412 - *)
110413 - cat >> $cwrappersource <<EOF
110414 - execv("$SHELL",newargz);
110415 -EOF
110416 - ;;
110417 - esac
110418 -
110419 - cat >> $cwrappersource <<"EOF"
110420 - return 127;
110421 -}
110422 -
110423 -void *
110424 -xmalloc (size_t num)
110425 -{
110426 - void * p = (void *) malloc (num);
110427 - if (!p)
110428 - lt_fatal ("Memory exhausted");
110429 -
110430 - return p;
110431 -}
110432 -
110433 -char *
110434 -xstrdup (const char *string)
110435 -{
110436 - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
110437 -;
110438 -}
110439 -
110440 -const char *
110441 -base_name (const char *name)
110442 -{
110443 - const char *base;
110444 -
110445 -#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
110446 - /* Skip over the disk name in MSDOS pathnames. */
110447 - if (isalpha ((unsigned char)name[0]) && name[1] == ':')
110448 - name += 2;
110449 -#endif
110450 -
110451 - for (base = name; *name; name++)
110452 - if (IS_DIR_SEPARATOR (*name))
110453 - base = name + 1;
110454 - return base;
110455 -}
110456 -
110457 -int
110458 -check_executable(const char * path)
110459 -{
110460 - struct stat st;
110461 -
110462 - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
110463 - if ((!path) || (!*path))
110464 - return 0;
110465 -
110466 - if ((stat (path, &st) >= 0) &&
110467 - (
110468 - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
110469 -#if defined (S_IXOTH)
110470 - ((st.st_mode & S_IXOTH) == S_IXOTH) ||
110471 -#endif
110472 -#if defined (S_IXGRP)
110473 - ((st.st_mode & S_IXGRP) == S_IXGRP) ||
110474 -#endif
110475 - ((st.st_mode & S_IXUSR) == S_IXUSR))
110476 - )
110477 - return 1;
110478 - else
110479 - return 0;
110480 -}
110481 -
110482 -/* Searches for the full path of the wrapper. Returns
110483 - newly allocated full path name if found, NULL otherwise */
110484 -char *
110485 -find_executable (const char* wrapper)
110486 -{
110487 - int has_slash = 0;
110488 - const char* p;
110489 - const char* p_next;
110490 - /* static buffer for getcwd */
110491 - char tmp[LT_PATHMAX + 1];
110492 - int tmp_len;
110493 - char* concat_name;
110494 -
110495 - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
110496 -
110497 - if ((wrapper == NULL) || (*wrapper == '\0'))
110498 - return NULL;
110499 -
110500 - /* Absolute path? */
110501 -#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
110502 - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
110503 - {
110504 - concat_name = xstrdup (wrapper);
110505 - if (check_executable(concat_name))
110506 - return concat_name;
110507 - XFREE(concat_name);
110508 - }
110509 - else
110510 - {
110511 -#endif
110512 - if (IS_DIR_SEPARATOR (wrapper[0]))
110513 - {
110514 - concat_name = xstrdup (wrapper);
110515 - if (check_executable(concat_name))
110516 - return concat_name;
110517 - XFREE(concat_name);
110518 - }
110519 -#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
110520 - }
110521 -#endif
110522 -
110523 - for (p = wrapper; *p; p++)
110524 - if (*p == '/')
110525 - {
110526 - has_slash = 1;
110527 - break;
110528 - }
110529 - if (!has_slash)
110530 - {
110531 - /* no slashes; search PATH */
110532 - const char* path = getenv ("PATH");
110533 - if (path != NULL)
110534 - {
110535 - for (p = path; *p; p = p_next)
110536 - {
110537 - const char* q;
110538 - size_t p_len;
110539 - for (q = p; *q; q++)
110540 - if (IS_PATH_SEPARATOR(*q))
110541 - break;
110542 - p_len = q - p;
110543 - p_next = (*q == '\0' ? q : q + 1);
110544 - if (p_len == 0)
110545 - {
110546 - /* empty path: current directory */
110547 - if (getcwd (tmp, LT_PATHMAX) == NULL)
110548 - lt_fatal ("getcwd failed");
110549 - tmp_len = strlen(tmp);
110550 - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
110551 - memcpy (concat_name, tmp, tmp_len);
110552 - concat_name[tmp_len] = '/';
110553 - strcpy (concat_name + tmp_len + 1, wrapper);
110554 - }
110555 - else
110556 - {
110557 - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
110558 - memcpy (concat_name, p, p_len);
110559 - concat_name[p_len] = '/';
110560 - strcpy (concat_name + p_len + 1, wrapper);
110561 - }
110562 - if (check_executable(concat_name))
110563 - return concat_name;
110564 - XFREE(concat_name);
110565 - }
110566 - }
110567 - /* not found in PATH; assume curdir */
110568 - }
110569 - /* Relative path | not found in path: prepend cwd */
110570 - if (getcwd (tmp, LT_PATHMAX) == NULL)
110571 - lt_fatal ("getcwd failed");
110572 - tmp_len = strlen(tmp);
110573 - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
110574 - memcpy (concat_name, tmp, tmp_len);
110575 - concat_name[tmp_len] = '/';
110576 - strcpy (concat_name + tmp_len + 1, wrapper);
110577 -
110578 - if (check_executable(concat_name))
110579 - return concat_name;
110580 - XFREE(concat_name);
110581 - return NULL;
110582 -}
110583 -
110584 -char *
110585 -strendzap(char *str, const char *pat)
110586 -{
110587 - size_t len, patlen;
110588 -
110589 - assert(str != NULL);
110590 - assert(pat != NULL);
110591 -
110592 - len = strlen(str);
110593 - patlen = strlen(pat);
110594 -
110595 - if (patlen <= len)
110596 - {
110597 - str += len - patlen;
110598 - if (strcmp(str, pat) == 0)
110599 - *str = '\0';
110600 - }
110601 - return str;
110602 -}
110603 -
110604 -static void
110605 -lt_error_core (int exit_status, const char * mode,
110606 - const char * message, va_list ap)
110607 -{
110608 - fprintf (stderr, "%s: %s: ", program_name, mode);
110609 - vfprintf (stderr, message, ap);
110610 - fprintf (stderr, ".\n");
110611 -
110612 - if (exit_status >= 0)
110613 - exit (exit_status);
110614 -}
110615 -
110616 -void
110617 -lt_fatal (const char *message, ...)
110618 -{
110619 - va_list ap;
110620 - va_start (ap, message);
110621 - lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
110622 - va_end (ap);
110623 -}
110624 -EOF
110625 - # we should really use a build-platform specific compiler
110626 - # here, but OTOH, the wrappers (shell script and this C one)
110627 - # are only useful if you want to execute the "real" binary.
110628 - # Since the "real" binary is built for $host, then this
110629 - # wrapper might as well be built for $host, too.
110630 - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
110631 - ;;
110632 - esac
110633 - $rm $output
110634 - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
110635 -
110636 - $echo > $output "\
110637 -#! $SHELL
110638 -
110639 -# $output - temporary wrapper script for $objdir/$outputname
110640 -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
110641 -#
110642 -# The $output program cannot be directly executed until all the libtool
110643 -# libraries that it depends on are installed.
110644 -#
110645 -# This wrapper script should never be moved out of the build directory.
110646 -# If it is, it will not operate correctly.
110647 -
110648 -# Sed substitution that helps us do robust quoting. It backslashifies
110649 -# metacharacters that are still active within double-quoted strings.
110650 -Xsed='${SED} -e 1s/^X//'
110651 -sed_quote_subst='$sed_quote_subst'
110652 -
110653 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
110654 -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
110655 - emulate sh
110656 - NULLCMD=:
110657 - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
110658 - # is contrary to our usage. Disable this feature.
110659 - alias -g '\${1+\"\$@\"}'='\"\$@\"'
110660 - setopt NO_GLOB_SUBST
110661 -else
110662 - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
110663 -fi
110664 -BIN_SH=xpg4; export BIN_SH # for Tru64
110665 -DUALCASE=1; export DUALCASE # for MKS sh
110666 -
110667 -# The HP-UX ksh and POSIX shell print the target directory to stdout
110668 -# if CDPATH is set.
110669 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
110670 -
110671 -relink_command=\"$relink_command\"
110672 -
110673 -# This environment variable determines our operation mode.
110674 -if test \"\$libtool_install_magic\" = \"$magic\"; then
110675 - # install mode needs the following variable:
110676 - notinst_deplibs='$notinst_deplibs'
110677 -else
110678 - # When we are sourced in execute mode, \$file and \$echo are already set.
110679 - if test \"\$libtool_execute_magic\" != \"$magic\"; then
110680 - echo=\"$qecho\"
110681 - file=\"\$0\"
110682 - # Make sure echo works.
110683 - if test \"X\$1\" = X--no-reexec; then
110684 - # Discard the --no-reexec flag, and continue.
110685 - shift
110686 - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
110687 - # Yippee, \$echo works!
110688 - :
110689 - else
110690 - # Restart under the correct shell, and then maybe \$echo will work.
110691 - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
110692 - fi
110693 - fi\
110694 -"
110695 - $echo >> $output "\
110696 -
110697 - # Find the directory that this script lives in.
110698 - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
110699 - test \"x\$thisdir\" = \"x\$file\" && thisdir=.
110700 -
110701 - # Follow symbolic links until we get to the real thisdir.
110702 - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
110703 - while test -n \"\$file\"; do
110704 - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
110705 -
110706 - # If there was a directory component, then change thisdir.
110707 - if test \"x\$destdir\" != \"x\$file\"; then
110708 - case \"\$destdir\" in
110709 - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
110710 - *) thisdir=\"\$thisdir/\$destdir\" ;;
110711 - esac
110712 - fi
110713 -
110714 - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
110715 - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
110716 - done
110717 -
110718 - # Try to get the absolute directory name.
110719 - absdir=\`cd \"\$thisdir\" && pwd\`
110720 - test -n \"\$absdir\" && thisdir=\"\$absdir\"
110721 -"
110722 -
110723 - if test "$fast_install" = yes; then
110724 - $echo >> $output "\
110725 - program=lt-'$outputname'$exeext
110726 - progdir=\"\$thisdir/$objdir\"
110727 -
110728 - if test ! -f \"\$progdir/\$program\" || \\
110729 - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
110730 - test \"X\$file\" != \"X\$progdir/\$program\"; }; then
110731 -
110732 - file=\"\$\$-\$program\"
110733 -
110734 - if test ! -d \"\$progdir\"; then
110735 - $mkdir \"\$progdir\"
110736 - else
110737 - $rm \"\$progdir/\$file\"
110738 - fi"
110739 -
110740 - $echo >> $output "\
110741 -
110742 - # relink executable if necessary
110743 - if test -n \"\$relink_command\"; then
110744 - if relink_command_output=\`eval \$relink_command 2>&1\`; then :
110745 - else
110746 - $echo \"\$relink_command_output\" >&2
110747 - $rm \"\$progdir/\$file\"
110748 - exit $EXIT_FAILURE
110749 - fi
110750 - fi
110751 -
110752 - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
110753 - { $rm \"\$progdir/\$program\";
110754 - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
110755 - $rm \"\$progdir/\$file\"
110756 - fi"
110757 - else
110758 - $echo >> $output "\
110759 - program='$outputname'
110760 - progdir=\"\$thisdir/$objdir\"
110761 -"
110762 - fi
110763 -
110764 - $echo >> $output "\
110765 -
110766 - if test -f \"\$progdir/\$program\"; then"
110767 -
110768 - # Export our shlibpath_var if we have one.
110769 - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
110770 - $echo >> $output "\
110771 - # Add our own library path to $shlibpath_var
110772 - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
110773 -
110774 - # Some systems cannot cope with colon-terminated $shlibpath_var
110775 - # The second colon is a workaround for a bug in BeOS R4 sed
110776 - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
110777 -
110778 - export $shlibpath_var
110779 -"
110780 - fi
110781 -
110782 - # fixup the dll searchpath if we need to.
110783 - if test -n "$dllsearchpath"; then
110784 - $echo >> $output "\
110785 - # Add the dll search path components to the executable PATH
110786 - PATH=$dllsearchpath:\$PATH
110787 -"
110788 - fi
110789 -
110790 - $echo >> $output "\
110791 - if test \"\$libtool_execute_magic\" != \"$magic\"; then
110792 - # Run the actual program with our arguments.
110793 -"
110794 - case $host in
110795 - # Backslashes separate directories on plain windows
110796 - *-*-mingw | *-*-os2*)
110797 - $echo >> $output "\
110798 - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
110799 -"
110800 - ;;
110801 -
110802 - *)
110803 - $echo >> $output "\
110804 - exec \"\$progdir/\$program\" \${1+\"\$@\"}
110805 -"
110806 - ;;
110807 - esac
110808 - $echo >> $output "\
110809 - \$echo \"\$0: cannot exec \$program \$*\"
110810 - exit $EXIT_FAILURE
110811 - fi
110812 - else
110813 - # The program doesn't exist.
110814 - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
110815 - \$echo \"This script is just a wrapper for \$program.\" 1>&2
110816 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2
110817 - exit $EXIT_FAILURE
110818 - fi
110819 -fi\
110820 -"
110821 - chmod +x $output
110822 - fi
110823 - exit $EXIT_SUCCESS
110824 - ;;
110825 - esac
110826 -
110827 - # See if we need to build an old-fashioned archive.
110828 - for oldlib in $oldlibs; do
110829 -
110830 - if test "$build_libtool_libs" = convenience; then
110831 - oldobjs="$libobjs_save"
110832 - addlibs="$convenience"
110833 - build_libtool_libs=no
110834 - else
110835 - if test "$build_libtool_libs" = module; then
110836 - oldobjs="$libobjs_save"
110837 - build_libtool_libs=no
110838 - else
110839 - oldobjs="$old_deplibs $non_pic_objects"
110840 - fi
110841 - addlibs="$old_convenience"
110842 - fi
110843 -
110844 - if test -n "$addlibs"; then
110845 - gentop="$output_objdir/${outputname}x"
110846 - generated="$generated $gentop"
110847 -
110848 - func_extract_archives $gentop $addlibs
110849 - oldobjs="$oldobjs $func_extract_archives_result"
110850 - fi
110851 -
110852 - # Do each command in the archive commands.
110853 - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
110854 - cmds=$old_archive_from_new_cmds
110855 - else
110856 - # POSIX demands no paths to be encoded in archives. We have
110857 - # to avoid creating archives with duplicate basenames if we
110858 - # might have to extract them afterwards, e.g., when creating a
110859 - # static archive out of a convenience library, or when linking
110860 - # the entirety of a libtool archive into another (currently
110861 - # not supported by libtool).
110862 - if (for obj in $oldobjs
110863 - do
110864 - $echo "X$obj" | $Xsed -e 's%^.*/%%'
110865 - done | sort | sort -uc >/dev/null 2>&1); then
110866 - :
110867 - else
110868 - $echo "copying selected object files to avoid basename conflicts..."
110869 -
110870 - if test -z "$gentop"; then
110871 - gentop="$output_objdir/${outputname}x"
110872 - generated="$generated $gentop"
110873 -
110874 - $show "${rm}r $gentop"
110875 - $run ${rm}r "$gentop"
110876 - $show "$mkdir $gentop"
110877 - $run $mkdir "$gentop"
110878 - exit_status=$?
110879 - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
110880 - exit $exit_status
110881 - fi
110882 - fi
110883 -
110884 - save_oldobjs=$oldobjs
110885 - oldobjs=
110886 - counter=1
110887 - for obj in $save_oldobjs
110888 - do
110889 - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
110890 - case " $oldobjs " in
110891 - " ") oldobjs=$obj ;;
110892 - *[\ /]"$objbase "*)
110893 - while :; do
110894 - # Make sure we don't pick an alternate name that also
110895 - # overlaps.
110896 - newobj=lt$counter-$objbase
110897 - counter=`expr $counter + 1`
110898 - case " $oldobjs " in
110899 - *[\ /]"$newobj "*) ;;
110900 - *) if test ! -f "$gentop/$newobj"; then break; fi ;;
110901 - esac
110902 - done
110903 - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
110904 - $run ln "$obj" "$gentop/$newobj" ||
110905 - $run cp "$obj" "$gentop/$newobj"
110906 - oldobjs="$oldobjs $gentop/$newobj"
110907 - ;;
110908 - *) oldobjs="$oldobjs $obj" ;;
110909 - esac
110910 - done
110911 - fi
110912 -
110913 - eval cmds=\"$old_archive_cmds\"
110914 -
110915 - if len=`expr "X$cmds" : ".*"` &&
110916 - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
110917 - cmds=$old_archive_cmds
110918 - else
110919 - # the command line is too long to link in one step, link in parts
110920 - $echo "using piecewise archive linking..."
110921 - save_RANLIB=$RANLIB
110922 - RANLIB=:
110923 - objlist=
110924 - concat_cmds=
110925 - save_oldobjs=$oldobjs
110926 -
110927 - # Is there a better way of finding the last object in the list?
110928 - for obj in $save_oldobjs
110929 - do
110930 - last_oldobj=$obj
110931 - done
110932 - for obj in $save_oldobjs
110933 - do
110934 - oldobjs="$objlist $obj"
110935 - objlist="$objlist $obj"
110936 - eval test_cmds=\"$old_archive_cmds\"
110937 - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
110938 - test "$len" -le "$max_cmd_len"; then
110939 - :
110940 - else
110941 - # the above command should be used before it gets too long
110942 - oldobjs=$objlist
110943 - if test "$obj" = "$last_oldobj" ; then
110944 - RANLIB=$save_RANLIB
110945 - fi
110946 - test -z "$concat_cmds" || concat_cmds=$concat_cmds~
110947 - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
110948 - objlist=
110949 - fi
110950 - done
110951 - RANLIB=$save_RANLIB
110952 - oldobjs=$objlist
110953 - if test "X$oldobjs" = "X" ; then
110954 - eval cmds=\"\$concat_cmds\"
110955 - else
110956 - eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
110957 - fi
110958 - fi
110959 - fi
110960 - save_ifs="$IFS"; IFS='~'
110961 - for cmd in $cmds; do
110962 - eval cmd=\"$cmd\"
110963 - IFS="$save_ifs"
110964 - $show "$cmd"
110965 - $run eval "$cmd" || exit $?
110966 - done
110967 - IFS="$save_ifs"
110968 - done
110969 -
110970 - if test -n "$generated"; then
110971 - $show "${rm}r$generated"
110972 - $run ${rm}r$generated
110973 - fi
110974 -
110975 - # Now create the libtool archive.
110976 - case $output in
110977 - *.la)
110978 - old_library=
110979 - test "$build_old_libs" = yes && old_library="$libname.$libext"
110980 - $show "creating $output"
110981 -
110982 - # Preserve any variables that may affect compiler behavior
110983 - for var in $variables_saved_for_relink; do
110984 - if eval test -z \"\${$var+set}\"; then
110985 - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
110986 - elif eval var_value=\$$var; test -z "$var_value"; then
110987 - relink_command="$var=; export $var; $relink_command"
110988 - else
110989 - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
110990 - relink_command="$var=\"$var_value\"; export $var; $relink_command"
110991 - fi
110992 - done
110993 - # Quote the link command for shipping.
110994 - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
110995 - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
110996 - if test "$hardcode_automatic" = yes ; then
110997 - relink_command=
110998 - fi
110999 -
111000 -
111001 - # Only create the output if not a dry run.
111002 - if test -z "$run"; then
111003 - for installed in no yes; do
111004 - if test "$installed" = yes; then
111005 - if test -z "$install_libdir"; then
111006 - break
111007 - fi
111008 - output="$output_objdir/$outputname"i
111009 - # Replace all uninstalled libtool libraries with the installed ones
111010 - newdependency_libs=
111011 - for deplib in $dependency_libs; do
111012 - case $deplib in
111013 - *.la)
111014 - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
111015 - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
111016 - if test -z "$libdir"; then
111017 - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
111018 - exit $EXIT_FAILURE
111019 - fi
111020 - newdependency_libs="$newdependency_libs $libdir/$name"
111021 - ;;
111022 - *) newdependency_libs="$newdependency_libs $deplib" ;;
111023 - esac
111024 - done
111025 - dependency_libs="$newdependency_libs"
111026 - newdlfiles=
111027 - for lib in $dlfiles; do
111028 - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
111029 - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
111030 - if test -z "$libdir"; then
111031 - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
111032 - exit $EXIT_FAILURE
111033 - fi
111034 - newdlfiles="$newdlfiles $libdir/$name"
111035 - done
111036 - dlfiles="$newdlfiles"
111037 - newdlprefiles=
111038 - for lib in $dlprefiles; do
111039 - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
111040 - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
111041 - if test -z "$libdir"; then
111042 - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
111043 - exit $EXIT_FAILURE
111044 - fi
111045 - newdlprefiles="$newdlprefiles $libdir/$name"
111046 - done
111047 - dlprefiles="$newdlprefiles"
111048 - else
111049 - newdlfiles=
111050 - for lib in $dlfiles; do
111051 - case $lib in
111052 - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
111053 - *) abs=`pwd`"/$lib" ;;
111054 - esac
111055 - newdlfiles="$newdlfiles $abs"
111056 - done
111057 - dlfiles="$newdlfiles"
111058 - newdlprefiles=
111059 - for lib in $dlprefiles; do
111060 - case $lib in
111061 - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
111062 - *) abs=`pwd`"/$lib" ;;
111063 - esac
111064 - newdlprefiles="$newdlprefiles $abs"
111065 - done
111066 - dlprefiles="$newdlprefiles"
111067 - fi
111068 - $rm $output
111069 - # place dlname in correct position for cygwin
111070 - tdlname=$dlname
111071 - case $host,$output,$installed,$module,$dlname in
111072 - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
111073 - esac
111074 - $echo > $output "\
111075 -# $outputname - a libtool library file
111076 -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
111077 -#
111078 -# Please DO NOT delete this file!
111079 -# It is necessary for linking the library.
111080 -
111081 -# The name that we can dlopen(3).
111082 -dlname='$tdlname'
111083 -
111084 -# Names of this library.
111085 -library_names='$library_names'
111086 -
111087 -# The name of the static archive.
111088 -old_library='$old_library'
111089 -
111090 -# Libraries that this one depends upon.
111091 -dependency_libs='$dependency_libs'
111092 -
111093 -# Version information for $libname.
111094 -current=$current
111095 -age=$age
111096 -revision=$revision
111097 -
111098 -# Is this an already installed library?
111099 -installed=$installed
111100 -
111101 -# Should we warn about portability when linking against -modules?
111102 -shouldnotlink=$module
111103 -
111104 -# Files to dlopen/dlpreopen
111105 -dlopen='$dlfiles'
111106 -dlpreopen='$dlprefiles'
111107 -
111108 -# Directory that this library needs to be installed in:
111109 -libdir='$install_libdir'"
111110 - if test "$installed" = no && test "$need_relink" = yes; then
111111 - $echo >> $output "\
111112 -relink_command=\"$relink_command\""
111113 - fi
111114 - done
111115 - fi
111116 -
111117 - # Do a symbolic link so that the libtool archive can be found in
111118 - # LD_LIBRARY_PATH before the program is installed.
111119 - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
111120 - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
111121 - ;;
111122 - esac
111123 - exit $EXIT_SUCCESS
111124 - ;;
111125 -
111126 - # libtool install mode
111127 - install)
111128 - modename="$modename: install"
111129 -
111130 - # There may be an optional sh(1) argument at the beginning of
111131 - # install_prog (especially on Windows NT).
111132 - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
111133 - # Allow the use of GNU shtool's install command.
111134 - $echo "X$nonopt" | grep shtool > /dev/null; then
111135 - # Aesthetically quote it.
111136 - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
111137 - case $arg in
111138 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
111139 - arg="\"$arg\""
111140 - ;;
111141 - esac
111142 - install_prog="$arg "
111143 - arg="$1"
111144 - shift
111145 - else
111146 - install_prog=
111147 - arg=$nonopt
111148 - fi
111149 -
111150 - # The real first argument should be the name of the installation program.
111151 - # Aesthetically quote it.
111152 - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
111153 - case $arg in
111154 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
111155 - arg="\"$arg\""
111156 - ;;
111157 - esac
111158 - install_prog="$install_prog$arg"
111159 -
111160 - # We need to accept at least all the BSD install flags.
111161 - dest=
111162 - files=
111163 - opts=
111164 - prev=
111165 - install_type=
111166 - isdir=no
111167 - stripme=
111168 - for arg
111169 - do
111170 - if test -n "$dest"; then
111171 - files="$files $dest"
111172 - dest=$arg
111173 - continue
111174 - fi
111175 -
111176 - case $arg in
111177 - -d) isdir=yes ;;
111178 - -f)
111179 - case " $install_prog " in
111180 - *[\\\ /]cp\ *) ;;
111181 - *) prev=$arg ;;
111182 - esac
111183 - ;;
111184 - -g | -m | -o) prev=$arg ;;
111185 - -s)
111186 - stripme=" -s"
111187 - continue
111188 - ;;
111189 - -*)
111190 - ;;
111191 - *)
111192 - # If the previous option needed an argument, then skip it.
111193 - if test -n "$prev"; then
111194 - prev=
111195 - else
111196 - dest=$arg
111197 - continue
111198 - fi
111199 - ;;
111200 - esac
111201 -
111202 - # Aesthetically quote the argument.
111203 - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
111204 - case $arg in
111205 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
111206 - arg="\"$arg\""
111207 - ;;
111208 - esac
111209 - install_prog="$install_prog $arg"
111210 - done
111211 -
111212 - if test -z "$install_prog"; then
111213 - $echo "$modename: you must specify an install program" 1>&2
111214 - $echo "$help" 1>&2
111215 - exit $EXIT_FAILURE
111216 - fi
111217 -
111218 - if test -n "$prev"; then
111219 - $echo "$modename: the \`$prev' option requires an argument" 1>&2
111220 - $echo "$help" 1>&2
111221 - exit $EXIT_FAILURE
111222 - fi
111223 -
111224 - if test -z "$files"; then
111225 - if test -z "$dest"; then
111226 - $echo "$modename: no file or destination specified" 1>&2
111227 - else
111228 - $echo "$modename: you must specify a destination" 1>&2
111229 - fi
111230 - $echo "$help" 1>&2
111231 - exit $EXIT_FAILURE
111232 - fi
111233 -
111234 - # Strip any trailing slash from the destination.
111235 - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
111236 -
111237 - # Check to see that the destination is a directory.
111238 - test -d "$dest" && isdir=yes
111239 - if test "$isdir" = yes; then
111240 - destdir="$dest"
111241 - destname=
111242 - else
111243 - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
111244 - test "X$destdir" = "X$dest" && destdir=.
111245 - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
111246 -
111247 - # Not a directory, so check to see that there is only one file specified.
111248 - set dummy $files
111249 - if test "$#" -gt 2; then
111250 - $echo "$modename: \`$dest' is not a directory" 1>&2
111251 - $echo "$help" 1>&2
111252 - exit $EXIT_FAILURE
111253 - fi
111254 - fi
111255 - case $destdir in
111256 - [\\/]* | [A-Za-z]:[\\/]*) ;;
111257 - *)
111258 - for file in $files; do
111259 - case $file in
111260 - *.lo) ;;
111261 - *)
111262 - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
111263 - $echo "$help" 1>&2
111264 - exit $EXIT_FAILURE
111265 - ;;
111266 - esac
111267 - done
111268 - ;;
111269 - esac
111270 -
111271 - # This variable tells wrapper scripts just to set variables rather
111272 - # than running their programs.
111273 - libtool_install_magic="$magic"
111274 -
111275 - staticlibs=
111276 - future_libdirs=
111277 - current_libdirs=
111278 - for file in $files; do
111279 -
111280 - # Do each installation.
111281 - case $file in
111282 - *.$libext)
111283 - # Do the static libraries later.
111284 - staticlibs="$staticlibs $file"
111285 - ;;
111286 -
111287 - *.la)
111288 - # Check to see that this really is a libtool archive.
111289 - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
111290 - else
111291 - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
111292 - $echo "$help" 1>&2
111293 - exit $EXIT_FAILURE
111294 - fi
111295 -
111296 - library_names=
111297 - old_library=
111298 - relink_command=
111299 - # If there is no directory component, then add one.
111300 - case $file in
111301 - */* | *\\*) . $file ;;
111302 - *) . ./$file ;;
111303 - esac
111304 -
111305 - # Add the libdir to current_libdirs if it is the destination.
111306 - if test "X$destdir" = "X$libdir"; then
111307 - case "$current_libdirs " in
111308 - *" $libdir "*) ;;
111309 - *) current_libdirs="$current_libdirs $libdir" ;;
111310 - esac
111311 - else
111312 - # Note the libdir as a future libdir.
111313 - case "$future_libdirs " in
111314 - *" $libdir "*) ;;
111315 - *) future_libdirs="$future_libdirs $libdir" ;;
111316 - esac
111317 - fi
111318 -
111319 - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
111320 - test "X$dir" = "X$file/" && dir=
111321 - dir="$dir$objdir"
111322 -
111323 - if test -n "$relink_command"; then
111324 - # Determine the prefix the user has applied to our future dir.
111325 - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
111326 -
111327 - # Don't allow the user to place us outside of our expected
111328 - # location b/c this prevents finding dependent libraries that
111329 - # are installed to the same prefix.
111330 - # At present, this check doesn't affect windows .dll's that
111331 - # are installed into $libdir/../bin (currently, that works fine)
111332 - # but it's something to keep an eye on.
111333 - if test "$inst_prefix_dir" = "$destdir"; then
111334 - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
111335 - exit $EXIT_FAILURE
111336 - fi
111337 -
111338 - if test -n "$inst_prefix_dir"; then
111339 - # Stick the inst_prefix_dir data into the link command.
111340 - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
111341 - else
111342 - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
111343 - fi
111344 -
111345 - $echo "$modename: warning: relinking \`$file'" 1>&2
111346 - $show "$relink_command"
111347 - if $run eval "$relink_command"; then :
111348 - else
111349 - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
111350 - exit $EXIT_FAILURE
111351 - fi
111352 - fi
111353 -
111354 - # See the names of the shared library.
111355 - set dummy $library_names
111356 - if test -n "$2"; then
111357 - realname="$2"
111358 - shift
111359 - shift
111360 -
111361 - srcname="$realname"
111362 - test -n "$relink_command" && srcname="$realname"T
111363 -
111364 - # Install the shared library and build the symlinks.
111365 - $show "$install_prog $dir/$srcname $destdir/$realname"
111366 - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
111367 - if test -n "$stripme" && test -n "$striplib"; then
111368 - $show "$striplib $destdir/$realname"
111369 - $run eval "$striplib $destdir/$realname" || exit $?
111370 - fi
111371 -
111372 - if test "$#" -gt 0; then
111373 - # Delete the old symlinks, and create new ones.
111374 - # Try `ln -sf' first, because the `ln' binary might depend on
111375 - # the symlink we replace! Solaris /bin/ln does not understand -f,
111376 - # so we also need to try rm && ln -s.
111377 - for linkname
111378 - do
111379 - if test "$linkname" != "$realname"; then
111380 - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
111381 - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
111382 - fi
111383 - done
111384 - fi
111385 -
111386 - # Do each command in the postinstall commands.
111387 - lib="$destdir/$realname"
111388 - cmds=$postinstall_cmds
111389 - save_ifs="$IFS"; IFS='~'
111390 - for cmd in $cmds; do
111391 - IFS="$save_ifs"
111392 - eval cmd=\"$cmd\"
111393 - $show "$cmd"
111394 - $run eval "$cmd" || {
111395 - lt_exit=$?
111396 -
111397 - # Restore the uninstalled library and exit
111398 - if test "$mode" = relink; then
111399 - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
111400 - fi
111401 -
111402 - exit $lt_exit
111403 - }
111404 - done
111405 - IFS="$save_ifs"
111406 - fi
111407 -
111408 - # Install the pseudo-library for information purposes.
111409 - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
111410 - instname="$dir/$name"i
111411 - $show "$install_prog $instname $destdir/$name"
111412 - $run eval "$install_prog $instname $destdir/$name" || exit $?
111413 -
111414 - # Maybe install the static library, too.
111415 - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
111416 - ;;
111417 -
111418 - *.lo)
111419 - # Install (i.e. copy) a libtool object.
111420 -
111421 - # Figure out destination file name, if it wasn't already specified.
111422 - if test -n "$destname"; then
111423 - destfile="$destdir/$destname"
111424 - else
111425 - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
111426 - destfile="$destdir/$destfile"
111427 - fi
111428 -
111429 - # Deduce the name of the destination old-style object file.
111430 - case $destfile in
111431 - *.lo)
111432 - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
111433 - ;;
111434 - *.$objext)
111435 - staticdest="$destfile"
111436 - destfile=
111437 - ;;
111438 - *)
111439 - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
111440 - $echo "$help" 1>&2
111441 - exit $EXIT_FAILURE
111442 - ;;
111443 - esac
111444 -
111445 - # Install the libtool object if requested.
111446 - if test -n "$destfile"; then
111447 - $show "$install_prog $file $destfile"
111448 - $run eval "$install_prog $file $destfile" || exit $?
111449 - fi
111450 -
111451 - # Install the old object if enabled.
111452 - if test "$build_old_libs" = yes; then
111453 - # Deduce the name of the old-style object file.
111454 - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
111455 -
111456 - $show "$install_prog $staticobj $staticdest"
111457 - $run eval "$install_prog \$staticobj \$staticdest" || exit $?
111458 - fi
111459 - exit $EXIT_SUCCESS
111460 - ;;
111461 -
111462 - *)
111463 - # Figure out destination file name, if it wasn't already specified.
111464 - if test -n "$destname"; then
111465 - destfile="$destdir/$destname"
111466 - else
111467 - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
111468 - destfile="$destdir/$destfile"
111469 - fi
111470 -
111471 - # If the file is missing, and there is a .exe on the end, strip it
111472 - # because it is most likely a libtool script we actually want to
111473 - # install
111474 - stripped_ext=""
111475 - case $file in
111476 - *.exe)
111477 - if test ! -f "$file"; then
111478 - file=`$echo $file|${SED} 's,.exe$,,'`
111479 - stripped_ext=".exe"
111480 - fi
111481 - ;;
111482 - esac
111483 -
111484 - # Do a test to see if this is really a libtool program.
111485 - case $host in
111486 - *cygwin*|*mingw*)
111487 - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
111488 - ;;
111489 - *)
111490 - wrapper=$file
111491 - ;;
111492 - esac
111493 - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
111494 - notinst_deplibs=
111495 - relink_command=
111496 -
111497 - # Note that it is not necessary on cygwin/mingw to append a dot to
111498 - # foo even if both foo and FILE.exe exist: automatic-append-.exe
111499 - # behavior happens only for exec(3), not for open(2)! Also, sourcing
111500 - # `FILE.' does not work on cygwin managed mounts.
111501 - #
111502 - # If there is no directory component, then add one.
111503 - case $wrapper in
111504 - */* | *\\*) . ${wrapper} ;;
111505 - *) . ./${wrapper} ;;
111506 - esac
111507 -
111508 - # Check the variables that should have been set.
111509 - if test -z "$notinst_deplibs"; then
111510 - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
111511 - exit $EXIT_FAILURE
111512 - fi
111513 -
111514 - finalize=yes
111515 - for lib in $notinst_deplibs; do
111516 - # Check to see that each library is installed.
111517 - libdir=
111518 - if test -f "$lib"; then
111519 - # If there is no directory component, then add one.
111520 - case $lib in
111521 - */* | *\\*) . $lib ;;
111522 - *) . ./$lib ;;
111523 - esac
111524 - fi
111525 - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
111526 - if test -n "$libdir" && test ! -f "$libfile"; then
111527 - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
111528 - finalize=no
111529 - fi
111530 - done
111531 -
111532 - relink_command=
111533 - # Note that it is not necessary on cygwin/mingw to append a dot to
111534 - # foo even if both foo and FILE.exe exist: automatic-append-.exe
111535 - # behavior happens only for exec(3), not for open(2)! Also, sourcing
111536 - # `FILE.' does not work on cygwin managed mounts.
111537 - #
111538 - # If there is no directory component, then add one.
111539 - case $wrapper in
111540 - */* | *\\*) . ${wrapper} ;;
111541 - *) . ./${wrapper} ;;
111542 - esac
111543 -
111544 - outputname=
111545 - if test "$fast_install" = no && test -n "$relink_command"; then
111546 - if test "$finalize" = yes && test -z "$run"; then
111547 - tmpdir=`func_mktempdir`
111548 - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
111549 - outputname="$tmpdir/$file"
111550 - # Replace the output file specification.
111551 - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
111552 -
111553 - $show "$relink_command"
111554 - if $run eval "$relink_command"; then :
111555 - else
111556 - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
111557 - ${rm}r "$tmpdir"
111558 - continue
111559 - fi
111560 - file="$outputname"
111561 - else
111562 - $echo "$modename: warning: cannot relink \`$file'" 1>&2
111563 - fi
111564 - else
111565 - # Install the binary that we compiled earlier.
111566 - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
111567 - fi
111568 - fi
111569 -
111570 - # remove .exe since cygwin /usr/bin/install will append another
111571 - # one anyway
111572 - case $install_prog,$host in
111573 - */usr/bin/install*,*cygwin*)
111574 - case $file:$destfile in
111575 - *.exe:*.exe)
111576 - # this is ok
111577 - ;;
111578 - *.exe:*)
111579 - destfile=$destfile.exe
111580 - ;;
111581 - *:*.exe)
111582 - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
111583 - ;;
111584 - esac
111585 - ;;
111586 - esac
111587 - $show "$install_prog$stripme $file $destfile"
111588 - $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
111589 - test -n "$outputname" && ${rm}r "$tmpdir"
111590 - ;;
111591 - esac
111592 - done
111593 -
111594 - for file in $staticlibs; do
111595 - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
111596 -
111597 - # Set up the ranlib parameters.
111598 - oldlib="$destdir/$name"
111599 -
111600 - $show "$install_prog $file $oldlib"
111601 - $run eval "$install_prog \$file \$oldlib" || exit $?
111602 -
111603 - if test -n "$stripme" && test -n "$old_striplib"; then
111604 - $show "$old_striplib $oldlib"
111605 - $run eval "$old_striplib $oldlib" || exit $?
111606 - fi
111607 -
111608 - # Do each command in the postinstall commands.
111609 - cmds=$old_postinstall_cmds
111610 - save_ifs="$IFS"; IFS='~'
111611 - for cmd in $cmds; do
111612 - IFS="$save_ifs"
111613 - eval cmd=\"$cmd\"
111614 - $show "$cmd"
111615 - $run eval "$cmd" || exit $?
111616 - done
111617 - IFS="$save_ifs"
111618 - done
111619 -
111620 - if test -n "$future_libdirs"; then
111621 - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
111622 - fi
111623 -
111624 - if test -n "$current_libdirs"; then
111625 - # Maybe just do a dry run.
111626 - test -n "$run" && current_libdirs=" -n$current_libdirs"
111627 - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
111628 - else
111629 - exit $EXIT_SUCCESS
111630 - fi
111631 - ;;
111632 -
111633 - # libtool finish mode
111634 - finish)
111635 - modename="$modename: finish"
111636 - libdirs="$nonopt"
111637 - admincmds=
111638 -
111639 - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
111640 - for dir
111641 - do
111642 - libdirs="$libdirs $dir"
111643 - done
111644 -
111645 - for libdir in $libdirs; do
111646 - if test -n "$finish_cmds"; then
111647 - # Do each command in the finish commands.
111648 - cmds=$finish_cmds
111649 - save_ifs="$IFS"; IFS='~'
111650 - for cmd in $cmds; do
111651 - IFS="$save_ifs"
111652 - eval cmd=\"$cmd\"
111653 - $show "$cmd"
111654 - $run eval "$cmd" || admincmds="$admincmds
111655 - $cmd"
111656 - done
111657 - IFS="$save_ifs"
111658 - fi
111659 - if test -n "$finish_eval"; then
111660 - # Do the single finish_eval.
111661 - eval cmds=\"$finish_eval\"
111662 - $run eval "$cmds" || admincmds="$admincmds
111663 - $cmds"
111664 - fi
111665 - done
111666 - fi
111667 -
111668 - # Exit here if they wanted silent mode.
111669 - test "$show" = : && exit $EXIT_SUCCESS
111670 -
111671 - $echo "X----------------------------------------------------------------------" | $Xsed
111672 - $echo "Libraries have been installed in:"
111673 - for libdir in $libdirs; do
111674 - $echo " $libdir"
111675 - done
111676 - $echo
111677 - $echo "If you ever happen to want to link against installed libraries"
111678 - $echo "in a given directory, LIBDIR, you must either use libtool, and"
111679 - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
111680 - $echo "flag during linking and do at least one of the following:"
111681 - if test -n "$shlibpath_var"; then
111682 - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
111683 - $echo " during execution"
111684 - fi
111685 - if test -n "$runpath_var"; then
111686 - $echo " - add LIBDIR to the \`$runpath_var' environment variable"
111687 - $echo " during linking"
111688 - fi
111689 - if test -n "$hardcode_libdir_flag_spec"; then
111690 - libdir=LIBDIR
111691 - eval flag=\"$hardcode_libdir_flag_spec\"
111692 -
111693 - $echo " - use the \`$flag' linker flag"
111694 - fi
111695 - if test -n "$admincmds"; then
111696 - $echo " - have your system administrator run these commands:$admincmds"
111697 - fi
111698 - if test -f /etc/ld.so.conf; then
111699 - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
111700 - fi
111701 - $echo
111702 - $echo "See any operating system documentation about shared libraries for"
111703 - $echo "more information, such as the ld(1) and ld.so(8) manual pages."
111704 - $echo "X----------------------------------------------------------------------" | $Xsed
111705 - exit $EXIT_SUCCESS
111706 - ;;
111707 -
111708 - # libtool execute mode
111709 - execute)
111710 - modename="$modename: execute"
111711 -
111712 - # The first argument is the command name.
111713 - cmd="$nonopt"
111714 - if test -z "$cmd"; then
111715 - $echo "$modename: you must specify a COMMAND" 1>&2
111716 - $echo "$help"
111717 - exit $EXIT_FAILURE
111718 - fi
111719 -
111720 - # Handle -dlopen flags immediately.
111721 - for file in $execute_dlfiles; do
111722 - if test ! -f "$file"; then
111723 - $echo "$modename: \`$file' is not a file" 1>&2
111724 - $echo "$help" 1>&2
111725 - exit $EXIT_FAILURE
111726 - fi
111727 -
111728 - dir=
111729 - case $file in
111730 - *.la)
111731 - # Check to see that this really is a libtool archive.
111732 - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
111733 - else
111734 - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
111735 - $echo "$help" 1>&2
111736 - exit $EXIT_FAILURE
111737 - fi
111738 -
111739 - # Read the libtool library.
111740 - dlname=
111741 - library_names=
111742 -
111743 - # If there is no directory component, then add one.
111744 - case $file in
111745 - */* | *\\*) . $file ;;
111746 - *) . ./$file ;;
111747 - esac
111748 -
111749 - # Skip this library if it cannot be dlopened.
111750 - if test -z "$dlname"; then
111751 - # Warn if it was a shared library.
111752 - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
111753 - continue
111754 - fi
111755 -
111756 - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
111757 - test "X$dir" = "X$file" && dir=.
111758 -
111759 - if test -f "$dir/$objdir/$dlname"; then
111760 - dir="$dir/$objdir"
111761 - else
111762 - if test ! -f "$dir/$dlname"; then
111763 - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
111764 - exit $EXIT_FAILURE
111765 - fi
111766 - fi
111767 - ;;
111768 -
111769 - *.lo)
111770 - # Just add the directory containing the .lo file.
111771 - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
111772 - test "X$dir" = "X$file" && dir=.
111773 - ;;
111774 -
111775 - *)
111776 - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
111777 - continue
111778 - ;;
111779 - esac
111780 -
111781 - # Get the absolute pathname.
111782 - absdir=`cd "$dir" && pwd`
111783 - test -n "$absdir" && dir="$absdir"
111784 -
111785 - # Now add the directory to shlibpath_var.
111786 - if eval "test -z \"\$$shlibpath_var\""; then
111787 - eval "$shlibpath_var=\"\$dir\""
111788 - else
111789 - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
111790 - fi
111791 - done
111792 -
111793 - # This variable tells wrapper scripts just to set shlibpath_var
111794 - # rather than running their programs.
111795 - libtool_execute_magic="$magic"
111796 -
111797 - # Check if any of the arguments is a wrapper script.
111798 - args=
111799 - for file
111800 - do
111801 - case $file in
111802 - -*) ;;
111803 - *)
111804 - # Do a test to see if this is really a libtool program.
111805 - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
111806 - # If there is no directory component, then add one.
111807 - case $file in
111808 - */* | *\\*) . $file ;;
111809 - *) . ./$file ;;
111810 - esac
111811 -
111812 - # Transform arg to wrapped name.
111813 - file="$progdir/$program"
111814 - fi
111815 - ;;
111816 - esac
111817 - # Quote arguments (to preserve shell metacharacters).
111818 - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
111819 - args="$args \"$file\""
111820 - done
111821 -
111822 - if test -z "$run"; then
111823 - if test -n "$shlibpath_var"; then
111824 - # Export the shlibpath_var.
111825 - eval "export $shlibpath_var"
111826 - fi
111827 -
111828 - # Restore saved environment variables
111829 - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
111830 - do
111831 - eval "if test \"\${save_$lt_var+set}\" = set; then
111832 - $lt_var=\$save_$lt_var; export $lt_var
111833 - fi"
111834 - done
111835 -
111836 - # Now prepare to actually exec the command.
111837 - exec_cmd="\$cmd$args"
111838 - else
111839 - # Display what would be done.
111840 - if test -n "$shlibpath_var"; then
111841 - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
111842 - $echo "export $shlibpath_var"
111843 - fi
111844 - $echo "$cmd$args"
111845 - exit $EXIT_SUCCESS
111846 - fi
111847 - ;;
111848 -
111849 - # libtool clean and uninstall mode
111850 - clean | uninstall)
111851 - modename="$modename: $mode"
111852 - rm="$nonopt"
111853 - files=
111854 - rmforce=
111855 - exit_status=0
111856 -
111857 - # This variable tells wrapper scripts just to set variables rather
111858 - # than running their programs.
111859 - libtool_install_magic="$magic"
111860 -
111861 - for arg
111862 - do
111863 - case $arg in
111864 - -f) rm="$rm $arg"; rmforce=yes ;;
111865 - -*) rm="$rm $arg" ;;
111866 - *) files="$files $arg" ;;
111867 - esac
111868 - done
111869 -
111870 - if test -z "$rm"; then
111871 - $echo "$modename: you must specify an RM program" 1>&2
111872 - $echo "$help" 1>&2
111873 - exit $EXIT_FAILURE
111874 - fi
111875 -
111876 - rmdirs=
111877 -
111878 - origobjdir="$objdir"
111879 - for file in $files; do
111880 - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
111881 - if test "X$dir" = "X$file"; then
111882 - dir=.
111883 - objdir="$origobjdir"
111884 - else
111885 - objdir="$dir/$origobjdir"
111886 - fi
111887 - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
111888 - test "$mode" = uninstall && objdir="$dir"
111889 -
111890 - # Remember objdir for removal later, being careful to avoid duplicates
111891 - if test "$mode" = clean; then
111892 - case " $rmdirs " in
111893 - *" $objdir "*) ;;
111894 - *) rmdirs="$rmdirs $objdir" ;;
111895 - esac
111896 - fi
111897 -
111898 - # Don't error if the file doesn't exist and rm -f was used.
111899 - if (test -L "$file") >/dev/null 2>&1 \
111900 - || (test -h "$file") >/dev/null 2>&1 \
111901 - || test -f "$file"; then
111902 - :
111903 - elif test -d "$file"; then
111904 - exit_status=1
111905 - continue
111906 - elif test "$rmforce" = yes; then
111907 - continue
111908 - fi
111909 -
111910 - rmfiles="$file"
111911 -
111912 - case $name in
111913 - *.la)
111914 - # Possibly a libtool archive, so verify it.
111915 - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
111916 - . $dir/$name
111917 -
111918 - # Delete the libtool libraries and symlinks.
111919 - for n in $library_names; do
111920 - rmfiles="$rmfiles $objdir/$n"
111921 - done
111922 - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
111923 -
111924 - case "$mode" in
111925 - clean)
111926 - case " $library_names " in
111927 - # " " in the beginning catches empty $dlname
111928 - *" $dlname "*) ;;
111929 - *) rmfiles="$rmfiles $objdir/$dlname" ;;
111930 - esac
111931 - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
111932 - ;;
111933 - uninstall)
111934 - if test -n "$library_names"; then
111935 - # Do each command in the postuninstall commands.
111936 - cmds=$postuninstall_cmds
111937 - save_ifs="$IFS"; IFS='~'
111938 - for cmd in $cmds; do
111939 - IFS="$save_ifs"
111940 - eval cmd=\"$cmd\"
111941 - $show "$cmd"
111942 - $run eval "$cmd"
111943 - if test "$?" -ne 0 && test "$rmforce" != yes; then
111944 - exit_status=1
111945 - fi
111946 - done
111947 - IFS="$save_ifs"
111948 - fi
111949 -
111950 - if test -n "$old_library"; then
111951 - # Do each command in the old_postuninstall commands.
111952 - cmds=$old_postuninstall_cmds
111953 - save_ifs="$IFS"; IFS='~'
111954 - for cmd in $cmds; do
111955 - IFS="$save_ifs"
111956 - eval cmd=\"$cmd\"
111957 - $show "$cmd"
111958 - $run eval "$cmd"
111959 - if test "$?" -ne 0 && test "$rmforce" != yes; then
111960 - exit_status=1
111961 - fi
111962 - done
111963 - IFS="$save_ifs"
111964 - fi
111965 - # FIXME: should reinstall the best remaining shared library.
111966 - ;;
111967 - esac
111968 - fi
111969 - ;;
111970 -
111971 - *.lo)
111972 - # Possibly a libtool object, so verify it.
111973 - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
111974 -
111975 - # Read the .lo file
111976 - . $dir/$name
111977 -
111978 - # Add PIC object to the list of files to remove.
111979 - if test -n "$pic_object" \
111980 - && test "$pic_object" != none; then
111981 - rmfiles="$rmfiles $dir/$pic_object"
111982 - fi
111983 -
111984 - # Add non-PIC object to the list of files to remove.
111985 - if test -n "$non_pic_object" \
111986 - && test "$non_pic_object" != none; then
111987 - rmfiles="$rmfiles $dir/$non_pic_object"
111988 - fi
111989 - fi
111990 - ;;
111991 -
111992 - *)
111993 - if test "$mode" = clean ; then
111994 - noexename=$name
111995 - case $file in
111996 - *.exe)
111997 - file=`$echo $file|${SED} 's,.exe$,,'`
111998 - noexename=`$echo $name|${SED} 's,.exe$,,'`
111999 - # $file with .exe has already been added to rmfiles,
112000 - # add $file without .exe
112001 - rmfiles="$rmfiles $file"
112002 - ;;
112003 - esac
112004 - # Do a test to see if this is a libtool program.
112005 - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
112006 - relink_command=
112007 - . $dir/$noexename
112008 -
112009 - # note $name still contains .exe if it was in $file originally
112010 - # as does the version of $file that was added into $rmfiles
112011 - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
112012 - if test "$fast_install" = yes && test -n "$relink_command"; then
112013 - rmfiles="$rmfiles $objdir/lt-$name"
112014 - fi
112015 - if test "X$noexename" != "X$name" ; then
112016 - rmfiles="$rmfiles $objdir/lt-${noexename}.c"
112017 - fi
112018 - fi
112019 - fi
112020 - ;;
112021 - esac
112022 - $show "$rm $rmfiles"
112023 - $run $rm $rmfiles || exit_status=1
112024 - done
112025 - objdir="$origobjdir"
112026 -
112027 - # Try to remove the ${objdir}s in the directories where we deleted files
112028 - for dir in $rmdirs; do
112029 - if test -d "$dir"; then
112030 - $show "rmdir $dir"
112031 - $run rmdir $dir >/dev/null 2>&1
112032 - fi
112033 - done
112034 -
112035 - exit $exit_status
112036 - ;;
112037 -
112038 - "")
112039 - $echo "$modename: you must specify a MODE" 1>&2
112040 - $echo "$generic_help" 1>&2
112041 - exit $EXIT_FAILURE
112042 - ;;
112043 - esac
112044 -
112045 - if test -z "$exec_cmd"; then
112046 - $echo "$modename: invalid operation mode \`$mode'" 1>&2
112047 - $echo "$generic_help" 1>&2
112048 - exit $EXIT_FAILURE
112049 - fi
112050 -fi # test -z "$show_help"
112051 -
112052 -if test -n "$exec_cmd"; then
112053 - eval exec $exec_cmd
112054 - exit $EXIT_FAILURE
112055 -fi
112056 -
112057 -# We need to display help for each of the modes.
112058 -case $mode in
112059 -"") $echo \
112060 -"Usage: $modename [OPTION]... [MODE-ARG]...
112061 -
112062 -Provide generalized library-building support services.
112063 -
112064 - --config show all configuration variables
112065 - --debug enable verbose shell tracing
112066 --n, --dry-run display commands without modifying any files
112067 - --features display basic configuration information and exit
112068 - --finish same as \`--mode=finish'
112069 - --help display this help message and exit
112070 - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
112071 - --quiet same as \`--silent'
112072 - --silent don't print informational messages
112073 - --tag=TAG use configuration variables from tag TAG
112074 - --version print version information
112075 -
112076 -MODE must be one of the following:
112077 -
112078 - clean remove files from the build directory
112079 - compile compile a source file into a libtool object
112080 - execute automatically set library path, then run a program
112081 - finish complete the installation of libtool libraries
112082 - install install libraries or executables
112083 - link create a library or an executable
112084 - uninstall remove libraries from an installed directory
112085 -
112086 -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
112087 -a more detailed description of MODE.
112088 -
112089 -Report bugs to <bug-libtool@gnu.org>."
112090 - exit $EXIT_SUCCESS
112091 - ;;
112092 -
112093 -clean)
112094 - $echo \
112095 -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
112096 -
112097 -Remove files from the build directory.
112098 -
112099 -RM is the name of the program to use to delete files associated with each FILE
112100 -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
112101 -to RM.
112102 -
112103 -If FILE is a libtool library, object or program, all the files associated
112104 -with it are deleted. Otherwise, only FILE itself is deleted using RM."
112105 - ;;
112106 -
112107 -compile)
112108 - $echo \
112109 -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
112110 -
112111 -Compile a source file into a libtool library object.
112112 -
112113 -This mode accepts the following additional options:
112114 -
112115 - -o OUTPUT-FILE set the output file name to OUTPUT-FILE
112116 - -prefer-pic try to building PIC objects only
112117 - -prefer-non-pic try to building non-PIC objects only
112118 - -static always build a \`.o' file suitable for static linking
112119 -
112120 -COMPILE-COMMAND is a command to be used in creating a \`standard' object file
112121 -from the given SOURCEFILE.
112122 -
112123 -The output file name is determined by removing the directory component from
112124 -SOURCEFILE, then substituting the C source code suffix \`.c' with the
112125 -library object suffix, \`.lo'."
112126 - ;;
112127 -
112128 -execute)
112129 - $echo \
112130 -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
112131 -
112132 -Automatically set library path, then run a program.
112133 -
112134 -This mode accepts the following additional options:
112135 -
112136 - -dlopen FILE add the directory containing FILE to the library path
112137 -
112138 -This mode sets the library path environment variable according to \`-dlopen'
112139 -flags.
112140 -
112141 -If any of the ARGS are libtool executable wrappers, then they are translated
112142 -into their corresponding uninstalled binary, and any of their required library
112143 -directories are added to the library path.
112144 -
112145 -Then, COMMAND is executed, with ARGS as arguments."
112146 - ;;
112147 -
112148 -finish)
112149 - $echo \
112150 -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
112151 -
112152 -Complete the installation of libtool libraries.
112153 -
112154 -Each LIBDIR is a directory that contains libtool libraries.
112155 -
112156 -The commands that this mode executes may require superuser privileges. Use
112157 -the \`--dry-run' option if you just want to see what would be executed."
112158 - ;;
112159 -
112160 -install)
112161 - $echo \
112162 -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
112163 -
112164 -Install executables or libraries.
112165 -
112166 -INSTALL-COMMAND is the installation command. The first component should be
112167 -either the \`install' or \`cp' program.
112168 -
112169 -The rest of the components are interpreted as arguments to that command (only
112170 -BSD-compatible install options are recognized)."
112171 - ;;
112172 -
112173 -link)
112174 - $echo \
112175 -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
112176 -
112177 -Link object files or libraries together to form another library, or to
112178 -create an executable program.
112179 -
112180 -LINK-COMMAND is a command using the C compiler that you would use to create
112181 -a program from several object files.
112182 -
112183 -The following components of LINK-COMMAND are treated specially:
112184 -
112185 - -all-static do not do any dynamic linking at all
112186 - -avoid-version do not add a version suffix if possible
112187 - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
112188 - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
112189 - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
112190 - -export-symbols SYMFILE
112191 - try to export only the symbols listed in SYMFILE
112192 - -export-symbols-regex REGEX
112193 - try to export only the symbols matching REGEX
112194 - -LLIBDIR search LIBDIR for required installed libraries
112195 - -lNAME OUTPUT-FILE requires the installed library libNAME
112196 - -module build a library that can dlopened
112197 - -no-fast-install disable the fast-install mode
112198 - -no-install link a not-installable executable
112199 - -no-undefined declare that a library does not refer to external symbols
112200 - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
112201 - -objectlist FILE Use a list of object files found in FILE to specify objects
112202 - -precious-files-regex REGEX
112203 - don't remove output files matching REGEX
112204 - -release RELEASE specify package release information
112205 - -rpath LIBDIR the created library will eventually be installed in LIBDIR
112206 - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
112207 - -static do not do any dynamic linking of uninstalled libtool libraries
112208 - -static-libtool-libs
112209 - do not do any dynamic linking of libtool libraries
112210 - -version-info CURRENT[:REVISION[:AGE]]
112211 - specify library version info [each variable defaults to 0]
112212 -
112213 -All other options (arguments beginning with \`-') are ignored.
112214 -
112215 -Every other argument is treated as a filename. Files ending in \`.la' are
112216 -treated as uninstalled libtool libraries, other files are standard or library
112217 -object files.
112218 -
112219 -If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
112220 -only library objects (\`.lo' files) may be specified, and \`-rpath' is
112221 -required, except when creating a convenience library.
112222 -
112223 -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
112224 -using \`ar' and \`ranlib', or on Windows using \`lib'.
112225 -
112226 -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
112227 -is created, otherwise an executable program is created."
112228 - ;;
112229 -
112230 -uninstall)
112231 - $echo \
112232 -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
112233 -
112234 -Remove libraries from an installation directory.
112235 -
112236 -RM is the name of the program to use to delete files associated with each FILE
112237 -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
112238 -to RM.
112239 -
112240 -If FILE is a libtool library, all the files associated with it are deleted.
112241 -Otherwise, only FILE itself is deleted using RM."
112242 - ;;
112243 -
112244 -*)
112245 - $echo "$modename: invalid operation mode \`$mode'" 1>&2
112246 - $echo "$help" 1>&2
112247 - exit $EXIT_FAILURE
112248 - ;;
112249 -esac
112250 -
112251 -$echo
112252 -$echo "Try \`$modename --help' for more information about other modes."
112253 -
112254 -exit $?
112255 -
112256 -# The TAGs below are defined such that we never get into a situation
112257 -# in which we disable both kinds of libraries. Given conflicting
112258 -# choices, we go for a static library, that is the most portable,
112259 -# since we can't tell whether shared libraries were disabled because
112260 -# the user asked for that or because the platform doesn't support
112261 -# them. This is particularly important on AIX, because we don't
112262 -# support having both static and shared libraries enabled at the same
112263 -# time on that platform, so we default to a shared-only configuration.
112264 -# If a disable-shared tag is given, we'll fallback to a static-only
112265 -# configuration. But we'll never go from static-only to shared-only.
112266 -
112267 -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
112268 -disable_libs=shared
112269 -# ### END LIBTOOL TAG CONFIG: disable-shared
112270 -
112271 -# ### BEGIN LIBTOOL TAG CONFIG: disable-static
112272 -disable_libs=static
112273 -# ### END LIBTOOL TAG CONFIG: disable-static
112274 -
112275 -# Local Variables:
112276 -# mode:shell-script
112277 -# sh-indentation:2
112278 -# End:
112279 diff -rupN original/m4/codeset.m4 new/m4/codeset.m4
112280 --- original/m4/codeset.m4 2009-03-28 22:33:59.000000000 -0430
112281 +++ new/m4/codeset.m4 1969-12-31 20:00:00.000000000 -0400
112282 @@ -1,23 +0,0 @@
112283 -# codeset.m4 serial AM1 (gettext-0.10.40)
112284 -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
112285 -dnl This file is free software, distributed under the terms of the GNU
112286 -dnl General Public License. As a special exception to the GNU General
112287 -dnl Public License, this file may be distributed as part of a program
112288 -dnl that contains a configuration script generated by Autoconf, under
112289 -dnl the same distribution terms as the rest of that program.
112290 -
112291 -dnl From Bruno Haible.
112292 -
112293 -AC_DEFUN([AM_LANGINFO_CODESET],
112294 -[
112295 - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
112296 - [AC_TRY_LINK([#include <langinfo.h>],
112297 - [char* cs = nl_langinfo(CODESET);],
112298 - am_cv_langinfo_codeset=yes,
112299 - am_cv_langinfo_codeset=no)
112300 - ])
112301 - if test $am_cv_langinfo_codeset = yes; then
112302 - AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
112303 - [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
112304 - fi
112305 -])
112306 diff -rupN original/m4/gettext.m4 new/m4/gettext.m4
112307 --- original/m4/gettext.m4 2009-03-28 22:33:59.000000000 -0430
112308 +++ new/m4/gettext.m4 1969-12-31 20:00:00.000000000 -0400
112309 @@ -1,415 +0,0 @@
112310 -# gettext.m4 serial 20 (gettext-0.12)
112311 -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
112312 -dnl This file is free software, distributed under the terms of the GNU
112313 -dnl General Public License. As a special exception to the GNU General
112314 -dnl Public License, this file may be distributed as part of a program
112315 -dnl that contains a configuration script generated by Autoconf, under
112316 -dnl the same distribution terms as the rest of that program.
112317 -dnl
112318 -dnl This file can can be used in projects which are not available under
112319 -dnl the GNU General Public License or the GNU Library General Public
112320 -dnl License but which still want to provide support for the GNU gettext
112321 -dnl functionality.
112322 -dnl Please note that the actual code of the GNU gettext library is covered
112323 -dnl by the GNU Library General Public License, and the rest of the GNU
112324 -dnl gettext package package is covered by the GNU General Public License.
112325 -dnl They are *not* in the public domain.
112326 -
112327 -dnl Authors:
112328 -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
112329 -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
112330 -
112331 -dnl Macro to add for using GNU gettext.
112332 -
112333 -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
112334 -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
112335 -dnl default (if it is not specified or empty) is 'no-libtool'.
112336 -dnl INTLSYMBOL should be 'external' for packages with no intl directory,
112337 -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
112338 -dnl If INTLSYMBOL is 'use-libtool', then a libtool library
112339 -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
112340 -dnl depending on --{enable,disable}-{shared,static} and on the presence of
112341 -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
112342 -dnl $(top_builddir)/intl/libintl.a will be created.
112343 -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
112344 -dnl implementations (in libc or libintl) without the ngettext() function
112345 -dnl will be ignored. If NEEDSYMBOL is specified and is
112346 -dnl 'need-formatstring-macros', then GNU gettext implementations that don't
112347 -dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
112348 -dnl INTLDIR is used to find the intl libraries. If empty,
112349 -dnl the value `$(top_builddir)/intl/' is used.
112350 -dnl
112351 -dnl The result of the configuration is one of three cases:
112352 -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
112353 -dnl and used.
112354 -dnl Catalog format: GNU --> install in $(datadir)
112355 -dnl Catalog extension: .mo after installation, .gmo in source tree
112356 -dnl 2) GNU gettext has been found in the system's C library.
112357 -dnl Catalog format: GNU --> install in $(datadir)
112358 -dnl Catalog extension: .mo after installation, .gmo in source tree
112359 -dnl 3) No internationalization, always use English msgid.
112360 -dnl Catalog format: none
112361 -dnl Catalog extension: none
112362 -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
112363 -dnl The use of .gmo is historical (it was needed to avoid overwriting the
112364 -dnl GNU format catalogs when building on a platform with an X/Open gettext),
112365 -dnl but we keep it in order not to force irrelevant filename changes on the
112366 -dnl maintainers.
112367 -dnl
112368 -AC_DEFUN([AM_GNU_GETTEXT],
112369 -[
112370 - dnl Argument checking.
112371 - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
112372 - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
112373 -])])])])])
112374 - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
112375 - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
112376 -])])])])
112377 - define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
112378 - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
112379 -
112380 - AC_REQUIRE([AM_PO_SUBDIRS])dnl
112381 - ifelse(gt_included_intl, yes, [
112382 - AC_REQUIRE([AM_INTL_SUBDIR])dnl
112383 - ])
112384 -
112385 - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
112386 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
112387 - AC_REQUIRE([AC_LIB_RPATH])
112388 -
112389 - dnl Sometimes libintl requires libiconv, so first search for libiconv.
112390 - dnl Ideally we would do this search only after the
112391 - dnl if test "$USE_NLS" = "yes"; then
112392 - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
112393 - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
112394 - dnl the configure script would need to contain the same shell code
112395 - dnl again, outside any 'if'. There are two solutions:
112396 - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
112397 - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
112398 - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
112399 - dnl documented, we avoid it.
112400 - ifelse(gt_included_intl, yes, , [
112401 - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
112402 - ])
112403 -
112404 - dnl Set USE_NLS.
112405 - AM_NLS
112406 -
112407 - ifelse(gt_included_intl, yes, [
112408 - BUILD_INCLUDED_LIBINTL=no
112409 - USE_INCLUDED_LIBINTL=no
112410 - ])
112411 - LIBINTL=
112412 - LTLIBINTL=
112413 - POSUB=
112414 -
112415 - dnl If we use NLS figure out what method
112416 - if test "$USE_NLS" = "yes"; then
112417 - gt_use_preinstalled_gnugettext=no
112418 - ifelse(gt_included_intl, yes, [
112419 - AC_MSG_CHECKING([whether included gettext is requested])
112420 - AC_ARG_WITH(included-gettext,
112421 - [ --with-included-gettext use the GNU gettext library included here],
112422 - nls_cv_force_use_gnu_gettext=$withval,
112423 - nls_cv_force_use_gnu_gettext=no)
112424 - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
112425 -
112426 - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
112427 - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
112428 - ])
112429 - dnl User does not insist on using GNU NLS library. Figure out what
112430 - dnl to use. If GNU gettext is available we use this. Else we have
112431 - dnl to fall back to GNU NLS library.
112432 -
112433 - dnl Add a version number to the cache macros.
112434 - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
112435 - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
112436 - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
112437 -
112438 - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
112439 - [AC_TRY_LINK([#include <libintl.h>
112440 -]ifelse([$2], [need-formatstring-macros],
112441 -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
112442 -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
112443 -#endif
112444 -changequote(,)dnl
112445 -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
112446 -changequote([,])dnl
112447 -], [])[extern int _nl_msg_cat_cntr;
112448 -extern int *_nl_domain_bindings;],
112449 - [bindtextdomain ("", "");
112450 -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
112451 - gt_cv_func_gnugettext_libc=yes,
112452 - gt_cv_func_gnugettext_libc=no)])
112453 -
112454 - if test "$gt_cv_func_gnugettext_libc" != "yes"; then
112455 - dnl Sometimes libintl requires libiconv, so first search for libiconv.
112456 - ifelse(gt_included_intl, yes, , [
112457 - AM_ICONV_LINK
112458 - ])
112459 - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
112460 - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
112461 - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
112462 - dnl even if libiconv doesn't exist.
112463 - AC_LIB_LINKFLAGS_BODY([intl])
112464 - AC_CACHE_CHECK([for GNU gettext in libintl],
112465 - gt_cv_func_gnugettext_libintl,
112466 - [gt_save_CPPFLAGS="$CPPFLAGS"
112467 - CPPFLAGS="$CPPFLAGS $INCINTL"
112468 - gt_save_LIBS="$LIBS"
112469 - LIBS="$LIBS $LIBINTL"
112470 - dnl Now see whether libintl exists and does not depend on libiconv.
112471 - AC_TRY_LINK([#include <libintl.h>
112472 -]ifelse([$2], [need-formatstring-macros],
112473 -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
112474 -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
112475 -#endif
112476 -changequote(,)dnl
112477 -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
112478 -changequote([,])dnl
112479 -], [])[extern int _nl_msg_cat_cntr;
112480 -extern
112481 -#ifdef __cplusplus
112482 -"C"
112483 -#endif
112484 -const char *_nl_expand_alias ();],
112485 - [bindtextdomain ("", "");
112486 -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
112487 - gt_cv_func_gnugettext_libintl=yes,
112488 - gt_cv_func_gnugettext_libintl=no)
112489 - dnl Now see whether libintl exists and depends on libiconv.
112490 - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
112491 - LIBS="$LIBS $LIBICONV"
112492 - AC_TRY_LINK([#include <libintl.h>
112493 -]ifelse([$2], [need-formatstring-macros],
112494 -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
112495 -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
112496 -#endif
112497 -changequote(,)dnl
112498 -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
112499 -changequote([,])dnl
112500 -], [])[extern int _nl_msg_cat_cntr;
112501 -extern
112502 -#ifdef __cplusplus
112503 -"C"
112504 -#endif
112505 -const char *_nl_expand_alias ();],
112506 - [bindtextdomain ("", "");
112507 -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
112508 - [LIBINTL="$LIBINTL $LIBICONV"
112509 - LTLIBINTL="$LTLIBINTL $LTLIBICONV"
112510 - gt_cv_func_gnugettext_libintl=yes
112511 - ])
112512 - fi
112513 - CPPFLAGS="$gt_save_CPPFLAGS"
112514 - LIBS="$gt_save_LIBS"])
112515 - fi
112516 -
112517 - dnl If an already present or preinstalled GNU gettext() is found,
112518 - dnl use it. But if this macro is used in GNU gettext, and GNU
112519 - dnl gettext is already preinstalled in libintl, we update this
112520 - dnl libintl. (Cf. the install rule in intl/Makefile.in.)
112521 - if test "$gt_cv_func_gnugettext_libc" = "yes" \
112522 - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
112523 - && test "$PACKAGE" != gettext-runtime \
112524 - && test "$PACKAGE" != gettext-tools; }; then
112525 - gt_use_preinstalled_gnugettext=yes
112526 - else
112527 - dnl Reset the values set by searching for libintl.
112528 - LIBINTL=
112529 - LTLIBINTL=
112530 - INCINTL=
112531 - fi
112532 -
112533 - ifelse(gt_included_intl, yes, [
112534 - if test "$gt_use_preinstalled_gnugettext" != "yes"; then
112535 - dnl GNU gettext is not found in the C library.
112536 - dnl Fall back on included GNU gettext library.
112537 - nls_cv_use_gnu_gettext=yes
112538 - fi
112539 - fi
112540 -
112541 - if test "$nls_cv_use_gnu_gettext" = "yes"; then
112542 - dnl Mark actions used to generate GNU NLS library.
112543 - BUILD_INCLUDED_LIBINTL=yes
112544 - USE_INCLUDED_LIBINTL=yes
112545 - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
112546 - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
112547 - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
112548 - fi
112549 -
112550 - if test "$gt_use_preinstalled_gnugettext" = "yes" \
112551 - || test "$nls_cv_use_gnu_gettext" = "yes"; then
112552 - dnl Mark actions to use GNU gettext tools.
112553 - CATOBJEXT=.gmo
112554 - fi
112555 - ])
112556 -
112557 - if test "$gt_use_preinstalled_gnugettext" = "yes" \
112558 - || test "$nls_cv_use_gnu_gettext" = "yes"; then
112559 - AC_DEFINE(ENABLE_NLS, 1,
112560 - [Define to 1 if translation of program messages to the user's native language
112561 - is requested.])
112562 - else
112563 - USE_NLS=no
112564 - fi
112565 - fi
112566 -
112567 - AC_MSG_CHECKING([whether to use NLS])
112568 - AC_MSG_RESULT([$USE_NLS])
112569 - if test "$USE_NLS" = "yes"; then
112570 - AC_MSG_CHECKING([where the gettext function comes from])
112571 - if test "$gt_use_preinstalled_gnugettext" = "yes"; then
112572 - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
112573 - gt_source="external libintl"
112574 - else
112575 - gt_source="libc"
112576 - fi
112577 - else
112578 - gt_source="included intl directory"
112579 - fi
112580 - AC_MSG_RESULT([$gt_source])
112581 - fi
112582 -
112583 - if test "$USE_NLS" = "yes"; then
112584 -
112585 - if test "$gt_use_preinstalled_gnugettext" = "yes"; then
112586 - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
112587 - AC_MSG_CHECKING([how to link with libintl])
112588 - AC_MSG_RESULT([$LIBINTL])
112589 - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
112590 - fi
112591 -
112592 - dnl For backward compatibility. Some packages may be using this.
112593 - AC_DEFINE(HAVE_GETTEXT, 1,
112594 - [Define if the GNU gettext() function is already present or preinstalled.])
112595 - AC_DEFINE(HAVE_DCGETTEXT, 1,
112596 - [Define if the GNU dcgettext() function is already present or preinstalled.])
112597 - fi
112598 -
112599 - dnl We need to process the po/ directory.
112600 - POSUB=po
112601 - fi
112602 -
112603 - ifelse(gt_included_intl, yes, [
112604 - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
112605 - dnl to 'yes' because some of the testsuite requires it.
112606 - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
112607 - BUILD_INCLUDED_LIBINTL=yes
112608 - fi
112609 -
112610 - dnl Make all variables we use known to autoconf.
112611 - AC_SUBST(BUILD_INCLUDED_LIBINTL)
112612 - AC_SUBST(USE_INCLUDED_LIBINTL)
112613 - AC_SUBST(CATOBJEXT)
112614 -
112615 - dnl For backward compatibility. Some configure.ins may be using this.
112616 - nls_cv_header_intl=
112617 - nls_cv_header_libgt=
112618 -
112619 - dnl For backward compatibility. Some Makefiles may be using this.
112620 - DATADIRNAME=share
112621 - AC_SUBST(DATADIRNAME)
112622 -
112623 - dnl For backward compatibility. Some Makefiles may be using this.
112624 - INSTOBJEXT=.mo
112625 - AC_SUBST(INSTOBJEXT)
112626 -
112627 - dnl For backward compatibility. Some Makefiles may be using this.
112628 - GENCAT=gencat
112629 - AC_SUBST(GENCAT)
112630 -
112631 - dnl For backward compatibility. Some Makefiles may be using this.
112632 - if test "$USE_INCLUDED_LIBINTL" = yes; then
112633 - INTLOBJS="\$(GETTOBJS)"
112634 - fi
112635 - AC_SUBST(INTLOBJS)
112636 -
112637 - dnl Enable libtool support if the surrounding package wishes it.
112638 - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
112639 - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
112640 - ])
112641 -
112642 - dnl For backward compatibility. Some Makefiles may be using this.
112643 - INTLLIBS="$LIBINTL"
112644 - AC_SUBST(INTLLIBS)
112645 -
112646 - dnl Make all documented variables known to autoconf.
112647 - AC_SUBST(LIBINTL)
112648 - AC_SUBST(LTLIBINTL)
112649 - AC_SUBST(POSUB)
112650 -])
112651 -
112652 -
112653 -dnl Checks for all prerequisites of the intl subdirectory,
112654 -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
112655 -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
112656 -AC_DEFUN([AM_INTL_SUBDIR],
112657 -[
112658 - AC_REQUIRE([AC_PROG_INSTALL])dnl
112659 - AC_REQUIRE([AM_MKINSTALLDIRS])dnl
112660 - AC_REQUIRE([AC_PROG_CC])dnl
112661 - AC_REQUIRE([AC_CANONICAL_HOST])dnl
112662 - AC_REQUIRE([AC_PROG_RANLIB])dnl
112663 - AC_REQUIRE([AC_ISC_POSIX])dnl
112664 - AC_REQUIRE([AC_HEADER_STDC])dnl
112665 - AC_REQUIRE([AC_C_CONST])dnl
112666 - AC_REQUIRE([AC_C_INLINE])dnl
112667 - AC_REQUIRE([AC_TYPE_OFF_T])dnl
112668 - AC_REQUIRE([AC_TYPE_SIZE_T])dnl
112669 - AC_REQUIRE([AC_FUNC_ALLOCA])dnl
112670 - AC_REQUIRE([AC_FUNC_MMAP])dnl
112671 - AC_REQUIRE([jm_GLIBC21])dnl
112672 - AC_REQUIRE([gt_INTDIV0])dnl
112673 - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
112674 - AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
112675 - AC_REQUIRE([gt_INTTYPES_PRI])dnl
112676 -
112677 - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
112678 -stdlib.h string.h unistd.h sys/param.h])
112679 - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
112680 -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
112681 -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \
112682 -__fsetlocking])
112683 -
112684 - AM_ICONV
112685 - AM_LANGINFO_CODESET
112686 - if test $ac_cv_header_locale_h = yes; then
112687 - AM_LC_MESSAGES
112688 - fi
112689 -
112690 - dnl intl/plural.c is generated from intl/plural.y. It requires bison,
112691 - dnl because plural.y uses bison specific features. It requires at least
112692 - dnl bison-1.26 because earlier versions generate a plural.c that doesn't
112693 - dnl compile.
112694 - dnl bison is only needed for the maintainer (who touches plural.y). But in
112695 - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
112696 - dnl the rule in general Makefile. Now, some people carelessly touch the
112697 - dnl files or have a broken "make" program, hence the plural.c rule will
112698 - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
112699 - dnl present or too old.
112700 - AC_CHECK_PROGS([INTLBISON], [bison])
112701 - if test -z "$INTLBISON"; then
112702 - ac_verc_fail=yes
112703 - else
112704 - dnl Found it, now check the version.
112705 - AC_MSG_CHECKING([version of bison])
112706 -changequote(<<,>>)dnl
112707 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
112708 - case $ac_prog_version in
112709 - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
112710 - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
112711 -changequote([,])dnl
112712 - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
112713 - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
112714 - esac
112715 - AC_MSG_RESULT([$ac_prog_version])
112716 - fi
112717 - if test $ac_verc_fail = yes; then
112718 - INTLBISON=:
112719 - fi
112720 -])
112721 -
112722 -
112723 -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
112724 -AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
112725 diff -rupN original/m4/glibc21.m4 new/m4/glibc21.m4
112726 --- original/m4/glibc21.m4 2009-03-28 22:33:59.000000000 -0430
112727 +++ new/m4/glibc21.m4 1969-12-31 20:00:00.000000000 -0400
112728 @@ -1,32 +0,0 @@
112729 -# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
112730 -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
112731 -dnl This file is free software, distributed under the terms of the GNU
112732 -dnl General Public License. As a special exception to the GNU General
112733 -dnl Public License, this file may be distributed as part of a program
112734 -dnl that contains a configuration script generated by Autoconf, under
112735 -dnl the same distribution terms as the rest of that program.
112736 -
112737 -# Test for the GNU C Library, version 2.1 or newer.
112738 -# From Bruno Haible.
112739 -
112740 -AC_DEFUN([jm_GLIBC21],
112741 - [
112742 - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
112743 - ac_cv_gnu_library_2_1,
112744 - [AC_EGREP_CPP([Lucky GNU user],
112745 - [
112746 -#include <features.h>
112747 -#ifdef __GNU_LIBRARY__
112748 - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
112749 - Lucky GNU user
112750 - #endif
112751 -#endif
112752 - ],
112753 - ac_cv_gnu_library_2_1=yes,
112754 - ac_cv_gnu_library_2_1=no)
112755 - ]
112756 - )
112757 - AC_SUBST(GLIBC21)
112758 - GLIBC21="$ac_cv_gnu_library_2_1"
112759 - ]
112760 -)
112761 diff -rupN original/m4/iconv.m4 new/m4/iconv.m4
112762 --- original/m4/iconv.m4 2009-03-28 22:33:59.000000000 -0430
112763 +++ new/m4/iconv.m4 1969-12-31 20:00:00.000000000 -0400
112764 @@ -1,103 +0,0 @@
112765 -# iconv.m4 serial AM4 (gettext-0.11.3)
112766 -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
112767 -dnl This file is free software, distributed under the terms of the GNU
112768 -dnl General Public License. As a special exception to the GNU General
112769 -dnl Public License, this file may be distributed as part of a program
112770 -dnl that contains a configuration script generated by Autoconf, under
112771 -dnl the same distribution terms as the rest of that program.
112772 -
112773 -dnl From Bruno Haible.
112774 -
112775 -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
112776 -[
112777 - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
112778 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
112779 - AC_REQUIRE([AC_LIB_RPATH])
112780 -
112781 - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
112782 - dnl accordingly.
112783 - AC_LIB_LINKFLAGS_BODY([iconv])
112784 -])
112785 -
112786 -AC_DEFUN([AM_ICONV_LINK],
112787 -[
112788 - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
112789 - dnl those with the standalone portable GNU libiconv installed).
112790 -
112791 - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
112792 - dnl accordingly.
112793 - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
112794 -
112795 - dnl Add $INCICONV to CPPFLAGS before performing the following checks,
112796 - dnl because if the user has installed libiconv and not disabled its use
112797 - dnl via --without-libiconv-prefix, he wants to use it. The first
112798 - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
112799 - am_save_CPPFLAGS="$CPPFLAGS"
112800 - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
112801 -
112802 - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
112803 - am_cv_func_iconv="no, consider installing GNU libiconv"
112804 - am_cv_lib_iconv=no
112805 - AC_TRY_LINK([#include <stdlib.h>
112806 -#include <iconv.h>],
112807 - [iconv_t cd = iconv_open("","");
112808 - iconv(cd,NULL,NULL,NULL,NULL);
112809 - iconv_close(cd);],
112810 - am_cv_func_iconv=yes)
112811 - if test "$am_cv_func_iconv" != yes; then
112812 - am_save_LIBS="$LIBS"
112813 - LIBS="$LIBS $LIBICONV"
112814 - AC_TRY_LINK([#include <stdlib.h>
112815 -#include <iconv.h>],
112816 - [iconv_t cd = iconv_open("","");
112817 - iconv(cd,NULL,NULL,NULL,NULL);
112818 - iconv_close(cd);],
112819 - am_cv_lib_iconv=yes
112820 - am_cv_func_iconv=yes)
112821 - LIBS="$am_save_LIBS"
112822 - fi
112823 - ])
112824 - if test "$am_cv_func_iconv" = yes; then
112825 - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
112826 - fi
112827 - if test "$am_cv_lib_iconv" = yes; then
112828 - AC_MSG_CHECKING([how to link with libiconv])
112829 - AC_MSG_RESULT([$LIBICONV])
112830 - else
112831 - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
112832 - dnl either.
112833 - CPPFLAGS="$am_save_CPPFLAGS"
112834 - LIBICONV=
112835 - LTLIBICONV=
112836 - fi
112837 - AC_SUBST(LIBICONV)
112838 - AC_SUBST(LTLIBICONV)
112839 -])
112840 -
112841 -AC_DEFUN([AM_ICONV],
112842 -[
112843 - AM_ICONV_LINK
112844 - if test "$am_cv_func_iconv" = yes; then
112845 - AC_MSG_CHECKING([for iconv declaration])
112846 - AC_CACHE_VAL(am_cv_proto_iconv, [
112847 - AC_TRY_COMPILE([
112848 -#include <stdlib.h>
112849 -#include <iconv.h>
112850 -extern
112851 -#ifdef __cplusplus
112852 -"C"
112853 -#endif
112854 -#if defined(__STDC__) || defined(__cplusplus)
112855 -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
112856 -#else
112857 -size_t iconv();
112858 -#endif
112859 -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
112860 - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
112861 - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
112862 - AC_MSG_RESULT([$]{ac_t:-
112863 - }[$]am_cv_proto_iconv)
112864 - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
112865 - [Define as const if the declaration of iconv() needs const.])
112866 - fi
112867 -])
112868 diff -rupN original/m4/intdiv0.m4 new/m4/intdiv0.m4
112869 --- original/m4/intdiv0.m4 2009-03-28 22:33:59.000000000 -0430
112870 +++ new/m4/intdiv0.m4 1969-12-31 20:00:00.000000000 -0400
112871 @@ -1,72 +0,0 @@
112872 -# intdiv0.m4 serial 1 (gettext-0.11.3)
112873 -dnl Copyright (C) 2002 Free Software Foundation, Inc.
112874 -dnl This file is free software, distributed under the terms of the GNU
112875 -dnl General Public License. As a special exception to the GNU General
112876 -dnl Public License, this file may be distributed as part of a program
112877 -dnl that contains a configuration script generated by Autoconf, under
112878 -dnl the same distribution terms as the rest of that program.
112879 -
112880 -dnl From Bruno Haible.
112881 -
112882 -AC_DEFUN([gt_INTDIV0],
112883 -[
112884 - AC_REQUIRE([AC_PROG_CC])dnl
112885 - AC_REQUIRE([AC_CANONICAL_HOST])dnl
112886 -
112887 - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
112888 - gt_cv_int_divbyzero_sigfpe,
112889 - [
112890 - AC_TRY_RUN([
112891 -#include <stdlib.h>
112892 -#include <signal.h>
112893 -
112894 -static void
112895 -#ifdef __cplusplus
112896 -sigfpe_handler (int sig)
112897 -#else
112898 -sigfpe_handler (sig) int sig;
112899 -#endif
112900 -{
112901 - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
112902 - exit (sig != SIGFPE);
112903 -}
112904 -
112905 -int x = 1;
112906 -int y = 0;
112907 -int z;
112908 -int nan;
112909 -
112910 -int main ()
112911 -{
112912 - signal (SIGFPE, sigfpe_handler);
112913 -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
112914 -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
112915 - signal (SIGTRAP, sigfpe_handler);
112916 -#endif
112917 -/* Linux/SPARC yields signal SIGILL. */
112918 -#if defined (__sparc__) && defined (__linux__)
112919 - signal (SIGILL, sigfpe_handler);
112920 -#endif
112921 -
112922 - z = x / y;
112923 - nan = y / y;
112924 - exit (1);
112925 -}
112926 -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
112927 - [
112928 - # Guess based on the CPU.
112929 - case "$host_cpu" in
112930 - alpha* | i[34567]86 | m68k | s390*)
112931 - gt_cv_int_divbyzero_sigfpe="guessing yes";;
112932 - *)
112933 - gt_cv_int_divbyzero_sigfpe="guessing no";;
112934 - esac
112935 - ])
112936 - ])
112937 - case "$gt_cv_int_divbyzero_sigfpe" in
112938 - *yes) value=1;;
112939 - *) value=0;;
112940 - esac
112941 - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
112942 - [Define if integer division by zero raises signal SIGFPE.])
112943 -])
112944 diff -rupN original/m4/inttypes-pri.m4 new/m4/inttypes-pri.m4
112945 --- original/m4/inttypes-pri.m4 2009-03-28 22:33:59.000000000 -0430
112946 +++ new/m4/inttypes-pri.m4 1969-12-31 20:00:00.000000000 -0400
112947 @@ -1,32 +0,0 @@
112948 -# inttypes-pri.m4 serial 1 (gettext-0.11.4)
112949 -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
112950 -dnl This file is free software, distributed under the terms of the GNU
112951 -dnl General Public License. As a special exception to the GNU General
112952 -dnl Public License, this file may be distributed as part of a program
112953 -dnl that contains a configuration script generated by Autoconf, under
112954 -dnl the same distribution terms as the rest of that program.
112955 -
112956 -dnl From Bruno Haible.
112957 -
112958 -# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
112959 -# macros to non-string values. This is the case on AIX 4.3.3.
112960 -
112961 -AC_DEFUN([gt_INTTYPES_PRI],
112962 -[
112963 - AC_REQUIRE([gt_HEADER_INTTYPES_H])
112964 - if test $gt_cv_header_inttypes_h = yes; then
112965 - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
112966 - gt_cv_inttypes_pri_broken,
112967 - [
112968 - AC_TRY_COMPILE([#include <inttypes.h>
112969 -#ifdef PRId32
112970 -char *p = PRId32;
112971 -#endif
112972 -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
112973 - ])
112974 - fi
112975 - if test "$gt_cv_inttypes_pri_broken" = yes; then
112976 - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
112977 - [Define if <inttypes.h> exists and defines unusable PRI* macros.])
112978 - fi
112979 -])
112980 diff -rupN original/m4/inttypes.m4 new/m4/inttypes.m4
112981 --- original/m4/inttypes.m4 2009-03-28 22:33:59.000000000 -0430
112982 +++ new/m4/inttypes.m4 1969-12-31 20:00:00.000000000 -0400
112983 @@ -1,27 +0,0 @@
112984 -# inttypes.m4 serial 1 (gettext-0.11.4)
112985 -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
112986 -dnl This file is free software, distributed under the terms of the GNU
112987 -dnl General Public License. As a special exception to the GNU General
112988 -dnl Public License, this file may be distributed as part of a program
112989 -dnl that contains a configuration script generated by Autoconf, under
112990 -dnl the same distribution terms as the rest of that program.
112991 -
112992 -dnl From Paul Eggert.
112993 -
112994 -# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
112995 -# <sys/types.h>.
112996 -
112997 -AC_DEFUN([gt_HEADER_INTTYPES_H],
112998 -[
112999 - AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
113000 - [
113001 - AC_TRY_COMPILE(
113002 - [#include <sys/types.h>
113003 -#include <inttypes.h>],
113004 - [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
113005 - ])
113006 - if test $gt_cv_header_inttypes_h = yes; then
113007 - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
113008 - [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
113009 - fi
113010 -])
113011 diff -rupN original/m4/inttypes_h.m4 new/m4/inttypes_h.m4
113012 --- original/m4/inttypes_h.m4 2009-03-28 22:34:00.000000000 -0430
113013 +++ new/m4/inttypes_h.m4 1969-12-31 20:00:00.000000000 -0400
113014 @@ -1,28 +0,0 @@
113015 -# inttypes_h.m4 serial 5 (gettext-0.12)
113016 -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
113017 -dnl This file is free software, distributed under the terms of the GNU
113018 -dnl General Public License. As a special exception to the GNU General
113019 -dnl Public License, this file may be distributed as part of a program
113020 -dnl that contains a configuration script generated by Autoconf, under
113021 -dnl the same distribution terms as the rest of that program.
113022 -
113023 -dnl From Paul Eggert.
113024 -
113025 -# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
113026 -# doesn't clash with <sys/types.h>, and declares uintmax_t.
113027 -
113028 -AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
113029 -[
113030 - AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
113031 - [AC_TRY_COMPILE(
113032 - [#include <sys/types.h>
113033 -#include <inttypes.h>],
113034 - [uintmax_t i = (uintmax_t) -1;],
113035 - jm_ac_cv_header_inttypes_h=yes,
113036 - jm_ac_cv_header_inttypes_h=no)])
113037 - if test $jm_ac_cv_header_inttypes_h = yes; then
113038 - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
113039 - [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
113040 - and declares uintmax_t. ])
113041 - fi
113042 -])
113043 diff -rupN original/m4/isc-posix.m4 new/m4/isc-posix.m4
113044 --- original/m4/isc-posix.m4 2009-03-28 22:34:00.000000000 -0430
113045 +++ new/m4/isc-posix.m4 1969-12-31 20:00:00.000000000 -0400
113046 @@ -1,26 +0,0 @@
113047 -# isc-posix.m4 serial 2 (gettext-0.11.2)
113048 -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
113049 -dnl This file is free software, distributed under the terms of the GNU
113050 -dnl General Public License. As a special exception to the GNU General
113051 -dnl Public License, this file may be distributed as part of a program
113052 -dnl that contains a configuration script generated by Autoconf, under
113053 -dnl the same distribution terms as the rest of that program.
113054 -
113055 -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
113056 -
113057 -# This test replaces the one in autoconf.
113058 -# Currently this macro should have the same name as the autoconf macro
113059 -# because gettext's gettext.m4 (distributed in the automake package)
113060 -# still uses it. Otherwise, the use in gettext.m4 makes autoheader
113061 -# give these diagnostics:
113062 -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
113063 -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
113064 -
113065 -undefine([AC_ISC_POSIX])
113066 -
113067 -AC_DEFUN([AC_ISC_POSIX],
113068 - [
113069 - dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
113070 - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
113071 - ]
113072 -)
113073 diff -rupN original/m4/lcmessage.m4 new/m4/lcmessage.m4
113074 --- original/m4/lcmessage.m4 2009-03-28 22:34:00.000000000 -0430
113075 +++ new/m4/lcmessage.m4 1969-12-31 20:00:00.000000000 -0400
113076 @@ -1,32 +0,0 @@
113077 -# lcmessage.m4 serial 3 (gettext-0.11.3)
113078 -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
113079 -dnl This file is free software, distributed under the terms of the GNU
113080 -dnl General Public License. As a special exception to the GNU General
113081 -dnl Public License, this file may be distributed as part of a program
113082 -dnl that contains a configuration script generated by Autoconf, under
113083 -dnl the same distribution terms as the rest of that program.
113084 -dnl
113085 -dnl This file can can be used in projects which are not available under
113086 -dnl the GNU General Public License or the GNU Library General Public
113087 -dnl License but which still want to provide support for the GNU gettext
113088 -dnl functionality.
113089 -dnl Please note that the actual code of the GNU gettext library is covered
113090 -dnl by the GNU Library General Public License, and the rest of the GNU
113091 -dnl gettext package package is covered by the GNU General Public License.
113092 -dnl They are *not* in the public domain.
113093 -
113094 -dnl Authors:
113095 -dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
113096 -
113097 -# Check whether LC_MESSAGES is available in <locale.h>.
113098 -
113099 -AC_DEFUN([AM_LC_MESSAGES],
113100 -[
113101 - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
113102 - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
113103 - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
113104 - if test $am_cv_val_LC_MESSAGES = yes; then
113105 - AC_DEFINE(HAVE_LC_MESSAGES, 1,
113106 - [Define if your <locale.h> file defines LC_MESSAGES.])
113107 - fi
113108 -])
113109 diff -rupN original/m4/lib-ld.m4 new/m4/lib-ld.m4
113110 --- original/m4/lib-ld.m4 2009-03-28 22:34:00.000000000 -0430
113111 +++ new/m4/lib-ld.m4 1969-12-31 20:00:00.000000000 -0400
113112 @@ -1,110 +0,0 @@
113113 -# lib-ld.m4 serial 2 (gettext-0.12)
113114 -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
113115 -dnl This file is free software, distributed under the terms of the GNU
113116 -dnl General Public License. As a special exception to the GNU General
113117 -dnl Public License, this file may be distributed as part of a program
113118 -dnl that contains a configuration script generated by Autoconf, under
113119 -dnl the same distribution terms as the rest of that program.
113120 -
113121 -dnl Subroutines of libtool.m4,
113122 -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
113123 -dnl with libtool.m4.
113124 -
113125 -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
113126 -AC_DEFUN([AC_LIB_PROG_LD_GNU],
113127 -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
113128 -[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
113129 -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
113130 - acl_cv_prog_gnu_ld=yes
113131 -else
113132 - acl_cv_prog_gnu_ld=no
113133 -fi])
113134 -with_gnu_ld=$acl_cv_prog_gnu_ld
113135 -])
113136 -
113137 -dnl From libtool-1.4. Sets the variable LD.
113138 -AC_DEFUN([AC_LIB_PROG_LD],
113139 -[AC_ARG_WITH(gnu-ld,
113140 -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
113141 -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
113142 -AC_REQUIRE([AC_PROG_CC])dnl
113143 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
113144 -# Prepare PATH_SEPARATOR.
113145 -# The user is always right.
113146 -if test "${PATH_SEPARATOR+set}" != set; then
113147 - echo "#! /bin/sh" >conf$$.sh
113148 - echo "exit 0" >>conf$$.sh
113149 - chmod +x conf$$.sh
113150 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
113151 - PATH_SEPARATOR=';'
113152 - else
113153 - PATH_SEPARATOR=:
113154 - fi
113155 - rm -f conf$$.sh
113156 -fi
113157 -ac_prog=ld
113158 -if test "$GCC" = yes; then
113159 - # Check if gcc -print-prog-name=ld gives a path.
113160 - AC_MSG_CHECKING([for ld used by GCC])
113161 - case $host in
113162 - *-*-mingw*)
113163 - # gcc leaves a trailing carriage return which upsets mingw
113164 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
113165 - *)
113166 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
113167 - esac
113168 - case $ac_prog in
113169 - # Accept absolute paths.
113170 - [[\\/]* | [A-Za-z]:[\\/]*)]
113171 - [re_direlt='/[^/][^/]*/\.\./']
113172 - # Canonicalize the path of ld
113173 - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
113174 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
113175 - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
113176 - done
113177 - test -z "$LD" && LD="$ac_prog"
113178 - ;;
113179 - "")
113180 - # If it fails, then pretend we aren't using GCC.
113181 - ac_prog=ld
113182 - ;;
113183 - *)
113184 - # If it is relative, then search for the first ld in PATH.
113185 - with_gnu_ld=unknown
113186 - ;;
113187 - esac
113188 -elif test "$with_gnu_ld" = yes; then
113189 - AC_MSG_CHECKING([for GNU ld])
113190 -else
113191 - AC_MSG_CHECKING([for non-GNU ld])
113192 -fi
113193 -AC_CACHE_VAL(acl_cv_path_LD,
113194 -[if test -z "$LD"; then
113195 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
113196 - for ac_dir in $PATH; do
113197 - test -z "$ac_dir" && ac_dir=.
113198 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
113199 - acl_cv_path_LD="$ac_dir/$ac_prog"
113200 - # Check to see if the program is GNU ld. I'd rather use --version,
113201 - # but apparently some GNU ld's only accept -v.
113202 - # Break only if it was the GNU/non-GNU ld that we prefer.
113203 - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
113204 - test "$with_gnu_ld" != no && break
113205 - else
113206 - test "$with_gnu_ld" != yes && break
113207 - fi
113208 - fi
113209 - done
113210 - IFS="$ac_save_ifs"
113211 -else
113212 - acl_cv_path_LD="$LD" # Let the user override the test with a path.
113213 -fi])
113214 -LD="$acl_cv_path_LD"
113215 -if test -n "$LD"; then
113216 - AC_MSG_RESULT($LD)
113217 -else
113218 - AC_MSG_RESULT(no)
113219 -fi
113220 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
113221 -AC_LIB_PROG_LD_GNU
113222 -])
113223 diff -rupN original/m4/lib-link.m4 new/m4/lib-link.m4
113224 --- original/m4/lib-link.m4 2009-03-28 22:34:00.000000000 -0430
113225 +++ new/m4/lib-link.m4 1969-12-31 20:00:00.000000000 -0400
113226 @@ -1,551 +0,0 @@
113227 -# lib-link.m4 serial 4 (gettext-0.12)
113228 -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
113229 -dnl This file is free software, distributed under the terms of the GNU
113230 -dnl General Public License. As a special exception to the GNU General
113231 -dnl Public License, this file may be distributed as part of a program
113232 -dnl that contains a configuration script generated by Autoconf, under
113233 -dnl the same distribution terms as the rest of that program.
113234 -
113235 -dnl From Bruno Haible.
113236 -
113237 -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
113238 -dnl the libraries corresponding to explicit and implicit dependencies.
113239 -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
113240 -dnl augments the CPPFLAGS variable.
113241 -AC_DEFUN([AC_LIB_LINKFLAGS],
113242 -[
113243 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
113244 - AC_REQUIRE([AC_LIB_RPATH])
113245 - define([Name],[translit([$1],[./-], [___])])
113246 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
113247 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
113248 - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
113249 - AC_LIB_LINKFLAGS_BODY([$1], [$2])
113250 - ac_cv_lib[]Name[]_libs="$LIB[]NAME"
113251 - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
113252 - ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
113253 - ])
113254 - LIB[]NAME="$ac_cv_lib[]Name[]_libs"
113255 - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
113256 - INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
113257 - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
113258 - AC_SUBST([LIB]NAME)
113259 - AC_SUBST([LTLIB]NAME)
113260 - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
113261 - dnl results of this search when this library appears as a dependency.
113262 - HAVE_LIB[]NAME=yes
113263 - undefine([Name])
113264 - undefine([NAME])
113265 -])
113266 -
113267 -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
113268 -dnl searches for libname and the libraries corresponding to explicit and
113269 -dnl implicit dependencies, together with the specified include files and
113270 -dnl the ability to compile and link the specified testcode. If found, it
113271 -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
113272 -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
113273 -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
113274 -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
113275 -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
113276 -[
113277 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
113278 - AC_REQUIRE([AC_LIB_RPATH])
113279 - define([Name],[translit([$1],[./-], [___])])
113280 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
113281 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
113282 -
113283 - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
113284 - dnl accordingly.
113285 - AC_LIB_LINKFLAGS_BODY([$1], [$2])
113286 -
113287 - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
113288 - dnl because if the user has installed lib[]Name and not disabled its use
113289 - dnl via --without-lib[]Name-prefix, he wants to use it.
113290 - ac_save_CPPFLAGS="$CPPFLAGS"
113291 - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
113292 -
113293 - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
113294 - ac_save_LIBS="$LIBS"
113295 - LIBS="$LIBS $LIB[]NAME"
113296 - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
113297 - LIBS="$ac_save_LIBS"
113298 - ])
113299 - if test "$ac_cv_lib[]Name" = yes; then
113300 - HAVE_LIB[]NAME=yes
113301 - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
113302 - AC_MSG_CHECKING([how to link with lib[]$1])
113303 - AC_MSG_RESULT([$LIB[]NAME])
113304 - else
113305 - HAVE_LIB[]NAME=no
113306 - dnl If $LIB[]NAME didn't lead to a usable library, we don't need
113307 - dnl $INC[]NAME either.
113308 - CPPFLAGS="$ac_save_CPPFLAGS"
113309 - LIB[]NAME=
113310 - LTLIB[]NAME=
113311 - fi
113312 - AC_SUBST([HAVE_LIB]NAME)
113313 - AC_SUBST([LIB]NAME)
113314 - AC_SUBST([LTLIB]NAME)
113315 - undefine([Name])
113316 - undefine([NAME])
113317 -])
113318 -
113319 -dnl Determine the platform dependent parameters needed to use rpath:
113320 -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
113321 -dnl hardcode_direct, hardcode_minus_L.
113322 -AC_DEFUN([AC_LIB_RPATH],
113323 -[
113324 - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
113325 - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
113326 - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
113327 - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
113328 - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
113329 - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
113330 - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
113331 - . ./conftest.sh
113332 - rm -f ./conftest.sh
113333 - acl_cv_rpath=done
113334 - ])
113335 - wl="$acl_cv_wl"
113336 - libext="$acl_cv_libext"
113337 - shlibext="$acl_cv_shlibext"
113338 - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
113339 - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
113340 - hardcode_direct="$acl_cv_hardcode_direct"
113341 - hardcode_minus_L="$acl_cv_hardcode_minus_L"
113342 - dnl Determine whether the user wants rpath handling at all.
113343 - AC_ARG_ENABLE(rpath,
113344 - [ --disable-rpath do not hardcode runtime library paths],
113345 - :, enable_rpath=yes)
113346 -])
113347 -
113348 -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
113349 -dnl the libraries corresponding to explicit and implicit dependencies.
113350 -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
113351 -AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
113352 -[
113353 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
113354 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
113355 - dnl By default, look in $includedir and $libdir.
113356 - use_additional=yes
113357 - AC_LIB_WITH_FINAL_PREFIX([
113358 - eval additional_includedir=\"$includedir\"
113359 - eval additional_libdir=\"$libdir\"
113360 - ])
113361 - AC_LIB_ARG_WITH([lib$1-prefix],
113362 -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
113363 - --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
113364 -[
113365 - if test "X$withval" = "Xno"; then
113366 - use_additional=no
113367 - else
113368 - if test "X$withval" = "X"; then
113369 - AC_LIB_WITH_FINAL_PREFIX([
113370 - eval additional_includedir=\"$includedir\"
113371 - eval additional_libdir=\"$libdir\"
113372 - ])
113373 - else
113374 - additional_includedir="$withval/include"
113375 - additional_libdir="$withval/lib"
113376 - fi
113377 - fi
113378 -])
113379 - dnl Search the library and its dependencies in $additional_libdir and
113380 - dnl $LDFLAGS. Using breadth-first-seach.
113381 - LIB[]NAME=
113382 - LTLIB[]NAME=
113383 - INC[]NAME=
113384 - rpathdirs=
113385 - ltrpathdirs=
113386 - names_already_handled=
113387 - names_next_round='$1 $2'
113388 - while test -n "$names_next_round"; do
113389 - names_this_round="$names_next_round"
113390 - names_next_round=
113391 - for name in $names_this_round; do
113392 - already_handled=
113393 - for n in $names_already_handled; do
113394 - if test "$n" = "$name"; then
113395 - already_handled=yes
113396 - break
113397 - fi
113398 - done
113399 - if test -z "$already_handled"; then
113400 - names_already_handled="$names_already_handled $name"
113401 - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
113402 - dnl or AC_LIB_HAVE_LINKFLAGS call.
113403 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
113404 - eval value=\"\$HAVE_LIB$uppername\"
113405 - if test -n "$value"; then
113406 - if test "$value" = yes; then
113407 - eval value=\"\$LIB$uppername\"
113408 - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
113409 - eval value=\"\$LTLIB$uppername\"
113410 - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
113411 - else
113412 - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
113413 - dnl that this library doesn't exist. So just drop it.
113414 - :
113415 - fi
113416 - else
113417 - dnl Search the library lib$name in $additional_libdir and $LDFLAGS
113418 - dnl and the already constructed $LIBNAME/$LTLIBNAME.
113419 - found_dir=
113420 - found_la=
113421 - found_so=
113422 - found_a=
113423 - if test $use_additional = yes; then
113424 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
113425 - found_dir="$additional_libdir"
113426 - found_so="$additional_libdir/lib$name.$shlibext"
113427 - if test -f "$additional_libdir/lib$name.la"; then
113428 - found_la="$additional_libdir/lib$name.la"
113429 - fi
113430 - else
113431 - if test -f "$additional_libdir/lib$name.$libext"; then
113432 - found_dir="$additional_libdir"
113433 - found_a="$additional_libdir/lib$name.$libext"
113434 - if test -f "$additional_libdir/lib$name.la"; then
113435 - found_la="$additional_libdir/lib$name.la"
113436 - fi
113437 - fi
113438 - fi
113439 - fi
113440 - if test "X$found_dir" = "X"; then
113441 - for x in $LDFLAGS $LTLIB[]NAME; do
113442 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113443 - case "$x" in
113444 - -L*)
113445 - dir=`echo "X$x" | sed -e 's/^X-L//'`
113446 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
113447 - found_dir="$dir"
113448 - found_so="$dir/lib$name.$shlibext"
113449 - if test -f "$dir/lib$name.la"; then
113450 - found_la="$dir/lib$name.la"
113451 - fi
113452 - else
113453 - if test -f "$dir/lib$name.$libext"; then
113454 - found_dir="$dir"
113455 - found_a="$dir/lib$name.$libext"
113456 - if test -f "$dir/lib$name.la"; then
113457 - found_la="$dir/lib$name.la"
113458 - fi
113459 - fi
113460 - fi
113461 - ;;
113462 - esac
113463 - if test "X$found_dir" != "X"; then
113464 - break
113465 - fi
113466 - done
113467 - fi
113468 - if test "X$found_dir" != "X"; then
113469 - dnl Found the library.
113470 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
113471 - if test "X$found_so" != "X"; then
113472 - dnl Linking with a shared library. We attempt to hardcode its
113473 - dnl directory into the executable's runpath, unless it's the
113474 - dnl standard /usr/lib.
113475 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
113476 - dnl No hardcoding is needed.
113477 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
113478 - else
113479 - dnl Use an explicit option to hardcode DIR into the resulting
113480 - dnl binary.
113481 - dnl Potentially add DIR to ltrpathdirs.
113482 - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
113483 - haveit=
113484 - for x in $ltrpathdirs; do
113485 - if test "X$x" = "X$found_dir"; then
113486 - haveit=yes
113487 - break
113488 - fi
113489 - done
113490 - if test -z "$haveit"; then
113491 - ltrpathdirs="$ltrpathdirs $found_dir"
113492 - fi
113493 - dnl The hardcoding into $LIBNAME is system dependent.
113494 - if test "$hardcode_direct" = yes; then
113495 - dnl Using DIR/libNAME.so during linking hardcodes DIR into the
113496 - dnl resulting binary.
113497 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
113498 - else
113499 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
113500 - dnl Use an explicit option to hardcode DIR into the resulting
113501 - dnl binary.
113502 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
113503 - dnl Potentially add DIR to rpathdirs.
113504 - dnl The rpathdirs will be appended to $LIBNAME at the end.
113505 - haveit=
113506 - for x in $rpathdirs; do
113507 - if test "X$x" = "X$found_dir"; then
113508 - haveit=yes
113509 - break
113510 - fi
113511 - done
113512 - if test -z "$haveit"; then
113513 - rpathdirs="$rpathdirs $found_dir"
113514 - fi
113515 - else
113516 - dnl Rely on "-L$found_dir".
113517 - dnl But don't add it if it's already contained in the LDFLAGS
113518 - dnl or the already constructed $LIBNAME
113519 - haveit=
113520 - for x in $LDFLAGS $LIB[]NAME; do
113521 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113522 - if test "X$x" = "X-L$found_dir"; then
113523 - haveit=yes
113524 - break
113525 - fi
113526 - done
113527 - if test -z "$haveit"; then
113528 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
113529 - fi
113530 - if test "$hardcode_minus_L" != no; then
113531 - dnl FIXME: Not sure whether we should use
113532 - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
113533 - dnl here.
113534 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
113535 - else
113536 - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
113537 - dnl here, because this doesn't fit in flags passed to the
113538 - dnl compiler. So give up. No hardcoding. This affects only
113539 - dnl very old systems.
113540 - dnl FIXME: Not sure whether we should use
113541 - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
113542 - dnl here.
113543 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
113544 - fi
113545 - fi
113546 - fi
113547 - fi
113548 - else
113549 - if test "X$found_a" != "X"; then
113550 - dnl Linking with a static library.
113551 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
113552 - else
113553 - dnl We shouldn't come here, but anyway it's good to have a
113554 - dnl fallback.
113555 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
113556 - fi
113557 - fi
113558 - dnl Assume the include files are nearby.
113559 - additional_includedir=
113560 - case "$found_dir" in
113561 - */lib | */lib/)
113562 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
113563 - additional_includedir="$basedir/include"
113564 - ;;
113565 - esac
113566 - if test "X$additional_includedir" != "X"; then
113567 - dnl Potentially add $additional_includedir to $INCNAME.
113568 - dnl But don't add it
113569 - dnl 1. if it's the standard /usr/include,
113570 - dnl 2. if it's /usr/local/include and we are using GCC on Linux,
113571 - dnl 3. if it's already present in $CPPFLAGS or the already
113572 - dnl constructed $INCNAME,
113573 - dnl 4. if it doesn't exist as a directory.
113574 - if test "X$additional_includedir" != "X/usr/include"; then
113575 - haveit=
113576 - if test "X$additional_includedir" = "X/usr/local/include"; then
113577 - if test -n "$GCC"; then
113578 - case $host_os in
113579 - linux*) haveit=yes;;
113580 - esac
113581 - fi
113582 - fi
113583 - if test -z "$haveit"; then
113584 - for x in $CPPFLAGS $INC[]NAME; do
113585 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113586 - if test "X$x" = "X-I$additional_includedir"; then
113587 - haveit=yes
113588 - break
113589 - fi
113590 - done
113591 - if test -z "$haveit"; then
113592 - if test -d "$additional_includedir"; then
113593 - dnl Really add $additional_includedir to $INCNAME.
113594 - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
113595 - fi
113596 - fi
113597 - fi
113598 - fi
113599 - fi
113600 - dnl Look for dependencies.
113601 - if test -n "$found_la"; then
113602 - dnl Read the .la file. It defines the variables
113603 - dnl dlname, library_names, old_library, dependency_libs, current,
113604 - dnl age, revision, installed, dlopen, dlpreopen, libdir.
113605 - save_libdir="$libdir"
113606 - case "$found_la" in
113607 - */* | *\\*) . "$found_la" ;;
113608 - *) . "./$found_la" ;;
113609 - esac
113610 - libdir="$save_libdir"
113611 - dnl We use only dependency_libs.
113612 - for dep in $dependency_libs; do
113613 - case "$dep" in
113614 - -L*)
113615 - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
113616 - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
113617 - dnl But don't add it
113618 - dnl 1. if it's the standard /usr/lib,
113619 - dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
113620 - dnl 3. if it's already present in $LDFLAGS or the already
113621 - dnl constructed $LIBNAME,
113622 - dnl 4. if it doesn't exist as a directory.
113623 - if test "X$additional_libdir" != "X/usr/lib"; then
113624 - haveit=
113625 - if test "X$additional_libdir" = "X/usr/local/lib"; then
113626 - if test -n "$GCC"; then
113627 - case $host_os in
113628 - linux*) haveit=yes;;
113629 - esac
113630 - fi
113631 - fi
113632 - if test -z "$haveit"; then
113633 - haveit=
113634 - for x in $LDFLAGS $LIB[]NAME; do
113635 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113636 - if test "X$x" = "X-L$additional_libdir"; then
113637 - haveit=yes
113638 - break
113639 - fi
113640 - done
113641 - if test -z "$haveit"; then
113642 - if test -d "$additional_libdir"; then
113643 - dnl Really add $additional_libdir to $LIBNAME.
113644 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
113645 - fi
113646 - fi
113647 - haveit=
113648 - for x in $LDFLAGS $LTLIB[]NAME; do
113649 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113650 - if test "X$x" = "X-L$additional_libdir"; then
113651 - haveit=yes
113652 - break
113653 - fi
113654 - done
113655 - if test -z "$haveit"; then
113656 - if test -d "$additional_libdir"; then
113657 - dnl Really add $additional_libdir to $LTLIBNAME.
113658 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
113659 - fi
113660 - fi
113661 - fi
113662 - fi
113663 - ;;
113664 - -R*)
113665 - dir=`echo "X$dep" | sed -e 's/^X-R//'`
113666 - if test "$enable_rpath" != no; then
113667 - dnl Potentially add DIR to rpathdirs.
113668 - dnl The rpathdirs will be appended to $LIBNAME at the end.
113669 - haveit=
113670 - for x in $rpathdirs; do
113671 - if test "X$x" = "X$dir"; then
113672 - haveit=yes
113673 - break
113674 - fi
113675 - done
113676 - if test -z "$haveit"; then
113677 - rpathdirs="$rpathdirs $dir"
113678 - fi
113679 - dnl Potentially add DIR to ltrpathdirs.
113680 - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
113681 - haveit=
113682 - for x in $ltrpathdirs; do
113683 - if test "X$x" = "X$dir"; then
113684 - haveit=yes
113685 - break
113686 - fi
113687 - done
113688 - if test -z "$haveit"; then
113689 - ltrpathdirs="$ltrpathdirs $dir"
113690 - fi
113691 - fi
113692 - ;;
113693 - -l*)
113694 - dnl Handle this in the next round.
113695 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
113696 - ;;
113697 - *.la)
113698 - dnl Handle this in the next round. Throw away the .la's
113699 - dnl directory; it is already contained in a preceding -L
113700 - dnl option.
113701 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
113702 - ;;
113703 - *)
113704 - dnl Most likely an immediate library name.
113705 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
113706 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
113707 - ;;
113708 - esac
113709 - done
113710 - fi
113711 - else
113712 - dnl Didn't find the library; assume it is in the system directories
113713 - dnl known to the linker and runtime loader. (All the system
113714 - dnl directories known to the linker should also be known to the
113715 - dnl runtime loader, otherwise the system is severely misconfigured.)
113716 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
113717 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
113718 - fi
113719 - fi
113720 - fi
113721 - done
113722 - done
113723 - if test "X$rpathdirs" != "X"; then
113724 - if test -n "$hardcode_libdir_separator"; then
113725 - dnl Weird platform: only the last -rpath option counts, the user must
113726 - dnl pass all path elements in one option. We can arrange that for a
113727 - dnl single library, but not when more than one $LIBNAMEs are used.
113728 - alldirs=
113729 - for found_dir in $rpathdirs; do
113730 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
113731 - done
113732 - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
113733 - acl_save_libdir="$libdir"
113734 - libdir="$alldirs"
113735 - eval flag=\"$hardcode_libdir_flag_spec\"
113736 - libdir="$acl_save_libdir"
113737 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
113738 - else
113739 - dnl The -rpath options are cumulative.
113740 - for found_dir in $rpathdirs; do
113741 - acl_save_libdir="$libdir"
113742 - libdir="$found_dir"
113743 - eval flag=\"$hardcode_libdir_flag_spec\"
113744 - libdir="$acl_save_libdir"
113745 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
113746 - done
113747 - fi
113748 - fi
113749 - if test "X$ltrpathdirs" != "X"; then
113750 - dnl When using libtool, the option that works for both libraries and
113751 - dnl executables is -R. The -R options are cumulative.
113752 - for found_dir in $ltrpathdirs; do
113753 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
113754 - done
113755 - fi
113756 -])
113757 -
113758 -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
113759 -dnl unless already present in VAR.
113760 -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
113761 -dnl contains two or three consecutive elements that belong together.
113762 -AC_DEFUN([AC_LIB_APPENDTOVAR],
113763 -[
113764 - for element in [$2]; do
113765 - haveit=
113766 - for x in $[$1]; do
113767 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113768 - if test "X$x" = "X$element"; then
113769 - haveit=yes
113770 - break
113771 - fi
113772 - done
113773 - if test -z "$haveit"; then
113774 - [$1]="${[$1]}${[$1]:+ }$element"
113775 - fi
113776 - done
113777 -])
113778 diff -rupN original/m4/lib-prefix.m4 new/m4/lib-prefix.m4
113779 --- original/m4/lib-prefix.m4 2009-03-28 22:34:00.000000000 -0430
113780 +++ new/m4/lib-prefix.m4 1969-12-31 20:00:00.000000000 -0400
113781 @@ -1,155 +0,0 @@
113782 -# lib-prefix.m4 serial 2 (gettext-0.12)
113783 -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
113784 -dnl This file is free software, distributed under the terms of the GNU
113785 -dnl General Public License. As a special exception to the GNU General
113786 -dnl Public License, this file may be distributed as part of a program
113787 -dnl that contains a configuration script generated by Autoconf, under
113788 -dnl the same distribution terms as the rest of that program.
113789 -
113790 -dnl From Bruno Haible.
113791 -
113792 -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
113793 -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
113794 -dnl require excessive bracketing.
113795 -ifdef([AC_HELP_STRING],
113796 -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
113797 -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
113798 -
113799 -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
113800 -dnl to access previously installed libraries. The basic assumption is that
113801 -dnl a user will want packages to use other packages he previously installed
113802 -dnl with the same --prefix option.
113803 -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
113804 -dnl libraries, but is otherwise very convenient.
113805 -AC_DEFUN([AC_LIB_PREFIX],
113806 -[
113807 - AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
113808 - AC_REQUIRE([AC_PROG_CC])
113809 - AC_REQUIRE([AC_CANONICAL_HOST])
113810 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
113811 - dnl By default, look in $includedir and $libdir.
113812 - use_additional=yes
113813 - AC_LIB_WITH_FINAL_PREFIX([
113814 - eval additional_includedir=\"$includedir\"
113815 - eval additional_libdir=\"$libdir\"
113816 - ])
113817 - AC_LIB_ARG_WITH([lib-prefix],
113818 -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
113819 - --without-lib-prefix don't search for libraries in includedir and libdir],
113820 -[
113821 - if test "X$withval" = "Xno"; then
113822 - use_additional=no
113823 - else
113824 - if test "X$withval" = "X"; then
113825 - AC_LIB_WITH_FINAL_PREFIX([
113826 - eval additional_includedir=\"$includedir\"
113827 - eval additional_libdir=\"$libdir\"
113828 - ])
113829 - else
113830 - additional_includedir="$withval/include"
113831 - additional_libdir="$withval/lib"
113832 - fi
113833 - fi
113834 -])
113835 - if test $use_additional = yes; then
113836 - dnl Potentially add $additional_includedir to $CPPFLAGS.
113837 - dnl But don't add it
113838 - dnl 1. if it's the standard /usr/include,
113839 - dnl 2. if it's already present in $CPPFLAGS,
113840 - dnl 3. if it's /usr/local/include and we are using GCC on Linux,
113841 - dnl 4. if it doesn't exist as a directory.
113842 - if test "X$additional_includedir" != "X/usr/include"; then
113843 - haveit=
113844 - for x in $CPPFLAGS; do
113845 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113846 - if test "X$x" = "X-I$additional_includedir"; then
113847 - haveit=yes
113848 - break
113849 - fi
113850 - done
113851 - if test -z "$haveit"; then
113852 - if test "X$additional_includedir" = "X/usr/local/include"; then
113853 - if test -n "$GCC"; then
113854 - case $host_os in
113855 - linux*) haveit=yes;;
113856 - esac
113857 - fi
113858 - fi
113859 - if test -z "$haveit"; then
113860 - if test -d "$additional_includedir"; then
113861 - dnl Really add $additional_includedir to $CPPFLAGS.
113862 - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
113863 - fi
113864 - fi
113865 - fi
113866 - fi
113867 - dnl Potentially add $additional_libdir to $LDFLAGS.
113868 - dnl But don't add it
113869 - dnl 1. if it's the standard /usr/lib,
113870 - dnl 2. if it's already present in $LDFLAGS,
113871 - dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
113872 - dnl 4. if it doesn't exist as a directory.
113873 - if test "X$additional_libdir" != "X/usr/lib"; then
113874 - haveit=
113875 - for x in $LDFLAGS; do
113876 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
113877 - if test "X$x" = "X-L$additional_libdir"; then
113878 - haveit=yes
113879 - break
113880 - fi
113881 - done
113882 - if test -z "$haveit"; then
113883 - if test "X$additional_libdir" = "X/usr/local/lib"; then
113884 - if test -n "$GCC"; then
113885 - case $host_os in
113886 - linux*) haveit=yes;;
113887 - esac
113888 - fi
113889 - fi
113890 - if test -z "$haveit"; then
113891 - if test -d "$additional_libdir"; then
113892 - dnl Really add $additional_libdir to $LDFLAGS.
113893 - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
113894 - fi
113895 - fi
113896 - fi
113897 - fi
113898 - fi
113899 -])
113900 -
113901 -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
113902 -dnl acl_final_exec_prefix, containing the values to which $prefix and
113903 -dnl $exec_prefix will expand at the end of the configure script.
113904 -AC_DEFUN([AC_LIB_PREPARE_PREFIX],
113905 -[
113906 - dnl Unfortunately, prefix and exec_prefix get only finally determined
113907 - dnl at the end of configure.
113908 - if test "X$prefix" = "XNONE"; then
113909 - acl_final_prefix="$ac_default_prefix"
113910 - else
113911 - acl_final_prefix="$prefix"
113912 - fi
113913 - if test "X$exec_prefix" = "XNONE"; then
113914 - acl_final_exec_prefix='${prefix}'
113915 - else
113916 - acl_final_exec_prefix="$exec_prefix"
113917 - fi
113918 - acl_save_prefix="$prefix"
113919 - prefix="$acl_final_prefix"
113920 - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
113921 - prefix="$acl_save_prefix"
113922 -])
113923 -
113924 -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
113925 -dnl variables prefix and exec_prefix bound to the values they will have
113926 -dnl at the end of the configure script.
113927 -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
113928 -[
113929 - acl_save_prefix="$prefix"
113930 - prefix="$acl_final_prefix"
113931 - acl_save_exec_prefix="$exec_prefix"
113932 - exec_prefix="$acl_final_exec_prefix"
113933 - $1
113934 - exec_prefix="$acl_save_exec_prefix"
113935 - prefix="$acl_save_prefix"
113936 -])
113937 diff -rupN original/m4/nls.m4 new/m4/nls.m4
113938 --- original/m4/nls.m4 2009-03-28 22:34:00.000000000 -0430
113939 +++ new/m4/nls.m4 1969-12-31 20:00:00.000000000 -0400
113940 @@ -1,49 +0,0 @@
113941 -# nls.m4 serial 1 (gettext-0.12)
113942 -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
113943 -dnl This file is free software, distributed under the terms of the GNU
113944 -dnl General Public License. As a special exception to the GNU General
113945 -dnl Public License, this file may be distributed as part of a program
113946 -dnl that contains a configuration script generated by Autoconf, under
113947 -dnl the same distribution terms as the rest of that program.
113948 -dnl
113949 -dnl This file can can be used in projects which are not available under
113950 -dnl the GNU General Public License or the GNU Library General Public
113951 -dnl License but which still want to provide support for the GNU gettext
113952 -dnl functionality.
113953 -dnl Please note that the actual code of the GNU gettext library is covered
113954 -dnl by the GNU Library General Public License, and the rest of the GNU
113955 -dnl gettext package package is covered by the GNU General Public License.
113956 -dnl They are *not* in the public domain.
113957 -
113958 -dnl Authors:
113959 -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
113960 -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
113961 -
113962 -AC_DEFUN([AM_NLS],
113963 -[
113964 - AC_MSG_CHECKING([whether NLS is requested])
113965 - dnl Default is enabled NLS
113966 - AC_ARG_ENABLE(nls,
113967 - [ --disable-nls do not use Native Language Support],
113968 - USE_NLS=$enableval, USE_NLS=yes)
113969 - AC_MSG_RESULT($USE_NLS)
113970 - AC_SUBST(USE_NLS)
113971 -])
113972 -
113973 -AC_DEFUN([AM_MKINSTALLDIRS],
113974 -[
113975 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
113976 - dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
113977 - dnl Try to locate it.
113978 - MKINSTALLDIRS=
113979 - if test -n "$ac_aux_dir"; then
113980 - case "$ac_aux_dir" in
113981 - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
113982 - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
113983 - esac
113984 - fi
113985 - if test -z "$MKINSTALLDIRS"; then
113986 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
113987 - fi
113988 - AC_SUBST(MKINSTALLDIRS)
113989 -])
113990 diff -rupN original/m4/po.m4 new/m4/po.m4
113991 --- original/m4/po.m4 2009-03-28 22:34:00.000000000 -0430
113992 +++ new/m4/po.m4 1969-12-31 20:00:00.000000000 -0400
113993 @@ -1,197 +0,0 @@
113994 -# po.m4 serial 1 (gettext-0.12)
113995 -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
113996 -dnl This file is free software, distributed under the terms of the GNU
113997 -dnl General Public License. As a special exception to the GNU General
113998 -dnl Public License, this file may be distributed as part of a program
113999 -dnl that contains a configuration script generated by Autoconf, under
114000 -dnl the same distribution terms as the rest of that program.
114001 -dnl
114002 -dnl This file can can be used in projects which are not available under
114003 -dnl the GNU General Public License or the GNU Library General Public
114004 -dnl License but which still want to provide support for the GNU gettext
114005 -dnl functionality.
114006 -dnl Please note that the actual code of the GNU gettext library is covered
114007 -dnl by the GNU Library General Public License, and the rest of the GNU
114008 -dnl gettext package package is covered by the GNU General Public License.
114009 -dnl They are *not* in the public domain.
114010 -
114011 -dnl Authors:
114012 -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
114013 -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
114014 -
114015 -dnl Checks for all prerequisites of the po subdirectory.
114016 -AC_DEFUN([AM_PO_SUBDIRS],
114017 -[
114018 - AC_REQUIRE([AC_PROG_MAKE_SET])dnl
114019 - AC_REQUIRE([AC_PROG_INSTALL])dnl
114020 - AC_REQUIRE([AM_MKINSTALLDIRS])dnl
114021 - AC_REQUIRE([AM_NLS])dnl
114022 -
114023 - dnl Perform the following tests also if --disable-nls has been given,
114024 - dnl because they are needed for "make dist" to work.
114025 -
114026 - dnl Search for GNU msgfmt in the PATH.
114027 - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
114028 - dnl The second test excludes FreeBSD msgfmt.
114029 - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
114030 - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
114031 - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
114032 - :)
114033 - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
114034 -
114035 - dnl Search for GNU xgettext 0.12 or newer in the PATH.
114036 - dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
114037 - dnl The second test excludes FreeBSD xgettext.
114038 - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
114039 - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
114040 - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
114041 - :)
114042 - dnl Remove leftover from FreeBSD xgettext call.
114043 - rm -f messages.po
114044 -
114045 - dnl Search for GNU msgmerge 0.11 or newer in the PATH.
114046 - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
114047 - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
114048 -
114049 - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
114050 - dnl Test whether we really found GNU msgfmt.
114051 - if test "$GMSGFMT" != ":"; then
114052 - dnl If it is no GNU msgfmt we define it as : so that the
114053 - dnl Makefiles still can work.
114054 - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
114055 - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
114056 - : ;
114057 - else
114058 - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
114059 - AC_MSG_RESULT(
114060 - [found $GMSGFMT program is not GNU msgfmt; ignore it])
114061 - GMSGFMT=":"
114062 - fi
114063 - fi
114064 -
114065 - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
114066 - dnl Test whether we really found GNU xgettext.
114067 - if test "$XGETTEXT" != ":"; then
114068 - dnl If it is no GNU xgettext we define it as : so that the
114069 - dnl Makefiles still can work.
114070 - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
114071 - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
114072 - : ;
114073 - else
114074 - AC_MSG_RESULT(
114075 - [found xgettext program is not GNU xgettext; ignore it])
114076 - XGETTEXT=":"
114077 - fi
114078 - dnl Remove leftover from FreeBSD xgettext call.
114079 - rm -f messages.po
114080 - fi
114081 -
114082 - AC_OUTPUT_COMMANDS([
114083 - for ac_file in $CONFIG_FILES; do
114084 - # Support "outfile[:infile[:infile...]]"
114085 - case "$ac_file" in
114086 - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
114087 - esac
114088 - # PO directories have a Makefile.in generated from Makefile.in.in.
114089 - case "$ac_file" in */Makefile.in)
114090 - # Adjust a relative srcdir.
114091 - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
114092 - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
114093 - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
114094 - # In autoconf-2.13 it is called $ac_given_srcdir.
114095 - # In autoconf-2.50 it is called $srcdir.
114096 - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
114097 - case "$ac_given_srcdir" in
114098 - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
114099 - /*) top_srcdir="$ac_given_srcdir" ;;
114100 - *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
114101 - esac
114102 - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
114103 - rm -f "$ac_dir/POTFILES"
114104 - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
114105 - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
114106 - POMAKEFILEDEPS="POTFILES.in"
114107 - # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
114108 - # on $ac_dir but don't depend on user-specified configuration
114109 - # parameters.
114110 - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
114111 - # The LINGUAS file contains the set of available languages.
114112 - if test -n "$OBSOLETE_ALL_LINGUAS"; then
114113 - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
114114 - fi
114115 - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
114116 - # Hide the ALL_LINGUAS assigment from automake.
114117 - eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
114118 - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
114119 - else
114120 - # The set of available languages was given in configure.in.
114121 - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
114122 - fi
114123 - case "$ac_given_srcdir" in
114124 - .) srcdirpre= ;;
114125 - *) srcdirpre='$(srcdir)/' ;;
114126 - esac
114127 - POFILES=
114128 - GMOFILES=
114129 - UPDATEPOFILES=
114130 - DUMMYPOFILES=
114131 - for lang in $ALL_LINGUAS; do
114132 - POFILES="$POFILES $srcdirpre$lang.po"
114133 - GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
114134 - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
114135 - DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
114136 - done
114137 - # CATALOGS depends on both $ac_dir and the user's LINGUAS
114138 - # environment variable.
114139 - INST_LINGUAS=
114140 - if test -n "$ALL_LINGUAS"; then
114141 - for presentlang in $ALL_LINGUAS; do
114142 - useit=no
114143 - if test "%UNSET%" != "$LINGUAS"; then
114144 - desiredlanguages="$LINGUAS"
114145 - else
114146 - desiredlanguages="$ALL_LINGUAS"
114147 - fi
114148 - for desiredlang in $desiredlanguages; do
114149 - # Use the presentlang catalog if desiredlang is
114150 - # a. equal to presentlang, or
114151 - # b. a variant of presentlang (because in this case,
114152 - # presentlang can be used as a fallback for messages
114153 - # which are not translated in the desiredlang catalog).
114154 - case "$desiredlang" in
114155 - "$presentlang"*) useit=yes;;
114156 - esac
114157 - done
114158 - if test $useit = yes; then
114159 - INST_LINGUAS="$INST_LINGUAS $presentlang"
114160 - fi
114161 - done
114162 - fi
114163 - CATALOGS=
114164 - if test -n "$INST_LINGUAS"; then
114165 - for lang in $INST_LINGUAS; do
114166 - CATALOGS="$CATALOGS $lang.gmo"
114167 - done
114168 - fi
114169 - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
114170 - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
114171 - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
114172 - if test -f "$f"; then
114173 - case "$f" in
114174 - *.orig | *.bak | *~) ;;
114175 - *) cat "$f" >> "$ac_dir/Makefile" ;;
114176 - esac
114177 - fi
114178 - done
114179 - fi
114180 - ;;
114181 - esac
114182 - done],
114183 - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
114184 - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
114185 - # from automake.
114186 - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
114187 - # Capture the value of LINGUAS because we need it to compute CATALOGS.
114188 - LINGUAS="${LINGUAS-%UNSET%}"
114189 - ])
114190 -])
114191 diff -rupN original/m4/progtest.m4 new/m4/progtest.m4
114192 --- original/m4/progtest.m4 2009-03-28 22:34:00.000000000 -0430
114193 +++ new/m4/progtest.m4 1969-12-31 20:00:00.000000000 -0400
114194 @@ -1,91 +0,0 @@
114195 -# progtest.m4 serial 3 (gettext-0.12)
114196 -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
114197 -dnl This file is free software, distributed under the terms of the GNU
114198 -dnl General Public License. As a special exception to the GNU General
114199 -dnl Public License, this file may be distributed as part of a program
114200 -dnl that contains a configuration script generated by Autoconf, under
114201 -dnl the same distribution terms as the rest of that program.
114202 -dnl
114203 -dnl This file can can be used in projects which are not available under
114204 -dnl the GNU General Public License or the GNU Library General Public
114205 -dnl License but which still want to provide support for the GNU gettext
114206 -dnl functionality.
114207 -dnl Please note that the actual code of the GNU gettext library is covered
114208 -dnl by the GNU Library General Public License, and the rest of the GNU
114209 -dnl gettext package package is covered by the GNU General Public License.
114210 -dnl They are *not* in the public domain.
114211 -
114212 -dnl Authors:
114213 -dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
114214 -
114215 -# Search path for a program which passes the given test.
114216 -
114217 -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
114218 -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
114219 -AC_DEFUN([AM_PATH_PROG_WITH_TEST],
114220 -[
114221 -# Prepare PATH_SEPARATOR.
114222 -# The user is always right.
114223 -if test "${PATH_SEPARATOR+set}" != set; then
114224 - echo "#! /bin/sh" >conf$$.sh
114225 - echo "exit 0" >>conf$$.sh
114226 - chmod +x conf$$.sh
114227 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
114228 - PATH_SEPARATOR=';'
114229 - else
114230 - PATH_SEPARATOR=:
114231 - fi
114232 - rm -f conf$$.sh
114233 -fi
114234 -
114235 -# Find out how to test for executable files. Don't use a zero-byte file,
114236 -# as systems may use methods other than mode bits to determine executability.
114237 -cat >conf$$.file <<_ASEOF
114238 -#! /bin/sh
114239 -exit 0
114240 -_ASEOF
114241 -chmod +x conf$$.file
114242 -if test -x conf$$.file >/dev/null 2>&1; then
114243 - ac_executable_p="test -x"
114244 -else
114245 - ac_executable_p="test -f"
114246 -fi
114247 -rm -f conf$$.file
114248 -
114249 -# Extract the first word of "$2", so it can be a program name with args.
114250 -set dummy $2; ac_word=[$]2
114251 -AC_MSG_CHECKING([for $ac_word])
114252 -AC_CACHE_VAL(ac_cv_path_$1,
114253 -[case "[$]$1" in
114254 - [[\\/]]* | ?:[[\\/]]*)
114255 - ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
114256 - ;;
114257 - *)
114258 - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
114259 - for ac_dir in ifelse([$5], , $PATH, [$5]); do
114260 - IFS="$ac_save_IFS"
114261 - test -z "$ac_dir" && ac_dir=.
114262 - for ac_exec_ext in '' $ac_executable_extensions; do
114263 - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
114264 - if [$3]; then
114265 - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
114266 - break 2
114267 - fi
114268 - fi
114269 - done
114270 - done
114271 - IFS="$ac_save_IFS"
114272 -dnl If no 4th arg is given, leave the cache variable unset,
114273 -dnl so AC_PATH_PROGS will keep looking.
114274 -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
114275 -])dnl
114276 - ;;
114277 -esac])dnl
114278 -$1="$ac_cv_path_$1"
114279 -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
114280 - AC_MSG_RESULT([$]$1)
114281 -else
114282 - AC_MSG_RESULT(no)
114283 -fi
114284 -AC_SUBST($1)dnl
114285 -])
114286 diff -rupN original/m4/stdint_h.m4 new/m4/stdint_h.m4
114287 --- original/m4/stdint_h.m4 2009-03-28 22:34:00.000000000 -0430
114288 +++ new/m4/stdint_h.m4 1969-12-31 20:00:00.000000000 -0400
114289 @@ -1,28 +0,0 @@
114290 -# stdint_h.m4 serial 3 (gettext-0.12)
114291 -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
114292 -dnl This file is free software, distributed under the terms of the GNU
114293 -dnl General Public License. As a special exception to the GNU General
114294 -dnl Public License, this file may be distributed as part of a program
114295 -dnl that contains a configuration script generated by Autoconf, under
114296 -dnl the same distribution terms as the rest of that program.
114297 -
114298 -dnl From Paul Eggert.
114299 -
114300 -# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
114301 -# doesn't clash with <sys/types.h>, and declares uintmax_t.
114302 -
114303 -AC_DEFUN([jm_AC_HEADER_STDINT_H],
114304 -[
114305 - AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
114306 - [AC_TRY_COMPILE(
114307 - [#include <sys/types.h>
114308 -#include <stdint.h>],
114309 - [uintmax_t i = (uintmax_t) -1;],
114310 - jm_ac_cv_header_stdint_h=yes,
114311 - jm_ac_cv_header_stdint_h=no)])
114312 - if test $jm_ac_cv_header_stdint_h = yes; then
114313 - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
114314 - [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
114315 - and declares uintmax_t. ])
114316 - fi
114317 -])
114318 diff -rupN original/m4/uintmax_t.m4 new/m4/uintmax_t.m4
114319 --- original/m4/uintmax_t.m4 2009-03-28 22:34:00.000000000 -0430
114320 +++ new/m4/uintmax_t.m4 1969-12-31 20:00:00.000000000 -0400
114321 @@ -1,32 +0,0 @@
114322 -# uintmax_t.m4 serial 7 (gettext-0.12)
114323 -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
114324 -dnl This file is free software, distributed under the terms of the GNU
114325 -dnl General Public License. As a special exception to the GNU General
114326 -dnl Public License, this file may be distributed as part of a program
114327 -dnl that contains a configuration script generated by Autoconf, under
114328 -dnl the same distribution terms as the rest of that program.
114329 -
114330 -dnl From Paul Eggert.
114331 -
114332 -AC_PREREQ(2.13)
114333 -
114334 -# Define uintmax_t to 'unsigned long' or 'unsigned long long'
114335 -# if it is not already defined in <stdint.h> or <inttypes.h>.
114336 -
114337 -AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
114338 -[
114339 - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
114340 - AC_REQUIRE([jm_AC_HEADER_STDINT_H])
114341 - if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
114342 - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
114343 - test $ac_cv_type_unsigned_long_long = yes \
114344 - && ac_type='unsigned long long' \
114345 - || ac_type='unsigned long'
114346 - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
114347 - [Define to unsigned long or unsigned long long
114348 - if <stdint.h> and <inttypes.h> don't define.])
114349 - else
114350 - AC_DEFINE(HAVE_UINTMAX_T, 1,
114351 - [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
114352 - fi
114353 -])
114354 diff -rupN original/m4/ulonglong.m4 new/m4/ulonglong.m4
114355 --- original/m4/ulonglong.m4 2009-03-28 22:34:00.000000000 -0430
114356 +++ new/m4/ulonglong.m4 1969-12-31 20:00:00.000000000 -0400
114357 @@ -1,23 +0,0 @@
114358 -# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
114359 -dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
114360 -dnl This file is free software, distributed under the terms of the GNU
114361 -dnl General Public License. As a special exception to the GNU General
114362 -dnl Public License, this file may be distributed as part of a program
114363 -dnl that contains a configuration script generated by Autoconf, under
114364 -dnl the same distribution terms as the rest of that program.
114365 -
114366 -dnl From Paul Eggert.
114367 -
114368 -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
114369 -[
114370 - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
114371 - [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
114372 - [unsigned long long ullmax = (unsigned long long) -1;
114373 - return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
114374 - ac_cv_type_unsigned_long_long=yes,
114375 - ac_cv_type_unsigned_long_long=no)])
114376 - if test $ac_cv_type_unsigned_long_long = yes; then
114377 - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
114378 - [Define if you have the unsigned long long type.])
114379 - fi
114380 -])
114381 diff -rupN original/missing new/missing
114382 --- original/missing 2009-03-28 22:34:09.000000000 -0430
114383 +++ new/missing 1969-12-31 20:00:00.000000000 -0400
114384 @@ -1,367 +0,0 @@
114385 -#! /bin/sh
114386 -# Common stub for a few missing GNU programs while installing.
114387 -
114388 -scriptversion=2006-05-10.23
114389 -
114390 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
114391 -# Free Software Foundation, Inc.
114392 -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
114393 -
114394 -# This program is free software; you can redistribute it and/or modify
114395 -# it under the terms of the GNU General Public License as published by
114396 -# the Free Software Foundation; either version 2, or (at your option)
114397 -# any later version.
114398 -
114399 -# This program is distributed in the hope that it will be useful,
114400 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
114401 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
114402 -# GNU General Public License for more details.
114403 -
114404 -# You should have received a copy of the GNU General Public License
114405 -# along with this program; if not, write to the Free Software
114406 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
114407 -# 02110-1301, USA.
114408 -
114409 -# As a special exception to the GNU General Public License, if you
114410 -# distribute this file as part of a program that contains a
114411 -# configuration script generated by Autoconf, you may include it under
114412 -# the same distribution terms that you use for the rest of that program.
114413 -
114414 -if test $# -eq 0; then
114415 - echo 1>&2 "Try \`$0 --help' for more information"
114416 - exit 1
114417 -fi
114418 -
114419 -run=:
114420 -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
114421 -sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
114422 -
114423 -# In the cases where this matters, `missing' is being run in the
114424 -# srcdir already.
114425 -if test -f configure.ac; then
114426 - configure_ac=configure.ac
114427 -else
114428 - configure_ac=configure.in
114429 -fi
114430 -
114431 -msg="missing on your system"
114432 -
114433 -case $1 in
114434 ---run)
114435 - # Try to run requested program, and just exit if it succeeds.
114436 - run=
114437 - shift
114438 - "$@" && exit 0
114439 - # Exit code 63 means version mismatch. This often happens
114440 - # when the user try to use an ancient version of a tool on
114441 - # a file that requires a minimum version. In this case we
114442 - # we should proceed has if the program had been absent, or
114443 - # if --run hadn't been passed.
114444 - if test $? = 63; then
114445 - run=:
114446 - msg="probably too old"
114447 - fi
114448 - ;;
114449 -
114450 - -h|--h|--he|--hel|--help)
114451 - echo "\
114452 -$0 [OPTION]... PROGRAM [ARGUMENT]...
114453 -
114454 -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
114455 -error status if there is no known handling for PROGRAM.
114456 -
114457 -Options:
114458 - -h, --help display this help and exit
114459 - -v, --version output version information and exit
114460 - --run try to run the given command, and emulate it if it fails
114461 -
114462 -Supported PROGRAM values:
114463 - aclocal touch file \`aclocal.m4'
114464 - autoconf touch file \`configure'
114465 - autoheader touch file \`config.h.in'
114466 - autom4te touch the output file, or create a stub one
114467 - automake touch all \`Makefile.in' files
114468 - bison create \`y.tab.[ch]', if possible, from existing .[ch]
114469 - flex create \`lex.yy.c', if possible, from existing .c
114470 - help2man touch the output file
114471 - lex create \`lex.yy.c', if possible, from existing .c
114472 - makeinfo touch the output file
114473 - tar try tar, gnutar, gtar, then tar without non-portable flags
114474 - yacc create \`y.tab.[ch]', if possible, from existing .[ch]
114475 -
114476 -Send bug reports to <bug-automake@gnu.org>."
114477 - exit $?
114478 - ;;
114479 -
114480 - -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
114481 - echo "missing $scriptversion (GNU Automake)"
114482 - exit $?
114483 - ;;
114484 -
114485 - -*)
114486 - echo 1>&2 "$0: Unknown \`$1' option"
114487 - echo 1>&2 "Try \`$0 --help' for more information"
114488 - exit 1
114489 - ;;
114490 -
114491 -esac
114492 -
114493 -# Now exit if we have it, but it failed. Also exit now if we
114494 -# don't have it and --version was passed (most likely to detect
114495 -# the program).
114496 -case $1 in
114497 - lex|yacc)
114498 - # Not GNU programs, they don't have --version.
114499 - ;;
114500 -
114501 - tar)
114502 - if test -n "$run"; then
114503 - echo 1>&2 "ERROR: \`tar' requires --run"
114504 - exit 1
114505 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
114506 - exit 1
114507 - fi
114508 - ;;
114509 -
114510 - *)
114511 - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
114512 - # We have it, but it failed.
114513 - exit 1
114514 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
114515 - # Could not run --version or --help. This is probably someone
114516 - # running `$TOOL --version' or `$TOOL --help' to check whether
114517 - # $TOOL exists and not knowing $TOOL uses missing.
114518 - exit 1
114519 - fi
114520 - ;;
114521 -esac
114522 -
114523 -# If it does not exist, or fails to run (possibly an outdated version),
114524 -# try to emulate it.
114525 -case $1 in
114526 - aclocal*)
114527 - echo 1>&2 "\
114528 -WARNING: \`$1' is $msg. You should only need it if
114529 - you modified \`acinclude.m4' or \`${configure_ac}'. You might want
114530 - to install the \`Automake' and \`Perl' packages. Grab them from
114531 - any GNU archive site."
114532 - touch aclocal.m4
114533 - ;;
114534 -
114535 - autoconf)
114536 - echo 1>&2 "\
114537 -WARNING: \`$1' is $msg. You should only need it if
114538 - you modified \`${configure_ac}'. You might want to install the
114539 - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
114540 - archive site."
114541 - touch configure
114542 - ;;
114543 -
114544 - autoheader)
114545 - echo 1>&2 "\
114546 -WARNING: \`$1' is $msg. You should only need it if
114547 - you modified \`acconfig.h' or \`${configure_ac}'. You might want
114548 - to install the \`Autoconf' and \`GNU m4' packages. Grab them
114549 - from any GNU archive site."
114550 - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
114551 - test -z "$files" && files="config.h"
114552 - touch_files=
114553 - for f in $files; do
114554 - case $f in
114555 - *:*) touch_files="$touch_files "`echo "$f" |
114556 - sed -e 's/^[^:]*://' -e 's/:.*//'`;;
114557 - *) touch_files="$touch_files $f.in";;
114558 - esac
114559 - done
114560 - touch $touch_files
114561 - ;;
114562 -
114563 - automake*)
114564 - echo 1>&2 "\
114565 -WARNING: \`$1' is $msg. You should only need it if
114566 - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
114567 - You might want to install the \`Automake' and \`Perl' packages.
114568 - Grab them from any GNU archive site."
114569 - find . -type f -name Makefile.am -print |
114570 - sed 's/\.am$/.in/' |
114571 - while read f; do touch "$f"; done
114572 - ;;
114573 -
114574 - autom4te)
114575 - echo 1>&2 "\
114576 -WARNING: \`$1' is needed, but is $msg.
114577 - You might have modified some files without having the
114578 - proper tools for further handling them.
114579 - You can get \`$1' as part of \`Autoconf' from any GNU
114580 - archive site."
114581 -
114582 - file=`echo "$*" | sed -n "$sed_output"`
114583 - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
114584 - if test -f "$file"; then
114585 - touch $file
114586 - else
114587 - test -z "$file" || exec >$file
114588 - echo "#! /bin/sh"
114589 - echo "# Created by GNU Automake missing as a replacement of"
114590 - echo "# $ $@"
114591 - echo "exit 0"
114592 - chmod +x $file
114593 - exit 1
114594 - fi
114595 - ;;
114596 -
114597 - bison|yacc)
114598 - echo 1>&2 "\
114599 -WARNING: \`$1' $msg. You should only need it if
114600 - you modified a \`.y' file. You may need the \`Bison' package
114601 - in order for those modifications to take effect. You can get
114602 - \`Bison' from any GNU archive site."
114603 - rm -f y.tab.c y.tab.h
114604 - if test $# -ne 1; then
114605 - eval LASTARG="\${$#}"
114606 - case $LASTARG in
114607 - *.y)
114608 - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
114609 - if test -f "$SRCFILE"; then
114610 - cp "$SRCFILE" y.tab.c
114611 - fi
114612 - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
114613 - if test -f "$SRCFILE"; then
114614 - cp "$SRCFILE" y.tab.h
114615 - fi
114616 - ;;
114617 - esac
114618 - fi
114619 - if test ! -f y.tab.h; then
114620 - echo >y.tab.h
114621 - fi
114622 - if test ! -f y.tab.c; then
114623 - echo 'main() { return 0; }' >y.tab.c
114624 - fi
114625 - ;;
114626 -
114627 - lex|flex)
114628 - echo 1>&2 "\
114629 -WARNING: \`$1' is $msg. You should only need it if
114630 - you modified a \`.l' file. You may need the \`Flex' package
114631 - in order for those modifications to take effect. You can get
114632 - \`Flex' from any GNU archive site."
114633 - rm -f lex.yy.c
114634 - if test $# -ne 1; then
114635 - eval LASTARG="\${$#}"
114636 - case $LASTARG in
114637 - *.l)
114638 - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
114639 - if test -f "$SRCFILE"; then
114640 - cp "$SRCFILE" lex.yy.c
114641 - fi
114642 - ;;
114643 - esac
114644 - fi
114645 - if test ! -f lex.yy.c; then
114646 - echo 'main() { return 0; }' >lex.yy.c
114647 - fi
114648 - ;;
114649 -
114650 - help2man)
114651 - echo 1>&2 "\
114652 -WARNING: \`$1' is $msg. You should only need it if
114653 - you modified a dependency of a manual page. You may need the
114654 - \`Help2man' package in order for those modifications to take
114655 - effect. You can get \`Help2man' from any GNU archive site."
114656 -
114657 - file=`echo "$*" | sed -n "$sed_output"`
114658 - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
114659 - if test -f "$file"; then
114660 - touch $file
114661 - else
114662 - test -z "$file" || exec >$file
114663 - echo ".ab help2man is required to generate this page"
114664 - exit 1
114665 - fi
114666 - ;;
114667 -
114668 - makeinfo)
114669 - echo 1>&2 "\
114670 -WARNING: \`$1' is $msg. You should only need it if
114671 - you modified a \`.texi' or \`.texinfo' file, or any other file
114672 - indirectly affecting the aspect of the manual. The spurious
114673 - call might also be the consequence of using a buggy \`make' (AIX,
114674 - DU, IRIX). You might want to install the \`Texinfo' package or
114675 - the \`GNU make' package. Grab either from any GNU archive site."
114676 - # The file to touch is that specified with -o ...
114677 - file=`echo "$*" | sed -n "$sed_output"`
114678 - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
114679 - if test -z "$file"; then
114680 - # ... or it is the one specified with @setfilename ...
114681 - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
114682 - file=`sed -n '
114683 - /^@setfilename/{
114684 - s/.* \([^ ]*\) *$/\1/
114685 - p
114686 - q
114687 - }' $infile`
114688 - # ... or it is derived from the source name (dir/f.texi becomes f.info)
114689 - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
114690 - fi
114691 - # If the file does not exist, the user really needs makeinfo;
114692 - # let's fail without touching anything.
114693 - test -f $file || exit 1
114694 - touch $file
114695 - ;;
114696 -
114697 - tar)
114698 - shift
114699 -
114700 - # We have already tried tar in the generic part.
114701 - # Look for gnutar/gtar before invocation to avoid ugly error
114702 - # messages.
114703 - if (gnutar --version > /dev/null 2>&1); then
114704 - gnutar "$@" && exit 0
114705 - fi
114706 - if (gtar --version > /dev/null 2>&1); then
114707 - gtar "$@" && exit 0
114708 - fi
114709 - firstarg="$1"
114710 - if shift; then
114711 - case $firstarg in
114712 - *o*)
114713 - firstarg=`echo "$firstarg" | sed s/o//`
114714 - tar "$firstarg" "$@" && exit 0
114715 - ;;
114716 - esac
114717 - case $firstarg in
114718 - *h*)
114719 - firstarg=`echo "$firstarg" | sed s/h//`
114720 - tar "$firstarg" "$@" && exit 0
114721 - ;;
114722 - esac
114723 - fi
114724 -
114725 - echo 1>&2 "\
114726 -WARNING: I can't seem to be able to run \`tar' with the given arguments.
114727 - You may want to install GNU tar or Free paxutils, or check the
114728 - command line arguments."
114729 - exit 1
114730 - ;;
114731 -
114732 - *)
114733 - echo 1>&2 "\
114734 -WARNING: \`$1' is needed, and is $msg.
114735 - You might have modified some files without having the
114736 - proper tools for further handling them. Check the \`README' file,
114737 - it often tells you about the needed prerequisites for installing
114738 - this package. You may also peek at any GNU archive site, in case
114739 - some other package would contain this missing \`$1' program."
114740 - exit 1
114741 - ;;
114742 -esac
114743 -
114744 -exit 0
114745 -
114746 -# Local variables:
114747 -# eval: (add-hook 'write-file-hooks 'time-stamp)
114748 -# time-stamp-start: "scriptversion="
114749 -# time-stamp-format: "%:y-%02m-%02d.%02H"
114750 -# time-stamp-end: "$"
114751 -# End:
114752 diff -rupN original/mkinstalldirs new/mkinstalldirs
114753 --- original/mkinstalldirs 2009-03-28 22:34:00.000000000 -0430
114754 +++ new/mkinstalldirs 1969-12-31 20:00:00.000000000 -0400
114755 @@ -1,111 +0,0 @@
114756 -#! /bin/sh
114757 -# mkinstalldirs --- make directory hierarchy
114758 -# Author: Noah Friedman <friedman@prep.ai.mit.edu>
114759 -# Created: 1993-05-16
114760 -# Public domain
114761 -
114762 -errstatus=0
114763 -dirmode=""
114764 -
114765 -usage="\
114766 -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
114767 -
114768 -# process command line arguments
114769 -while test $# -gt 0 ; do
114770 - case $1 in
114771 - -h | --help | --h*) # -h for help
114772 - echo "$usage" 1>&2
114773 - exit 0
114774 - ;;
114775 - -m) # -m PERM arg
114776 - shift
114777 - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
114778 - dirmode=$1
114779 - shift
114780 - ;;
114781 - --) # stop option processing
114782 - shift
114783 - break
114784 - ;;
114785 - -*) # unknown option
114786 - echo "$usage" 1>&2
114787 - exit 1
114788 - ;;
114789 - *) # first non-opt arg
114790 - break
114791 - ;;
114792 - esac
114793 -done
114794 -
114795 -for file
114796 -do
114797 - if test -d "$file"; then
114798 - shift
114799 - else
114800 - break
114801 - fi
114802 -done
114803 -
114804 -case $# in
114805 - 0) exit 0 ;;
114806 -esac
114807 -
114808 -case $dirmode in
114809 - '')
114810 - if mkdir -p -- . 2>/dev/null; then
114811 - echo "mkdir -p -- $*"
114812 - exec mkdir -p -- "$@"
114813 - fi
114814 - ;;
114815 - *)
114816 - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
114817 - echo "mkdir -m $dirmode -p -- $*"
114818 - exec mkdir -m "$dirmode" -p -- "$@"
114819 - fi
114820 - ;;
114821 -esac
114822 -
114823 -for file
114824 -do
114825 - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
114826 - shift
114827 -
114828 - pathcomp=
114829 - for d
114830 - do
114831 - pathcomp="$pathcomp$d"
114832 - case $pathcomp in
114833 - -*) pathcomp=./$pathcomp ;;
114834 - esac
114835 -
114836 - if test ! -d "$pathcomp"; then
114837 - echo "mkdir $pathcomp"
114838 -
114839 - mkdir "$pathcomp" || lasterr=$?
114840 -
114841 - if test ! -d "$pathcomp"; then
114842 - errstatus=$lasterr
114843 - else
114844 - if test ! -z "$dirmode"; then
114845 - echo "chmod $dirmode $pathcomp"
114846 - lasterr=""
114847 - chmod "$dirmode" "$pathcomp" || lasterr=$?
114848 -
114849 - if test ! -z "$lasterr"; then
114850 - errstatus=$lasterr
114851 - fi
114852 - fi
114853 - fi
114854 - fi
114855 -
114856 - pathcomp="$pathcomp/"
114857 - done
114858 -done
114859 -
114860 -exit $errstatus
114861 -
114862 -# Local Variables:
114863 -# mode: shell-script
114864 -# sh-indentation: 2
114865 -# End:
114866 -# mkinstalldirs ends here
114867 diff -rupN original/pixmaps/Makefile.in new/pixmaps/Makefile.in
114868 --- original/pixmaps/Makefile.in 2009-03-29 01:17:41.000000000 -0430
114869 +++ new/pixmaps/Makefile.in 1969-12-31 20:00:00.000000000 -0400
114870 @@ -1,443 +0,0 @@
114871 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
114872 -# @configure_input@
114873 -
114874 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
114875 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
114876 -# This Makefile.in is free software; the Free Software Foundation
114877 -# gives unlimited permission to copy and/or distribute it,
114878 -# with or without modifications, as long as this notice is preserved.
114879 -
114880 -# This program is distributed in the hope that it will be useful,
114881 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
114882 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
114883 -# PARTICULAR PURPOSE.
114884 -
114885 -@SET_MAKE@
114886 -
114887 -VPATH = @srcdir@
114888 -pkgdatadir = $(datadir)/@PACKAGE@
114889 -pkglibdir = $(libdir)/@PACKAGE@
114890 -pkgincludedir = $(includedir)/@PACKAGE@
114891 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
114892 -install_sh_DATA = $(install_sh) -c -m 644
114893 -install_sh_PROGRAM = $(install_sh) -c
114894 -install_sh_SCRIPT = $(install_sh) -c
114895 -INSTALL_HEADER = $(INSTALL_DATA)
114896 -transform = $(program_transform_name)
114897 -NORMAL_INSTALL = :
114898 -PRE_INSTALL = :
114899 -POST_INSTALL = :
114900 -NORMAL_UNINSTALL = :
114901 -PRE_UNINSTALL = :
114902 -POST_UNINSTALL = :
114903 -build_triplet = @build@
114904 -host_triplet = @host@
114905 -target_triplet = @target@
114906 -subdir = pixmaps
114907 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
114908 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
114909 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
114910 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
114911 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
114912 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
114913 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
114914 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
114915 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
114916 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
114917 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
114918 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
114919 - $(top_srcdir)/configure.ac
114920 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
114921 - $(ACLOCAL_M4)
114922 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
114923 -CONFIG_HEADER = $(top_builddir)/include/config.h
114924 -CONFIG_CLEAN_FILES =
114925 -SOURCES =
114926 -DIST_SOURCES =
114927 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
114928 -am__vpath_adj = case $$p in \
114929 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
114930 - *) f=$$p;; \
114931 - esac;
114932 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
114933 -am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"
114934 -iconDATA_INSTALL = $(INSTALL_DATA)
114935 -pixmapDATA_INSTALL = $(INSTALL_DATA)
114936 -DATA = $(icon_DATA) $(pixmap_DATA)
114937 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
114938 -ACLOCAL = @ACLOCAL@
114939 -ALLOCA = @ALLOCA@
114940 -ALL_LINGUAS = @ALL_LINGUAS@
114941 -ALSA_LIBS = @ALSA_LIBS@
114942 -AMTAR = @AMTAR@
114943 -AR = @AR@
114944 -AUTOCONF = @AUTOCONF@
114945 -AUTOHEADER = @AUTOHEADER@
114946 -AUTOMAKE = @AUTOMAKE@
114947 -AWK = @AWK@
114948 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
114949 -BURN_CFLAGS = @BURN_CFLAGS@
114950 -BURN_LIBS = @BURN_LIBS@
114951 -CATOBJEXT = @CATOBJEXT@
114952 -CC = @CC@
114953 -CCAS = @CCAS@
114954 -CCASDEPMODE = @CCASDEPMODE@
114955 -CCASFLAGS = @CCASFLAGS@
114956 -CCDEPMODE = @CCDEPMODE@
114957 -CFLAGS = @CFLAGS@
114958 -CPP = @CPP@
114959 -CPPFLAGS = @CPPFLAGS@
114960 -CXX = @CXX@
114961 -CXXCPP = @CXXCPP@
114962 -CXXDEPMODE = @CXXDEPMODE@
114963 -CXXFLAGS = @CXXFLAGS@
114964 -CYGPATH_W = @CYGPATH_W@
114965 -DATADIRNAME = @DATADIRNAME@
114966 -DEFS = @DEFS@
114967 -DEPDIR = @DEPDIR@
114968 -DFBINIMAGE = @DFBINIMAGE@
114969 -DSYMUTIL = @DSYMUTIL@
114970 -ECHO = @ECHO@
114971 -ECHO_C = @ECHO_C@
114972 -ECHO_N = @ECHO_N@
114973 -ECHO_T = @ECHO_T@
114974 -EGREP = @EGREP@
114975 -EXEEXT = @EXEEXT@
114976 -F77 = @F77@
114977 -FFLAGS = @FFLAGS@
114978 -FLTKCONFIG = @FLTKCONFIG@
114979 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
114980 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
114981 -GENCAT = @GENCAT@
114982 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
114983 -GIO2_CFLAGS = @GIO2_CFLAGS@
114984 -GIO2_LIBS = @GIO2_LIBS@
114985 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
114986 -GLADE2_LIBS = @GLADE2_LIBS@
114987 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
114988 -GLIB2_LIBS = @GLIB2_LIBS@
114989 -GLIBC21 = @GLIBC21@
114990 -GMSGFMT = @GMSGFMT@
114991 -GREP = @GREP@
114992 -GTK2_CFLAGS = @GTK2_CFLAGS@
114993 -GTK2_LIBS = @GTK2_LIBS@
114994 -INSTALL = @INSTALL@
114995 -INSTALL_DATA = @INSTALL_DATA@
114996 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
114997 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
114998 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
114999 -INSTOBJEXT = @INSTOBJEXT@
115000 -INTLBISON = @INTLBISON@
115001 -INTLLIBS = @INTLLIBS@
115002 -INTLOBJS = @INTLOBJS@
115003 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
115004 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
115005 -INTLTOOL_PERL = @INTLTOOL_PERL@
115006 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
115007 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
115008 -LDFLAGS = @LDFLAGS@
115009 -LIBICONV = @LIBICONV@
115010 -LIBINTL = @LIBINTL@
115011 -LIBOBJS = @LIBOBJS@
115012 -LIBS = @LIBS@
115013 -LIBTOOL = @LIBTOOL@
115014 -LN_S = @LN_S@
115015 -LTLIBICONV = @LTLIBICONV@
115016 -LTLIBINTL = @LTLIBINTL@
115017 -LTLIBOBJS = @LTLIBOBJS@
115018 -MAINT = @MAINT@
115019 -MAKEINFO = @MAKEINFO@
115020 -MKDIR_P = @MKDIR_P@
115021 -MKINSTALLDIRS = @MKINSTALLDIRS@
115022 -MSGFMT = @MSGFMT@
115023 -MSGMERGE = @MSGMERGE@
115024 -NASM = @NASM@
115025 -NMEDIT = @NMEDIT@
115026 -OBJEXT = @OBJEXT@
115027 -PACKAGE = @PACKAGE@
115028 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
115029 -PACKAGE_NAME = @PACKAGE_NAME@
115030 -PACKAGE_STRING = @PACKAGE_STRING@
115031 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
115032 -PACKAGE_VERSION = @PACKAGE_VERSION@
115033 -PATH_SEPARATOR = @PATH_SEPARATOR@
115034 -PKG_CONFIG = @PKG_CONFIG@
115035 -POSUB = @POSUB@
115036 -RANLIB = @RANLIB@
115037 -SED = @SED@
115038 -SET_MAKE = @SET_MAKE@
115039 -SHELL = @SHELL@
115040 -STRIP = @STRIP@
115041 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
115042 -USE_NLS = @USE_NLS@
115043 -VERSION = @VERSION@
115044 -XGETTEXT = @XGETTEXT@
115045 -abs_builddir = @abs_builddir@
115046 -abs_srcdir = @abs_srcdir@
115047 -abs_top_builddir = @abs_top_builddir@
115048 -abs_top_srcdir = @abs_top_srcdir@
115049 -ac_ct_CC = @ac_ct_CC@
115050 -ac_ct_CXX = @ac_ct_CXX@
115051 -ac_ct_F77 = @ac_ct_F77@
115052 -am__include = @am__include@
115053 -am__leading_dot = @am__leading_dot@
115054 -am__quote = @am__quote@
115055 -am__tar = @am__tar@
115056 -am__untar = @am__untar@
115057 -bindir = @bindir@
115058 -build = @build@
115059 -build_alias = @build_alias@
115060 -build_cpu = @build_cpu@
115061 -build_os = @build_os@
115062 -build_vendor = @build_vendor@
115063 -builddir = @builddir@
115064 -datadir = @datadir@
115065 -datarootdir = @datarootdir@
115066 -docdir = @docdir@
115067 -dvidir = @dvidir@
115068 -exec_prefix = @exec_prefix@
115069 -host = @host@
115070 -host_alias = @host_alias@
115071 -host_cpu = @host_cpu@
115072 -host_os = @host_os@
115073 -host_vendor = @host_vendor@
115074 -htmldir = @htmldir@
115075 -includedir = @includedir@
115076 -infodir = @infodir@
115077 -install_sh = @install_sh@
115078 -libdir = @libdir@
115079 -libexecdir = @libexecdir@
115080 -localedir = @localedir@
115081 -localstatedir = @localstatedir@
115082 -mandir = @mandir@
115083 -mkdir_p = @mkdir_p@
115084 -oldincludedir = @oldincludedir@
115085 -pdfdir = @pdfdir@
115086 -prefix = @prefix@
115087 -program_transform_name = @program_transform_name@
115088 -psdir = @psdir@
115089 -sbindir = @sbindir@
115090 -sharedstatedir = @sharedstatedir@
115091 -srcdir = @srcdir@
115092 -sysconfdir = @sysconfdir@
115093 -target = @target@
115094 -target_alias = @target_alias@
115095 -target_cpu = @target_cpu@
115096 -target_os = @target_os@
115097 -target_vendor = @target_vendor@
115098 -top_build_prefix = @top_build_prefix@
115099 -top_builddir = @top_builddir@
115100 -top_srcdir = @top_srcdir@
115101 -pixmapdir = "$(datadir)/pcsx"
115102 -pixmap_DATA = pcsx.jpg
115103 -icondir = "$(datadir)/pixmaps"
115104 -icon_DATA = pcsx-icon.png
115105 -EXTRA_DIST = pcsx.jpg pcsx-icon.png
115106 -all: all-am
115107 -
115108 -.SUFFIXES:
115109 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
115110 - @for dep in $?; do \
115111 - case '$(am__configure_deps)' in \
115112 - *$$dep*) \
115113 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
115114 - && exit 0; \
115115 - exit 1;; \
115116 - esac; \
115117 - done; \
115118 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/Makefile'; \
115119 - cd $(top_srcdir) && \
115120 - $(AUTOMAKE) --gnu pixmaps/Makefile
115121 -.PRECIOUS: Makefile
115122 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
115123 - @case '$?' in \
115124 - *config.status*) \
115125 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
115126 - *) \
115127 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
115128 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
115129 - esac;
115130 -
115131 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
115132 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
115133 -
115134 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
115135 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
115136 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
115137 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
115138 -
115139 -mostlyclean-libtool:
115140 - -rm -f *.lo
115141 -
115142 -clean-libtool:
115143 - -rm -rf .libs _libs
115144 -install-iconDATA: $(icon_DATA)
115145 - @$(NORMAL_INSTALL)
115146 - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
115147 - @list='$(icon_DATA)'; for p in $$list; do \
115148 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
115149 - f=$(am__strip_dir) \
115150 - echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
115151 - $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
115152 - done
115153 -
115154 -uninstall-iconDATA:
115155 - @$(NORMAL_UNINSTALL)
115156 - @list='$(icon_DATA)'; for p in $$list; do \
115157 - f=$(am__strip_dir) \
115158 - echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
115159 - rm -f "$(DESTDIR)$(icondir)/$$f"; \
115160 - done
115161 -install-pixmapDATA: $(pixmap_DATA)
115162 - @$(NORMAL_INSTALL)
115163 - test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
115164 - @list='$(pixmap_DATA)'; for p in $$list; do \
115165 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
115166 - f=$(am__strip_dir) \
115167 - echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \
115168 - $(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \
115169 - done
115170 -
115171 -uninstall-pixmapDATA:
115172 - @$(NORMAL_UNINSTALL)
115173 - @list='$(pixmap_DATA)'; for p in $$list; do \
115174 - f=$(am__strip_dir) \
115175 - echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \
115176 - rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \
115177 - done
115178 -tags: TAGS
115179 -TAGS:
115180 -
115181 -ctags: CTAGS
115182 -CTAGS:
115183 -
115184 -
115185 -distdir: $(DISTFILES)
115186 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
115187 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
115188 - list='$(DISTFILES)'; \
115189 - dist_files=`for file in $$list; do echo $$file; done | \
115190 - sed -e "s|^$$srcdirstrip/||;t" \
115191 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
115192 - case $$dist_files in \
115193 - */*) $(MKDIR_P) `echo "$$dist_files" | \
115194 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
115195 - sort -u` ;; \
115196 - esac; \
115197 - for file in $$dist_files; do \
115198 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
115199 - if test -d $$d/$$file; then \
115200 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
115201 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
115202 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
115203 - fi; \
115204 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
115205 - else \
115206 - test -f $(distdir)/$$file \
115207 - || cp -p $$d/$$file $(distdir)/$$file \
115208 - || exit 1; \
115209 - fi; \
115210 - done
115211 -check-am: all-am
115212 -check: check-am
115213 -all-am: Makefile $(DATA)
115214 -installdirs:
115215 - for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"; do \
115216 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
115217 - done
115218 -install: install-am
115219 -install-exec: install-exec-am
115220 -install-data: install-data-am
115221 -uninstall: uninstall-am
115222 -
115223 -install-am: all-am
115224 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
115225 -
115226 -installcheck: installcheck-am
115227 -install-strip:
115228 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
115229 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
115230 - `test -z '$(STRIP)' || \
115231 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
115232 -mostlyclean-generic:
115233 -
115234 -clean-generic:
115235 -
115236 -distclean-generic:
115237 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
115238 -
115239 -maintainer-clean-generic:
115240 - @echo "This command is intended for maintainers to use"
115241 - @echo "it deletes files that may require special tools to rebuild."
115242 -clean: clean-am
115243 -
115244 -clean-am: clean-generic clean-libtool mostlyclean-am
115245 -
115246 -distclean: distclean-am
115247 - -rm -f Makefile
115248 -distclean-am: clean-am distclean-generic
115249 -
115250 -dvi: dvi-am
115251 -
115252 -dvi-am:
115253 -
115254 -html: html-am
115255 -
115256 -info: info-am
115257 -
115258 -info-am:
115259 -
115260 -install-data-am: install-iconDATA install-pixmapDATA
115261 -
115262 -install-dvi: install-dvi-am
115263 -
115264 -install-exec-am:
115265 -
115266 -install-html: install-html-am
115267 -
115268 -install-info: install-info-am
115269 -
115270 -install-man:
115271 -
115272 -install-pdf: install-pdf-am
115273 -
115274 -install-ps: install-ps-am
115275 -
115276 -installcheck-am:
115277 -
115278 -maintainer-clean: maintainer-clean-am
115279 - -rm -f Makefile
115280 -maintainer-clean-am: distclean-am maintainer-clean-generic
115281 -
115282 -mostlyclean: mostlyclean-am
115283 -
115284 -mostlyclean-am: mostlyclean-generic mostlyclean-libtool
115285 -
115286 -pdf: pdf-am
115287 -
115288 -pdf-am:
115289 -
115290 -ps: ps-am
115291 -
115292 -ps-am:
115293 -
115294 -uninstall-am: uninstall-iconDATA uninstall-pixmapDATA
115295 -
115296 -.MAKE: install-am install-strip
115297 -
115298 -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
115299 - distclean distclean-generic distclean-libtool distdir dvi \
115300 - dvi-am html html-am info info-am install install-am \
115301 - install-data install-data-am install-dvi install-dvi-am \
115302 - install-exec install-exec-am install-html install-html-am \
115303 - install-iconDATA install-info install-info-am install-man \
115304 - install-pdf install-pdf-am install-pixmapDATA install-ps \
115305 - install-ps-am install-strip installcheck installcheck-am \
115306 - installdirs maintainer-clean maintainer-clean-generic \
115307 - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
115308 - ps ps-am uninstall uninstall-am uninstall-iconDATA \
115309 - uninstall-pixmapDATA
115310 -
115311 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
115312 -# Otherwise a system limit (for SysV at least) may be exceeded.
115313 -.NOEXPORT:
115314 diff -rupN original/plugins/dfOpenGL/Makefile.in new/plugins/dfOpenGL/Makefile.in
115315 --- original/plugins/dfOpenGL/Makefile.in 2009-03-29 01:17:41.000000000 -0430
115316 +++ new/plugins/dfOpenGL/Makefile.in 1969-12-31 20:00:00.000000000 -0400
115317 @@ -1,633 +0,0 @@
115318 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
115319 -# @configure_input@
115320 -
115321 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
115322 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
115323 -# This Makefile.in is free software; the Free Software Foundation
115324 -# gives unlimited permission to copy and/or distribute it,
115325 -# with or without modifications, as long as this notice is preserved.
115326 -
115327 -# This program is distributed in the hope that it will be useful,
115328 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
115329 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
115330 -# PARTICULAR PURPOSE.
115331 -
115332 -@SET_MAKE@
115333 -
115334 -
115335 -
115336 -VPATH = @srcdir@
115337 -pkgdatadir = $(datadir)/@PACKAGE@
115338 -pkglibdir = $(libdir)/@PACKAGE@
115339 -pkgincludedir = $(includedir)/@PACKAGE@
115340 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
115341 -install_sh_DATA = $(install_sh) -c -m 644
115342 -install_sh_PROGRAM = $(install_sh) -c
115343 -install_sh_SCRIPT = $(install_sh) -c
115344 -INSTALL_HEADER = $(INSTALL_DATA)
115345 -transform = $(program_transform_name)
115346 -NORMAL_INSTALL = :
115347 -PRE_INSTALL = :
115348 -POST_INSTALL = :
115349 -NORMAL_UNINSTALL = :
115350 -PRE_UNINSTALL = :
115351 -POST_UNINSTALL = :
115352 -build_triplet = @build@
115353 -host_triplet = @host@
115354 -target_triplet = @target@
115355 -bin_PROGRAMS = cfgDFOpenGL$(EXEEXT)
115356 -subdir = plugins/dfOpenGL
115357 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS TODO
115358 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
115359 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
115360 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
115361 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
115362 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
115363 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
115364 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
115365 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
115366 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
115367 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
115368 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
115369 - $(top_srcdir)/configure.ac
115370 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
115371 - $(ACLOCAL_M4)
115372 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
115373 -CONFIG_HEADER = $(top_builddir)/include/config.h
115374 -CONFIG_CLEAN_FILES =
115375 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
115376 -am__vpath_adj = case $$p in \
115377 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
115378 - *) f=$$p;; \
115379 - esac;
115380 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
115381 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
115382 - "$(DESTDIR)$(gladedir)"
115383 -libLTLIBRARIES_INSTALL = $(INSTALL)
115384 -LTLIBRARIES = $(lib_LTLIBRARIES)
115385 -libdfOpenGL_la_LIBADD =
115386 -am_libdfOpenGL_la_OBJECTS = GPU.lo primitive_drawing.lo fps.lo \
115387 - gllog.lo cfg.lo
115388 -libdfOpenGL_la_OBJECTS = $(am_libdfOpenGL_la_OBJECTS)
115389 -libdfOpenGL_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
115390 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
115391 - $(libdfOpenGL_la_LDFLAGS) $(LDFLAGS) -o $@
115392 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
115393 -PROGRAMS = $(bin_PROGRAMS)
115394 -am_cfgDFOpenGL_OBJECTS = main.$(OBJEXT)
115395 -cfgDFOpenGL_OBJECTS = $(am_cfgDFOpenGL_OBJECTS)
115396 -am__DEPENDENCIES_1 =
115397 -cfgDFOpenGL_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
115398 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
115399 -depcomp = $(SHELL) $(top_srcdir)/depcomp
115400 -am__depfiles_maybe = depfiles
115401 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
115402 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
115403 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
115404 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
115405 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
115406 -CCLD = $(CC)
115407 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
115408 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
115409 - $(LDFLAGS) -o $@
115410 -SOURCES = $(libdfOpenGL_la_SOURCES) $(cfgDFOpenGL_SOURCES)
115411 -DIST_SOURCES = $(libdfOpenGL_la_SOURCES) $(cfgDFOpenGL_SOURCES)
115412 -gladeDATA_INSTALL = $(INSTALL_DATA)
115413 -DATA = $(glade_DATA)
115414 -ETAGS = etags
115415 -CTAGS = ctags
115416 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
115417 -ACLOCAL = @ACLOCAL@
115418 -ALLOCA = @ALLOCA@
115419 -ALL_LINGUAS = @ALL_LINGUAS@
115420 -ALSA_LIBS = @ALSA_LIBS@
115421 -AMTAR = @AMTAR@
115422 -AR = @AR@
115423 -AUTOCONF = @AUTOCONF@
115424 -AUTOHEADER = @AUTOHEADER@
115425 -AUTOMAKE = @AUTOMAKE@
115426 -AWK = @AWK@
115427 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
115428 -BURN_CFLAGS = @BURN_CFLAGS@
115429 -BURN_LIBS = @BURN_LIBS@
115430 -CATOBJEXT = @CATOBJEXT@
115431 -CC = @CC@
115432 -CCAS = @CCAS@
115433 -CCASDEPMODE = @CCASDEPMODE@
115434 -CCASFLAGS = @CCASFLAGS@
115435 -CCDEPMODE = @CCDEPMODE@
115436 -CFLAGS = @CFLAGS@
115437 -CPP = @CPP@
115438 -CPPFLAGS = @CPPFLAGS@
115439 -CXX = @CXX@
115440 -CXXCPP = @CXXCPP@
115441 -CXXDEPMODE = @CXXDEPMODE@
115442 -CXXFLAGS = @CXXFLAGS@
115443 -CYGPATH_W = @CYGPATH_W@
115444 -DATADIRNAME = @DATADIRNAME@
115445 -DEFS = @DEFS@
115446 -DEPDIR = @DEPDIR@
115447 -DFBINIMAGE = @DFBINIMAGE@
115448 -DSYMUTIL = @DSYMUTIL@
115449 -ECHO = @ECHO@
115450 -ECHO_C = @ECHO_C@
115451 -ECHO_N = @ECHO_N@
115452 -ECHO_T = @ECHO_T@
115453 -EGREP = @EGREP@
115454 -EXEEXT = @EXEEXT@
115455 -F77 = @F77@
115456 -FFLAGS = @FFLAGS@
115457 -FLTKCONFIG = @FLTKCONFIG@
115458 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
115459 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
115460 -GENCAT = @GENCAT@
115461 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
115462 -GIO2_CFLAGS = @GIO2_CFLAGS@
115463 -GIO2_LIBS = @GIO2_LIBS@
115464 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
115465 -GLADE2_LIBS = @GLADE2_LIBS@
115466 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
115467 -GLIB2_LIBS = @GLIB2_LIBS@
115468 -GLIBC21 = @GLIBC21@
115469 -GMSGFMT = @GMSGFMT@
115470 -GREP = @GREP@
115471 -GTK2_CFLAGS = @GTK2_CFLAGS@
115472 -GTK2_LIBS = @GTK2_LIBS@
115473 -INSTALL = @INSTALL@
115474 -INSTALL_DATA = @INSTALL_DATA@
115475 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
115476 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
115477 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
115478 -INSTOBJEXT = @INSTOBJEXT@
115479 -INTLBISON = @INTLBISON@
115480 -INTLLIBS = @INTLLIBS@
115481 -INTLOBJS = @INTLOBJS@
115482 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
115483 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
115484 -INTLTOOL_PERL = @INTLTOOL_PERL@
115485 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
115486 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
115487 -LDFLAGS = @LDFLAGS@
115488 -LIBICONV = @LIBICONV@
115489 -LIBINTL = @LIBINTL@
115490 -LIBOBJS = @LIBOBJS@
115491 -LIBS = @LIBS@
115492 -LIBTOOL = @LIBTOOL@
115493 -LN_S = @LN_S@
115494 -LTLIBICONV = @LTLIBICONV@
115495 -LTLIBINTL = @LTLIBINTL@
115496 -LTLIBOBJS = @LTLIBOBJS@
115497 -MAINT = @MAINT@
115498 -MAKEINFO = @MAKEINFO@
115499 -MKDIR_P = @MKDIR_P@
115500 -MKINSTALLDIRS = @MKINSTALLDIRS@
115501 -MSGFMT = @MSGFMT@
115502 -MSGMERGE = @MSGMERGE@
115503 -NASM = @NASM@
115504 -NMEDIT = @NMEDIT@
115505 -OBJEXT = @OBJEXT@
115506 -PACKAGE = @PACKAGE@
115507 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
115508 -PACKAGE_NAME = @PACKAGE_NAME@
115509 -PACKAGE_STRING = @PACKAGE_STRING@
115510 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
115511 -PACKAGE_VERSION = @PACKAGE_VERSION@
115512 -PATH_SEPARATOR = @PATH_SEPARATOR@
115513 -PKG_CONFIG = @PKG_CONFIG@
115514 -POSUB = @POSUB@
115515 -RANLIB = @RANLIB@
115516 -SED = @SED@
115517 -SET_MAKE = @SET_MAKE@
115518 -SHELL = @SHELL@
115519 -STRIP = @STRIP@
115520 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
115521 -USE_NLS = @USE_NLS@
115522 -VERSION = @VERSION@
115523 -XGETTEXT = @XGETTEXT@
115524 -abs_builddir = @abs_builddir@
115525 -abs_srcdir = @abs_srcdir@
115526 -abs_top_builddir = @abs_top_builddir@
115527 -abs_top_srcdir = @abs_top_srcdir@
115528 -ac_ct_CC = @ac_ct_CC@
115529 -ac_ct_CXX = @ac_ct_CXX@
115530 -ac_ct_F77 = @ac_ct_F77@
115531 -am__include = @am__include@
115532 -am__leading_dot = @am__leading_dot@
115533 -am__quote = @am__quote@
115534 -am__tar = @am__tar@
115535 -am__untar = @am__untar@
115536 -bindir = $(prefix)/lib/games/psemu/
115537 -build = @build@
115538 -build_alias = @build_alias@
115539 -build_cpu = @build_cpu@
115540 -build_os = @build_os@
115541 -build_vendor = @build_vendor@
115542 -builddir = @builddir@
115543 -datadir = @datadir@
115544 -datarootdir = @datarootdir@
115545 -docdir = @docdir@
115546 -dvidir = @dvidir@
115547 -exec_prefix = @exec_prefix@
115548 -host = @host@
115549 -host_alias = @host_alias@
115550 -host_cpu = @host_cpu@
115551 -host_os = @host_os@
115552 -host_vendor = @host_vendor@
115553 -htmldir = @htmldir@
115554 -includedir = @includedir@
115555 -infodir = @infodir@
115556 -install_sh = @install_sh@
115557 -libdir = $(prefix)/lib/games/psemu/
115558 -libexecdir = @libexecdir@
115559 -localedir = @localedir@
115560 -localstatedir = @localstatedir@
115561 -mandir = @mandir@
115562 -mkdir_p = @mkdir_p@
115563 -oldincludedir = @oldincludedir@
115564 -pdfdir = @pdfdir@
115565 -prefix = @prefix@
115566 -program_transform_name = @program_transform_name@
115567 -psdir = @psdir@
115568 -sbindir = @sbindir@
115569 -sharedstatedir = @sharedstatedir@
115570 -srcdir = @srcdir@
115571 -sysconfdir = @sysconfdir@
115572 -target = @target@
115573 -target_alias = @target_alias@
115574 -target_cpu = @target_cpu@
115575 -target_os = @target_os@
115576 -target_vendor = @target_vendor@
115577 -top_build_prefix = @top_build_prefix@
115578 -top_builddir = @top_builddir@
115579 -top_srcdir = @top_srcdir@
115580 -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
115581 - -DLOCALE_DIR=\"${datadir}/locale/\" \
115582 - -DDATADIR=\"${datadir}/psemu/\" \
115583 - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
115584 - -g -O0 -Wall -fPIC
115585 -
115586 -lib_LTLIBRARIES = libdfOpenGL.la
115587 -libdfOpenGL_la_SOURCES = GPU.c GPU.h \
115588 - primitive_drawing.c primitive_drawing.h \
115589 - fps.c gllog.c cfg.c cfg.h gpu_i.h
115590 -
115591 -libdfOpenGL_la_LDFLAGS = -L/usr/lib -lXxf86vm -lGL -lm
115592 -cfgDFOpenGL_SOURCES = gpucfg-0.1df/main.c
115593 -cfgDFOpenGL_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
115594 -glade_DATA = gpucfg-0.1df/dfopengl.glade2
115595 -gladedir = $(datadir)/psemu/
115596 -EXTRA_DIST = $(glade_DATA) \
115597 - LICENSE TODO oldMakefile PSEmu_PlugIn_Defs.h
115598 -
115599 -all: all-am
115600 -
115601 -.SUFFIXES:
115602 -.SUFFIXES: .c .lo .o .obj
115603 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
115604 - @for dep in $?; do \
115605 - case '$(am__configure_deps)' in \
115606 - *$$dep*) \
115607 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
115608 - && exit 0; \
115609 - exit 1;; \
115610 - esac; \
115611 - done; \
115612 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfOpenGL/Makefile'; \
115613 - cd $(top_srcdir) && \
115614 - $(AUTOMAKE) --gnu plugins/dfOpenGL/Makefile
115615 -.PRECIOUS: Makefile
115616 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
115617 - @case '$?' in \
115618 - *config.status*) \
115619 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
115620 - *) \
115621 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
115622 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
115623 - esac;
115624 -
115625 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
115626 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
115627 -
115628 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
115629 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
115630 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
115631 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
115632 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
115633 - @$(NORMAL_INSTALL)
115634 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
115635 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
115636 - if test -f $$p; then \
115637 - f=$(am__strip_dir) \
115638 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
115639 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
115640 - else :; fi; \
115641 - done
115642 -
115643 -uninstall-libLTLIBRARIES:
115644 - @$(NORMAL_UNINSTALL)
115645 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
115646 - p=$(am__strip_dir) \
115647 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
115648 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
115649 - done
115650 -
115651 -clean-libLTLIBRARIES:
115652 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
115653 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
115654 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
115655 - test "$$dir" != "$$p" || dir=.; \
115656 - echo "rm -f \"$${dir}/so_locations\""; \
115657 - rm -f "$${dir}/so_locations"; \
115658 - done
115659 -libdfOpenGL.la: $(libdfOpenGL_la_OBJECTS) $(libdfOpenGL_la_DEPENDENCIES)
115660 - $(libdfOpenGL_la_LINK) -rpath $(libdir) $(libdfOpenGL_la_OBJECTS) $(libdfOpenGL_la_LIBADD) $(LIBS)
115661 -install-binPROGRAMS: $(bin_PROGRAMS)
115662 - @$(NORMAL_INSTALL)
115663 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
115664 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
115665 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
115666 - if test -f $$p \
115667 - || test -f $$p1 \
115668 - ; then \
115669 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
115670 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
115671 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
115672 - else :; fi; \
115673 - done
115674 -
115675 -uninstall-binPROGRAMS:
115676 - @$(NORMAL_UNINSTALL)
115677 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
115678 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
115679 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
115680 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
115681 - done
115682 -
115683 -clean-binPROGRAMS:
115684 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
115685 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
115686 - echo " rm -f $$p $$f"; \
115687 - rm -f $$p $$f ; \
115688 - done
115689 -cfgDFOpenGL$(EXEEXT): $(cfgDFOpenGL_OBJECTS) $(cfgDFOpenGL_DEPENDENCIES)
115690 - @rm -f cfgDFOpenGL$(EXEEXT)
115691 - $(LINK) $(cfgDFOpenGL_OBJECTS) $(cfgDFOpenGL_LDADD) $(LIBS)
115692 -
115693 -mostlyclean-compile:
115694 - -rm -f *.$(OBJEXT)
115695 -
115696 -distclean-compile:
115697 - -rm -f *.tab.c
115698 -
115699 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GPU.Plo@am__quote@
115700 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
115701 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fps.Plo@am__quote@
115702 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gllog.Plo@am__quote@
115703 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
115704 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_drawing.Plo@am__quote@
115705 -
115706 -.c.o:
115707 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
115708 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
115709 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
115710 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
115711 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
115712 -
115713 -.c.obj:
115714 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
115715 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
115716 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
115717 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
115718 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
115719 -
115720 -.c.lo:
115721 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
115722 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
115723 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
115724 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
115725 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
115726 -
115727 -main.o: gpucfg-0.1df/main.c
115728 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'gpucfg-0.1df/main.c' || echo '$(srcdir)/'`gpucfg-0.1df/main.c
115729 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
115730 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gpucfg-0.1df/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
115731 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
115732 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'gpucfg-0.1df/main.c' || echo '$(srcdir)/'`gpucfg-0.1df/main.c
115733 -
115734 -main.obj: gpucfg-0.1df/main.c
115735 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'gpucfg-0.1df/main.c'; then $(CYGPATH_W) 'gpucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg-0.1df/main.c'; fi`
115736 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
115737 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gpucfg-0.1df/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
115738 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
115739 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'gpucfg-0.1df/main.c'; then $(CYGPATH_W) 'gpucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg-0.1df/main.c'; fi`
115740 -
115741 -mostlyclean-libtool:
115742 - -rm -f *.lo
115743 -
115744 -clean-libtool:
115745 - -rm -rf .libs _libs
115746 -install-gladeDATA: $(glade_DATA)
115747 - @$(NORMAL_INSTALL)
115748 - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
115749 - @list='$(glade_DATA)'; for p in $$list; do \
115750 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
115751 - f=$(am__strip_dir) \
115752 - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
115753 - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
115754 - done
115755 -
115756 -uninstall-gladeDATA:
115757 - @$(NORMAL_UNINSTALL)
115758 - @list='$(glade_DATA)'; for p in $$list; do \
115759 - f=$(am__strip_dir) \
115760 - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
115761 - rm -f "$(DESTDIR)$(gladedir)/$$f"; \
115762 - done
115763 -
115764 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
115765 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
115766 - unique=`for i in $$list; do \
115767 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
115768 - done | \
115769 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
115770 - END { if (nonempty) { for (i in files) print i; }; }'`; \
115771 - mkid -fID $$unique
115772 -tags: TAGS
115773 -
115774 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
115775 - $(TAGS_FILES) $(LISP)
115776 - tags=; \
115777 - here=`pwd`; \
115778 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
115779 - unique=`for i in $$list; do \
115780 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
115781 - done | \
115782 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
115783 - END { if (nonempty) { for (i in files) print i; }; }'`; \
115784 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
115785 - test -n "$$unique" || unique=$$empty_fix; \
115786 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
115787 - $$tags $$unique; \
115788 - fi
115789 -ctags: CTAGS
115790 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
115791 - $(TAGS_FILES) $(LISP)
115792 - tags=; \
115793 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
115794 - unique=`for i in $$list; do \
115795 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
115796 - done | \
115797 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
115798 - END { if (nonempty) { for (i in files) print i; }; }'`; \
115799 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
115800 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
115801 - $$tags $$unique
115802 -
115803 -GTAGS:
115804 - here=`$(am__cd) $(top_builddir) && pwd` \
115805 - && cd $(top_srcdir) \
115806 - && gtags -i $(GTAGS_ARGS) $$here
115807 -
115808 -distclean-tags:
115809 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
115810 -
115811 -distdir: $(DISTFILES)
115812 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
115813 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
115814 - list='$(DISTFILES)'; \
115815 - dist_files=`for file in $$list; do echo $$file; done | \
115816 - sed -e "s|^$$srcdirstrip/||;t" \
115817 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
115818 - case $$dist_files in \
115819 - */*) $(MKDIR_P) `echo "$$dist_files" | \
115820 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
115821 - sort -u` ;; \
115822 - esac; \
115823 - for file in $$dist_files; do \
115824 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
115825 - if test -d $$d/$$file; then \
115826 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
115827 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
115828 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
115829 - fi; \
115830 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
115831 - else \
115832 - test -f $(distdir)/$$file \
115833 - || cp -p $$d/$$file $(distdir)/$$file \
115834 - || exit 1; \
115835 - fi; \
115836 - done
115837 -check-am: all-am
115838 -check: check-am
115839 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
115840 -install-binPROGRAMS: install-libLTLIBRARIES
115841 -
115842 -installdirs:
115843 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
115844 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
115845 - done
115846 -install: install-am
115847 -install-exec: install-exec-am
115848 -install-data: install-data-am
115849 -uninstall: uninstall-am
115850 -
115851 -install-am: all-am
115852 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
115853 -
115854 -installcheck: installcheck-am
115855 -install-strip:
115856 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
115857 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
115858 - `test -z '$(STRIP)' || \
115859 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
115860 -mostlyclean-generic:
115861 -
115862 -clean-generic:
115863 -
115864 -distclean-generic:
115865 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
115866 -
115867 -maintainer-clean-generic:
115868 - @echo "This command is intended for maintainers to use"
115869 - @echo "it deletes files that may require special tools to rebuild."
115870 -clean: clean-am
115871 -
115872 -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
115873 - clean-libtool mostlyclean-am
115874 -
115875 -distclean: distclean-am
115876 - -rm -rf ./$(DEPDIR)
115877 - -rm -f Makefile
115878 -distclean-am: clean-am distclean-compile distclean-generic \
115879 - distclean-tags
115880 -
115881 -dvi: dvi-am
115882 -
115883 -dvi-am:
115884 -
115885 -html: html-am
115886 -
115887 -info: info-am
115888 -
115889 -info-am:
115890 -
115891 -install-data-am: install-gladeDATA
115892 -
115893 -install-dvi: install-dvi-am
115894 -
115895 -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
115896 -
115897 -install-html: install-html-am
115898 -
115899 -install-info: install-info-am
115900 -
115901 -install-man:
115902 -
115903 -install-pdf: install-pdf-am
115904 -
115905 -install-ps: install-ps-am
115906 -
115907 -installcheck-am:
115908 -
115909 -maintainer-clean: maintainer-clean-am
115910 - -rm -rf ./$(DEPDIR)
115911 - -rm -f Makefile
115912 -maintainer-clean-am: distclean-am maintainer-clean-generic
115913 -
115914 -mostlyclean: mostlyclean-am
115915 -
115916 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
115917 - mostlyclean-libtool
115918 -
115919 -pdf: pdf-am
115920 -
115921 -pdf-am:
115922 -
115923 -ps: ps-am
115924 -
115925 -ps-am:
115926 -
115927 -uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
115928 - uninstall-libLTLIBRARIES
115929 -
115930 -.MAKE: install-am install-strip
115931 -
115932 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
115933 - clean-generic clean-libLTLIBRARIES clean-libtool ctags \
115934 - distclean distclean-compile distclean-generic \
115935 - distclean-libtool distclean-tags distdir dvi dvi-am html \
115936 - html-am info info-am install install-am install-binPROGRAMS \
115937 - install-data install-data-am install-dvi install-dvi-am \
115938 - install-exec install-exec-am install-gladeDATA install-html \
115939 - install-html-am install-info install-info-am \
115940 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
115941 - install-ps install-ps-am install-strip installcheck \
115942 - installcheck-am installdirs maintainer-clean \
115943 - maintainer-clean-generic mostlyclean mostlyclean-compile \
115944 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
115945 - tags uninstall uninstall-am uninstall-binPROGRAMS \
115946 - uninstall-gladeDATA uninstall-libLTLIBRARIES
115947 -
115948 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
115949 -# Otherwise a system limit (for SysV at least) may be exceeded.
115950 -.NOEXPORT:
115951 diff -rupN original/plugins/dfbinimage/About.cpp new/plugins/dfbinimage/About.cpp
115952 --- original/plugins/dfbinimage/About.cpp 1969-12-31 20:00:00.000000000 -0400
115953 +++ new/plugins/dfbinimage/About.cpp 2007-10-08 17:13:28.000000000 -0400
115954 @@ -0,0 +1,133 @@
115955 +/************************************************************************
115956 +
115957 +About.cpp
115958 +
115959 +Copyright (C) 2007 Virus
115960 +Copyright (C) 2002 mooby
115961 +
115962 +This program is free software; you can redistribute it and/or
115963 +modify it under the terms of the GNU General Public License
115964 +as published by the Free Software Foundation; either version 2
115965 +of the License, or (at your option) any later version.
115966 +
115967 +This program is distributed in the hope that it will be useful,
115968 +but WITHOUT ANY WARRANTY; without even the implied warranty of
115969 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
115970 +GNU General Public License for more details.
115971 +
115972 +You should have received a copy of the GNU General Public License
115973 +along with this program; if not, write to the Free Software
115974 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
115975 +
115976 +************************************************************************/
115977 +
115978 +
115979 +#include "defines.h"
115980 +#include "externs.h"
115981 +#include "Utils.hpp"
115982 +#include <string.h>
115983 +
115984 +// About.cpp
115985 +// has the config, about, and test functions and related structs
115986 +
115987 +// lots of this code was taken from PEOPS. THANK YOU!!!!
115988 +
115989 +const unsigned char version = 1; // do not touch - library for PSEmu 1.x
115990 +
115991 +#define REVISION 2
115992 +#define BUILD 8
115993 +
115994 +#ifdef _DEBUG
115995 +#ifdef SUPER_DEBUG
115996 +static char *libraryName = "Mooby2 cd disk image super debug driver";
115997 +#else
115998 +static char *libraryName = "Mooby2 cd disk image debug driver";
115999 +#endif
116000 +#else
116001 +static char *libraryName = "BIN Image Reader";
116002 +#endif
116003 +
116004 +//static char *PluginAuthor = "Mooby";
116005 +
116006 +static FPSEAbout aboutMooby = {FPSE_CDROM,
116007 + BUILD,
116008 + REVISION,
116009 + FPSE_OK,
116010 + "mooby",
116011 +#ifdef _DEBUG
116012 +#ifdef SUPER_DEBUG
116013 + "Mooby2 cd disk image super debug driver",
116014 +#else
116015 + "Mooby2 cd disk image debug driver",
116016 +#endif
116017 +#else
116018 + "Mooby2 cd disk image driver",
116019 +#endif
116020 + "moo"};
116021 +
116022 +
116023 +/** PSX emu interface **/
116024 +
116025 +// lots of this code was swiped from PEOPS. thank you =)
116026 +char * CALLBACK PSEgetLibName(void)
116027 +{
116028 + return libraryName;
116029 +}
116030 +
116031 +unsigned long CALLBACK PSEgetLibType(void)
116032 +{
116033 + return PSE_LT_CDR;
116034 +}
116035 +
116036 +unsigned long CALLBACK PSEgetLibVersion(void)
116037 +{
116038 + return version<<16|REVISION<<8|BUILD;
116039 +}
116040 +
116041 +void CALLBACK CDRabout(void)
116042 +{
116043 + std::ostringstream out;
116044 + out << libraryName;
116045 + moobyMessage(out.str());
116046 +}
116047 +
116048 +long CALLBACK CDRtest(void)
116049 +{
116050 + moobyMessage("Of course it'll work.");
116051 + return 0;
116052 +}
116053 +
116054 +/** FPSE interface **/
116055 +
116056 +void CD_About(UINT32 *par)
116057 +{
116058 + memcpy(par, &aboutMooby, sizeof(FPSEAbout));
116059 +}
116060 +
116061 +/** PCSX2 interface **/
116062 +
116063 +void CALLBACK CDVDabout()
116064 +{
116065 + CDRabout();
116066 +}
116067 +
116068 +s32 CALLBACK CDVDtest()
116069 +{
116070 + return CDRtest();
116071 +}
116072 +
116073 +u32 CALLBACK PS2EgetLibType(void)
116074 +{
116075 + return PS2E_LT_CDVD;
116076 +}
116077 +
116078 +u32 CALLBACK PS2EgetLibVersion(void)
116079 +{
116080 + return PSEgetLibVersion();
116081 +}
116082 +
116083 +char* CALLBACK PS2EgetLibName(void)
116084 +{
116085 + return PSEgetLibName();
116086 +}
116087 +
116088 diff -rupN original/plugins/dfbinimage/CDDAData.cpp new/plugins/dfbinimage/CDDAData.cpp
116089 --- original/plugins/dfbinimage/CDDAData.cpp 1969-12-31 20:00:00.000000000 -0400
116090 +++ new/plugins/dfbinimage/CDDAData.cpp 2008-01-22 15:50:49.000000000 -0430
116091 @@ -0,0 +1,287 @@
116092 +/************************************************************************
116093 +
116094 +CDDAData.cpp
116095 +
116096 +Copyright (C) 2007 Virus
116097 +Copyright (C) 2002 mooby
116098 +
116099 +This program is free software; you can redistribute it and/or
116100 +modify it under the terms of the GNU General Public License
116101 +as published by the Free Software Foundation; either version 2
116102 +of the License, or (at your option) any later version.
116103 +
116104 +This program is distributed in the hope that it will be useful,
116105 +but WITHOUT ANY WARRANTY; without even the implied warranty of
116106 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
116107 +GNU General Public License for more details.
116108 +
116109 +You should have received a copy of the GNU General Public License
116110 +along with this program; if not, write to the Free Software
116111 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
116112 +
116113 +************************************************************************/
116114 +#pragma warning(disable:4786)
116115 +
116116 +#include "CDDAData.hpp"
116117 +#include "Preferences.hpp"
116118 +
116119 +#include <portaudio.h>
116120 +
116121 +using namespace std;
116122 +
116123 +extern Preferences prefs;
116124 +extern std::string programName;
116125 +
116126 +// this callback repeats one track over and over
116127 +int CDDACallbackRepeat( const void *inputBuffer, void *outputBuffer,
116128 + unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *timeinfo,
116129 + PaStreamCallbackFlags statusFlags, void *userData )
116130 +{
116131 + unsigned int i;
116132 +/* Cast data passed through stream to our structure type. */
116133 + PlayCDDAData* data = (PlayCDDAData*)userData;
116134 + short* out = (short*)outputBuffer;
116135 +
116136 + data->theCD->seek(data->CDDAPos);
116137 + short* buffer = (short*)data->theCD->getBuffer();
116138 +
116139 + buffer += data->frameOffset;
116140 +
116141 + double volume = data->volume;
116142 +
116143 + // buffer the data
116144 + for( i=0; i<framesPerBuffer; i++ )
116145 + {
116146 + /* Stereo channels are interleaved. */
116147 + *out++ = (short)(*buffer++ * volume); /* left */
116148 + *out++ = (short)(*buffer++ * volume); /* right */
116149 + data->frameOffset += 4;
116150 +
116151 + // at the end of a frame, get the next one
116152 + if (data->frameOffset == bytesPerFrame)
116153 + {
116154 + data->CDDAPos += CDTime(0,0,1);
116155 +
116156 + // when at the end of this track, loop to the start
116157 + // of this track
116158 + if (data->CDDAPos == data->CDDAEnd)
116159 + {
116160 + data->CDDAPos = data->CDDAStart;
116161 + }
116162 +
116163 + data->theCD->seek(data->CDDAPos);
116164 + data->frameOffset = 0;
116165 + buffer = (short*)data->theCD->getBuffer();
116166 + }
116167 + }
116168 +}
116169 +
116170 +// this callback plays through one track once and stops
116171 +int CDDACallbackOneTrackStop( const void *inputBuffer, void *outputBuffer,
116172 + unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *timeinfo,
116173 + PaStreamCallbackFlags statusFlags, void *userData )
116174 +{
116175 + unsigned int i;
116176 +/* Cast data passed through stream to our structure type. */
116177 + PlayCDDAData* data = (PlayCDDAData*)userData;
116178 + short* out = (short*)outputBuffer;
116179 + short* buffer;
116180 +
116181 + // seek to the current CDDA read position
116182 + if (!data->endOfTrack)
116183 + {
116184 + data->theCD->seek(data->CDDAPos);
116185 + buffer = (short*)data->theCD->getBuffer();
116186 + }
116187 + else
116188 + {
116189 + buffer = (short*)data->nullAudio;
116190 + }
116191 +
116192 + buffer += data->frameOffset;
116193 +
116194 + double volume = data->volume;
116195 +
116196 + // buffer the data
116197 + for( i=0; i<framesPerBuffer; i++ )
116198 + {
116199 + /* Stereo channels are interleaved. */
116200 + *out++ = (short)(*buffer++ * volume); /* left */
116201 + *out++ = (short)(*buffer++ * volume); /* right */
116202 + data->frameOffset += 4;
116203 +
116204 + // at the end of a frame, get the next one
116205 + if (data->frameOffset == bytesPerFrame)
116206 + {
116207 + data->CDDAPos += CDTime(0,0,1);
116208 +
116209 + // when at the end of this track, use null audio
116210 + if (data->CDDAPos == data->CDDAEnd)
116211 + {
116212 + data->endOfTrack = true;
116213 + buffer = (short*)data->nullAudio;
116214 + data->CDDAPos -= CDTime(0,0,1);
116215 + data->frameOffset = 0;
116216 + }
116217 + // not at end of track, just do normal buffering
116218 + else
116219 + {
116220 + data->theCD->seek(data->CDDAPos);
116221 + data->frameOffset = 0;
116222 + buffer = (short*)data->theCD->getBuffer();
116223 + }
116224 + }
116225 + }
116226 +}
116227 +
116228 +PlayCDDAData::PlayCDDAData(const std::vector<TrackInfo> ti, CDTime gapLength)
116229 + : stream(NULL),
116230 + frameOffset(0), theCD(NULL), trackList(ti), playing(false),
116231 + endOfTrack(false), pregapLength(gapLength)
116232 +{
116233 + memset(nullAudio, 0, sizeof(nullAudio));
116234 + volume = atof(prefs.prefsMap[volumeString].c_str())/(double)100;
116235 + if (volume < 0) volume = 0;
116236 + else if (volume > 1) volume = 1;
116237 +}
116238 +
116239 +// initialize the CDDA file data and initalize the audio stream
116240 +void PlayCDDAData::openFile(const std::string& file)
116241 +{
116242 + PaError err;
116243 + std::string extension;
116244 + theCD = FileInterfaceFactory(file, extension);
116245 + theCD->setPregap(pregapLength, trackList[2].trackStart);
116246 + err = Pa_Initialize();
116247 + if( err != paNoError )
116248 + {
116249 + Exception e(string("PA Init error: ") + string(Pa_GetErrorText( err )));
116250 + THROW(e);
116251 + }
116252 + // disable extra caching on the file interface
116253 + theCD->setCacheMode(FileInterface::oldMode);
116254 +}
116255 +
116256 +// start playing the data
116257 +int PlayCDDAData::play(const CDTime& startTime)
116258 +{
116259 + CDTime localStartTime = startTime;
116260 + // if play was called with the same time as the previous call,
116261 + // dont restart it. this fixes a problem with FPSE's play call.
116262 + // of course, if play is called with a different track,
116263 + // stop playing the current stream.
116264 + if (playing)
116265 + {
116266 + if (startTime == InitialTime)
116267 + {
116268 + return 0;
116269 + }
116270 + else
116271 + {
116272 + stop();
116273 + }
116274 + }
116275 +
116276 + InitialTime = startTime;
116277 +
116278 + // make sure there's a valid option chosen
116279 + if ((prefs.prefsMap[repeatString] != repeatOneString) &&
116280 + (prefs.prefsMap[repeatString] != repeatAllString) &&
116281 + (prefs.prefsMap[repeatString] != playOneString))
116282 + {
116283 + prefs.prefsMap[repeatString] = repeatAllString;
116284 + prefs.write();
116285 + }
116286 +
116287 + // figure out which track to play to set the end time
116288 + if ( (prefs.prefsMap[repeatString] == repeatOneString) ||
116289 + (prefs.prefsMap[repeatString] == playOneString))
116290 + {
116291 + unsigned int i = 1;
116292 + while ( (i < (trackList.size() - 1)) && (startTime > trackList[i].trackStart) )
116293 + {
116294 + i++;
116295 + }
116296 + // adjust the start time if it's blatantly off from the start time...
116297 + if (localStartTime > trackList[i].trackStart)
116298 + {
116299 + if ( (localStartTime - trackList[i].trackStart) > CDTime(0,2,0))
116300 + {
116301 + localStartTime = trackList[i].trackStart;
116302 + }
116303 + }
116304 + else
116305 + {
116306 + if ( (trackList[i].trackStart - localStartTime) > CDTime(0,2,0))
116307 + {
116308 + localStartTime = trackList[i].trackStart;
116309 + }
116310 + }
116311 + CDDAStart = localStartTime;
116312 + CDDAEnd = trackList[i].trackStart + trackList[i].trackLength;
116313 + }
116314 +
116315 + else if (prefs.prefsMap[repeatString] == repeatAllString)
116316 + {
116317 + CDDAEnd = trackList[trackList.size() - 1].trackStart +
116318 + trackList[trackList.size() - 1].trackLength;
116319 + CDDAStart = trackList[2].trackStart;
116320 + if (localStartTime > CDDAEnd)
116321 + {
116322 + localStartTime = CDDAStart;
116323 + }
116324 + }
116325 +
116326 + // set the cdda position, start and end times
116327 + CDDAPos = localStartTime;
116328 +
116329 + endOfTrack = false;
116330 +
116331 + // open a stream - pass in this CDDA object as the user data.
116332 + // depending on the play mode, use a different callback
116333 + PaError err;
116334 +
116335 + if (prefs.prefsMap[repeatString] == repeatAllString)
116336 + err = Pa_OpenDefaultStream(&stream, 0, 2, paInt16, 44100, 5880,
116337 + CDDACallbackRepeat, this);
116338 + else if (prefs.prefsMap[repeatString] == repeatOneString)
116339 + err = Pa_OpenDefaultStream(&stream, 0, 2, paInt16, 44100, 5880,
116340 + CDDACallbackRepeat, this);
116341 + else if (prefs.prefsMap[repeatString] == playOneString)
116342 + err = Pa_OpenDefaultStream(&stream, 0, 2, paInt16, 44100, 5880,
116343 + CDDACallbackOneTrackStop, this);
116344 +
116345 + if( err != paNoError )
116346 + {
116347 + return 0;
116348 + }
116349 +
116350 + // start the stream. the CDDACallback will automatically get
116351 + // called to buffer the audio
116352 + err = Pa_StartStream( stream );
116353 +
116354 + if( err != paNoError )
116355 + {
116356 + return 0;
116357 + }
116358 +
116359 + playing = true;
116360 + return 0;
116361 +}
116362 +
116363 +// close the stream - nice and simple
116364 +int PlayCDDAData::stop()
116365 +{
116366 + if (playing)
116367 + {
116368 + PaError err = Pa_CloseStream( stream );
116369 + if( err != paNoError )
116370 + {
116371 + Exception e(string("PA Close Stream error: ") + string(Pa_GetErrorText( err )));
116372 + THROW(e);
116373 + }
116374 + playing = false;
116375 + }
116376 + return 0;
116377 +}
116378 +
116379 diff -rupN original/plugins/dfbinimage/CDDAData.hpp new/plugins/dfbinimage/CDDAData.hpp
116380 --- original/plugins/dfbinimage/CDDAData.hpp 1969-12-31 20:00:00.000000000 -0400
116381 +++ new/plugins/dfbinimage/CDDAData.hpp 2008-01-22 15:50:49.000000000 -0430
116382 @@ -0,0 +1,113 @@
116383 +/************************************************************************
116384 +
116385 +CDDAData.hpp
116386 +
116387 +Copyright (C) 2007 Virus
116388 +Copyright (C) 2002 mooby
116389 +
116390 +This program is free software; you can redistribute it and/or
116391 +modify it under the terms of the GNU General Public License
116392 +as published by the Free Software Foundation; either version 2
116393 +of the License, or (at your option) any later version.
116394 +
116395 +This program is distributed in the hope that it will be useful,
116396 +but WITHOUT ANY WARRANTY; without even the implied warranty of
116397 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
116398 +GNU General Public License for more details.
116399 +
116400 +You should have received a copy of the GNU General Public License
116401 +along with this program; if not, write to the Free Software
116402 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
116403 +
116404 +************************************************************************/
116405 +
116406 +
116407 +
116408 +#ifndef CDDADATA_HPP
116409 +#define CDDADATA_HPP
116410 +
116411 +#include "FileInterface.hpp"
116412 +#include "CDTime.hpp"
116413 +#include "TrackInfo.hpp"
116414 +
116415 +#include <portaudio.h>
116416 +
116417 +// CDDA data virtual base class
116418 +class CDDAData
116419 +{
116420 +public:
116421 + CDDAData() {}
116422 + virtual ~CDDAData() {}
116423 + virtual void openFile(const std::string& file) = 0;
116424 + virtual int play(const CDTime& startTime) = 0;
116425 + virtual int stop() = 0;
116426 + virtual bool isPlaying(void) {return false;}
116427 + virtual CDTime playTime(void) {return CDTime();}
116428 +};
116429 +
116430 +// if there's no CDDA data, just return sensible values
116431 +class NoCDDAData : public CDDAData
116432 +{
116433 +public:
116434 + NoCDDAData() {}
116435 + virtual ~NoCDDAData() {}
116436 + virtual void openFile(const std::string& file) {}
116437 + virtual int play(const CDTime& startTime) {return 0;}
116438 + virtual int stop() {return 0;}
116439 +};
116440 +
116441 +// for really playing CDDA data.
116442 +class PlayCDDAData : public CDDAData
116443 +{
116444 +public:
116445 + // ti is the list of track lengths.
116446 + // sets the volume from whatever is stored in the preferences
116447 + PlayCDDAData(const std::vector<TrackInfo> ti, CDTime gapLength);
116448 +
116449 + // cleans up
116450 + virtual ~PlayCDDAData() {if (playing) stop(); delete theCD; Pa_Terminate();}
116451 +
116452 + // opens the file and readies the plugin for playing
116453 + virtual void openFile(const std::string& file);
116454 + // plays data starting at startTime
116455 + virtual int play(const CDTime& startTime);
116456 + // stops playing
116457 + virtual int stop();
116458 +
116459 + virtual bool isPlaying(void) {return playing;}
116460 + virtual CDTime playTime(void) {return CDDAPos;}
116461 +
116462 + // All the data members are public so they can be accessed by the PortAudio
116463 + // callback
116464 +
116465 + // the PortAudio stream for playing
116466 + PaStream* stream;
116467 +
116468 + // the volume as set in the configuration window
116469 + double volume;
116470 + // the current position of playing
116471 + CDTime CDDAPos;
116472 + // the end time of this track
116473 + CDTime CDDAEnd;
116474 + // the start time taken from play()
116475 + CDTime CDDAStart;
116476 + CDTime InitialTime;
116477 + // the offset into the frame that it's currently playing from
116478 + unsigned long frameOffset;
116479 + // a FileInterface for getting the data from
116480 + FileInterface* theCD;
116481 + // the track list of the CD for calculating times n such
116482 + std::vector<TrackInfo> trackList;
116483 + // if true, it's playing.
116484 + bool playing;
116485 + // a buffer of null audio if repeat is off
116486 + char nullAudio[bytesPerFrame];
116487 + // if true and repeating one track, this is at the end of the currently playing track
116488 + bool endOfTrack;
116489 + // length of the pregap between tracks 1 and 2
116490 + CDTime pregapLength;
116491 + // time of the pregap
116492 + CDTime pregapTime;
116493 +};
116494 +
116495 +#endif
116496 diff -rupN original/plugins/dfbinimage/CDInterface.hpp new/plugins/dfbinimage/CDInterface.hpp
116497 --- original/plugins/dfbinimage/CDInterface.hpp 1969-12-31 20:00:00.000000000 -0400
116498 +++ new/plugins/dfbinimage/CDInterface.hpp 2007-10-08 17:13:28.000000000 -0400
116499 @@ -0,0 +1,174 @@
116500 +/************************************************************************
116501 +
116502 +CDInterface.hpp
116503 +
116504 +Copyright (C) 2007 Virus
116505 +Copyright (C) 2002 mooby
116506 +
116507 +This program is free software; you can redistribute it and/or
116508 +modify it under the terms of the GNU General Public License
116509 +as published by the Free Software Foundation; either version 2
116510 +of the License, or (at your option) any later version.
116511 +
116512 +This program is distributed in the hope that it will be useful,
116513 +but WITHOUT ANY WARRANTY; without even the implied warranty of
116514 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
116515 +GNU General Public License for more details.
116516 +
116517 +You should have received a copy of the GNU General Public License
116518 +along with this program; if not, write to the Free Software
116519 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
116520 +
116521 +************************************************************************/
116522 +
116523 +
116524 +#ifndef CDINTERFACE_HPP
116525 +#define CDINTERFACE_HPP
116526 +
116527 +#include "TrackInfo.hpp"
116528 +#include "SubchannelData.hpp"
116529 +#include "CDDAData.hpp"
116530 +#include "TrackParser.hpp"
116531 +#include "FileInterface.hpp"
116532 +
116533 +extern TDTNFormat tdtnformat;
116534 +extern std::string programName;
116535 +
116536 +// a container class for holding all the CD info needed
116537 +class CDInterface
116538 +{
116539 +public:
116540 + CDInterface()
116541 + : scd(NULL),
116542 + cdda(NULL), image(NULL)
116543 + {
116544 + // based on the program name, decide what order to return the
116545 + // track info. fyi, tester is my testing/development program.
116546 + programName = getProgramName();
116547 + if ( (programName == "epsxe") ||
116548 + (programName == "pcsx") ||
116549 + (programName == "pcsx2") ||
116550 + (programName == "tester") )
116551 + tdtnformat = fsmint;
116552 + else
116553 + tdtnformat = msfbcd;
116554 + }
116555 +
116556 + // opens the file
116557 + inline void open(const std::string& str);
116558 +
116559 + // cleans up
116560 + ~CDInterface()
116561 + {
116562 + if (cdda)
116563 + delete cdda;
116564 + if (image)
116565 + delete image;
116566 + if (scd)
116567 + delete scd;
116568 + }
116569 +
116570 + // returns the number of tracks - 1 because trackList[0] is
116571 + // the full CD length
116572 + inline unsigned long getNumTracks() const
116573 + {return trackList.size() - 1;}
116574 +
116575 + // returns the TrackInfo for trackNum
116576 + inline TrackInfo getTrackInfo(const unsigned long trackNum) const
116577 + throw(Exception);
116578 +
116579 + // seeks the data pointer to time
116580 + inline void moveDataPointer(const CDTime& time) throw(Exception)
116581 + {
116582 + image->seek(time);
116583 + scd->seek(time);
116584 + }
116585 + // returns the pointer to the data buffer
116586 + inline unsigned char* readDataPointer() const
116587 + {return image->getBuffer();}
116588 + // returns the pointer to the subchannel data
116589 + inline unsigned char* readSubchannelPointer() const
116590 + {return scd->get();}
116591 + // returns the CD length
116592 + inline CDTime getCDLength() {return image->getCDLength();}
116593 +
116594 + // starts CDDA playing at time
116595 + inline int playTrack(const CDTime& time) {return cdda->play(time);}
116596 + // stops CDDA playing
116597 + inline int stopTrack() {return cdda->stop();}
116598 + // returns the time of the sector that's currently being read
116599 + inline CDTime readTime(void)
116600 + {
116601 + if (cdda->isPlaying())
116602 + return cdda->playTime();
116603 + else
116604 + return image->getSeekTime();
116605 + }
116606 + // returns whether or not the CDDA is playing
116607 + inline bool isPlaying (void) {return cdda->isPlaying();}
116608 +
116609 +private:
116610 + // a vector of track info that stores the start, end, and length of each track
116611 + std::vector<TrackInfo> trackList;
116612 +
116613 + // the subchannel data for the cd
116614 + SubchannelData* scd;
116615 + // the CDDA data for the cd
116616 + CDDAData* cdda;
116617 + // the interface to the CD image itself
116618 + FileInterface* image;
116619 +};
116620 +
116621 +// initalizes all the data for CDInterface based on a file name from
116622 +// CDOpen
116623 +inline void CDInterface::open(const std::string& str)
116624 +{
116625 + // use the FIFactory to make the FileInterface
116626 + std::string extension;
116627 + image = FileInterfaceFactory(str, extension);
116628 +
116629 + std::string fileroot = str;
116630 + fileroot.erase(fileroot.rfind(extension));
116631 +
116632 + TrackParser* tp = TrackParserFactory(fileroot, image);
116633 + tp->parse();
116634 + tp->postProcess(image->getCDLength());
116635 + trackList = tp->getTrackList();
116636 + delete tp;
116637 +
116638 + // if there is more than one track, initalize the CDDA data
116639 + if (trackList.size() > 2)
116640 + {
116641 + cdda = new PlayCDDAData(trackList, tp->getPregapLength());
116642 + cdda->openFile(str);
116643 + }
116644 + else
116645 + {
116646 + cdda = new NoCDDAData();
116647 + }
116648 +
116649 + // build the subchannel data
116650 + scd = SubchannelDataFactory(fileroot);
116651 +
116652 + if (trackList.size() > 2)
116653 + {
116654 + image->setPregap(tp->getPregapLength(), trackList[2].trackStart);
116655 + }
116656 +
116657 +}
116658 +
116659 +// returns the TrackInfo for trackNum if it exists
116660 +inline TrackInfo CDInterface::getTrackInfo(const unsigned long trackNum) const
116661 + throw(Exception)
116662 +{
116663 + if (trackNum >= trackList.size())
116664 + {
116665 + std::ostringstream ost;
116666 + ost << trackNum << std::endl;
116667 + Exception e(std::string("Track number out of bounds") + ost.str());
116668 + THROW(e);
116669 + }
116670 + return trackList[trackNum];
116671 +}
116672 +
116673 +#endif
116674 diff -rupN original/plugins/dfbinimage/CDTime.hpp new/plugins/dfbinimage/CDTime.hpp
116675 --- original/plugins/dfbinimage/CDTime.hpp 1969-12-31 20:00:00.000000000 -0400
116676 +++ new/plugins/dfbinimage/CDTime.hpp 2007-10-08 17:13:28.000000000 -0400
116677 @@ -0,0 +1,487 @@
116678 +/************************************************************************
116679 +
116680 +CDTime.hpp
116681 +
116682 +Copyright (C) 2007 Virus
116683 +Copyright (C) 2002 mooby
116684 +
116685 +This program is free software; you can redistribute it and/or
116686 +modify it under the terms of the GNU General Public License
116687 +as published by the Free Software Foundation; either version 2
116688 +of the License, or (at your option) any later version.
116689 +
116690 +This program is distributed in the hope that it will be useful,
116691 +but WITHOUT ANY WARRANTY; without even the implied warranty of
116692 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
116693 +GNU General Public License for more details.
116694 +
116695 +You should have received a copy of the GNU General Public License
116696 +along with this program; if not, write to the Free Software
116697 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
116698 +
116699 +************************************************************************/
116700 +
116701 +
116702 +
116703 +#ifndef CDTIME_HPP
116704 +#define CDTIME_HPP
116705 +
116706 +#include "Utils.hpp"
116707 +#include "Exception.hpp"
116708 +
116709 +#include <iomanip>
116710 +#include <iostream>
116711 +
116712 +// MSFTime is a container for minute, second, and frame
116713 +class MSFTime
116714 +{
116715 +public:
116716 + // default 0:0:0
116717 + MSFTime() : minute(0), sec(0), frame(0) {}
116718 +
116719 + // various constructors...
116720 + MSFTime(const unsigned char m, const unsigned char s, const unsigned char f)
116721 + : minute(m), sec(s), frame(f) {}
116722 +
116723 + MSFTime(const unsigned char* msf, const TDTNFormat format)
116724 + : minute(0), sec(0), frame(0)
116725 + {setMSF(msf, format);}
116726 +
116727 + MSFTime(const MSFTime& r) : minute(r.minute), sec(r.sec), frame(r.frame) {}
116728 +
116729 + inline void setMSF(const unsigned char m, const unsigned char s, const unsigned char f)
116730 + {minute = m; sec = s; frame = f;}
116731 +
116732 + // sets this MSF time based on format. format tells the order of the
116733 + // frame, min and sec in the char* and whether or not it's integer or BCD
116734 + inline void setMSF(const unsigned char* msf, const TDTNFormat format)
116735 + {
116736 + if (format == msfbcd)
116737 + {
116738 + minute = BCDToInt(msf[0]);
116739 + sec = BCDToInt(msf[1]);
116740 + frame = BCDToInt(msf[2]);
116741 + }
116742 + else if (format == msfint)
116743 + {
116744 + minute = msf[0];
116745 + sec = msf[1];
116746 + frame = msf[2];
116747 + }
116748 + else if (format == fsmbcd)
116749 + {
116750 + minute = BCDToInt(msf[2]);
116751 + sec = BCDToInt(msf[1]);
116752 + frame = BCDToInt(msf[0]);
116753 + }
116754 + else if (format == fsmint)
116755 + {
116756 + minute = msf[2];
116757 + sec = msf[1];
116758 + frame = msf[0];
116759 + }
116760 + }
116761 +
116762 + inline unsigned char m() const
116763 + {return minute;}
116764 +
116765 + inline unsigned char s() const
116766 + {return sec;}
116767 +
116768 + inline unsigned char f() const
116769 + {return frame;}
116770 +
116771 + inline friend std::ostream& operator<<(std::ostream& o, const MSFTime& m);
116772 + inline friend std::istream& operator>>(std::istream& i, MSFTime& m);
116773 +
116774 + // Note that this does NOT return a reference
116775 + inline unsigned char operator[](const size_t index) const
116776 + throw(Exception)
116777 + {
116778 + switch(index)
116779 + {
116780 + case 0: return minute;
116781 + case 1: return sec;
116782 + case 2: return frame;
116783 + default:
116784 + {
116785 + Exception e("Index out of range");
116786 + THROW(e);
116787 + }
116788 + }
116789 + }
116790 +
116791 +private:
116792 + unsigned char minute;
116793 + unsigned char sec;
116794 + unsigned char frame;
116795 +};
116796 +
116797 +// CDTime contains all the data conversions, operations, and types needed for
116798 +// calculating any type of time used in this plugin
116799 +class CDTime
116800 +{
116801 +public:
116802 + // CDTime holds the time in 3 ways - msf, absoluteByte, and absoluteFrame.
116803 + // This enum tells what conversions have been done on the data.
116804 + enum conversionType
116805 + {
116806 + msf = 0x01,
116807 + abByte = 0x02,
116808 + abFrame = 0x04,
116809 + allTypes = 0x07
116810 + };
116811 +
116812 + CDTime()
116813 + : conversions(0), absoluteByte(0), absoluteFrame(0)
116814 + {}
116815 +
116816 + CDTime(const CDTime& r)
116817 + : conversions(r.conversions), MSF(r.MSF), absoluteByte(r.absoluteByte), absoluteFrame(r.absoluteFrame)
116818 + {}
116819 +
116820 + CDTime(const unsigned char m, const unsigned char s, const unsigned char f)
116821 + : conversions(msf), MSF(m, s, f), absoluteByte(0), absoluteFrame(0)
116822 + {convertTime();}
116823 +
116824 + CDTime(const unsigned char* msftime, const TDTNFormat format)
116825 + : conversions(msf), MSF(msftime, format), absoluteByte(0), absoluteFrame(0)
116826 + {
116827 + convertTime();
116828 + }
116829 +
116830 + CDTime(const MSFTime& msftime)
116831 + : conversions(msf), MSF(msftime), absoluteByte(0), absoluteFrame(0)
116832 + {convertTime();}
116833 +
116834 + // converts a time like 00:00:00 to a CD time
116835 + CDTime(const std::string& str)
116836 + : conversions(msf), absoluteByte(0), absoluteFrame(0)
116837 + {
116838 + MSF.setMSF(atoi(str.substr(0,2).c_str()), atoi(str.substr(3, 2).c_str()),
116839 + atoi(str.substr(6, 2).c_str()));
116840 + convertTime();
116841 + }
116842 +
116843 + // constructor for absoluteByte and absoluteFrame
116844 + CDTime(const unsigned long absoluteAddr, const conversionType ct);
116845 +
116846 + // math and comparison operators
116847 + inline bool operator<(const CDTime& r) const;
116848 + inline bool operator>(const CDTime& r) const;
116849 + inline bool operator==(const CDTime& r) const;
116850 + inline bool operator!=(const CDTime& r) const;
116851 + inline bool operator<=(const CDTime& r) const;
116852 + inline bool operator>=(const CDTime& r) const;
116853 +
116854 + // using the default operator=
116855 + inline CDTime& operator+=(const CDTime& r);
116856 + inline CDTime& operator-=(const CDTime& r);
116857 + inline CDTime operator+(const CDTime& r) const;
116858 + inline CDTime operator-(const CDTime& r) const;
116859 +
116860 + // access and set operators
116861 + inline MSFTime getMSF() const;
116862 + inline CDTime& setMSF(const MSFTime& r);
116863 +
116864 + // this one is special - it converts the MSFTime into the TDTNFormat format
116865 + // and stores it in an internal buffer, then returns a pointer to that buffer.
116866 + // This is really useful for GetTD.
116867 + inline unsigned char* getMSFbuf(const TDTNFormat format = msfint) const;
116868 +
116869 + inline unsigned long getAbsoluteByte() const;
116870 + inline CDTime& setAbsoluteByte(const unsigned long ab);
116871 +
116872 + inline unsigned long getAbsoluteFrame() const;
116873 + inline CDTime& setAbsoluteFrame(const unsigned long af);
116874 +
116875 + inline friend std::ostream& operator<<(std::ostream& o, const CDTime& cdt);
116876 + inline friend std::istream& operator>>(std::istream& i, CDTime& m);
116877 +
116878 +private:
116879 + // based on what conversions have already been done on the data, convertTime
116880 + // sets whatever data members have not been set yet.
116881 + inline void convertTime()
116882 + throw(Exception);
116883 +
116884 + // Data members
116885 +
116886 + // this holds what conversions that have already been done on the data (with bitmasks)
116887 + unsigned char conversions;
116888 +
116889 + // the time data
116890 + MSFTime MSF;
116891 + unsigned long absoluteByte;
116892 + unsigned long absoluteFrame;
116893 + // used for converting time to unsigned char[3]
116894 + unsigned char MSFbuf[3];
116895 +};
116896 +
116897 +inline std::ostream& operator<<(std::ostream& o, const MSFTime& m)
116898 +{
116899 + o << std::setfill('0') << std::setw(2) << (int)m.m()
116900 + << ':' << std::setw(2) << (int)m.s()
116901 + << ':' << std::setw(2) << (int)m.f();
116902 + return o;
116903 +}
116904 +
116905 +inline std::istream& operator>>(std::istream& i, MSFTime& m)
116906 +{
116907 + std::ios::iostate state = i.exceptions();
116908 + i.exceptions(std::ios::failbit|std::ios::badbit|std::ios::eofbit);
116909 + try
116910 + {
116911 + char c;
116912 + int minute, sec, frame;
116913 + i >> minute >> c >> sec >> c >> frame;
116914 + m.minute = minute;
116915 + m.sec = sec;
116916 + m.frame = frame;
116917 + }
116918 + catch(...)
116919 + {
116920 + i.setstate(std::ios::failbit);
116921 + }
116922 + i.exceptions(state);
116923 + return i;
116924 +}
116925 +
116926 +inline CDTime::CDTime(const unsigned long absoluteAddr, const conversionType ct)
116927 + : conversions(0), absoluteByte(0), absoluteFrame(0)
116928 +{
116929 + if (ct == abByte)
116930 + {
116931 + conversions = ct;
116932 + absoluteByte = absoluteAddr;
116933 + convertTime();
116934 + }
116935 + else if (ct == abFrame)
116936 + {
116937 + conversions = ct;
116938 + absoluteFrame = absoluteAddr;
116939 + convertTime();
116940 + }
116941 +}
116942 +
116943 +inline bool CDTime::operator<(const CDTime& r) const
116944 +{
116945 + return absoluteByte < r.absoluteByte;
116946 +}
116947 +
116948 +inline bool CDTime::operator>(const CDTime& r) const
116949 +{
116950 + return absoluteByte > r.absoluteByte;
116951 +}
116952 +
116953 +inline bool CDTime::operator==(const CDTime& r) const
116954 +{
116955 + return absoluteByte == r.absoluteByte;
116956 +}
116957 +
116958 +inline bool CDTime::operator!=(const CDTime& r) const
116959 +{
116960 + return absoluteByte != r.absoluteByte;
116961 +}
116962 +
116963 +inline bool CDTime::operator<=(const CDTime& r) const
116964 +{
116965 + return absoluteByte <= r.absoluteByte;
116966 +}
116967 +
116968 +inline bool CDTime::operator>=(const CDTime& r) const
116969 +{
116970 + return absoluteByte >= r.absoluteByte;
116971 +}
116972 +
116973 +inline CDTime& CDTime::operator+=(const CDTime& r)
116974 +{
116975 + absoluteByte += r.absoluteByte;
116976 + conversions = abByte;
116977 + convertTime();
116978 + return *this;
116979 +}
116980 +
116981 +inline CDTime& CDTime::operator-=(const CDTime& r)
116982 +{
116983 + absoluteByte -= r.absoluteByte;
116984 + conversions = abByte;
116985 + convertTime();
116986 + return *this;
116987 +}
116988 +
116989 +inline CDTime CDTime::operator+(const CDTime& r) const
116990 +{
116991 + CDTime temp(*this);
116992 + return (temp += r);
116993 +}
116994 +
116995 +inline CDTime CDTime::operator-(const CDTime& r) const
116996 +{
116997 + CDTime temp(*this);
116998 + return (temp -= r);
116999 +}
117000 +
117001 +inline MSFTime CDTime::getMSF() const
117002 +{
117003 + return MSF;
117004 +}
117005 +
117006 +inline CDTime& CDTime::setMSF(const MSFTime& r)
117007 +{
117008 + MSF = r;
117009 + conversions = msf;
117010 + convertTime();
117011 + return *this;
117012 +}
117013 +
117014 +inline unsigned char* CDTime::getMSFbuf(const TDTNFormat format) const
117015 +{
117016 + CDTime& thisCDTime = const_cast<CDTime&>(*this);
117017 + if (format == msfbcd)
117018 + {
117019 + thisCDTime.MSFbuf[0] = intToBCD(MSF.m());
117020 + thisCDTime.MSFbuf[1] = intToBCD(MSF.s());
117021 + thisCDTime.MSFbuf[2] = intToBCD(MSF.f());
117022 + }
117023 + else if (format == fsmbcd)
117024 + {
117025 + thisCDTime.MSFbuf[0] = intToBCD(MSF.f());
117026 + thisCDTime.MSFbuf[1] = intToBCD(MSF.s());
117027 + thisCDTime.MSFbuf[2] = intToBCD(MSF.m());
117028 + }
117029 + else if (format == fsmint)
117030 + {
117031 + thisCDTime.MSFbuf[0] = MSF.f();
117032 + thisCDTime.MSFbuf[1] = MSF.s();
117033 + thisCDTime.MSFbuf[2] = MSF.m();
117034 + }
117035 + else if (format == msfint)
117036 + {
117037 + thisCDTime.MSFbuf[0] = MSF.m();
117038 + thisCDTime.MSFbuf[1] = MSF.s();
117039 + thisCDTime.MSFbuf[2] = MSF.f();
117040 + }
117041 + return (unsigned char*)&MSFbuf;
117042 +}
117043 +
117044 +
117045 +inline unsigned long CDTime::getAbsoluteByte() const
117046 +{
117047 + return absoluteByte;
117048 +}
117049 +
117050 +inline CDTime& CDTime::setAbsoluteByte(const unsigned long ab)
117051 +{
117052 + absoluteByte = ab;
117053 + conversions = abByte;
117054 + convertTime();
117055 + return *this;
117056 +}
117057 +
117058 +inline unsigned long CDTime::getAbsoluteFrame() const
117059 +{
117060 + return absoluteFrame;
117061 +}
117062 +
117063 +inline CDTime& CDTime::setAbsoluteFrame(const unsigned long af)
117064 +{
117065 + absoluteFrame = af;
117066 + conversions = abFrame;
117067 + convertTime();
117068 + return *this;
117069 +}
117070 +
117071 +
117072 +// set all the times for the conversions that have not been done yet.
117073 +// at the end of the function, all the conversions should be done.
117074 +inline void CDTime::convertTime()
117075 + throw(Exception)
117076 +{
117077 + // if no times are set, throw an error
117078 + if (conversions == 0)
117079 + {
117080 + Exception e("Cannot perform time conversion");
117081 + THROW(e);
117082 + }
117083 + if (conversions & msf)
117084 + {
117085 + if (! (conversions & abByte))
117086 + {
117087 + absoluteByte = MSF.m() * bytesPerMinute +
117088 + MSF.s() * bytesPerSecond +
117089 + MSF.f() * bytesPerFrame;
117090 + }
117091 + if (! (conversions & abFrame))
117092 + {
117093 + absoluteFrame = MSF.m() * framesPerMinute +
117094 + MSF.s() * framesPerSecond +
117095 + MSF.f();
117096 + }
117097 + }
117098 + else if (conversions & abByte)
117099 + {
117100 + if (! (conversions & msf))
117101 + {
117102 + unsigned char m = absoluteByte / bytesPerMinute;
117103 + unsigned char s = (absoluteByte - m * bytesPerMinute) / bytesPerSecond;
117104 + unsigned char f = (absoluteByte - m * bytesPerMinute - s * bytesPerSecond) /
117105 + bytesPerFrame;
117106 + MSF.setMSF(m, s, f);
117107 + }
117108 + if (! (conversions & abFrame))
117109 + {
117110 + absoluteFrame = absoluteByte / bytesPerFrame;
117111 + }
117112 + }
117113 + else if (conversions & abFrame)
117114 + {
117115 + if (! (conversions & msf))
117116 + {
117117 + unsigned char m = absoluteFrame / framesPerMinute;
117118 + unsigned char s = (absoluteFrame - m * framesPerMinute) / framesPerSecond;
117119 + unsigned char f = absoluteFrame - m * framesPerMinute - s * framesPerSecond;
117120 + MSF.setMSF(m, s, f);
117121 + }
117122 + if (! (conversions & abByte))
117123 + {
117124 + absoluteByte = absoluteFrame * bytesPerFrame;
117125 + }
117126 + }
117127 + else
117128 + {
117129 + Exception e("Unknown conversion type");
117130 + THROW(e);
117131 + }
117132 + conversions |= allTypes;
117133 +}
117134 +
117135 +inline std::ostream& operator<<(std::ostream& o, const CDTime& cdt)
117136 +{
117137 + if (cdt.conversions == 0)
117138 + {
117139 + o << "Time not set" << std::endl;
117140 + return o;
117141 + }
117142 + if (cdt.conversions & CDTime::msf)
117143 + {
117144 + o << "MSF: " << cdt.MSF << std::endl;
117145 + }
117146 + if (cdt.conversions & CDTime::abByte)
117147 + {
117148 + o << "Absolute byte: " << cdt.absoluteByte << std::endl;
117149 + }
117150 + if (cdt.conversions & CDTime::abFrame)
117151 + {
117152 + o << "Absolute frame: " << cdt.absoluteFrame << std::endl;
117153 + }
117154 + return o;
117155 +}
117156 +
117157 +
117158 +inline std::istream& operator>>(std::istream& i, CDTime& cdt)
117159 +{
117160 + i >> cdt.MSF;
117161 + cdt.convertTime();
117162 +}
117163 +#endif
117164 +
117165 diff -rupN original/plugins/dfbinimage/ConfigCallbacks.cpp new/plugins/dfbinimage/ConfigCallbacks.cpp
117166 --- original/plugins/dfbinimage/ConfigCallbacks.cpp 1969-12-31 20:00:00.000000000 -0400
117167 +++ new/plugins/dfbinimage/ConfigCallbacks.cpp 2007-10-08 17:13:28.000000000 -0400
117168 @@ -0,0 +1,361 @@
117169 +/************************************************************************
117170 +
117171 +ConfigCallbacks.cpp
117172 +
117173 +Copyright (C) 2007 Virus
117174 +Copyright (C) 2002 mooby
117175 +
117176 +This program is free software; you can redistribute it and/or
117177 +modify it under the terms of the GNU General Public License
117178 +as published by the Free Software Foundation; either version 2
117179 +of the License, or (at your option) any later version.
117180 +
117181 +This program is distributed in the hope that it will be useful,
117182 +but WITHOUT ANY WARRANTY; without even the implied warranty of
117183 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
117184 +GNU General Public License for more details.
117185 +
117186 +You should have received a copy of the GNU General Public License
117187 +along with this program; if not, write to the Free Software
117188 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
117189 +
117190 +************************************************************************/
117191 +
117192 +#pragma warning(disable:4786)
117193 +
117194 +
117195 +#include "FileInterface.hpp"
117196 +#include "Preferences.hpp"
117197 +#include "ConfigCallbacks.hpp"
117198 +#include "ConfigFunctions.hpp"
117199 +
117200 +#include <fstream>
117201 +#include <string>
117202 +#include <vector>
117203 +#include <sstream>
117204 +
117205 +using namespace std;
117206 +
117207 +extern Preferences prefs;
117208 +
117209 +// a container for a window with a progress bar. used for compress and decompress
117210 +class ProgWindow
117211 +{
117212 +public:
117213 + ProgWindow(const string& text)
117214 + {
117215 + {
117216 + Fl_Window* o = new Fl_Window(220, 50, text.c_str());
117217 + w = o;
117218 + prog = new Fl_Progress(0,0,200,20);
117219 + prog->minimum(0);
117220 + prog->maximum(1);
117221 + prog->value(0);
117222 + o->end();
117223 + }
117224 + w->show();
117225 + Fl::wait(0);
117226 + }
117227 +
117228 + void update(const float moo)
117229 + {
117230 + prog->value(moo);
117231 + w->redraw();
117232 + Fl::wait(0);
117233 + }
117234 +
117235 + ~ProgWindow() {w->hide(); w->redraw(); delete w;}
117236 +private:
117237 + Fl_Window* w;
117238 + Fl_Progress* prog;
117239 +};
117240 +
117241 +// compresses cd using the compression methods in zipCD
117242 +void compressIt(FileInterface* cd,
117243 + CompressedFileInterface* zipCD,
117244 + const string& outputFileName,
117245 + const string& indexFileName)
117246 +{
117247 + cd->setCacheMode(FileInterface::oldMode);
117248 + CDTime start(0,2,0);
117249 + // these hold the info needed for generating the .index or .table file
117250 + vector<unsigned long> indexTable;
117251 + vector<unsigned long> sizeTable;
117252 +
117253 + // open the output file
117254 + std::ofstream outfile(outputFileName.c_str(), ios::binary);
117255 +
117256 + // the buffers for compression
117257 + unsigned char* inputBuffer =
117258 + new unsigned char[zipCD->getCompressedFrames() * bytesPerFrame];
117259 + unsigned char* outputBuffer =
117260 + new unsigned char[(zipCD->getCompressedFrames() + 1) * bytesPerFrame];
117261 +
117262 + ProgWindow* p = new ProgWindow("Compressing...");
117263 +
117264 + while (start < cd->getCDLength())
117265 + {
117266 + unsigned int i = 0;
117267 + // read up to compressedFrames or until the end of the CD, whichever is smaller
117268 + while ( (start < cd->getCDLength()) && (i < zipCD->getCompressedFrames()) )
117269 + {
117270 + p->update((float)start.getAbsoluteFrame() / (float)cd->getCDLength().getAbsoluteFrame());
117271 + cd->seek(start);
117272 + memcpy(inputBuffer + bytesPerFrame * i, cd->getBuffer(), bytesPerFrame);
117273 + i++;
117274 + start += CDTime(0,0,1);
117275 + }
117276 + // add the index information for the file location
117277 + indexTable.push_back(outfile.tellp());
117278 +
117279 + // compress the data
117280 + unsigned int outputBytes = (zipCD->getCompressedFrames() + 1) * bytesPerFrame;
117281 + unsigned int inputBytes = i * bytesPerFrame;
117282 + zipCD->compressData((char*)inputBuffer, (char*)outputBuffer,
117283 + inputBytes, outputBytes);
117284 +
117285 + // write the compressed data and add the compressed size to the sizeTable
117286 + outfile.write((char*)outputBuffer, outputBytes);
117287 + sizeTable.push_back(outputBytes);
117288 + }
117289 +
117290 + // write the index file
117291 + string tableToWrite = zipCD->toTable(indexTable, sizeTable);
117292 +
117293 + ofstream indexFile(indexFileName.c_str(), ios::binary);
117294 + indexFile.write(tableToWrite.c_str(), tableToWrite.size());
117295 +
117296 + // clean up
117297 + indexFile.close();
117298 + outfile.close();
117299 + delete [] inputBuffer;
117300 + delete [] outputBuffer;
117301 + delete cd;
117302 + delete zipCD;
117303 + delete p;
117304 +
117305 + moobyMessage("Done");
117306 +}
117307 +
117308 +// decompressing is much easier
117309 +void decompressIt(FileInterface* cd,
117310 + const string& outputFileName)
117311 +{
117312 + cd->setCacheMode(FileInterface::oldMode);
117313 + CDTime start(0,2,0);
117314 + std::ofstream outfile(outputFileName.c_str(), ios::binary);
117315 +
117316 + ProgWindow* p = new ProgWindow("Decompressing...");
117317 +
117318 + // write out every frame in the file
117319 + while (start < cd->getCDLength())
117320 + {
117321 + p->update((float)start.getAbsoluteFrame() / (float)cd->getCDLength().getAbsoluteFrame());
117322 + cd->seek(start);
117323 + outfile.write((char*)cd->getBuffer(), bytesPerFrame);
117324 + start += CDTime(0,0,1);
117325 + }
117326 +
117327 + outfile.close();
117328 + delete cd;
117329 + delete p;
117330 +
117331 + moobyMessage("Done");
117332 +}
117333 +
117334 +// callback for bzcompress
117335 +void bzCompress(Fl_Button*, void*)
117336 +{
117337 + char * returned;
117338 + if ( (returned = moobyFileChooser("Choose a file to compress in bz.index format", theUsualSuspects.c_str())) == NULL)
117339 + {
117340 + return;
117341 + }
117342 + string outputFileName(returned);
117343 + outputFileName += ".bz";
117344 + string indexFileName(outputFileName + string(".index"));
117345 + FileInterface* cd = new UncompressedFileInterface(1);
117346 + CompressedFileInterface* zipCD = new BZIndexFileInterface(1);
117347 + cd->openFile(returned);
117348 + compressIt(cd, zipCD, outputFileName, indexFileName);
117349 +}
117350 +
117351 +// callback for bzdecompress
117352 +void bzDecompress(Fl_Button*, void*)
117353 +{
117354 + char * returned;
117355 + if ( (returned = moobyFileChooser("Choose a .bz file to decompress", "*.bz")) == NULL)
117356 + {
117357 + return;
117358 + }
117359 + FileInterface* cd = new BZIndexFileInterface(1);
117360 + string theFile(returned);
117361 + cd->openFile(theFile);
117362 + string outputFileName(theFile);
117363 + outputFileName.erase(theFile.rfind(".bz"));
117364 + decompressIt(cd, outputFileName);
117365 +}
117366 +
117367 +// callback for zcompress
117368 +void zCompress(Fl_Button*, void*)
117369 +{
117370 + char * returned;
117371 + if ( (returned = moobyFileChooser("Choose a file to compress in Z.table format", theUsualSuspects.c_str())) == NULL)
117372 + {
117373 + return;
117374 + }
117375 + string outputFileName(returned);
117376 + outputFileName += ".Z";
117377 + string indexFileName(outputFileName + string(".table"));
117378 + FileInterface* cd = new UncompressedFileInterface(1);
117379 + CompressedFileInterface* zipCD = new ZTableFileInterface(1);
117380 + cd->openFile(returned);
117381 + compressIt(cd, zipCD, outputFileName, indexFileName);
117382 +}
117383 +
117384 +// callback for zdecompress
117385 +void zDecompress(Fl_Button*, void*)
117386 +{
117387 + char * returned;
117388 + if ( (returned = moobyFileChooser("Choose a .Z file to decompress", "*.Z")) == NULL)
117389 + {
117390 + return;
117391 + }
117392 + FileInterface* cd = new ZTableFileInterface(1);
117393 + string theFile(returned);
117394 + cd->openFile(theFile);
117395 + string outputFileName(theFile);
117396 + outputFileName.erase(theFile.rfind(".Z"));
117397 + decompressIt(cd, outputFileName);
117398 +}
117399 +
117400 +// callback for cddavolume
117401 +void CDDAVolume(Fl_Value_Slider* slider, void*)
117402 +{
117403 + ostringstream ost;
117404 + ost << slider->value();
117405 + prefs.prefsMap[volumeString] = ost.str();
117406 + prefs.write();
117407 +}
117408 +
117409 +// callback for repeat
117410 +void repeatAllCDDA(Fl_Check_Button* button, void* val)
117411 +{
117412 + if (button == NULL)
117413 + {
117414 + ((Fl_Check_Button*)val)->value(0);
117415 + }
117416 + else
117417 + {
117418 + button->value(1);
117419 + prefs.prefsMap[repeatString] = std::string(repeatAllString);
117420 + prefs.write();
117421 + repeatOneCDDA(NULL, ((ConfigWindow*)val)->repeatOneButton);
117422 + playOneCDDA(NULL, ((ConfigWindow*)val)->playOneButton);
117423 + }
117424 +}
117425 +
117426 +// callback for repeat
117427 +void repeatOneCDDA(Fl_Check_Button* button, void* val)
117428 +{
117429 + if (button == NULL)
117430 + {
117431 + ((Fl_Check_Button*)val)->value(0);
117432 + }
117433 + else
117434 + {
117435 + button->value(1);
117436 + prefs.prefsMap[repeatString] = std::string(repeatOneString);
117437 + prefs.write();
117438 + repeatAllCDDA(NULL, ((ConfigWindow*)val)->repeatAllButton);
117439 + playOneCDDA(NULL, ((ConfigWindow*)val)->playOneButton);
117440 + }
117441 +}
117442 +
117443 +// callback for repeat
117444 +void playOneCDDA(Fl_Check_Button* button, void* val)
117445 +{
117446 + if (button == NULL)
117447 + {
117448 + ((Fl_Check_Button*)val)->value(0);
117449 + }
117450 + else
117451 + {
117452 + button->value(1);
117453 + prefs.prefsMap[repeatString] = std::string(playOneString);
117454 + prefs.write();
117455 + repeatAllCDDA(NULL, ((ConfigWindow*)val)->repeatAllButton);
117456 + repeatOneCDDA(NULL, ((ConfigWindow*)val)->repeatOneButton);
117457 + }
117458 +}
117459 +
117460 +// callback for selecting an image for autorun
117461 +void chooseAutorunImage(Fl_Button* button, void* val)
117462 +{
117463 + char *returned = NULL;
117464 + bool done = false;
117465 + while (!done)
117466 + {
117467 + returned = moobyFileChooser("Choose an image to run", theUsualSuspects.c_str(), prefs.prefsMap[lastrunString]);
117468 + if (returned == NULL)
117469 + {
117470 + if (moobyAsk("You hit cancel or didn't pick a file.\nPick a different file?") == 0)
117471 + {
117472 + done = true;
117473 + }
117474 + }
117475 + else
117476 + {
117477 + done = true;
117478 + }
117479 + }
117480 + if (returned != NULL)
117481 + {
117482 + prefs.prefsMap[autorunString] = std::string(returned);
117483 + }
117484 + ((ConfigWindow*)val)->autorunBox->label(prefs.prefsMap[autorunString].c_str());
117485 +}
117486 +
117487 +void clearAutorunImage(Fl_Button* button, void* val)
117488 +{
117489 + prefs.prefsMap[autorunString] = std::string();
117490 + ((ConfigWindow*)val)->autorunBox->label("No autorun image selected");
117491 +}
117492 +
117493 +
117494 +// callback for OK
117495 +void configOK(Fl_Return_Button* button, void* val)
117496 +{
117497 + //delete ((ConfigWindow*)val)->w;
117498 + ((ConfigWindow*)val)->w->hide();
117499 +}
117500 +
117501 +// callback for cachesize
117502 +void cacheSize(Fl_Value_Slider* slider, void*)
117503 +{
117504 + ostringstream ost;
117505 + int tmp=(int)(slider->value()*446);
117506 + ost << tmp;
117507 + prefs.prefsMap[cacheSizeString] = ost.str();
117508 + prefs.write();
117509 +}
117510 +
117511 +// callback for new caching button
117512 +void newCaching(Fl_Check_Button* button, void*)
117513 +{
117514 + if (button->value() == 1)
117515 + prefs.prefsMap[cachingModeString] = std::string(newCachingString);
117516 + else
117517 + prefs.prefsMap[cachingModeString] = std::string(oldCachingString);
117518 + prefs.write();
117519 +}
117520 +
117521 +// callback for enable/disable subchannel
117522 +void subEnable(Fl_Check_Button* button, void*)
117523 +{
117524 + if (button->value() == 1)
117525 + prefs.prefsMap[subEnableString] = std::string("1");
117526 + else
117527 + prefs.prefsMap[subEnableString] = std::string();
117528 + prefs.write();
117529 +}
117530 diff -rupN original/plugins/dfbinimage/ConfigCallbacks.hpp new/plugins/dfbinimage/ConfigCallbacks.hpp
117531 --- original/plugins/dfbinimage/ConfigCallbacks.hpp 1969-12-31 20:00:00.000000000 -0400
117532 +++ new/plugins/dfbinimage/ConfigCallbacks.hpp 2007-10-08 17:13:28.000000000 -0400
117533 @@ -0,0 +1,47 @@
117534 +/************************************************************************
117535 +
117536 +ConfigCallbacks.hpp
117537 +
117538 +Copyright (C) 2007 Virus
117539 +Copyright (C) 2002 mooby
117540 +
117541 +This program is free software; you can redistribute it and/or
117542 +modify it under the terms of the GNU General Public License
117543 +as published by the Free Software Foundation; either version 2
117544 +of the License, or (at your option) any later version.
117545 +
117546 +This program is distributed in the hope that it will be useful,
117547 +but WITHOUT ANY WARRANTY; without even the implied warranty of
117548 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
117549 +GNU General Public License for more details.
117550 +
117551 +You should have received a copy of the GNU General Public License
117552 +along with this program; if not, write to the Free Software
117553 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
117554 +
117555 +************************************************************************/
117556 +
117557 +#ifndef CONFIG_CALLBACKS_HPP
117558 +#define CONFIG_CALLBACKS_HPP
117559 +
117560 +#include <FL/Fl_Value_Slider.H>
117561 +#include <FL/Fl_Check_Button.H>
117562 +#include <FL/Fl_Return_Button.H>
117563 +#include <FL/Fl_Progress.H>
117564 +
117565 +void bzCompress(Fl_Button*, void*);
117566 +void bzDecompress(Fl_Button*, void*);
117567 +void zCompress(Fl_Button*, void*);
117568 +void zDecompress(Fl_Button*, void*);
117569 +void CDDAVolume(Fl_Value_Slider*, void*);
117570 +void cacheSize(Fl_Value_Slider*, void*);
117571 +void newCaching(Fl_Check_Button*, void*);
117572 +void subEnable(Fl_Check_Button*, void*);
117573 +void repeatAllCDDA(Fl_Check_Button*, void* val = NULL);
117574 +void repeatOneCDDA(Fl_Check_Button*, void* val = NULL);
117575 +void playOneCDDA(Fl_Check_Button*, void* val = NULL);
117576 +void configOK(Fl_Return_Button*, void*);
117577 +void chooseAutorunImage(Fl_Button*, void*);
117578 +void clearAutorunImage(Fl_Button*, void*);
117579 +
117580 +#endif
117581 diff -rupN original/plugins/dfbinimage/ConfigFunctions.cpp new/plugins/dfbinimage/ConfigFunctions.cpp
117582 --- original/plugins/dfbinimage/ConfigFunctions.cpp 1969-12-31 20:00:00.000000000 -0400
117583 +++ new/plugins/dfbinimage/ConfigFunctions.cpp 2007-10-08 17:13:28.000000000 -0400
117584 @@ -0,0 +1,134 @@
117585 +/************************************************************************
117586 +
117587 +ConfigFunctions.cpp
117588 +
117589 +Copyright (C) 2007 Virus
117590 +Copyright (C) 2002 mooby
117591 +
117592 +This program is free software; you can redistribute it and/or
117593 +modify it under the terms of the GNU General Public License
117594 +as published by the Free Software Foundation; either version 2
117595 +of the License, or (at your option) any later version.
117596 +
117597 +This program is distributed in the hope that it will be useful,
117598 +but WITHOUT ANY WARRANTY; without even the implied warranty of
117599 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
117600 +GNU General Public License for more details.
117601 +
117602 +You should have received a copy of the GNU General Public License
117603 +along with this program; if not, write to the Free Software
117604 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
117605 +
117606 +************************************************************************/
117607 +
117608 +#include "defines.h"
117609 +#include "externs.h"
117610 +#include <iostream>
117611 +#include "Utils.hpp"
117612 +#include "Preferences.hpp"
117613 +#include "ConfigFunctions.hpp"
117614 +
117615 +extern Preferences prefs;
117616 +
117617 +void ConfigWindow::makeWindow()
117618 +{
117619 + {
117620 + Fl_Double_Window* o = new Fl_Double_Window(250, 500, "VirusCDR Configuration");
117621 + w = o;
117622 + { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(20,20,220,20, "Repeat all CDDA tracks");
117623 + o->value(prefs.prefsMap[repeatString] == repeatAllString);
117624 + o->callback((Fl_Callback*)repeatAllCDDA, this);
117625 + repeatAllButton = o;
117626 + }
117627 + { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(20,40,220,20, "Repeat one CDDA track");
117628 + o->value(prefs.prefsMap[repeatString] == repeatOneString);
117629 + o->callback((Fl_Callback*)repeatOneCDDA, this);
117630 + repeatOneButton = o;
117631 + }
117632 + { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(20,60,220,20, "Play one CDDA track and stop");
117633 + o->value(prefs.prefsMap[repeatString] == playOneString);
117634 + o->callback((Fl_Callback*)playOneCDDA, this);
117635 + playOneButton = o;
117636 + }
117637 + { Fl_Value_Slider* o = new Fl_Value_Slider(20, 90, 210, 25, "CDDA Volume");
117638 + o->type(1);
117639 + o->range(0, 100);
117640 + o->step(1);
117641 + o->value(atof(prefs.prefsMap[volumeString].c_str()));
117642 + o->callback((Fl_Callback*)CDDAVolume);
117643 + }
117644 + new Fl_Box(5, 150, 250, 25, "bz/track compression");
117645 + //new Fl_Box(5, 280, 250, 25, "Z/table compression");
117646 + { Fl_Button* o = new Fl_Button(20, 180, 95, 25, "Compress");
117647 + o->callback((Fl_Callback*)bzCompress);
117648 + }
117649 + { Fl_Button* o = new Fl_Button(130, 180, 95, 25, "Decompress");
117650 + o->callback((Fl_Callback*)bzDecompress);
117651 + }/*
117652 + { Fl_Button* o = new Fl_Button(20, 305, 95, 25, "Compress");
117653 + o->callback((Fl_Callback*)zCompress);
117654 + }
117655 + { Fl_Button* o = new Fl_Button(130, 305, 95, 25, "Decompress");
117656 + o->callback((Fl_Callback*)zDecompress);
117657 + }*/
117658 + {
117659 + Fl_Box* o;
117660 + if (prefs.prefsMap[autorunString] == std::string(""))
117661 + o = new Fl_Box(0, 340, 250, 25, "No autorun image selected");
117662 + else
117663 + o = new Fl_Box(0, 340, 250, 25, prefs.prefsMap[autorunString].c_str());
117664 + autorunBox = o;
117665 + }
117666 + {
117667 + Fl_Button* o = new Fl_Button(20, 370, 200, 25, "Choose an autorun image");
117668 + o->callback((Fl_Callback*)chooseAutorunImage, this);
117669 + }
117670 + {
117671 + Fl_Button* o = new Fl_Button(20, 405, 200, 25, "Clear the autorun image");
117672 + o->callback((Fl_Callback*)clearAutorunImage, this);
117673 + }
117674 + { Fl_Return_Button* o = new Fl_Return_Button(165, 465, 80, 25, "OK");
117675 + o->callback((Fl_Callback*)configOK, this);
117676 + }
117677 + { Fl_Check_Button* o = new Fl_Check_Button(20,220,220,20, "Read subchannel data");
117678 + o->value(prefs.prefsMap[subEnableString] != std::string());
117679 + o->callback((Fl_Callback*)subEnable);
117680 + }
117681 + { Fl_Check_Button* o = new Fl_Check_Button(20,255,220,20, "Alternative caching mode");
117682 + o->value(prefs.prefsMap[cachingModeString] == newCachingString);
117683 + o->callback((Fl_Callback*)newCaching);
117684 + }
117685 + { Fl_Value_Slider* o = new Fl_Value_Slider(20, 280, 210, 25, "Cache size (in Megabytes)");
117686 + o->type(1);
117687 + o->range(1, 700);
117688 + o->step(1);
117689 + o->value(atoi(prefs.prefsMap[cacheSizeString].c_str())/446);
117690 + o->callback((Fl_Callback*)cacheSize);
117691 + }
117692 + o->end();
117693 + }
117694 +}
117695 +
117696 +
117697 +
117698 +/** configure plugin external functions **/
117699 +
117700 +long CALLBACK CDRconfigure(void)
117701 +{
117702 + RunConfig();
117703 + prefs.write();
117704 + return 0;
117705 +}
117706 +
117707 +
117708 +int CD_Configure(UINT32 *par)
117709 +{
117710 + RunConfig();
117711 + prefs.write();
117712 + return 0;
117713 +}
117714 +
117715 +void CALLBACK CDVDconfigure()
117716 +{
117717 + CDRconfigure();
117718 +}
117719 diff -rupN original/plugins/dfbinimage/ConfigFunctions.hpp new/plugins/dfbinimage/ConfigFunctions.hpp
117720 --- original/plugins/dfbinimage/ConfigFunctions.hpp 1969-12-31 20:00:00.000000000 -0400
117721 +++ new/plugins/dfbinimage/ConfigFunctions.hpp 2007-10-08 17:13:28.000000000 -0400
117722 @@ -0,0 +1,67 @@
117723 +/************************************************************************
117724 +
117725 +ConfigFunctions.hpp
117726 +
117727 +Copyright (C) 2007 Virus
117728 +Copyright (C) 2002 mooby
117729 +
117730 +This program is free software; you can redistribute it and/or
117731 +modify it under the terms of the GNU General Public License
117732 +as published by the Free Software Foundation; either version 2
117733 +of the License, or (at your option) any later version.
117734 +
117735 +This program is distributed in the hope that it will be useful,
117736 +but WITHOUT ANY WARRANTY; without even the implied warranty of
117737 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
117738 +GNU General Public License for more details.
117739 +
117740 +You should have received a copy of the GNU General Public License
117741 +along with this program; if not, write to the Free Software
117742 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
117743 +
117744 +************************************************************************/
117745 +
117746 +#ifndef CONFIG_FUNCTIONS_HPP
117747 +#define CONFIG_FUNCTIONS_HPP
117748 +
117749 +#include "FL/Fl_Radio_Round_Button.H"
117750 +#include "ConfigCallbacks.hpp"
117751 +#include "Utils.hpp"
117752 +
117753 +// based on source generated from FLUID.
117754 +// this is the window that pops up when you use the Configure option
117755 +
117756 +class ConfigWindow
117757 +{
117758 +public:
117759 + ConfigWindow(){}
117760 + void makeWindow();
117761 + void show() { w->show(); }
117762 + Fl_Window* w;
117763 + Fl_Radio_Round_Button* repeatAllButton;
117764 + Fl_Radio_Round_Button* repeatOneButton;
117765 + Fl_Radio_Round_Button* playOneButton;
117766 + Fl_Box* autorunBox;
117767 + ~ConfigWindow(){ w->hide(); w->redraw(); delete w;}
117768 +};
117769 +
117770 +class RunConfig
117771 +{
117772 +public:
117773 + RunConfig()
117774 + {
117775 + Fl::scheme("plastic");
117776 + w.makeWindow();
117777 + w.show();
117778 + Fl::run();
117779 +#ifdef __LINUX__
117780 + Fl::wait();
117781 + Fl::flush();
117782 +#endif
117783 + }
117784 +
117785 +private:
117786 + ConfigWindow w;
117787 +};
117788 +
117789 +#endif
117790 diff -rupN original/plugins/dfbinimage/Exception.hpp new/plugins/dfbinimage/Exception.hpp
117791 --- original/plugins/dfbinimage/Exception.hpp 1969-12-31 20:00:00.000000000 -0400
117792 +++ new/plugins/dfbinimage/Exception.hpp 2007-10-08 17:13:28.000000000 -0400
117793 @@ -0,0 +1,71 @@
117794 +/************************************************************************
117795 +
117796 +Exception.hpp
117797 +
117798 +Copyright (C) 2007 Virus
117799 +Copyright (C) 2002 mooby
117800 +
117801 +This program is free software; you can redistribute it and/or
117802 +modify it under the terms of the GNU General Public License
117803 +as published by the Free Software Foundation; either version 2
117804 +of the License, or (at your option) any later version.
117805 +
117806 +This program is distributed in the hope that it will be useful,
117807 +but WITHOUT ANY WARRANTY; without even the implied warranty of
117808 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
117809 +GNU General Public License for more details.
117810 +
117811 +You should have received a copy of the GNU General Public License
117812 +along with this program; if not, write to the Free Software
117813 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
117814 +
117815 +************************************************************************/
117816 +
117817 +#pragma warning(disable:4786)
117818 +
117819 +#ifndef EXCEPTION_HPP
117820 +#define EXCEPTION_HPP
117821 +
117822 +#include <vector>
117823 +#include <string>
117824 +#include <iostream>
117825 +#include <sstream>
117826 +
117827 +#include <FL/fl_ask.H>
117828 +
117829 +// the exception data for the plugin. stores the line number too
117830 +// for easy debugging
117831 +class Exception
117832 +{
117833 +public:
117834 + Exception() : line(0) {}
117835 +
117836 + Exception(const std::string& str)
117837 + : line(0) {error.push_back(str);}
117838 +
117839 + inline void setLine(const unsigned long l) {line = l;}
117840 + inline void setFile(const std::string& str) {file = str;}
117841 + inline void addText(const std::string& str) {error.push_back(str);}
117842 + inline std::string text() {std::ostringstream str; str << *this; return str.str();}
117843 +
117844 + inline friend std::ostream& operator<<(std::ostream& o, const Exception& m);
117845 +
117846 +private:
117847 + unsigned long line;
117848 + std::string file;
117849 + std::vector<std::string> error;
117850 +};
117851 +
117852 +inline std::ostream& operator<<(std::ostream& o, const Exception& m)
117853 +{
117854 + std::vector<std::string>::size_type index;
117855 + for(index = 0; index < m.error.size(); index++)
117856 + o << m.error[index]<< std::endl;
117857 + o << "On line: " << m.line << std::endl
117858 + << "In file: " << m.file << std::endl;
117859 + return o;
117860 +}
117861 +
117862 +#define THROW(e) e.setLine(__LINE__); e.setFile(__FILE__); moobyMessage(e.text().c_str()); throw(e);
117863 +
117864 +#endif
117865 diff -rupN original/plugins/dfbinimage/FileInterface.cpp new/plugins/dfbinimage/FileInterface.cpp
117866 --- original/plugins/dfbinimage/FileInterface.cpp 1969-12-31 20:00:00.000000000 -0400
117867 +++ new/plugins/dfbinimage/FileInterface.cpp 2007-10-08 17:13:28.000000000 -0400
117868 @@ -0,0 +1,510 @@
117869 +/************************************************************************
117870 +
117871 +FileInterface.cpp
117872 +
117873 +Copyright (C) 2007 Virus
117874 +Copyright (C) 2002 mooby
117875 +
117876 +This program is free software; you can redistribute it and/or
117877 +modify it under the terms of the GNU General Public License
117878 +as published by the Free Software Foundation; either version 2
117879 +of the License, or (at your option) any later version.
117880 +
117881 +This program is distributed in the hope that it will be useful,
117882 +but WITHOUT ANY WARRANTY; without even the implied warranty of
117883 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
117884 +GNU General Public License for more details.
117885 +
117886 +You should have received a copy of the GNU General Public License
117887 +along with this program; if not, write to the Free Software
117888 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
117889 +
117890 +************************************************************************/
117891 +
117892 +#pragma warning(disable:4786)
117893 +
117894 +#include "FileInterface.hpp"
117895 +#include "TrackParser.hpp"
117896 +#include "Utils.hpp"
117897 +#include "Preferences.hpp"
117898 +
117899 +#include <sstream>
117900 +
117901 +#include <stdio.h>
117902 +#include <bzlib.h>
117903 +#include <zlib.h>
117904 +
117905 +#include <fcntl.h>
117906 +#include <sys/stat.h>
117907 +#include <sys/ioctl.h>
117908 +#include <linux/cdrom.h>
117909 +
117910 +
117911 +extern Preferences prefs;
117912 +
117913 +FileInterface::FileInterface(const unsigned long requestedFrames,
117914 + const unsigned long requiredFrames)
117915 + : bufferFrames(0), fileBuffer(NULL), pregapLength(CDTime(0,0,0)),
117916 + pregapTime(CDTime(99,59,74)), cacheMode(oldMode)
117917 +{
117918 + cache.setMaxSize(atoi(prefs.prefsMap[cacheSizeString].c_str()));
117919 + if (requiredFrames != 0)
117920 + {
117921 + bufferFrames = (requestedFrames < requiredFrames) ? requiredFrames : requestedFrames;
117922 + fileBuffer = new unsigned char[bufferFrames * bytesPerFrame];
117923 + }
117924 + // set the holdout size
117925 + if (prefs.prefsMap[cachingModeString] == newCachingString)
117926 + cacheMode = newMode;
117927 + else if (prefs.prefsMap[cachingModeString] == oldCachingString)
117928 + cacheMode = oldMode;
117929 +}
117930 +
117931 +
117932 +// given a file name, return the extension of the file and
117933 +// return the correct FileInterface for that file type
117934 +FileInterface* FileInterfaceFactory(const std::string& filename,
117935 + string& extension)
117936 +{
117937 + // for every file type that's supported, try to match the extension
117938 + FileInterface* image;
117939 + struct stat statBuf;
117940 +
117941 + if (extensionMatches(filename, ".bz.index"))
117942 + {
117943 + extension = filename.substr(filename.size() - string(".bz.index").size());
117944 + extension = filename.substr(filename.rfind(".", filename.rfind(extension) - 1));
117945 + image = new BZIndexFileInterface(1);
117946 + image->openFile(std::string(filename).erase(filename.rfind(".index")));
117947 +
117948 + }
117949 + else if (extensionMatches(filename, ".bz"))
117950 + {
117951 + extension = filename.substr(filename.size() - string(".bz").size());
117952 + extension = filename.substr(filename.rfind(".", filename.rfind(extension) - 1));
117953 + image = new BZIndexFileInterface(1);
117954 + image->openFile(filename);
117955 + }
117956 + else if (extensionMatches(filename, ".Z.table"))
117957 + {
117958 + extension = filename.substr(filename.size() - string(".Z.table").size());
117959 + extension = filename.substr(filename.rfind(".", filename.rfind(extension) - 1));
117960 + image = new ZTableFileInterface(1);
117961 + image->openFile(std::string(filename).erase(filename.rfind(".table")));
117962 + }
117963 + else if (extensionMatches(filename, ".Z"))
117964 + {
117965 + extension = filename.substr(filename.size() - string(".Z").size());
117966 + extension = filename.substr(filename.rfind(".", filename.rfind(extension) - 1));
117967 + image = new ZTableFileInterface(1);
117968 + image->openFile(filename);
117969 + }
117970 + else if (extensionMatches(filename, ".ccd"))
117971 + {
117972 + moobyMessage("Please open the image and not the ccd file.");
117973 + image = new UncompressedFileInterface(1);
117974 + extension = filename.substr(filename.size() - string(".ccd").size());
117975 + image->openFile(filename.substr(filename.size() - string(".ccd").size())
117976 + + string(".img"));
117977 + }
117978 +
117979 + // the CUE interface will take the name of the file
117980 + // in the cue sheet and open it as an uncompressed file
117981 + else if (extensionMatches(filename, ".cue"))
117982 + {
117983 + moobyMessage("Please open the image and not the cue sheet.");
117984 + extension = filename.substr(filename.size() - string(".cue").size());
117985 + CueParser cp(filename);
117986 + cp.parse();
117987 + image = new UncompressedFileInterface(1);
117988 +
117989 + // try to figure out the directory of the image.
117990 + // if none is in the cue sheet,
117991 + // just use the directory of filename.
117992 + std::string::size_type pos = cp.getCDName().rfind('/');
117993 + if (pos == std::string::npos)
117994 + {
117995 + pos = cp.getCDName().rfind('\\');
117996 + }
117997 + if (pos == std::string::npos)
117998 + {
117999 + pos = filename.rfind('/');
118000 + if (pos == std::string::npos)
118001 + pos = filename.rfind('\\');
118002 + image->openFile(std::string(filename).erase(pos + 1) + cp.getCDName());
118003 + }
118004 + else
118005 + {
118006 + image->openFile(cp.getCDName());
118007 + }
118008 + }
118009 +
118010 + else if(stat(filename.c_str(), &statBuf)>=0 && S_ISBLK(statBuf.st_mode)) {
118011 + extension = "";
118012 + image = new DeviceFileInterface(1);
118013 + image->openFile(std::string(filename));
118014 + }
118015 +
118016 + // all other file types that aren't directly supported,
118017 + // try to open them with UncompressedFileInterface
118018 + else
118019 + {
118020 + if (extensionMatches(filename, ".iso"))
118021 + {
118022 + moobyMessage("This plugin does not support ISO-9660 images. "
118023 + "If this is a binary image, rename it with a \".bin\" extension.");
118024 + }
118025 +
118026 + extension = filename.substr(filename.find_last_of('.'));
118027 + image = new UncompressedFileInterface(1);
118028 + image->openFile(filename);
118029 + }
118030 +
118031 + if (image)
118032 + return image;
118033 + else
118034 + {
118035 + Exception e(string("Error opening file: ") + filename);
118036 + THROW(e);
118037 + }
118038 +}
118039 +
118040 +FileInterface& FileInterface::setPregap(const CDTime& gapLength,
118041 + const CDTime& gapTime)
118042 +{
118043 + if (pregapLength == CDTime(0,0,0))
118044 + {
118045 + pregapLength = gapLength;
118046 + pregapTime = gapTime;
118047 + CDLength += gapLength;
118048 + }
118049 + return *this;
118050 +}
118051 +
118052 +// opens the file and calculates the length of the cd
118053 +void FileInterface::openFile(const std::string& str)
118054 + throw(Exception)
118055 +{
118056 + file.open(str.c_str(), std::ios::binary);
118057 + if (!file)
118058 + {
118059 + Exception e(std::string("Cannot open file: ") + str);
118060 + THROW(e);
118061 + }
118062 + fileName = str;
118063 + CDLength= CDTime(file.seekg(0, std::ios::end).tellg(), CDTime::abByte) + CDTime(0,2,0);
118064 + file.clear();
118065 + bufferPos.setMSF(MSFTime(255,255,255));
118066 +}
118067 +
118068 +// seekUnbuffered for the .index/.table files.
118069 +void CompressedFileInterface::seekUnbuffered(const CDTime& cdt)
118070 +throw(std::exception, Exception)
118071 +{
118072 + // calculate the index in the lookupTable where the data for CDTime cdt
118073 + // should be located
118074 + unsigned long requestedFrame = cdt.getAbsoluteFrame() - 150;
118075 + unsigned long cdtime = requestedFrame / compressedFrames;
118076 + if ((cdtime + 1) >= lookupTable.size())
118077 + {
118078 + Exception e("Seek past end of compressed index");
118079 + THROW(e);
118080 + }
118081 + unsigned long seekStart = lookupTable[cdtime];
118082 + unsigned long seekEnd = lookupTable[cdtime + 1];
118083 +
118084 + // read and decompress that data
118085 + file.clear();
118086 + file.seekg(seekStart, ios::beg);
118087 + file.read((char*)compressedDataBuffer, seekEnd - seekStart);
118088 + unsigned int destLen = compressedFrames * bytesPerFrame;
118089 +
118090 + decompressData ((char*)fileBuffer,
118091 + (char*)compressedDataBuffer,
118092 + seekEnd - seekStart,
118093 + destLen);
118094 +
118095 + // set the buffer pointer - make sure to check if
118096 + // the requested frame doesn't line up with how the file is compressed
118097 + bufferPointer = fileBuffer + (requestedFrame % compressedFrames) * bytesPerFrame;
118098 +
118099 + // set the buffer start and end times
118100 + bufferPos = CDTime(cdtime * compressedFrames + 150, CDTime::abFrame);
118101 + bufferEnd = CDTime(cdtime * compressedFrames + compressedFrames + 150, CDTime::abFrame);
118102 +}
118103 +
118104 +void ZTableFileInterface::openFile(const std::string& str)
118105 + throw(Exception)
118106 +{
118107 + // open the z file
118108 + FileInterface::openFile(str);
118109 +
118110 + // open the table file and read it
118111 + string indexFileName = str + string(".table");
118112 + ifstream indexFile(indexFileName.c_str(), ios::binary);
118113 + if (!indexFile)
118114 + {
118115 + Exception e(string("Cannot open file: ") + indexFileName);
118116 + THROW(e);
118117 + }
118118 +
118119 + // a Z.table file is binary where each element represents
118120 + // one compressed frame.
118121 + // 4 bytes: the offset of the frame in the .Z file
118122 + // 2 bytes: the length of the compressed frame
118123 + // for every frame in the file. internally, this plugin only
118124 + // uses the offsets, but it needs the last element of the lookupTable
118125 + // to be the entire CD length.
118126 + // The data is stored little endian, so flipBits will swap the
118127 + // bits if it's not a little endian system
118128 + unsigned long offset;
118129 + short length;
118130 +
118131 + indexFile.read((char*)&offset, 4);
118132 + indexFile.read((char*)&length, 2);
118133 +
118134 + while (indexFile)
118135 + {
118136 + flipBits(offset);
118137 + flipBits(length);
118138 + lookupTable.push_back(offset);
118139 + indexFile.read((char*)&offset, 4);
118140 + indexFile.read((char*)&length, 2);
118141 + }
118142 +
118143 + lookupTable.push_back(offset + length);
118144 +
118145 + // seek to the end of the CD and use the bufferEnd time as the
118146 + // CDLength
118147 + seekUnbuffered(CDTime((lookupTable.size() - 2) * compressedFrames, CDTime::abFrame) +
118148 + CDTime(0,2,0));
118149 + CDLength = bufferEnd;
118150 +}
118151 +
118152 +// compresses the data in uncompressedData
118153 +void ZTableFileInterface::compressData(char* uncompressedData,
118154 + char* compressedData,
118155 + unsigned int inputLen,
118156 + unsigned int& outputLen)
118157 + throw(Exception)
118158 +{
118159 + int rc;
118160 + if ( ( rc = compress( (unsigned char*)compressedData,
118161 + (unsigned long*)&outputLen,
118162 + (unsigned char*)uncompressedData,
118163 + inputLen) ) != 0)
118164 + {
118165 + Exception e("ZDecompress error");
118166 + THROW(e);
118167 + }
118168 +}
118169 +
118170 +// decompresses the data in compressedData
118171 +void ZTableFileInterface::decompressData(char* uncompressedData,
118172 + char* compressedData,
118173 + unsigned int inputLen,
118174 + unsigned int& outputLen)
118175 + throw(Exception)
118176 +{
118177 + int rc;
118178 + if ( (rc = uncompress ( (unsigned char*)uncompressedData,
118179 + (unsigned long*)&outputLen,
118180 + (unsigned char*)compressedData,
118181 + inputLen) ) != 0)
118182 + {
118183 + Exception e("ZDecompress error");
118184 + THROW(e);
118185 + }
118186 +}
118187 +
118188 +// table is a table of file positions, each element representing
118189 +// the position for that compressed frame.
118190 +// sizes is a table of the length of the compressed frame.
118191 +// this returns the data for the .Z.table file
118192 +string ZTableFileInterface::toTable(const vector<unsigned long>& table,
118193 + const vector<unsigned long>& sizes)
118194 +{
118195 + string toReturn;
118196 + vector<unsigned long>::size_type s;
118197 + for (s = 0; s < table.size(); s++)
118198 + {
118199 + unsigned long aNumber= table[s];
118200 + flipBits(aNumber);
118201 + toReturn += string((char*)&aNumber, 4);
118202 + short length = sizes[s];
118203 + flipBits(length);
118204 + toReturn += string((char*)&length, 2);
118205 + }
118206 + return toReturn;
118207 +}
118208 +
118209 +// opens a BZ file
118210 +void BZIndexFileInterface::openFile(const std::string& str)
118211 + throw(Exception)
118212 +{
118213 + // open the bz file
118214 + FileInterface::openFile(str);
118215 +
118216 + // open the index file and read it into the table
118217 + string indexFileName = str + string(".index");
118218 +
118219 + ifstream indexFile(indexFileName.c_str(), ios::binary);
118220 + if (!indexFile)
118221 + {
118222 + Exception e(string("Cannot open file: ") + indexFileName);
118223 + THROW(e);
118224 + }
118225 +
118226 + unsigned long offset;
118227 +
118228 + // the .BZ.table file is arranged so that one entry represents
118229 + // 10 compressed frames. that's because bzip only works well if
118230 + // you have a large amount of data to compress. each element in the
118231 + // table is a 4 byte unsigned integer representing the offset in
118232 + // the .BZ file of that set of 10 compressed frames. If there are
118233 + // 'n' frames in the uncompressed image, there are 'n/10 + 1' entries
118234 + // in the BZ.index file, where the last entry is the size of the
118235 + // compressed file.
118236 +
118237 + indexFile.read((char*)&offset, 4);
118238 +
118239 + while (indexFile)
118240 + {
118241 + // if it's big endian, the bits need to be reversed
118242 + flipBits(offset);
118243 +
118244 + lookupTable.push_back(offset);
118245 + indexFile.read((char*)&offset, 4);
118246 + }
118247 +
118248 + // to get the CD length, seek to the end of file and decompress the last frame
118249 + seekUnbuffered(CDTime((lookupTable.size() - 2) * compressedFrames, CDTime::abFrame) +
118250 + CDTime(0,2,0));
118251 + CDLength = bufferEnd;
118252 +}
118253 +
118254 +// compresses uncompressedData
118255 +void BZIndexFileInterface::compressData(char* uncompressedData,
118256 + char* compressedData,
118257 + unsigned int inputLen,
118258 + unsigned int& outputLen)
118259 + throw(Exception)
118260 +{
118261 + int rc;
118262 + if ( (rc = BZ2_bzBuffToBuffCompress( compressedData,
118263 + &outputLen,
118264 + uncompressedData,
118265 + inputLen,
118266 + 1,
118267 + 0,
118268 + 30 ) ) != BZ_OK)
118269 + {
118270 + Exception e("BZCompress error");
118271 + THROW(e);
118272 + }
118273 +}
118274 +
118275 +// decompresses compressedData
118276 +void BZIndexFileInterface::decompressData(char* uncompressedData,
118277 + char* compressedData,
118278 + unsigned int inputLen,
118279 + unsigned int& outputLen)
118280 + throw(Exception)
118281 +{
118282 + int rc;
118283 + if ( (rc = BZ2_bzBuffToBuffDecompress ( uncompressedData,
118284 + &outputLen,
118285 + compressedData,
118286 + inputLen,
118287 + 0,
118288 + 0) ) != BZ_OK)
118289 + {
118290 + Exception e("BZDecompress error");
118291 + THROW(e);
118292 + }
118293 +}
118294 +
118295 +// writes the .BZ.index file
118296 +string BZIndexFileInterface::toTable(const vector<unsigned long>& table,
118297 + const vector<unsigned long>& sizes)
118298 +{
118299 + string toReturn;
118300 + vector<unsigned long>::size_type s;
118301 + unsigned long aNumber;
118302 + for (s = 0; s < table.size(); s++)
118303 + {
118304 + aNumber= table[s];
118305 + flipBits(aNumber);
118306 + toReturn += string((char*)&aNumber, 4);
118307 + }
118308 + aNumber = table[table.size() - 1];
118309 + aNumber += sizes[sizes.size() - 1];
118310 + flipBits(aNumber);
118311 + toReturn += string((char*)&aNumber, 4);
118312 +
118313 + return toReturn;
118314 +}
118315 +
118316 +
118317 +// reads data into the cache for UncompressedFileInterface
118318 +void UncompressedFileInterface::seekUnbuffered(const CDTime& cdt)
118319 + throw(std::exception, Exception)
118320 +{
118321 + file.clear();
118322 + CDTime seekTime(cdt - CDTime(0,2,0));
118323 + file.seekg(seekTime.getAbsoluteByte(), ios::beg);
118324 + file.read((char*)fileBuffer, bufferFrames * bytesPerFrame);
118325 + bufferPointer = fileBuffer;
118326 + bufferPos = cdt;
118327 + bufferEnd = cdt + CDTime(bufferFrames, CDTime::abFrame);
118328 +}
118329 +
118330 +
118331 +// opens a device node.
118332 +void DeviceFileInterface::openFile(const std::string& str)
118333 + throw(Exception)
118334 +{
118335 + if(theFd >= 0)
118336 + close(theFd);
118337 + theFd = open(str.c_str(), O_RDONLY);
118338 + if(theFd < 0) {
118339 + Exception e(std::string("Cannot open device: ") + str);
118340 + THROW(e);
118341 + }
118342 + fileName = str;
118343 + struct cdrom_tocentry tocEntry;
118344 + memset(&tocEntry, 0, sizeof(tocEntry));
118345 + tocEntry.cdte_track = CDROM_LEADOUT;
118346 + tocEntry.cdte_format = CDROM_LBA;
118347 + if(ioctl(theFd, CDROMREADTOCENTRY, &tocEntry) < 0) {
118348 + Exception e(std::string("Cannot read TOC: ") + str);
118349 + THROW(e);
118350 + }
118351 + CDLength= CDTime(tocEntry.cdte_addr.lba, CDTime::abFrame) + CDTime(0,2,0);
118352 + bufferPos.setMSF(MSFTime(255,255,255));
118353 +}
118354 +
118355 +// reads data into the cache for DeviceFileInterface
118356 +void DeviceFileInterface::seekUnbuffered(const CDTime& cdt)
118357 + throw(std::exception, Exception)
118358 +{
118359 + CDTime seekTime(cdt);
118360 + char *buf = (char*)fileBuffer;
118361 + int cnt;
118362 + for(cnt = 0; cnt < bufferFrames; cnt++) {
118363 + memcpy(buf, seekTime.getMSFbuf(), 3);
118364 + if(ioctl(theFd, CDROMREADRAW, buf)<0)
118365 + break;
118366 + buf += bytesPerFrame;
118367 + seekTime += CDTime(0,0,1);
118368 + }
118369 + bufferPointer = fileBuffer;
118370 + bufferPos = cdt;
118371 + bufferEnd = cdt + CDTime(cnt, CDTime::abFrame);
118372 +}
118373 +
118374 +DeviceFileInterface::~DeviceFileInterface()
118375 +{
118376 + if(theFd >= 0)
118377 + close(theFd);
118378 +}
118379 diff -rupN original/plugins/dfbinimage/FileInterface.hpp new/plugins/dfbinimage/FileInterface.hpp
118380 --- original/plugins/dfbinimage/FileInterface.hpp 1969-12-31 20:00:00.000000000 -0400
118381 +++ new/plugins/dfbinimage/FileInterface.hpp 2007-10-08 17:13:28.000000000 -0400
118382 @@ -0,0 +1,341 @@
118383 +/************************************************************************
118384 +
118385 +FileInterface.hpp
118386 +
118387 +Copyright (C) 2007 Virus
118388 +Copyright (C) 2002 mooby
118389 +
118390 +This program is free software; you can redistribute it and/or
118391 +modify it under the terms of the GNU General Public License
118392 +as published by the Free Software Foundation; either version 2
118393 +of the License, or (at your option) any later version.
118394 +
118395 +This program is distributed in the hope that it will be useful,
118396 +but WITHOUT ANY WARRANTY; without even the implied warranty of
118397 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
118398 +GNU General Public License for more details.
118399 +
118400 +You should have received a copy of the GNU General Public License
118401 +along with this program; if not, write to the Free Software
118402 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
118403 +
118404 +************************************************************************/
118405 +
118406 +
118407 +#ifndef FILEINTERFACE_HPP
118408 +#define FILEINTERFACE_HPP
118409 +
118410 +#include "CDTime.hpp"
118411 +#include "TimeCache.hpp"
118412 +#include "Frame.hpp"
118413 +
118414 +#include <vector>
118415 +#include <fstream>
118416 +
118417 +using namespace std;
118418 +
118419 +// the constants for the number of frames in compressed files as well as
118420 +// how large the required buffers are
118421 +const unsigned long BZIndexBufferFrames = 10;
118422 +const unsigned long BZIndexBufferBytes = BZIndexBufferFrames * bytesPerFrame;
118423 +const unsigned long ZTableBufferFrames = 1;
118424 +const unsigned long ZTableBufferBytes = ZTableBufferFrames * bytesPerFrame;
118425 +const unsigned long UncompressedBufferFrames = 10;
118426 +const unsigned long UncompressedBufferBytes = UncompressedBufferFrames * bytesPerFrame;
118427 +
118428 +// a virtual interface to any CD image type
118429 +class FileInterface
118430 +{
118431 +public:
118432 + // bufferFrames is the number of frames you want
118433 + // available at any time.
118434 + virtual ~FileInterface()
118435 + {
118436 + if (bufferFrames != 0)
118437 + {
118438 + if (fileBuffer)
118439 + delete[] fileBuffer;
118440 + }
118441 + }
118442 +
118443 + // opens the file
118444 + virtual void openFile(const std::string& str)
118445 + throw(Exception);
118446 +
118447 + // seeks to the time cdt in the file and sets the buffer pointer
118448 + inline void seek(const CDTime& cdt)
118449 + throw(Exception);
118450 +
118451 + // returns the pointer to the last frame seeked.
118452 + inline unsigned char* getBuffer() const
118453 + {
118454 + if (cacheMode == oldMode)
118455 + return bufferPointer;
118456 + else if (cacheMode == newMode)
118457 + return *holdout;
118458 + }
118459 +
118460 + // returns the length of the CD
118461 + inline CDTime getCDLength() {return CDLength;}
118462 +
118463 + // sets up stuffs for pregap
118464 + FileInterface& setPregap(const CDTime& gapLength, const CDTime& gapTime);
118465 +
118466 + // returns the last seeked time
118467 + inline CDTime getSeekTime() {return seekTime;}
118468 +
118469 + // returns the name of the file
118470 + inline std::string getFileName() const {return fileName;}
118471 +
118472 + enum CacheMode
118473 + {
118474 + oldMode,
118475 + newMode
118476 + };
118477 +
118478 + inline FileInterface& setCacheMode(const CacheMode m)
118479 + { cacheMode = m; return *this; }
118480 +
118481 +protected:
118482 + // when seek(CDTime) seeks to a frame out of the buffer, this
118483 + // function buffers more data and sets the bufferPointer to
118484 + // the requested time
118485 + virtual void seekUnbuffered(const CDTime& cdt)
118486 + throw(std::exception, Exception) = 0;
118487 +
118488 + // the cd image
118489 + std::ifstream file;
118490 + // the number of frames buffered (0 for RAR)
118491 + unsigned long bufferFrames;
118492 + // the buffer to the cached data
118493 + unsigned char* fileBuffer;
118494 + // pointer to the last seeked frame
118495 + unsigned char* bufferPointer;
118496 + // the length of the CD
118497 + CDTime CDLength;
118498 + // the start position of the file buffer
118499 + CDTime bufferPos;
118500 + // the end position of the file buffer
118501 + CDTime bufferEnd;
118502 + // the last seeked time of this CD
118503 + CDTime seekTime;
118504 + // the name of the cd image
118505 + std::string fileName;
118506 + // time of the pregap
118507 + CDTime pregapTime;
118508 + // length of the pregap
118509 + CDTime pregapLength;
118510 +
118511 + CacheMode cacheMode;
118512 +
118513 + // the extra cache =)
118514 + TimeCache<Frame> cache;
118515 + Frame holdout;
118516 +
118517 +protected:
118518 + // this ensures that the buffer is at least as big as it's required (i.e. .BZ files
118519 + // need at least 10 frames buffered).
118520 + // for RAR, requiredFrames = 0
118521 + FileInterface(const unsigned long requestedFrames,
118522 + const unsigned long requiredFrames);
118523 +};
118524 +
118525 +// virtual interface to compressed files with index files (like .bz.index or .Z.table)
118526 +class CompressedFileInterface : public FileInterface
118527 +{
118528 +public:
118529 + CompressedFileInterface(const unsigned long bf, const unsigned long pf)
118530 + : FileInterface(bf, pf), compressedFrames(pf)
118531 + {
118532 + compressedDataBuffer =
118533 + new unsigned char[(pf + 1) * bytesPerFrame];
118534 + }
118535 +
118536 + virtual ~CompressedFileInterface()
118537 + {delete [] compressedDataBuffer;}
118538 +
118539 + virtual unsigned char* getCompressedBuffer() {return compressedDataBuffer;}
118540 +
118541 + virtual void compressData(char* uncompressedData,
118542 + char* compressedData,
118543 + unsigned int inputLen,
118544 + unsigned int& outputLen)
118545 + throw(Exception) = 0;
118546 + virtual void decompressData(char* uncompressedData,
118547 + char* compressedData,
118548 + unsigned int inputLen,
118549 + unsigned int& outputLen)
118550 + throw(Exception) = 0;
118551 +
118552 + virtual std::string toTable(const std::vector<unsigned long>& table,
118553 + const std::vector<unsigned long>& sizes) = 0;
118554 +
118555 + unsigned long getCompressedFrames() {return compressedFrames;}
118556 +
118557 +protected:
118558 + virtual void seekUnbuffered(const CDTime& cdt)
118559 + throw(std::exception, Exception);
118560 +
118561 + unsigned char* compressedDataBuffer;
118562 + std::vector<unsigned long> lookupTable;
118563 + unsigned long compressedFrames;
118564 +
118565 +private:
118566 + CompressedFileInterface();
118567 +};
118568 +
118569 +// interface to the ZTable type files
118570 +class ZTableFileInterface : public CompressedFileInterface
118571 +{
118572 +public:
118573 + ZTableFileInterface(const unsigned long bf)
118574 + : CompressedFileInterface(bf, ZTableBufferFrames) {}
118575 + virtual ~ZTableFileInterface() {}
118576 + virtual void openFile(const std::string& str)
118577 + throw(Exception);
118578 +
118579 + virtual void compressData(char* uncompressedData,
118580 + char* compressedData,
118581 + unsigned int inputLen,
118582 + unsigned int& outputLen)
118583 + throw(Exception);
118584 + virtual void decompressData(char* uncompressedData,
118585 + char* compressedData,
118586 + unsigned int inputLen,
118587 + unsigned int& outputLen)
118588 + throw(Exception);
118589 +
118590 + virtual std::string toTable(const std::vector<unsigned long>& table,
118591 + const std::vector<unsigned long>& sizes);
118592 +protected:
118593 +
118594 +private:
118595 + ZTableFileInterface();
118596 +};
118597 +
118598 +// interface to the BZIndex type of files
118599 +class BZIndexFileInterface : public CompressedFileInterface
118600 +{
118601 +public:
118602 + BZIndexFileInterface(const unsigned long bf)
118603 + : CompressedFileInterface(bf, BZIndexBufferFrames) {}
118604 + virtual ~BZIndexFileInterface() {}
118605 + virtual void openFile(const std::string& str)
118606 + throw(Exception);
118607 +
118608 + virtual void compressData(char* uncompressedData,
118609 + char* compressedData,
118610 + unsigned int inputLen,
118611 + unsigned int& outputLen)
118612 + throw(Exception);
118613 +
118614 + virtual void decompressData(char* uncompressedData,
118615 + char* compressedData,
118616 + unsigned int inputLen,
118617 + unsigned int& outputLen)
118618 + throw(Exception);
118619 +
118620 + virtual std::string toTable(const std::vector<unsigned long>& table,
118621 + const std::vector<unsigned long>& sizes);
118622 +protected:
118623 +
118624 +private:
118625 + BZIndexFileInterface();
118626 +};
118627 +
118628 +// interface to uncompressed files
118629 +class UncompressedFileInterface : public FileInterface
118630 +{
118631 +public:
118632 + UncompressedFileInterface(const unsigned long bf)
118633 + : FileInterface(bf, UncompressedBufferFrames)
118634 + {}
118635 +
118636 + virtual ~UncompressedFileInterface() {}
118637 +
118638 +protected:
118639 + virtual void seekUnbuffered(const CDTime& cdt)
118640 + throw(std::exception, Exception);
118641 +
118642 +private:
118643 + UncompressedFileInterface();
118644 +};
118645 +
118646 +// interface to device nodes
118647 +class DeviceFileInterface : public FileInterface
118648 +{
118649 +public:
118650 + DeviceFileInterface(const unsigned long bf)
118651 + : FileInterface(bf, UncompressedBufferFrames) , theFd(-1)
118652 + {}
118653 +
118654 + virtual ~DeviceFileInterface();
118655 +
118656 + virtual void openFile(const std::string& str)
118657 + throw(Exception);
118658 +
118659 +protected:
118660 + virtual void seekUnbuffered(const CDTime& cdt)
118661 + throw(std::exception, Exception);
118662 +
118663 +private:
118664 + int theFd;
118665 +};
118666 +
118667 +
118668 +// i optimized this function so the CDTimes don't need to use the timeConvert() function
118669 +// with all the + operations. If the data is buffered, it should return very quickly.
118670 +// This only ensures that one frame is available at bufferPointer, but that should be
118671 +// enough for most things...
118672 +inline void FileInterface::seek(const CDTime& cdt)
118673 + throw(Exception)
118674 +{
118675 + using namespace std;
118676 + seekTime = cdt;
118677 + if (seekTime >= pregapTime)
118678 + seekTime -= pregapLength;
118679 +
118680 +
118681 + if (seekTime < CDLength)
118682 + {
118683 + if (cacheMode == newMode)
118684 + {
118685 + // check in the global cache first
118686 + if (cache.find(seekTime, holdout))
118687 + {
118688 + return;
118689 + }
118690 + }
118691 +
118692 + // see if its in the file cache.
118693 + // in both of these cases, bufferPointer should point to the data
118694 + // requested
118695 + if ( (seekTime >= bufferPos) &&
118696 + ( (seekTime.getAbsoluteFrame() + 1) <= (bufferEnd.getAbsoluteFrame()) ) )
118697 + {
118698 + bufferPointer =
118699 + fileBuffer + (seekTime.getAbsoluteByte() - bufferPos.getAbsoluteByte());
118700 + }
118701 + else
118702 + {
118703 + seekUnbuffered(seekTime);
118704 + }
118705 + // insert the new data into the cache
118706 + if (cacheMode == newMode)
118707 + {
118708 + holdout = bufferPointer;
118709 + cache.insert(seekTime, holdout);
118710 + }
118711 + }
118712 + else
118713 + {
118714 + Exception e("Seek past end of disc");
118715 + /*THROW*/throw(e);
118716 + }
118717 +}
118718 +
118719 + // the factory method for creating a FileInterface based only on the filename
118720 +FileInterface* FileInterfaceFactory(const std::string& filename,
118721 + std::string& extension);
118722 +
118723 +#endif
118724 diff -rupN original/plugins/dfbinimage/Frame.hpp new/plugins/dfbinimage/Frame.hpp
118725 --- original/plugins/dfbinimage/Frame.hpp 1969-12-31 20:00:00.000000000 -0400
118726 +++ new/plugins/dfbinimage/Frame.hpp 2007-10-08 17:13:28.000000000 -0400
118727 @@ -0,0 +1,87 @@
118728 +/************************************************************************
118729 +
118730 +Frame.hpp
118731 +
118732 +Copyright (C) 2007 Virus
118733 +Copyright (C) 2002 mooby
118734 +
118735 +This program is free software; you can redistribute it and/or
118736 +modify it under the terms of the GNU General Public License
118737 +as published by the Free Software Foundation; either version 2
118738 +of the License, or (at your option) any later version.
118739 +
118740 +This program is distributed in the hope that it will be useful,
118741 +but WITHOUT ANY WARRANTY; without even the implied warranty of
118742 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
118743 +GNU General Public License for more details.
118744 +
118745 +You should have received a copy of the GNU General Public License
118746 +along with this program; if not, write to the Free Software
118747 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
118748 +
118749 +************************************************************************/
118750 +
118751 +#ifndef FRAME_HPP
118752 +#define FRAME_HPP
118753 +
118754 +#include "Utils.hpp"
118755 +
118756 +// one frame of CD data, 2352 bytes
118757 +class Frame
118758 +{
118759 +public:
118760 + // note that the data is uninitialized w/default constructor
118761 + Frame()
118762 + {
118763 + data = new unsigned char[bytesPerFrame];
118764 + }
118765 +
118766 + Frame(const unsigned char* d)
118767 + {
118768 + data = new unsigned char[bytesPerFrame];
118769 + memcpy(data, d, bytesPerFrame);
118770 + }
118771 +
118772 + Frame(const Frame& r)
118773 + {
118774 + data = new unsigned char[bytesPerFrame];
118775 + memcpy(data, r.data, bytesPerFrame);
118776 + }
118777 +
118778 + ~Frame() { delete [] data; }
118779 +
118780 + Frame& operator=(const Frame& r)
118781 + {
118782 + memcpy(data, r.data, bytesPerFrame);
118783 + return *this;
118784 + }
118785 +
118786 + Frame& operator=(const unsigned char* buf)
118787 + {
118788 + memcpy(data, buf, bytesPerFrame);
118789 + return *this;
118790 + }
118791 +
118792 + Frame& operator=(const char* buf)
118793 + {
118794 + memcpy(data, buf, bytesPerFrame);
118795 + return *this;
118796 + }
118797 +
118798 + int operator==(const Frame& r)
118799 + {
118800 + return memcmp(data, r.data, bytesPerFrame);
118801 + }
118802 +
118803 + unsigned char* operator*() const
118804 + {
118805 + return data;
118806 + }
118807 +
118808 +private:
118809 + unsigned char* data;
118810 +};
118811 +
118812 +
118813 +
118814 +#endif
118815 diff -rupN original/plugins/dfbinimage/Globals.cpp new/plugins/dfbinimage/Globals.cpp
118816 --- original/plugins/dfbinimage/Globals.cpp 1969-12-31 20:00:00.000000000 -0400
118817 +++ new/plugins/dfbinimage/Globals.cpp 2007-10-08 17:13:28.000000000 -0400
118818 @@ -0,0 +1,46 @@
118819 +/************************************************************************
118820 +
118821 +Globals.cpp
118822 +
118823 +Copyright (C) 2007 Virus
118824 +Copyright (C) 2002 mooby
118825 +
118826 +This program is free software; you can redistribute it and/or
118827 +modify it under the terms of the GNU General Public License
118828 +as published by the Free Software Foundation; either version 2
118829 +of the License, or (at your option) any later version.
118830 +
118831 +This program is distributed in the hope that it will be useful,
118832 +but WITHOUT ANY WARRANTY; without even the implied warranty of
118833 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
118834 +GNU General Public License for more details.
118835 +
118836 +You should have received a copy of the GNU General Public License
118837 +along with this program; if not, write to the Free Software
118838 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
118839 +
118840 +************************************************************************/
118841 +
118842 +#include "defines.h"
118843 +#include "Utils.hpp"
118844 +#include "CDInterface.hpp"
118845 +#include "Preferences.hpp"
118846 +
118847 +/** global data for the plugin **/
118848 +
118849 +// the cd data
118850 +CDInterface* theCD = NULL;
118851 +std::string passedfile = "";
118852 +Preferences prefs;
118853 +
118854 +// a return code
118855 +int rc = 0;
118856 +
118857 +// the format of the TD and TN calls
118858 +TDTNFormat tdtnformat = msfint;
118859 +
118860 +// the name of the emulator that's using the plugin
118861 +std::string programName;
118862 +
118863 +// whether it's using the psemu or fpse interface
118864 +EMUMode mode = psemu;
118865 diff -rupN original/plugins/dfbinimage/Makefile.am new/plugins/dfbinimage/Makefile.am
118866 --- original/plugins/dfbinimage/Makefile.am 1969-12-31 20:00:00.000000000 -0400
118867 +++ new/plugins/dfbinimage/Makefile.am 2007-10-08 17:13:28.000000000 -0400
118868 @@ -0,0 +1,10 @@
118869 +INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
118870 + -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
118871 + -DLOCALE_DIR=\"${datadir}/locale/\" \
118872 + $(FLTK_CXXFLAGS) -D__LINUX__
118873 +
118874 +libdir = $(prefix)/lib/games/psemu/
118875 +lib_LTLIBRARIES = libDFBinImage.la
118876 +libDFBinImage_la_LIBADD = -lstdc++ -lz -lbz2 -lpthread $(FLTK_LDFLAGS) -lportaudio
118877 +libDFBinImage_la_LDFLAGS = -module -avoid-version
118878 +libDFBinImage_la_SOURCES = About.cpp CDDAData.cpp ConfigCallbacks.cpp ConfigFunctions.cpp TrackParser.cpp FileInterface.cpp Globals.cpp Open.cpp PS2Open.cpp Preferences.cpp SubchannelData.cpp
118879 diff -rupN original/plugins/dfbinimage/Open.cpp new/plugins/dfbinimage/Open.cpp
118880 --- original/plugins/dfbinimage/Open.cpp 1969-12-31 20:00:00.000000000 -0400
118881 +++ new/plugins/dfbinimage/Open.cpp 2007-10-08 17:13:28.000000000 -0400
118882 @@ -0,0 +1,267 @@
118883 +/************************************************************************
118884 +
118885 +Open.cpp
118886 +
118887 +Copyright (C) 2007 Virus
118888 +Copyright (C) 2002 mooby
118889 +
118890 +This program is free software; you can redistribute it and/or
118891 +modify it under the terms of the GNU General Public License
118892 +as published by the Free Software Foundation; either version 2
118893 +of the License, or (at your option) any later version.
118894 +
118895 +This program is distributed in the hope that it will be useful,
118896 +but WITHOUT ANY WARRANTY; without even the implied warranty of
118897 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
118898 +GNU General Public License for more details.
118899 +
118900 +You should have received a copy of the GNU General Public License
118901 +along with this program; if not, write to the Free Software
118902 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
118903 +
118904 +************************************************************************/
118905 +#include <iostream>
118906 +#include <string>
118907 +
118908 +#include "CDInterface.hpp"
118909 +#include "defines.h"
118910 +#include "Preferences.hpp"
118911 +#include "externs.h"
118912 +#include <stdlib.h>
118913 +
118914 +
118915 +using namespace std;
118916 +
118917 +extern CDInterface* theCD;
118918 +extern string passedfile;
118919 +extern int rc;
118920 +extern TDTNFormat tdtnformat;
118921 +extern EMUMode mode;
118922 +extern Preferences prefs;
118923 +
118924 +#ifdef _WINDOWS
118925 +#include <windows.h>
118926 +
118927 +extern "C"
118928 +{
118929 + int WINAPI DllMain (HANDLE h, DWORD reason, void *ptr);
118930 +}
118931 +
118932 +// DLL init. thanks PEOPS =)
118933 +int WINAPI DllMain(HANDLE hModule, // DLL INIT
118934 + DWORD dwReason,
118935 + LPVOID lpReserved)
118936 +{
118937 + return TRUE; // very quick :)
118938 +}
118939 +
118940 +#endif
118941 +
118942 +int CD_Wait(void)
118943 +{
118944 + return FPSE_OK;
118945 +}
118946 +
118947 +void closeIt(void)
118948 +{
118949 + if (theCD)
118950 + {
118951 + delete theCD;
118952 + theCD = NULL;
118953 + }
118954 +}
118955 +
118956 +long CALLBACK CDRclose(void)
118957 +{
118958 + closeIt();
118959 + return 0;
118960 +}
118961 +
118962 +void CD_Close(void)
118963 +{
118964 + closeIt();
118965 +}
118966 +
118967 +void openIt(void)
118968 +{
118969 + if (theCD)
118970 + CDRclose();
118971 + string theFile = "";
118972 +
118973 + if (passedfile != std::string())
118974 + {
118975 + theFile = passedfile;
118976 + }
118977 + else if (prefs.prefsMap[autorunString] == std::string())
118978 + {
118979 + char * returned;
118980 + while ( (returned = moobyFileChooser("Choose an image to run", theUsualSuspects.c_str(), prefs.prefsMap[lastrunString])) == NULL)
118981 + {
118982 + if (moobyAsk("You hit cancel or didn't pick a file.\nPick a different file? ('No' will end the program)") == 0)
118983 + {
118984 + exit(0);
118985 + }
118986 + }
118987 + theFile = returned;
118988 + }
118989 + else
118990 + {
118991 + theFile = prefs.prefsMap[autorunString];
118992 + }
118993 + prefs.prefsMap[lastrunString] = theFile;
118994 + prefs.write();
118995 + theCD = new CDInterface();
118996 + cout << endl <<"Image file: " << theFile << endl;
118997 + theCD->open(theFile);
118998 +}
118999 +
119000 +// psemu open call - call open
119001 +long CALLBACK CDRopen(void)
119002 +{
119003 + Fl::scheme("plastic");
119004 + mode = psemu;
119005 + openIt();
119006 + return 0;
119007 +}
119008 +
119009 +int CD_Open(unsigned int* par)
119010 +{
119011 + Fl::scheme("plastic");
119012 + mode = fpse;
119013 + openIt();
119014 + return FPSE_OK;
119015 +}
119016 +
119017 +long CALLBACK CDRshutdown(void)
119018 +{
119019 + return CDRclose();
119020 +}
119021 +
119022 +long CALLBACK CDRplay(unsigned char * sector)
119023 +{
119024 + return theCD->playTrack(CDTime(sector, msfint));
119025 +}
119026 +
119027 +int CD_Play(unsigned char * sector)
119028 +{
119029 + return theCD->playTrack(CDTime(sector, msfint));
119030 +}
119031 +
119032 +long CALLBACK CDRstop(void)
119033 +{
119034 + return theCD->stopTrack();
119035 +}
119036 +
119037 +int CD_Stop(void)
119038 +{
119039 + return theCD->stopTrack();
119040 +}
119041 +
119042 +#if defined _WINDOWS || defined __CYGWIN32__
119043 +
119044 +long CALLBACK CDRgetStatus(struct CdrStat *stat)
119045 +{
119046 + if (theCD->isPlaying())
119047 + {
119048 + stat->Type = 0x02;
119049 + stat->Status = 0x80;
119050 + }
119051 + else
119052 + {
119053 + stat->Type = 0x01;
119054 + stat->Status = 0x20;
119055 + }
119056 + MSFTime now = theCD->readTime().getMSF();
119057 + stat->Time[0] = intToBCD(now.m());
119058 + stat->Time[1] = intToBCD(now.s());
119059 + stat->Time[2] = intToBCD(now.f());
119060 + return 0;
119061 +}
119062 +
119063 +#endif
119064 +
119065 +char CALLBACK CDRgetDriveLetter(void)
119066 +{
119067 + return 0;
119068 +}
119069 +
119070 +
119071 +long CALLBACK CDRinit(void)
119072 +{
119073 + theCD=NULL;
119074 + return 0;
119075 +}
119076 +
119077 +long CALLBACK CDRgetTN(unsigned char *buffer)
119078 +{
119079 + buffer[0] = 1;
119080 + if (tdtnformat == fsmint)
119081 + buffer[1] = (char)theCD->getNumTracks();
119082 + else
119083 + buffer[1] = intToBCD((char)theCD->getNumTracks());
119084 + return 0;
119085 +}
119086 +
119087 +int CD_GetTN(char* buffer)
119088 +{
119089 + buffer[1] = 1;
119090 + buffer[2] = (char)theCD->getNumTracks();
119091 + return FPSE_OK;
119092 +}
119093 +
119094 +unsigned char * CALLBACK CDRgetBufferSub(void)
119095 +{
119096 + return theCD->readSubchannelPointer();
119097 +}
119098 +
119099 +unsigned char* CD_GetSeek(void)
119100 +{
119101 + return theCD->readSubchannelPointer() + 12;
119102 +}
119103 +
119104 +long CALLBACK CDRgetTD(unsigned char track, unsigned char *buffer)
119105 +{
119106 + if (tdtnformat == fsmint)
119107 + memcpy(buffer, theCD->getTrackInfo(track).trackStart.getMSFbuf(tdtnformat), 3);
119108 + else
119109 + memcpy(buffer, theCD->getTrackInfo(BCDToInt(track)).trackStart.getMSFbuf(tdtnformat), 3);
119110 + return 0;
119111 +}
119112 +
119113 +int CD_GetTD(char* result, int track)
119114 +{
119115 + MSFTime now = theCD->getTrackInfo(BCDToInt(track)).trackStart.getMSF();
119116 + result[1] = now.m();
119117 + result[2] = now.s();
119118 +
119119 + return FPSE_OK;
119120 +}
119121 +
119122 +long CALLBACK CDRreadTrack(unsigned char *time)
119123 +{
119124 + CDTime now(time, msfbcd);
119125 + try {
119126 + theCD->moveDataPointer(now);
119127 + return 0;
119128 + } catch(Exception e) {
119129 + return -1;
119130 + }
119131 +}
119132 +
119133 +unsigned char* CD_Read(unsigned char* time)
119134 +{
119135 + CDTime now(time, msfint);
119136 + theCD->moveDataPointer(now);
119137 + return theCD->readDataPointer() + 12;
119138 +}
119139 +
119140 +unsigned char * CALLBACK CDRgetBuffer(void)
119141 +{
119142 + return theCD->readDataPointer() + 12;
119143 +}
119144 +
119145 +long CALLBACK CDRsetfilename(char *filename)
119146 +{
119147 + passedfile = std::string(filename);
119148 + return 0;
119149 +}
119150 diff -rupN original/plugins/dfbinimage/PS2Open.cpp new/plugins/dfbinimage/PS2Open.cpp
119151 --- original/plugins/dfbinimage/PS2Open.cpp 1969-12-31 20:00:00.000000000 -0400
119152 +++ new/plugins/dfbinimage/PS2Open.cpp 2007-10-08 17:13:28.000000000 -0400
119153 @@ -0,0 +1,71 @@
119154 +/************************************************************************
119155 +
119156 +PS2Open.cpp
119157 +
119158 +Copyright (C) 2007 Virus
119159 +Copyright (C) 2002 mooby
119160 +
119161 +This program is free software; you can redistribute it and/or
119162 +modify it under the terms of the GNU General Public License
119163 +as published by the Free Software Foundation; either version 2
119164 +of the License, or (at your option) any later version.
119165 +
119166 +This program is distributed in the hope that it will be useful,
119167 +but WITHOUT ANY WARRANTY; without even the implied warranty of
119168 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119169 +GNU General Public License for more details.
119170 +
119171 +You should have received a copy of the GNU General Public License
119172 +along with this program; if not, write to the Free Software
119173 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
119174 +
119175 +************************************************************************/
119176 +
119177 +#include "externs.h"
119178 +#include "CDTime.hpp"
119179 +#include "CDInterface.hpp"
119180 +
119181 +extern CDInterface* theCD;
119182 +
119183 +s32 CALLBACK CDVDinit()
119184 +{
119185 + return CDRinit();
119186 +}
119187 +
119188 +s32 CALLBACK CDVDopen()
119189 +{
119190 + return CDRopen();
119191 +}
119192 +
119193 +void CALLBACK CDVDclose()
119194 +{
119195 + CDRclose();
119196 +}
119197 +
119198 +void CALLBACK CDVDshutdown()
119199 +{
119200 + CDRshutdown();
119201 +}
119202 +
119203 +s32 CALLBACK CDVDreadTrack(cdvdLoc *Time)
119204 +{
119205 + CDTime now((unsigned char*)Time, msfint);
119206 + theCD->moveDataPointer(now);
119207 + return 0;
119208 +}
119209 +
119210 +u8* CALLBACK CDVDgetBuffer()
119211 +{
119212 + return (u8*)theCD->readDataPointer();
119213 +}
119214 +
119215 +s32 CALLBACK CDVDgetTN(cdvdTN *Buffer)
119216 +{
119217 + return CDRgetTN((unsigned char*)Buffer);
119218 +}
119219 +
119220 +s32 CALLBACK CDVDgetTD(u8 Track, cdvdLoc *Buffer)
119221 +{
119222 + return CDRgetTD(Track, (unsigned char*)Buffer);
119223 +}
119224 +
119225 diff -rupN original/plugins/dfbinimage/Preferences.cpp new/plugins/dfbinimage/Preferences.cpp
119226 --- original/plugins/dfbinimage/Preferences.cpp 1969-12-31 20:00:00.000000000 -0400
119227 +++ new/plugins/dfbinimage/Preferences.cpp 2007-10-08 17:13:28.000000000 -0400
119228 @@ -0,0 +1,120 @@
119229 +/************************************************************************
119230 +
119231 +Preferences.cpp
119232 +
119233 +Copyright (C) 2007 Virus
119234 +Copyright (C) 2002 mooby
119235 +
119236 +This program is free software; you can redistribute it and/or
119237 +modify it under the terms of the GNU General Public License
119238 +as published by the Free Software Foundation; either version 2
119239 +of the License, or (at your option) any later version.
119240 +
119241 +This program is distributed in the hope that it will be useful,
119242 +but WITHOUT ANY WARRANTY; without even the implied warranty of
119243 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119244 +GNU General Public License for more details.
119245 +
119246 +You should have received a copy of the GNU General Public License
119247 +along with this program; if not, write to the Free Software
119248 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
119249 +
119250 +************************************************************************/
119251 +
119252 +#include "Preferences.hpp"
119253 +
119254 +Preferences::Preferences()
119255 + : initialized(false)
119256 +{
119257 + this->open();
119258 +}
119259 +
119260 +Preferences::~Preferences()
119261 +{
119262 +}
119263 +
119264 +void Preferences::write()
119265 +{
119266 +#ifdef WIN32
119267 + HKEY myKey;
119268 + DWORD myDisp;
119269 +
119270 + RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\CDR\\MoobyCDR",0,NULL,REG_OPTION_NON_VOLATILE,KEY_ALL_ACCESS,NULL,&myKey,&myDisp);
119271 +
119272 + std::map<std::string, std::string>::iterator itr = prefsMap.begin();
119273 + while (itr != prefsMap.end())
119274 + {
119275 + RegSetValueEx(myKey,(itr->first).c_str(),0,REG_SZ,(LPBYTE) (itr->second).c_str(),itr->second.size() + 1);
119276 + itr++;
119277 + }
119278 + RegCloseKey(myKey);
119279 +
119280 +#else
119281 + Fl_Preferences app(Fl_Preferences::USER, "Vision Thing", "PSEmu Pro/CDR" );
119282 + Fl_Preferences myPrefs(app, "MoobyCDR");
119283 +
119284 + std::map<std::string, std::string>::iterator itr = prefsMap.begin();
119285 +
119286 + while (itr != prefsMap.end())
119287 + {
119288 + myPrefs.set((itr->first).c_str(), (itr->second).c_str());
119289 + itr++;
119290 + }
119291 +#endif
119292 +}
119293 +
119294 +void Preferences::open()
119295 +{
119296 + if (!initialized)
119297 + {
119298 + initialized = true;
119299 + allPrefs.push_back(volumeString);
119300 + allPrefs.push_back(repeatString);
119301 + allPrefs.push_back(autorunString);
119302 + allPrefs.push_back(lastrunString);
119303 + allPrefs.push_back(cacheSizeString);
119304 + allPrefs.push_back(cachingModeString);
119305 + allPrefs.push_back(subEnableString);
119306 +
119307 + const size_t bufSize = 1024;
119308 + char* buffer = new char[bufSize];
119309 +
119310 + // win32 code kindly pilfered from PEOPS =)
119311 +#ifdef WIN32
119312 + HKEY myKey;
119313 + DWORD type;
119314 + DWORD size;
119315 +
119316 + if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\CDR\\MoobyCDR",0,KEY_ALL_ACCESS,&myKey)==ERROR_SUCCESS)
119317 + {
119318 + std::list<std::string>::iterator itr = allPrefs.begin();
119319 + while (itr != allPrefs.end())
119320 + {
119321 + size = bufSize;
119322 + type = REG_SZ;
119323 + if(RegQueryValueEx(myKey,(*itr).c_str(),0,&type,(LPBYTE)buffer,&size)==ERROR_SUCCESS)
119324 + prefsMap[*itr] = std::string(buffer);
119325 + else
119326 + prefsMap[*itr] = std::string("");
119327 + itr++;
119328 + }
119329 +
119330 + RegCloseKey(myKey);
119331 + }
119332 +
119333 +#else
119334 + Fl_Preferences app(Fl_Preferences::USER, "Vision Thing", "PSEmu Pro/CDR" );
119335 + Fl_Preferences myPrefs(app, "MoobyCDR");
119336 +
119337 + std::list<std::string>::iterator itr = allPrefs.begin();
119338 + while (itr != allPrefs.end())
119339 + {
119340 + myPrefs.get((*itr).c_str(), buffer, "");
119341 + prefsMap[*itr] = std::string(buffer);
119342 + itr++;
119343 + }
119344 +#endif
119345 +
119346 + delete [] buffer;
119347 + }
119348 +}
119349 diff -rupN original/plugins/dfbinimage/Preferences.hpp new/plugins/dfbinimage/Preferences.hpp
119350 --- original/plugins/dfbinimage/Preferences.hpp 1969-12-31 20:00:00.000000000 -0400
119351 +++ new/plugins/dfbinimage/Preferences.hpp 2007-10-08 17:13:28.000000000 -0400
119352 @@ -0,0 +1,66 @@
119353 +/************************************************************************
119354 +
119355 +Preferences.hpp
119356 +
119357 +Copyright (C) 2007 Virus
119358 +Copyright (C) 2002 mooby
119359 +
119360 +This program is free software; you can redistribute it and/or
119361 +modify it under the terms of the GNU General Public License
119362 +as published by the Free Software Foundation; either version 2
119363 +of the License, or (at your option) any later version.
119364 +
119365 +This program is distributed in the hope that it will be useful,
119366 +but WITHOUT ANY WARRANTY; without even the implied warranty of
119367 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119368 +GNU General Public License for more details.
119369 +
119370 +You should have received a copy of the GNU General Public License
119371 +along with this program; if not, write to the Free Software
119372 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
119373 +
119374 +************************************************************************/
119375 +
119376 +#pragma warning(disable:4786)
119377 +
119378 +#ifndef PREFERENCES_HPP
119379 +#define PREFERENCES_HPP
119380 +
119381 +#include <map>
119382 +#include <list>
119383 +#include <string>
119384 +#include <FL/Fl_Preferences.H>
119385 +
119386 +static char* repeatString = "repeat";
119387 +static char* volumeString = "volume";
119388 +static char* autorunString = "autorun";
119389 +static char* lastrunString = "lastrun";
119390 +static char* cacheSizeString = "cachesize";
119391 +static char* cachingModeString = "cachemode";
119392 +static char* subEnableString = "subenable";
119393 +
119394 +// these are the repeat mode strings
119395 +static char* repeatAllString = "repeatAll";
119396 +static char* repeatOneString = "repeatOne";
119397 +static char* playOneString = "playOne";
119398 +static char* oldCachingString = "old";
119399 +static char* newCachingString = "new";
119400 +
119401 +// a wrapper for preference information.
119402 +class Preferences
119403 +{
119404 +public:
119405 + Preferences();
119406 + ~Preferences();
119407 + void write();
119408 +
119409 +private:
119410 + void open();
119411 + bool initialized;
119412 +
119413 +public:
119414 + std::map<std::string, std::string> prefsMap;
119415 + std::list<std::string> allPrefs;
119416 +};
119417 +
119418 +#endif
119419 diff -rupN original/plugins/dfbinimage/SubchannelData.cpp new/plugins/dfbinimage/SubchannelData.cpp
119420 --- original/plugins/dfbinimage/SubchannelData.cpp 1969-12-31 20:00:00.000000000 -0400
119421 +++ new/plugins/dfbinimage/SubchannelData.cpp 2007-10-08 17:13:28.000000000 -0400
119422 @@ -0,0 +1,239 @@
119423 +/************************************************************************
119424 +
119425 +SubchannelData.cpp
119426 +
119427 +Copyright (C) 2007 Virus
119428 +Copyright (C) 2002 mooby
119429 +
119430 +This program is free software; you can redistribute it and/or
119431 +modify it under the terms of the GNU General Public License
119432 +as published by the Free Software Foundation; either version 2
119433 +of the License, or (at your option) any later version.
119434 +
119435 +This program is distributed in the hope that it will be useful,
119436 +but WITHOUT ANY WARRANTY; without even the implied warranty of
119437 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119438 +GNU General Public License for more details.
119439 +
119440 +You should have received a copy of the GNU General Public License
119441 +along with this program; if not, write to the Free Software
119442 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
119443 +
119444 +************************************************************************/
119445 +
119446 +#include "SubchannelData.hpp"
119447 +#include "Preferences.hpp"
119448 +
119449 +extern Preferences prefs;
119450 +
119451 +using namespace std;
119452 +
119453 +#include <fstream>
119454 +
119455 +// tries to open the subchannel files to determine which
119456 +// one to use
119457 +SubchannelData* SubchannelDataFactory(const std::string& fileroot)
119458 +{
119459 + SubchannelData* scd = NULL;
119460 +
119461 + if (prefs.prefsMap[subEnableString] == std::string())
119462 + {
119463 + scd = new DisabledSubchannelData();
119464 + return scd;
119465 + }
119466 + {
119467 + ifstream testFile;
119468 + testFile.open( (fileroot + std::string(".sub")).c_str());
119469 + if (testFile)
119470 + {
119471 + scd = new SUBSubchannelData();
119472 + scd->openFile(fileroot + std::string(".sub"));
119473 + std::cout << "Subchannel data: " << fileroot + std::string(".sub") << endl;
119474 + return scd;
119475 + }
119476 + }
119477 + {
119478 + ifstream testFile;
119479 + testFile.open( (fileroot + std::string(".sbi")).c_str());
119480 + if (testFile)
119481 + {
119482 + scd = new SBISubchannelData();
119483 + scd->openFile(fileroot + std::string(".sbi"));
119484 + std::cout << "Subchannel data: " << fileroot + std::string(".sbi");
119485 + return scd;
119486 + }
119487 + }
119488 + {
119489 + ifstream testFile;
119490 + testFile.open( (fileroot + std::string(".m3s")).c_str());
119491 + if (testFile)
119492 + {
119493 + scd = new M3SSubchannelData();
119494 + scd->openFile(fileroot + std::string(".m3s"));
119495 + std::cout << "Subchannel data: " << fileroot + std::string(".m3s");
119496 + return scd;
119497 + }
119498 + }
119499 +
119500 + scd = new NoSubchannelData();
119501 + return scd;
119502 +}
119503 +
119504 +SUBSubchannelData::SUBSubchannelData()
119505 +{
119506 + // set the cache to be the size given in the prefs
119507 + cache.setMaxSize(atoi(prefs.prefsMap[cacheSizeString].c_str()));
119508 +}
119509 +
119510 +// SUB files read from the file whenever data is needed
119511 +void SUBSubchannelData::openFile(const string& file)
119512 + throw(Exception)
119513 +{
119514 + subFile.open(file.c_str(), ios::binary);
119515 + subFile.exceptions(ios::failbit);
119516 +}
119517 +
119518 +void SUBSubchannelData::seek(const CDTime& cdt)
119519 + throw(Exception)
119520 +{
119521 + // seek in the file for the data requested and set the subframe
119522 + // data
119523 + try
119524 + {
119525 + // try the cache first
119526 + if (enableCache && cache.find(cdt, sf))
119527 + {
119528 + return;
119529 + }
119530 +
119531 + subFile.clear();
119532 + subFile.seekg((cdt.getAbsoluteFrame() - 150) * SubchannelFrameSize);
119533 + subFile.read((char*)sf.subData, SubchannelFrameSize);
119534 +
119535 + if (enableCache)
119536 + cache.insert(cdt, sf);
119537 + }
119538 + catch(...)
119539 + {
119540 + sf.setTime(CDTime(cdt));
119541 + }
119542 +}
119543 +
119544 +// opens the SBI file and caches all the subframes in a map
119545 +void SBISubchannelData::openFile(const std::string& file)
119546 + throw(Exception)
119547 +{
119548 + ifstream subFile(file.c_str(), ios::binary);
119549 + subFile.exceptions(ios::failbit|ios::badbit|ios::eofbit);
119550 +
119551 + try
119552 + {
119553 + unsigned char buffer[4];
119554 + subFile.read((char*)&buffer, 4);
119555 + if (string((char*)&buffer) != string("SBI"))
119556 + {
119557 + Exception e(file + string(" isn't an SBI file"));
119558 + THROW(e);
119559 + }
119560 + while (subFile)
119561 + {
119562 + subFile.read((char*)&buffer, 4);
119563 + CDTime now((unsigned char*)&buffer, msfbcd);
119564 + SubchannelFrame subf(now);
119565 + // numbers are BCD in file, so only convert the
119566 + // generated subchannel data
119567 + bool convert1 = false,
119568 + convert2 = false;
119569 + switch(buffer[3])
119570 + {
119571 + case 1:
119572 + subFile.read((char*)&subf.subData[12], 10);
119573 + break;
119574 + case 2:
119575 + subFile.read((char*)&subf.subData[15], 3);
119576 + break;
119577 + case 3:
119578 + subFile.read((char*)&subf.subData[19], 3);
119579 + break;
119580 + default:
119581 + Exception e("Unknown buffer type in SBI file");
119582 + THROW(e);
119583 + break;
119584 + }
119585 + subMap[now] = subf;
119586 + }
119587 + }
119588 + catch(Exception&)
119589 + {
119590 + throw;
119591 + }
119592 + catch (std::exception& e)
119593 + {
119594 + if (!subFile.eof())
119595 + {
119596 + Exception exc("Error reading SBI file");
119597 + exc.addText(string(e.what()));
119598 + THROW(exc);
119599 + }
119600 + }
119601 +}
119602 +
119603 +// if the data is in the map, return it. otherwise, make up data
119604 +void SBISubchannelData::seek(const CDTime& cdt)
119605 + throw(Exception)
119606 +{
119607 + map<CDTime, SubchannelFrame>::iterator itr = subMap.find(cdt);
119608 + if (itr == subMap.end())
119609 + {
119610 + sf.setTime(cdt);
119611 + }
119612 + else
119613 + {
119614 + sf = (*itr).second;
119615 + }
119616 +}
119617 +
119618 +// opens and caches the M3S data
119619 +void M3SSubchannelData::openFile(const std::string& file)
119620 + throw(Exception)
119621 +{
119622 + ifstream subFile(file.c_str(), ios::binary);
119623 + subFile.exceptions(ios::failbit|ios::badbit|ios::eofbit);
119624 +
119625 + try
119626 + {
119627 + CDTime t(3,0,0);
119628 + char buffer[16];
119629 + while (subFile)
119630 + {
119631 + subFile.read((char*)&buffer, 16);
119632 + SubchannelFrame subf(t);
119633 + memcpy(&subf.subData[12], buffer, 16);
119634 + subMap[t] = subf;
119635 + t += CDTime(0,0,1);
119636 + if (t == CDTime(4,0,0))
119637 + break;
119638 + }
119639 + }
119640 + catch(std::exception& e)
119641 + {
119642 + Exception exc("Error reading M3S file");
119643 + exc.addText(string(e.what()));
119644 + THROW(exc);
119645 + }
119646 +}
119647 +
119648 +// if no data is found, create data. otherwise, return the data found.
119649 +void M3SSubchannelData::seek(const CDTime& cdt)
119650 + throw(Exception)
119651 +{
119652 + map<CDTime, SubchannelFrame>::iterator itr = subMap.find(cdt);
119653 + if (itr == subMap.end())
119654 + {
119655 + sf.setTime(cdt);
119656 + }
119657 + else
119658 + {
119659 + sf = (*itr).second;
119660 + }
119661 +}
119662 diff -rupN original/plugins/dfbinimage/SubchannelData.hpp new/plugins/dfbinimage/SubchannelData.hpp
119663 --- original/plugins/dfbinimage/SubchannelData.hpp 1969-12-31 20:00:00.000000000 -0400
119664 +++ new/plugins/dfbinimage/SubchannelData.hpp 2007-10-08 17:13:28.000000000 -0400
119665 @@ -0,0 +1,222 @@
119666 +/************************************************************************
119667 +
119668 +SubchannelData.hpp
119669 +
119670 +Copyright (C) 2007 Virus
119671 +Copyright (C) 2002 mooby
119672 +
119673 +This program is free software; you can redistribute it and/or
119674 +modify it under the terms of the GNU General Public License
119675 +as published by the Free Software Foundation; either version 2
119676 +of the License, or (at your option) any later version.
119677 +
119678 +This program is distributed in the hope that it will be useful,
119679 +but WITHOUT ANY WARRANTY; without even the implied warranty of
119680 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119681 +GNU General Public License for more details.
119682 +
119683 +You should have received a copy of the GNU General Public License
119684 +along with this program; if not, write to the Free Software
119685 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
119686 +
119687 +************************************************************************/
119688 +
119689 +
119690 +#ifndef SUBCHANNELDATA_HPP
119691 +#define SUBCHANNELDATA_HPP
119692 +
119693 +#include "CDTime.hpp"
119694 +#include "Exception.hpp"
119695 +#include "Utils.hpp"
119696 +#include "TimeCache.hpp"
119697 +
119698 +#include <fstream>
119699 +#include <map>
119700 +
119701 +// so the funny thing is the subchannel is actually 98 bytes long, but
119702 +// the first two are sync/identifier blocks, so 96 is ok for this.
119703 +// that and CloneCD Sub files don't write those two blocks...
119704 +const int SubchannelFrameSize = 96;
119705 +
119706 +
119707 +// one subchannel frame holds 96 bytes of subchannel data
119708 +class SubchannelFrame
119709 +{
119710 +public:
119711 + SubchannelFrame()
119712 + {
119713 + subData = new unsigned char[SubchannelFrameSize];
119714 + memset(subData, 0, SubchannelFrameSize);
119715 + }
119716 +
119717 + SubchannelFrame(const CDTime& time)
119718 + {
119719 + subData = new unsigned char[SubchannelFrameSize];
119720 + memset(subData, 0, SubchannelFrameSize);
119721 + setTime(time);
119722 + }
119723 +
119724 + SubchannelFrame(const SubchannelFrame& r)
119725 + {
119726 + subData = new unsigned char[SubchannelFrameSize];
119727 + memcpy(subData, r.subData, SubchannelFrameSize);
119728 + }
119729 +
119730 + ~SubchannelFrame() { if (subData) delete [] subData;}
119731 +
119732 + SubchannelFrame& operator=(const SubchannelFrame& r)
119733 + {
119734 + memcpy(subData, r.subData, SubchannelFrameSize);
119735 + return *this;
119736 + }
119737 +
119738 + inline void clear() {memset(subData, 0, SubchannelFrameSize);}
119739 +
119740 +
119741 + // in case it's not clear, here i'm faking the Q subchannel data.
119742 + // i'll explain... All integers should be in BCD format
119743 + inline SubchannelFrame& setTime(const CDTime& time)
119744 + {
119745 + CDTime localTime(time - CDTime(0,2,0));
119746 +
119747 + // the control and Q mode bits. this subchannel frame
119748 + // is mode 1
119749 + subData[12] = 0x41;
119750 + // track number
119751 + subData[13] = 0x01;
119752 + // index... 0 is reserved (pause) so 1 is ok
119753 + subData[14] = 0x01;
119754 + // track relative address - time of this sector relative to the track start
119755 + memcpy(subData + 15, (localTime).getMSFbuf(msfbcd), 3);
119756 + // zero, cause that's what it is.
119757 + subData[18] = 0x00;
119758 + // absolute frame address, from the start of the disc
119759 + memcpy(subData + 19, (time).getMSFbuf(msfbcd), 3);
119760 + return *this;
119761 + }
119762 +
119763 + inline unsigned char* getBuffer() const {return subData;}
119764 +
119765 + unsigned char* subData;
119766 +};
119767 +
119768 +
119769 +// virtual base class for storing subchannel data
119770 +class SubchannelData
119771 +{
119772 +public:
119773 + SubchannelData() {}
119774 + virtual void openFile(const std::string& file)
119775 + throw(Exception) = 0;
119776 + virtual void seek(const CDTime& cdt)
119777 + throw(Exception) = 0;
119778 + inline unsigned char* get(void) const {return sf.subData;}
119779 + virtual ~SubchannelData() {}
119780 +protected:
119781 + SubchannelFrame sf;
119782 +};
119783 +
119784 +// disables the subchannel data outright
119785 +class DisabledSubchannelData : public SubchannelData
119786 +{
119787 +public:
119788 + DisabledSubchannelData()
119789 + {
119790 + delete [] sf.subData;
119791 + sf.subData = NULL;
119792 + }
119793 + virtual void openFile(const std::string& file)
119794 + throw(Exception) {}
119795 + virtual void seek(const CDTime& cdt) throw(Exception)
119796 + {}
119797 + virtual ~DisabledSubchannelData() {}
119798 +};
119799 +
119800 +// makes up data if there is no subchannel data file
119801 +class NoSubchannelData : public SubchannelData
119802 +{
119803 +public:
119804 + NoSubchannelData() {}
119805 + virtual void openFile(const std::string& file)
119806 + throw(Exception) {}
119807 + virtual void seek(const CDTime& cdt) throw(Exception)
119808 + {sf.setTime(cdt);}
119809 + virtual ~NoSubchannelData() {}
119810 +};
119811 +
119812 +// reads a CloneCD SUB file for the subchannel data.
119813 +// the .SUB file stores all subchannel data for a disc,
119814 +// each block is the last 96 bytes of the full 98 byte data.
119815 +class SUBSubchannelData : public SubchannelData
119816 +{
119817 +public:
119818 + SUBSubchannelData();
119819 + virtual void openFile(const std::string& file)
119820 + throw(Exception);
119821 + virtual void seek(const CDTime& cdt)
119822 + throw(Exception);
119823 + virtual ~SUBSubchannelData() {}
119824 +private:
119825 + std::ifstream subFile;
119826 +
119827 + // the extra cache =)
119828 + TimeCache<SubchannelFrame> cache;
119829 + bool enableCache;
119830 +};
119831 +
119832 +/*
119833 + reads an SBI file for subchannel data, caches that info
119834 + internally and makes up any data not in that cache.
119835 +
119836 + the first 4 characters of the file are "SBI" and a null character '\0'
119837 +
119838 + each record is like this:
119839 + 3 bytes: the data in MSF/BCD format
119840 + 1 byte: a switch
119841 + 1 - all 10 Q channel subframe data starting
119842 + at subframe[12]
119843 + 2 - 3 bytes of the track relative address
119844 + at subframe[15]
119845 + 3 - 3 bytes of the track absolute address,
119846 + at subframe[19]
119847 +*/
119848 +class SBISubchannelData : public SubchannelData
119849 +{
119850 +public:
119851 + SBISubchannelData() {}
119852 + virtual void openFile(const std::string& file)
119853 + throw(Exception);
119854 + virtual void seek(const CDTime& cdt)
119855 + throw(Exception);
119856 + virtual ~SBISubchannelData() {}
119857 +private:
119858 + std::map<CDTime, SubchannelFrame> subMap;
119859 +};
119860 +
119861 +/*
119862 + reads an M3S file for subchannel data, caches that info
119863 + internally and makes up any data not in that cache.
119864 +
119865 + M3s stores all the subchannel data for minute 3 of the disc
119866 + in 16 byte blocks. You only need the first 10 of the
119867 + 16 bytes, read into subframe[12] to be OK though. once you
119868 + hit minute 4, there's no more data.
119869 +*/
119870 +class M3SSubchannelData : public SubchannelData
119871 +{
119872 +public:
119873 + M3SSubchannelData() {}
119874 + virtual void openFile(const std::string& file)
119875 + throw(Exception);
119876 + virtual void seek(const CDTime& cdt)
119877 + throw(Exception);
119878 + virtual ~M3SSubchannelData() {}
119879 +private:
119880 + std::map<CDTime, SubchannelFrame> subMap;
119881 +};
119882 +
119883 +// determines what kind of subchannel data is available based only
119884 +// on file names
119885 +SubchannelData* SubchannelDataFactory(const std::string& fileroot);
119886 +
119887 +#endif
119888 diff -rupN original/plugins/dfbinimage/TimeCache.hpp new/plugins/dfbinimage/TimeCache.hpp
119889 --- original/plugins/dfbinimage/TimeCache.hpp 1969-12-31 20:00:00.000000000 -0400
119890 +++ new/plugins/dfbinimage/TimeCache.hpp 2007-10-08 17:13:28.000000000 -0400
119891 @@ -0,0 +1,112 @@
119892 +/************************************************************************
119893 +
119894 +TimeCache.hpp
119895 +
119896 +Copyright (C) 2007 Virus
119897 +Copyright (C) 2002 mooby
119898 +
119899 +This program is free software; you can redistribute it and/or
119900 +modify it under the terms of the GNU General Public License
119901 +as published by the Free Software Foundation; either version 2
119902 +of the License, or (at your option) any later version.
119903 +
119904 +This program is distributed in the hope that it will be useful,
119905 +but WITHOUT ANY WARRANTY; without even the implied warranty of
119906 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119907 +GNU General Public License for more details.
119908 +
119909 +You should have received a copy of the GNU General Public License
119910 +along with this program; if not, write to the Free Software
119911 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
119912 +
119913 +************************************************************************/
119914 +
119915 +#ifndef TIMECACHE_HPP
119916 +#define TIMECACHE_HPP
119917 +
119918 +#include "CDTime.hpp"
119919 +#include <map>
119920 +#include <list>
119921 +
119922 +/*
119923 + * This is an LRU cache for any type of file data this plugin can store.
119924 + * It's a map of time to data...
119925 + */
119926 +
119927 +template <class Data>
119928 +class TimeCache
119929 +{
119930 +public:
119931 + TimeCache() : maxSize(10) {}
119932 +
119933 + TimeCache(size_t size) { setMaxSize(size); }
119934 +
119935 + TimeCache& setMaxSize(size_t size)
119936 + {
119937 + maxSize = size;
119938 + if (maxSize < 1)
119939 + maxSize = 1;
119940 + while (cache.size() > maxSize)
119941 + popOne();
119942 + return *this;
119943 + }
119944 +
119945 + size_t getMaxSize() const
119946 + { return maxSize; }
119947 +
119948 + // return true if found (and set Data d)
119949 + bool find (const CDTime& time, Data& d)
119950 + {
119951 + // try to find the data in the cache first
119952 + // if it's there, return it and set it as the most recent
119953 + typename CacheMap::iterator itr = cache.find(time);
119954 + if (itr != cache.end())
119955 + {
119956 + d = (*itr).second.first;
119957 + // splice will move the item in the LRUList to the front and
119958 + // keep the iterator valid
119959 + order.splice(order.begin(), order,
119960 + (*itr).second.second, (*itr).second.second);
119961 + return true;
119962 + }
119963 + else
119964 + {
119965 + return false;
119966 + }
119967 + }
119968 +
119969 + // insert this as the LRU data
119970 + void insert(const CDTime& time, const Data& d)
119971 + {
119972 + // are we full? push out the oldest data
119973 + while (cache.size() >= maxSize)
119974 + popOne();
119975 +
119976 + order.push_front(time);
119977 + cache[time] = CacheItem(d, order.begin());
119978 + }
119979 +
119980 +private:
119981 + // remove the oldest item from the cache
119982 + void popOne()
119983 + {
119984 + CDTime toast = order.back();
119985 + order.pop_back();
119986 + cache.erase(cache.find(toast));
119987 + }
119988 +
119989 + // maxSizeimum size of the cache
119990 + size_t maxSize;
119991 +
119992 + // the list is ordered from first to last starting with
119993 + // the most recently used data item.
119994 + typedef std::list<CDTime> LRUList;
119995 + LRUList order;
119996 +
119997 + // the map simply holds the time and data pairs
119998 + typedef std::pair<Data, LRUList::iterator> CacheItem;
119999 + typedef std::map<CDTime, CacheItem > CacheMap;
120000 + CacheMap cache;
120001 +};
120002 +
120003 +#endif // TIMECACHE_HPP
120004 diff -rupN original/plugins/dfbinimage/TrackInfo.hpp new/plugins/dfbinimage/TrackInfo.hpp
120005 --- original/plugins/dfbinimage/TrackInfo.hpp 1969-12-31 20:00:00.000000000 -0400
120006 +++ new/plugins/dfbinimage/TrackInfo.hpp 2007-10-08 17:13:28.000000000 -0400
120007 @@ -0,0 +1,55 @@
120008 +/************************************************************************
120009 +
120010 +TrackParser.hpp
120011 +
120012 +Copyright (C) 2007 Virus
120013 +Copyright (C) 2002 mooby
120014 +
120015 +This program is free software; you can redistribute it and/or
120016 +modify it under the terms of the GNU General Public License
120017 +as published by the Free Software Foundation; either version 2
120018 +of the License, or (at your option) any later version.
120019 +
120020 +This program is distributed in the hope that it will be useful,
120021 +but WITHOUT ANY WARRANTY; without even the implied warranty of
120022 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120023 +GNU General Public License for more details.
120024 +
120025 +You should have received a copy of the GNU General Public License
120026 +along with this program; if not, write to the Free Software
120027 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
120028 +
120029 +************************************************************************/
120030 +
120031 +
120032 +#ifndef TRACKINFO_HPP
120033 +#define TRACKINFO_HPP
120034 +
120035 +#include "CDTime.hpp"
120036 +
120037 +#include <iomanip>
120038 +
120039 +// This class stores all the information we need to know about one track.
120040 +// It's just a glorified struct.
120041 +class TrackInfo
120042 +{
120043 +public:
120044 + TrackInfo() : trackNumber(0) {}
120045 +
120046 + TrackInfo(const CDTime& tl)
120047 + : trackNumber(0), trackStart(0, CDTime::abFrame), trackLength(tl) {}
120048 +
120049 + inline friend std::ostream& operator<<(std::ostream& o, const TrackInfo& ti)
120050 + {
120051 + o << std::setw(2) << ti.trackNumber << ' ' << ti.trackStart.getMSF()
120052 + << ' ' << ti.trackEnd.getMSF() << ' ' << ti.trackLength.getMSF() << std::endl;
120053 + return o;
120054 + }
120055 +
120056 + unsigned long trackNumber;
120057 + CDTime trackStart;
120058 + CDTime trackEnd;
120059 + CDTime trackLength;
120060 +};
120061 +
120062 +#endif
120063 diff -rupN original/plugins/dfbinimage/TrackParser.cpp new/plugins/dfbinimage/TrackParser.cpp
120064 --- original/plugins/dfbinimage/TrackParser.cpp 1969-12-31 20:00:00.000000000 -0400
120065 +++ new/plugins/dfbinimage/TrackParser.cpp 2007-10-08 17:13:28.000000000 -0400
120066 @@ -0,0 +1,332 @@
120067 +/************************************************************************
120068 +
120069 +TrackParser.cpp
120070 +
120071 +Copyright (C) 2007 Virus
120072 +Copyright (C) 2002 mooby
120073 +
120074 +This program is free software; you can redistribute it and/or
120075 +modify it under the terms of the GNU General Public License
120076 +as published by the Free Software Foundation; either version 2
120077 +of the License, or (at your option) any later version.
120078 +
120079 +This program is distributed in the hope that it will be useful,
120080 +but WITHOUT ANY WARRANTY; without even the implied warranty of
120081 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120082 +GNU General Public License for more details.
120083 +
120084 +You should have received a copy of the GNU General Public License
120085 +along with this program; if not, write to the Free Software
120086 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
120087 +
120088 +************************************************************************/
120089 +
120090 +#pragma warning(disable:4786)
120091 +
120092 +#include "TrackParser.hpp"
120093 +#include "Utils.hpp"
120094 +
120095 +#include <fcntl.h>
120096 +#include <sys/stat.h>
120097 +#include <sys/ioctl.h>
120098 +#include <linux/cdrom.h>
120099 +
120100 +using namespace std;
120101 +
120102 +
120103 +TrackParser* TrackParserFactory(const std::string& filename,
120104 + const FileInterface* fi)
120105 +{
120106 + // try to open a track listing sheet
120107 + std::string thisFile;
120108 + if ( (thisFile = CCDParser::fileExists(filename)) != std::string())
120109 + return new CCDParser(thisFile);
120110 + else if ( (thisFile = CueParser::fileExists(filename)) != std::string())
120111 + return new CueParser(thisFile);
120112 + else if ( (thisFile = DeviceParser::fileExists(filename)) != std::string())
120113 + return new DeviceParser(thisFile);
120114 + else
120115 + return new NullParser(fi->getFileName());
120116 +}
120117 +
120118 + // just opens the file for parsing
120119 +TrackParser::TrackParser(const std::string& filename)
120120 + : cuename(filename), pregapLength(CDTime(0,0,0))
120121 +{
120122 + if (!filename.empty()) theCueSheet.open(filename.c_str());
120123 +}
120124 +
120125 +
120126 + // post processing on the list
120127 +void TrackParser::postProcess(const CDTime& CDLength)
120128 +{
120129 + vector<TrackInfo>::size_type index;
120130 +
120131 + CDTime thisCDLength(CDLength);
120132 +
120133 + // and if there's a pregap flag, add that time
120134 + thisCDLength += pregapLength;
120135 +
120136 + // calculate the track lengths, except for the last track
120137 + // which needs CDLength
120138 + // The track length is the start time of the next track - the start time of this track -
120139 + // 1 frame
120140 + if (tiv.size() > 0)
120141 + {
120142 + for(index = 0; index < tiv.size() - 1; index++)
120143 + {
120144 + tiv[index].trackLength = tiv[index + 1].trackStart -
120145 + tiv[index].trackStart;
120146 + }
120147 + // finally, at the end of the disc, there's a 2 second gap as well...
120148 + tiv[index].trackLength = thisCDLength - CDTime(0,2,0) - tiv[index].trackStart;
120149 + }
120150 + // if there is no cue sheet, just make a single track with length CDLength.
120151 + else
120152 + {
120153 + tiv.insert(tiv.begin(), TrackInfo(thisCDLength - CDTime(0,2,0)));
120154 + }
120155 +
120156 + // set the ending time
120157 + for(index = 0; index < tiv.size(); index++)
120158 + {
120159 + // there's an extra 2 seconds not accounted for somewhere....
120160 + tiv[index].trackStart += CDTime(0,2,0);
120161 + // and the track end is 1 frame less...
120162 + tiv[index].trackEnd = tiv[index].trackStart + tiv[index].trackLength - CDTime(0,0,1);
120163 + }
120164 +
120165 + // insert the total length at tiv[0]
120166 + TrackInfo track0;
120167 + track0.trackEnd = tiv[tiv.size()-1].trackEnd + CDTime(0,0,1);
120168 + track0.trackStart = track0.trackEnd;
120169 + track0.trackLength = track0.trackEnd;
120170 + track0.trackNumber = 0;
120171 + tiv.insert(tiv.begin(), track0);
120172 +}
120173 +
120174 +std::ostream& operator<<(std::ostream& o, const TrackParser& cp)
120175 +{
120176 + vector<TrackInfo>::size_type index;
120177 + for (index = 0; index < cp.tiv.size(); index++)
120178 + {
120179 + o << cp.tiv[index] << endl;
120180 + }
120181 + return o;
120182 +}
120183 +
120184 +
120185 +NullParser::NullParser(const std::string& filename)
120186 + : TrackParser(filename)
120187 +{}
120188 +
120189 +// parses a CUE file
120190 +void CueParser::parse() throw(Exception)
120191 +{
120192 + if (!theCueSheet)
120193 + {
120194 + // if there's a file error here, then there's either a file error
120195 + // or there's no cue sheet. in either case, we'll ignore it.
120196 + // a cue sheet is nice, but not necessary
120197 + return;
120198 + }
120199 +
120200 + bool doneReading = false;
120201 +
120202 + theCueSheet.exceptions(ios::eofbit|ios::badbit|ios::failbit);
120203 + string thisLine;
120204 +
120205 + try
120206 + {
120207 + TrackInfo thisTrack;
120208 +
120209 + getline(theCueSheet, thisLine);
120210 + doneReading = true;
120211 + // the file name is whatever is in the " marks
120212 + std::string::size_type firstpos = thisLine.find('"');
120213 + std::string::size_type lastpos = thisLine.rfind('"');
120214 + cuefilename = thisLine.substr(firstpos + 1, lastpos - firstpos - 1);
120215 +
120216 + while(theCueSheet)
120217 + {
120218 + getline(theCueSheet, thisLine);
120219 + string firstWord = word(thisLine, 1);
120220 + if (firstWord == "TRACK")
120221 + {
120222 + thisTrack.trackNumber = atoi(word(thisLine,2).c_str());
120223 + doneReading = false;
120224 + }
120225 + else if (firstWord == "PREGAP")
120226 + {
120227 + pregapLength = CDTime(word(thisLine,2));
120228 + }
120229 + else if (firstWord == "INDEX")
120230 + {
120231 + // we need INDEX 01
120232 + if (atoi(word(thisLine,2).c_str()) == 1)
120233 + {
120234 + thisTrack.trackStart = CDTime(word(thisLine,3));
120235 + thisTrack.trackStart += pregapLength;
120236 + tiv.push_back(thisTrack);
120237 + thisTrack = TrackInfo();
120238 + doneReading = true;
120239 + }
120240 + }
120241 + else
120242 + {
120243 + // whatever, we'll just skip this...
120244 + }
120245 + }
120246 + }
120247 + catch(std::exception& e)
120248 + {
120249 + if (!doneReading)
120250 + {
120251 + Exception exc(string("Error reading cue sheet ") + cuename);
120252 + exc.addText(string(e.what()));
120253 + THROW(exc);
120254 + }
120255 + }
120256 +}
120257 +
120258 +std::string CueParser::fileExists(const std::string& file)
120259 +{
120260 + {
120261 + std::ifstream is;
120262 + std::string cueName = file + std::string(".cue");
120263 + is.open(cueName.c_str());
120264 + if (is)
120265 + {
120266 + return cueName;
120267 + }
120268 + }
120269 + return string();
120270 +}
120271 +
120272 +// parses a CCD file
120273 +void CCDParser::parse() throw(Exception)
120274 +{
120275 + if (!theCueSheet)
120276 + {
120277 + // if there's a file error here, then there's either a file error
120278 + // or there's no cue sheet. in either case, we'll ignore it.
120279 + // a cue sheet is nice, but not necessary
120280 + return;
120281 + }
120282 +
120283 + bool doneReading = false;
120284 + theCueSheet.exceptions(ios::eofbit|ios::badbit|ios::failbit);
120285 + string thisLine;
120286 +
120287 + try
120288 + {
120289 + TrackInfo thisTrack;
120290 +
120291 + doneReading = false;
120292 +
120293 + // the file name is whatever the .ccd is changed to .img
120294 + cuefilename = cuename.substr(0,cuename.rfind('.')) + std::string(".img");
120295 +
120296 + while(theCueSheet)
120297 + {
120298 + getline(theCueSheet, thisLine);
120299 + string firstWord = word(thisLine, 1);
120300 + if (firstWord == "[TRACK")
120301 + {
120302 + thisTrack.trackNumber = atoi(word(thisLine,2).c_str());
120303 + }
120304 + else if (firstWord == "INDEX")
120305 + {
120306 + // we need INDEX 01
120307 + if (atoi(word(thisLine,2).c_str()) == 1)
120308 + {
120309 + // the number after the = sign is the
120310 + // absolute frame
120311 + std::string frame(thisLine.substr(thisLine.find('=')+1));
120312 + thisTrack.trackStart = CDTime(atoi(frame.c_str()), CDTime::abFrame);
120313 + tiv.push_back(thisTrack);
120314 + thisTrack = TrackInfo();
120315 + doneReading = true;
120316 + }
120317 + }
120318 + else
120319 + {
120320 + // whatever, we'll just skip this...
120321 + }
120322 + }
120323 + }
120324 + catch(std::exception& e)
120325 + {
120326 + if (!doneReading)
120327 + {
120328 + Exception exc(string("Error reading cue sheet ") + cuename);
120329 + exc.addText(string(e.what()));
120330 + THROW(exc);
120331 + }
120332 + }
120333 +}
120334 +
120335 +std::string CCDParser::fileExists(const std::string& file)
120336 +{
120337 + {
120338 + std::ifstream is;
120339 + std::string ccdName = file + std::string(".ccd");
120340 + is.open(ccdName.c_str());
120341 + if (is)
120342 + {
120343 + return ccdName;
120344 + }
120345 + }
120346 + {
120347 + std::ifstream is;
120348 + std::string ccdName = file + std::string(".CCD");
120349 + is.open(ccdName.c_str());
120350 + if (is)
120351 + {
120352 + return ccdName;
120353 + }
120354 + }
120355 + return std::string();
120356 +}
120357 +
120358 +// parses a device TOC
120359 +void DeviceParser::parse() throw(Exception)
120360 +{
120361 + int theFd = open(cuename.c_str(), O_RDONLY);
120362 + if(theFd < 0) {
120363 + Exception e(std::string("Cannot open device: ") + cuename);
120364 + THROW(e);
120365 + }
120366 + struct cdrom_tochdr tocHdr;
120367 + if(ioctl(theFd, CDROMREADTOCHDR, &tocHdr) < 0) {
120368 + close(theFd);
120369 + Exception e(std::string("Cannot read TOC: ") + cuename);
120370 + THROW(e);
120371 + }
120372 + struct cdrom_tocentry tocEntry;
120373 + for(int i = tocHdr.cdth_trk0; i <= tocHdr.cdth_trk1; i++) {
120374 + memset(&tocEntry, 0, sizeof(tocEntry));
120375 + tocEntry.cdte_track = i;
120376 + tocEntry.cdte_format = CDROM_LBA;
120377 + if(ioctl(theFd, CDROMREADTOCENTRY, &tocEntry) < 0) {
120378 + close(theFd);
120379 + Exception e(std::string("Cannot read TOC: ") + cuename);
120380 + THROW(e);
120381 + }
120382 + TrackInfo thisTrack;
120383 + thisTrack.trackNumber = i;
120384 + thisTrack.trackStart = CDTime(tocEntry.cdte_addr.lba, CDTime::abFrame);
120385 + tiv.push_back(thisTrack);
120386 + }
120387 + close(theFd);
120388 +}
120389 +
120390 +std::string DeviceParser::fileExists(const std::string& file)
120391 +{
120392 + struct stat statBuf;
120393 + if(stat(file.c_str(), &statBuf)>=0 && S_ISBLK(statBuf.st_mode))
120394 + return std::string(file);
120395 + else
120396 + return std::string();
120397 +}
120398 +
120399 diff -rupN original/plugins/dfbinimage/TrackParser.hpp new/plugins/dfbinimage/TrackParser.hpp
120400 --- original/plugins/dfbinimage/TrackParser.hpp 1969-12-31 20:00:00.000000000 -0400
120401 +++ new/plugins/dfbinimage/TrackParser.hpp 2007-10-08 17:13:28.000000000 -0400
120402 @@ -0,0 +1,146 @@
120403 +/************************************************************************
120404 +
120405 +TrackParser.hpp
120406 +
120407 +Copyright (C) 2007 Virus
120408 +Copyright (C) 2002 mooby
120409 +
120410 +This program is free software; you can redistribute it and/or
120411 +modify it under the terms of the GNU General Public License
120412 +as published by the Free Software Foundation; either version 2
120413 +of the License, or (at your option) any later version.
120414 +
120415 +This program is distributed in the hope that it will be useful,
120416 +but WITHOUT ANY WARRANTY; without even the implied warranty of
120417 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120418 +GNU General Public License for more details.
120419 +
120420 +You should have received a copy of the GNU General Public License
120421 +along with this program; if not, write to the Free Software
120422 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
120423 +
120424 +************************************************************************/
120425 +
120426 +
120427 +#ifndef TRACKPARSER_HPP
120428 +#define TRACKPARSER_HPP
120429 +
120430 +#include <string>
120431 +#include <fstream>
120432 +#include <vector>
120433 +
120434 +#include "TrackInfo.hpp"
120435 +#include "FileInterface.hpp"
120436 +
120437 +// TrackParser is the base class for reading CUE and CCD-type time sheets.
120438 +// It also sets up the list of tracks and times
120439 +class TrackParser
120440 +{
120441 +public:
120442 + // attempts to open the cue file 'filename'
120443 + TrackParser(const std::string& filename);
120444 +
120445 + virtual ~TrackParser() {}
120446 + // parses the cue file, if any. throws when there's a read error
120447 + virtual void parse() throw(Exception) = 0;
120448 +
120449 + // this needs the total CD length to correctly determine
120450 + // the start times and length of each track
120451 + void postProcess(const CDTime& CDLength);
120452 +
120453 + // accessors
120454 + // returns the track listing
120455 + // track[0] is the total length
120456 + // track[1...n] is the length of that track
120457 + inline std::vector<TrackInfo> getTrackList() const {return tiv;}
120458 + // returns the name of the CD as determined by the cue sheet (if any)
120459 + inline std::string getCDName() const {return cuefilename;}
120460 +
120461 + friend std::ostream& operator<<(std::ostream& o, const TrackParser& cp);
120462 +
120463 + CDTime getPregapLength() const { return pregapLength; }
120464 +
120465 +private:
120466 + TrackParser(const TrackParser& r);
120467 + TrackParser& operator=(const TrackParser& r);
120468 +
120469 +protected:
120470 + // the file itself
120471 + std::ifstream theCueSheet;
120472 + // the name of the .cue or .ccd file
120473 + std::string cuename;
120474 + // the name if the image file given in the cue sheet
120475 + std::string cuefilename;
120476 + // track info vector with start and end times and such...
120477 + std::vector<TrackInfo> tiv;
120478 + // length of the pregap (if any)
120479 + CDTime pregapLength;
120480 +};
120481 +
120482 +// this is for no track list
120483 +class NullParser : public TrackParser
120484 +{
120485 +public:
120486 + NullParser(const std::string& filename = std::string());
120487 +
120488 + virtual ~NullParser() {}
120489 +
120490 + virtual void parse() throw(Exception) {}
120491 +};
120492 +
120493 +// this parses CDRWin CUE files
120494 +class CueParser : public TrackParser
120495 +{
120496 +public:
120497 + CueParser(const std::string& filename)
120498 + : TrackParser(filename)
120499 + {}
120500 +
120501 + virtual ~CueParser() {}
120502 +
120503 + // this is the only real function here - parses the cue sheet into
120504 + // the internal data members
120505 + virtual void parse() throw(Exception);
120506 +
120507 + // returns a string with a CUE file name if that file exists
120508 + static std::string fileExists(const std::string& file);
120509 +};
120510 +
120511 +// this parses CloneCD CCD files
120512 +class CCDParser : public TrackParser
120513 +{
120514 +public:
120515 + CCDParser(const std::string& filename)
120516 + : TrackParser(filename)
120517 + {}
120518 +
120519 + virtual ~CCDParser() {}
120520 +
120521 + // this is the only real function here - parses the cue sheet into
120522 + // the internal data members
120523 + virtual void parse() throw(Exception);
120524 +
120525 + // returns a string with a CCD file name if that file exists
120526 + static std::string fileExists(const std::string& file);
120527 +};
120528 +
120529 +// this is for device nodes
120530 +class DeviceParser : public TrackParser
120531 +{
120532 +public:
120533 + DeviceParser(const std::string& filename)
120534 + : TrackParser(filename)
120535 + {}
120536 +
120537 + virtual ~DeviceParser() {}
120538 +
120539 + virtual void parse() throw(Exception);
120540 +
120541 + // returns a string with a device node file name if that node exists
120542 + static std::string fileExists(const std::string& file);
120543 +};
120544 +
120545 +// factory method for building track parser
120546 +TrackParser* TrackParserFactory(const std::string& filename, const FileInterface* fi);
120547 +
120548 +#endif
120549 diff -rupN original/plugins/dfbinimage/Utils.hpp new/plugins/dfbinimage/Utils.hpp
120550 --- original/plugins/dfbinimage/Utils.hpp 1969-12-31 20:00:00.000000000 -0400
120551 +++ new/plugins/dfbinimage/Utils.hpp 2007-10-08 17:13:28.000000000 -0400
120552 @@ -0,0 +1,242 @@
120553 +/************************************************************************
120554 +
120555 +VirusCDR Utils.hpp
120556 +
120557 +Copyright (C) 2007 Virus
120558 +Copyright (C) 2002 mooby
120559 +
120560 +This program is free software; you can redistribute it and/or
120561 +modify it under the terms of the GNU General Public License
120562 +as published by the Free Software Foundation; either version 2
120563 +of the License, or (at your option) any later version.
120564 +
120565 +This program is distributed in the hope that it will be useful,
120566 +but WITHOUT ANY WARRANTY; without even the implied warranty of
120567 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120568 +GNU General Public License for more details.
120569 +
120570 +You should have received a copy of the GNU General Public License
120571 +along with this program; if not, write to the Free Software
120572 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
120573 +
120574 +************************************************************************/
120575 +
120576 +#pragma warning(disable:4786)
120577 +
120578 +#ifndef UTILS_HPP
120579 +#define UTILS_HPP
120580 +
120581 +#include <sstream>
120582 +#include <FL/Fl.H>
120583 +#include <FL/fl_ask.H>
120584 +#include <FL/filename.H>
120585 +
120586 +#ifndef _FLU_
120587 +#include <FL/Fl_File_Chooser.H>
120588 +#endif
120589 +#ifdef _FLU_
120590 +#include <FLU/Flu_File_Chooser.h>
120591 +#endif
120592 +
120593 +#include <stdlib.h>
120594 +#ifdef _WINDOWS
120595 +#include <windows.h>
120596 +#endif
120597 +
120598 +/*
120599 + This file is for any utility function or constant that has use outside the scope of any
120600 + single file
120601 +*/
120602 +
120603 +// specifies how you want the MSF time formatted
120604 +// msf/fsm -> if time is specified in minute, second, frame or backwards
120605 +// int/bcd -> integer or binary coded decimal format
120606 +enum TDTNFormat
120607 +{
120608 + msfint,
120609 + fsmint,
120610 + fsmbcd,
120611 + msfbcd
120612 +};
120613 +
120614 +// a quick way to tell which API set is being used
120615 +enum EMUMode
120616 +{
120617 + psemu,
120618 + fpse
120619 +};
120620 +
120621 +// converts uchar in c to BCD character
120622 +#define intToBCD(c) (unsigned char)((c%10) | ((c/10)<<4))
120623 +
120624 +// converts BCD number in c to uchar
120625 +#define BCDToInt(c) (unsigned char)((c & 0x0F) + 10 * ((c & 0xF0) >> 4))
120626 +
120627 +static const std::string theUsualSuspects =
120628 + "Common image files (*.{bz,bz.index,Z,Z.table,bin,bwi,img,iso})";
120629 +
120630 +// CD time constants
120631 +static const unsigned int secondsPerMinute = 60;
120632 +static const unsigned int framesPerSecond = 75;
120633 +static const unsigned int framesPerMinute = framesPerSecond * secondsPerMinute;
120634 +static const unsigned int bytesPerFrame = 2352;
120635 +static const unsigned int bytesPerSecond = bytesPerFrame * framesPerSecond;
120636 +static const unsigned int bytesPerMinute = bytesPerSecond * secondsPerMinute;
120637 +
120638 +inline void moobyMessage(const std::string& message)
120639 +{
120640 + Fl::scheme("plastic");
120641 + fl_message("%s", message.c_str());
120642 +#ifdef __LINUX__
120643 + Fl::wait();
120644 + Fl::flush();
120645 +#endif
120646 +}
120647 +
120648 +inline void moobyMessage(const char* message)
120649 +{
120650 + Fl::scheme("plastic");
120651 + fl_message("%s", message);
120652 +#ifdef __LINUX__
120653 + Fl::wait();
120654 + Fl::flush();
120655 +#endif
120656 +}
120657 +
120658 +inline char* moobyFileChooser(const char* message, const char* filespec,
120659 + const std::string& last = std::string())
120660 +{
120661 + char* toReturn;
120662 + if (last.size())
120663 +#ifdef _FLU_
120664 + toReturn = (char*)flu_file_chooser(message, filespec, last.c_str());
120665 + else
120666 + toReturn = (char*)flu_file_chooser(message, filespec, NULL);
120667 +#else
120668 + toReturn = (char*)fl_file_chooser(message, filespec, last.c_str());
120669 + else
120670 + toReturn = (char*)fl_file_chooser(message, filespec, NULL);
120671 +#endif
120672 +
120673 +
120674 +#ifdef __LINUX__
120675 + Fl::wait();
120676 + Fl::flush();
120677 +#endif
120678 + return toReturn;
120679 +}
120680 +
120681 +inline int moobyAsk(const char* message)
120682 +{
120683 +// int i = fl_ask(message);
120684 + int i = fl_choice(message, fl_no, fl_yes, 0);
120685 +#ifdef __LINUX__
120686 + Fl::wait();
120687 + Fl::flush();
120688 +#endif
120689 + return i;
120690 +}
120691 +
120692 +// since most binary data is stored little endian, this flips
120693 +// the data bits for big endian systems
120694 +template <class T>
120695 +inline void flipBits(T& num)
120696 +{
120697 +#if 0
120698 + char* front = (char*)&num;
120699 + char* end = front + sizeof(T) - 1;
120700 + char t;
120701 + while (front < end)
120702 + {
120703 + t = *front;
120704 + *front = *end;
120705 + *end = t;
120706 + front++;
120707 + end--;
120708 + }
120709 +#endif
120710 +}
120711 +
120712 +// given a string and a number, returns the ' ' delimited word
120713 +// at position num
120714 +inline std::string word(const std::string& str, const unsigned long num)
120715 +{
120716 + if (str == std::string())
120717 + return str;
120718 +
120719 + unsigned long i;
120720 + std::string::size_type startpos = 0;
120721 + std::string::size_type endpos = 0;
120722 +
120723 + for(i = 0; i < num; i++)
120724 + {
120725 + startpos = str.find_first_not_of(' ', endpos);
120726 + if (startpos == std::string::npos)
120727 + return std::string();
120728 +
120729 + endpos = str.find_first_of(' ', startpos);
120730 + if (endpos == std::string::npos)
120731 + {
120732 + endpos = str.size();
120733 + }
120734 + }
120735 + return str.substr(startpos, endpos - startpos);
120736 +}
120737 +
120738 +// turns a string into its lowercase...
120739 +inline std::string tolcstr(const std::string& s)
120740 +{
120741 + std::string::size_type i;
120742 + std::string toReturn(s);
120743 + for (i = 0; i < s.size(); i++)
120744 + toReturn[i] = tolower(s[i]);
120745 + return toReturn;
120746 +}
120747 +
120748 +// tries to match the extension ext to the end of the file name
120749 +inline bool extensionMatches(const std::string& file, const std::string& ext)
120750 +{
120751 + if (file.size() < ext.size()) return false;
120752 + return (tolcstr(file.substr(file.size() - ext.size())) == ext);
120753 +}
120754 +
120755 +// returns what the name of the program running this plugin is.
120756 +inline std::string getProgramName(void)
120757 +{
120758 + std::string toReturn;
120759 +
120760 +#ifdef _WINDOWS
120761 + char buf[1024];
120762 + if (GetModuleFileName(NULL, (char*)&buf, 1024) == 0)
120763 + {
120764 + // i hope this never happens.... we'll just make an assumption ;)
120765 + toReturn = "epsxe";
120766 + }
120767 + else
120768 + {
120769 + toReturn = buf;
120770 + }
120771 +#else // for the UNIXes
120772 + char* buf = getenv("_");
120773 + if (buf == NULL)
120774 + {
120775 + toReturn = "pcsx";
120776 + }
120777 + else
120778 + {
120779 + toReturn = buf;
120780 + }
120781 +#endif
120782 +
120783 + // strips all the useless crud from the retuned string
120784 + toReturn = fl_filename_name(toReturn.c_str());
120785 + std::string::size_type i;
120786 + i = toReturn.find_last_of('.');
120787 + if (i != std::string::npos)
120788 + toReturn.erase(i);
120789 + for (i = 0; i < toReturn.size(); i++)
120790 + toReturn[i] = tolower(toReturn[i]);
120791 + return toReturn;
120792 +}
120793 +
120794 +#endif
120795 diff -rupN original/plugins/dfbinimage/defines.h new/plugins/dfbinimage/defines.h
120796 --- original/plugins/dfbinimage/defines.h 1969-12-31 20:00:00.000000000 -0400
120797 +++ new/plugins/dfbinimage/defines.h 2007-10-08 17:13:28.000000000 -0400
120798 @@ -0,0 +1,214 @@
120799 +/************************************************************************
120800 +
120801 +defines.h
120802 +
120803 +Copyright (C) 2007 Virus
120804 +Copyright (C) 2002 mooby
120805 +
120806 +This program is free software; you can redistribute it and/or
120807 +modify it under the terms of the GNU General Public License
120808 +as published by the Free Software Foundation; either version 2
120809 +of the License, or (at your option) any later version.
120810 +
120811 +This program is distributed in the hope that it will be useful,
120812 +but WITHOUT ANY WARRANTY; without even the implied warranty of
120813 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120814 +GNU General Public License for more details.
120815 +
120816 +You should have received a copy of the GNU General Public License
120817 +along with this program; if not, write to the Free Software
120818 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
120819 +
120820 +************************************************************************/
120821 +
120822 +#pragma warning(disable:4786)
120823 +
120824 +
120825 +#ifndef __DEFINES_H
120826 +#define __DEFINES_H
120827 +
120828 +#if defined _WINDOWS || defined __CYGWIN32__
120829 +#include <windows.h>
120830 +#else
120831 +#define CALLBACK
120832 +#endif
120833 +
120834 +#include <stdint.h>
120835 +
120836 +// PSEMU DEFINES
120837 +
120838 +// header version
120839 +#define _PPDK_HEADER_VERSION 1
120840 +
120841 +#define PLUGIN_VERSION 1
120842 +
120843 +// plugin type returned by PSEgetLibType (types can be merged if plugin is multi type!)
120844 +#define PSE_LT_CDR 1
120845 +
120846 +// every function in DLL if completed sucessfully should return this value
120847 +#define PSE_ERR_SUCCESS 0
120848 +// undefined error but fatal one, that kills all functionality
120849 +#define PSE_ERR_FATAL -1
120850 +
120851 +// XXX_Init return values
120852 +// Those return values apply to all libraries
120853 +
120854 +// initialization went OK
120855 +#define PSE_INIT_ERR_SUCCESS 0
120856 +
120857 +// this driver is not configured
120858 +#define PSE_INIT_ERR_NOTCONFIGURED -2
120859 +
120860 +// this driver can not operate properly on this hardware or hardware is not detected
120861 +#define PSE_INIT_ERR_NOHARDWARE -3
120862 +
120863 +
120864 +/* CDR PlugIn */
120865 +
120866 +// CDR_Test return values
120867 +
120868 +// sucess, everything configured, and went OK.
120869 +#define PSE_CDR_ERR_SUCCESS 0
120870 +
120871 +// ERRORS
120872 +#define PSE_CDR_ERR -40
120873 +// this driver is not configured
120874 +#define PSE_CDR_ERR_NOTCONFIGURED PSE_CDR_ERR - 0
120875 +// if this driver is unable to read data from medium
120876 +#define PSE_CDR_ERR_NOREAD PSE_CDR_ERR - 1
120877 +
120878 +// WARNINGS
120879 +#define PSE_CDR_WARN 40
120880 +// if this driver emulates lame mode ie. can read only 2048 tracks and sector header is emulated
120881 +// this might happen to CDROMS that do not support RAW mode reading - surelly it will kill many games
120882 +#define PSE_CDR_WARN_LAMECD PSE_CDR_WARN + 0
120883 +
120884 +
120885 +
120886 +
120887 +
120888 +
120889 +// FPSE DEFINES
120890 +
120891 +// Return values (should be applied to the entire code).
120892 +#define FPSE_OK 0
120893 +#define FPSE_ERR -1
120894 +#define FPSE_WARN 1
120895 +
120896 +typedef int8_t INT8;
120897 +typedef int16_t INT16;
120898 +
120899 +typedef uint8_t UINT8;
120900 +typedef uint16_t UINT16;
120901 +
120902 +#if !defined _WINDOWS && !defined __CYGWIN32__
120903 +typedef int32_t INT32;
120904 +typedef uint32_t UINT32;
120905 +#endif
120906 +
120907 +#define INT64 int64_t
120908 +
120909 +#define FPSE_CDROM 5
120910 +
120911 +
120912 +// New MDEC from GPU plugin.
120913 +typedef struct {
120914 + int (*MDEC0_Read)();
120915 + int (*MDEC0_Write)();
120916 + int (*MDEC1_Read)();
120917 + int (*MDEC1_Write)();
120918 + int (*MDEC0_DmaExec)();
120919 + int (*MDEC1_DmaExec)();
120920 +} MDEC_Export;
120921 +
120922 +#if defined _WINDOWS || defined __CYGWIN32__
120923 +// Main Struct for initialization
120924 +typedef struct {
120925 + UINT8 *SystemRam; // Pointer to the PSX system ram
120926 + UINT32 Flags; // Flags to plugins
120927 + UINT32 *IrqPulsePtr; // Pointer to interrupt pending reg
120928 + MDEC_Export MDecAltern; // Use another MDEC engine
120929 + int (*ReadCfg)(); // Read an item from INI
120930 + int (*WriteCfg)(); // Write an item to INI
120931 + void (*FlushRec)(); // Tell where the RAM is changed
120932 + HWND HWnd; // Window handle
120933 + HINSTANCE HInstance;
120934 +} FPSEWin32;
120935 +
120936 +// cdr stat struct
120937 +struct CdrStat
120938 +{
120939 + unsigned long Type;
120940 + unsigned long Status;
120941 + unsigned char Time[3]; // current playing time
120942 +};
120943 +
120944 +#endif
120945 +
120946 +// Main Struct for initialization
120947 +typedef struct {
120948 + UINT8 *SystemRam; // Pointer to the PSX system ram
120949 + UINT32 Flags; // Flags to plugins
120950 + UINT32 *IrqPulsePtr; // Pointer to interrupt pending reg
120951 + MDEC_Export MDecAltern; // Use another MDEC engine
120952 + int (*ReadCfg)(); // Read an item from INI
120953 + int (*WriteCfg)(); // Write an item to INI
120954 + void (*FlushRec)(); // Tell where the RAM is changed
120955 +} FPSElinux;
120956 +
120957 +// Info about a plugin
120958 +typedef struct {
120959 + UINT8 PlType; // Plugin type: GPU, SPU or Controllers
120960 + UINT8 VerLo; // Version High
120961 + UINT8 VerHi; // Version Low
120962 + UINT8 TestResult; // Returns if it'll work or not
120963 + char Author[64]; // Name of the author
120964 + char Name[64]; // Name of plugin
120965 + char Description[1024]; // Description to put in the edit box
120966 +} FPSEAbout;
120967 +
120968 +
120969 +
120970 +/* PS2 defines */
120971 +
120972 +#if defined(_WINDOWS)
120973 +
120974 +typedef __int8 s8;
120975 +typedef __int16 s16;
120976 +typedef __int32 s32;
120977 +typedef __int64 s64;
120978 +
120979 +typedef unsigned __int8 u8;
120980 +typedef unsigned __int16 u16;
120981 +typedef unsigned __int32 u32;
120982 +typedef unsigned __int64 u64;
120983 +
120984 +#elif defined(__LINUX__)
120985 +
120986 +typedef char s8;
120987 +typedef short s16;
120988 +typedef int s32;
120989 +typedef long long s64;
120990 +
120991 +typedef unsigned char u8;
120992 +typedef unsigned short u16;
120993 +typedef unsigned int u32;
120994 +typedef unsigned long long u64;
120995 +
120996 +#endif
120997 +
120998 +typedef struct { // NOT bcd coded
120999 + u8 minute;
121000 + u8 second;
121001 + u8 frame;
121002 +} cdvdLoc;
121003 +
121004 +typedef struct {
121005 + u8 strack;
121006 + u8 etrack;
121007 +} cdvdTN;
121008 +
121009 +#define PS2E_LT_CDVD 0x8
121010 +
121011 +
121012 +#endif //__DEFINES_H
121013 diff -rupN original/plugins/dfbinimage/externs.h new/plugins/dfbinimage/externs.h
121014 --- original/plugins/dfbinimage/externs.h 1969-12-31 20:00:00.000000000 -0400
121015 +++ new/plugins/dfbinimage/externs.h 2007-10-08 17:13:28.000000000 -0400
121016 @@ -0,0 +1,100 @@
121017 +/************************************************************************
121018 +
121019 +externs.h
121020 +
121021 +Copyright (C) 2007 Virus
121022 +Copyright (C) 2002 mooby
121023 +
121024 +This program is free software; you can redistribute it and/or
121025 +modify it under the terms of the GNU General Public License
121026 +as published by the Free Software Foundation; either version 2
121027 +of the License, or (at your option) any later version.
121028 +
121029 +This program is distributed in the hope that it will be useful,
121030 +but WITHOUT ANY WARRANTY; without even the implied warranty of
121031 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
121032 +GNU General Public License for more details.
121033 +
121034 +You should have received a copy of the GNU General Public License
121035 +along with this program; if not, write to the Free Software
121036 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
121037 +
121038 +************************************************************************/
121039 +
121040 +#pragma warning(disable:4786)
121041 +
121042 +
121043 +#ifndef EXTERNS_H
121044 +#define EXTERNS_H
121045 +
121046 +#include "defines.h"
121047 +
121048 +// sets all the callbacks as extern "c" for linux compatability
121049 +extern "C"
121050 +{
121051 +
121052 +char * CALLBACK PSEgetLibName(void);
121053 +unsigned long CALLBACK PSEgetLibType(void);
121054 +unsigned long CALLBACK PSEgetLibVersion(void);
121055 +void CALLBACK CDRabout(void);
121056 +long CALLBACK CDRtest(void);
121057 +long CALLBACK CDRconfigure(void);
121058 +long CALLBACK CDRclose(void);
121059 +long CALLBACK CDRopen(void);
121060 +long CALLBACK CDRshutdown(void);
121061 +long CALLBACK CDRplay(unsigned char * sector);
121062 +long CALLBACK CDRstop(void);
121063 +long CALLBACK CDRsetfilename(char *);
121064 +
121065 +// gcc doenst like this...
121066 +#if defined _WINDOWS || defined __CYGWIN32__
121067 +long CALLBACK CDRgetStatus(struct CdrStat *stat) ;
121068 +#endif
121069 +
121070 +char CALLBACK CDRgetDriveLetter(void);
121071 +long CALLBACK CDRinit(void);
121072 +long CALLBACK CDRgetTN(unsigned char *buffer);
121073 +unsigned char * CALLBACK CDRgetBufferSub(void);
121074 +long CALLBACK CDRgetTD(unsigned char track, unsigned char *buffer);
121075 +long CALLBACK CDRreadTrack(unsigned char *time);
121076 +unsigned char * CALLBACK CDRgetBuffer(void);
121077 +
121078 +
121079 +void CD_About(UINT32 *par);
121080 +int CD_Wait(void);
121081 +void CD_Close(void);
121082 +int CD_Open(unsigned int* par);
121083 +int CD_Play(unsigned char * sector);
121084 +int CD_Stop(void);
121085 +int CD_GetTN(char* result);
121086 +unsigned char* CD_GetSeek(void);
121087 +unsigned char* CD_Read(unsigned char* time);
121088 +int CD_GetTD(char* result, int track);
121089 +int CD_Configure(UINT32 *par);
121090 +
121091 +/* PS2 callbacks */
121092 +
121093 +u32 CALLBACK PS2EgetLibType(void);
121094 +u32 CALLBACK PS2EgetLibVersion(void);
121095 +char* CALLBACK PS2EgetLibName(void);
121096 +
121097 +s32 CALLBACK CDVDinit();
121098 +s32 CALLBACK CDVDopen();
121099 +void CALLBACK CDVDclose();
121100 +void CALLBACK CDVDshutdown();
121101 +s32 CALLBACK CDVDreadTrack(cdvdLoc *Time);
121102 +
121103 +// return can be NULL (for async modes)
121104 +u8* CALLBACK CDVDgetBuffer();
121105 +s32 CALLBACK CDVDgetTN(cdvdTN *Buffer);
121106 +s32 CALLBACK CDVDgetTD(u8 Track, cdvdLoc *Buffer);
121107 +
121108 +// extended funcs
121109 +void CALLBACK CDVDconfigure();
121110 +void CALLBACK CDVDabout();
121111 +s32 CALLBACK CDVDtest();
121112 +
121113 +
121114 +}
121115 +
121116 +#endif
121117 diff -rupN original/plugins/dfbinimage/notes.txt new/plugins/dfbinimage/notes.txt
121118 --- original/plugins/dfbinimage/notes.txt 1969-12-31 20:00:00.000000000 -0400
121119 +++ new/plugins/dfbinimage/notes.txt 2007-10-08 17:13:28.000000000 -0400
121120 @@ -0,0 +1,124 @@
121121 +and 2.8
121122 +
121123 +- there was a bug that was preventing the config window from ever returning - it would disappear but never close. i say *was* cause it's fixed =)
121124 +- use the "Enable subchannel option" to turn on/off subchannel data reading. some games work better with it off rather than on.
121125 +- upgraded PortAudio to version 0.18.1 (for CD-DA audio)
121126 +- added an experimental caching option. it's pretty much just a huge LRU cache for previously read data from the image. try it and see if you like it.
121127 +- other random fixes... i dont quite remember them all =)
121128 +
121129 +
121130 +yeah, yeah... 2.7
121131 +
121132 +- fixed a bug that was causing games without a track listing file (.cue, .ccd) to crash with the error "read past end of disc". just a lesson to keep those files when you're making your disc images =)
121133 +- the rar library is now using assembly optimized code.
121134 +- fixed (yet another) off by one problem, this time in the internally generated subchannel data.
121135 +- found a bug where if it seeked to the end of disk, sometimes it would get stuck there... oops
121136 +
121137 +
121138 +CDRMooby 2.6
121139 +
121140 +- the total cd length was returning 0:0:0.. oops =) i doubt this affects any compatability, but it's nice to have it fixed.
121141 +- by request, added a config option to alter the autorun settings. autorun images are now persistent until changed or cleared with the config settings or manually. this lets you use autorun with epsxecutor and other frontends.
121142 +
121143 +
121144 +CDRMooby 2.5
121145 +
121146 +sorry for the lack of communication folks, been on a hiatus of sorts lately... and sorry about 2.4 which ended up causing more problems than it fixed. anyway, here's the scoop on the latest stuff:
121147 +
121148 +- Fixed an off-by-one-frame subchannel problem that was causing XA playback to stop in certain games. Big thanks to the Peops CDR freely available source code for helping me find this one =)
121149 +- Fixed some mishandled pregap data that was messing with CDDA timing.
121150 +- Previously, only SUB subchannel files could be used because the plugin would fail to find any of the other subchannel file types.
121151 +- Linked with FLTK 1.1.3
121152 +
121153 +
121154 +CDRMooby 2.4
121155 +
121156 +I think this is fixed CDDA data better than any previous version =)
121157 +
121158 +
121159 +CDRMooby 2.3
121160 +
121161 +This release is dedicated to people who understand that problems get fixed when accompanied by DETAILED EXPLANATIONS of what went wrong. To the rest of you out there, don't complain unless you're willing to help. By the way, it seems many of you don't know that I have a forum of my own hosted by emufanatics at http://www.emufanatics.com/forums/viewforum.php?f=29 so use it.
121162 +
121163 +- fixes CDDA problems. If you still have trouble, describe the problem IN DETAIL at my forum...
121164 +
121165 +
121166 +
121167 +CDRMooby 2.2
121168 +
121169 +Do any of you use the Linux binaries? I just switched to Debian and I'm much happier for doing so. However Linux binaries that use C++ libraries don't translate well across Linuxes. In other words, this Linux binary probably won't work for everyone. And to make things worse for you Linux users, I got rid of make and replaced it with (the much superior) Jam (http://www.perforce.com/jam/jam.html) to make compiling the plugin more difficult for the rest of you. So no complaints from the peanut gallery if the Linux version doesn't work.
121170 +
121171 +- Added .CCD support - experimental at best, but will probably work in most cases
121172 +- Added PCSX2 interface. I've only tried one demo image and it worked, so consider this experimental too.
121173 +- Added some new CDDA play modes - play one track (and stop), repeat one track, repeat all tracks - selectable in the config menu. Choose whatever mode you prefer or is appropriate for the game. A serious shortcoming of the PSX CD emulation is the lack of pause and changing the repeat mode. I'm not sure if this is a BIOS function or CD hardware function or whatever, but it would be nice to fix someday...
121174 +- New config stuff: In Windows, the configuration settings are now stored in the registry. There's also a new key called "autorun" that, if set, the plugin will automatically use the image listed there without prompting for a file (a nice feature for you frontend people). Also, the plugin keeps track of the last file you ran and makes that the default when starting the emulator.
121175 +- The file chooser defaults to files that I know work well with the plugin. There still is the *.* option available, but I suggest you don't use it.
121176 +- Linked with FLTK 1.1.2, now with fewer bugs =)
121177 +
121178 +CDRMooby 2.1
121179 +
121180 +Because of complaints that I didn't change the version number last time, it's different now...
121181 +
121182 +- fixed a bug with FILE NAMES IN ALL CAPS (but why you would use them is beyond me...)
121183 +- fixed the linux bug with windows not closing when they should
121184 +- linked with FLTK 1.1.0 fixing various bugs, including a nasty drag-n-drop bug...
121185 +
121186 +
121187 +
121188 +CDRMooby 2.01
121189 +
121190 +re-linked it with the latest FLTK which fixes some bugs with the file selection. this also includes a bug fix with linux and bz and z compressed images.
121191 +
121192 +
121193 +
121194 +CDRMooby2 - The Real Deal
121195 +
121196 +Yes, after a long wait, this is the full release... New features since 1.6...
121197 +
121198 +Real subchannel support. Automatically detects subchannel files when they're available. Just make sure they're in the same directory as the image and named the same.
121199 +New GUIs, audio handling thanks to external libraries. Use the favorites tab in the file selection window to speed up finding your images.
121200 +CDDA Volume is now controllable from the config menu.
121201 +Better compatability with all emus, especially CD-DA audio.
121202 +
121203 +that's the new stuff... otherwise, it should behave similarly (tho better) than the last version. the rest is for those who dont have a clue what this does...
121204 +
121205 +THIS PLUGIN RUNS CD IMAGES, NOT CDS THEMSELVES.
121206 + The images MUST be in raw (2352 byte/frame) format or in one of the compressed formats - RAR (2.x only), Z.table or .bz.index (both available in the config menu)
121207 + When using a .CUE sheet, CD-DA is available (for games which have it)
121208 + - CD-DA volume is available in the config menu
121209 + Subchannel support using .sub (CloneCD), .sbi or .m3s (Pete's plugin)
121210 + Very stable and compatable
121211 +
121212 +BRAND NEW LOOK!!! Now uses FLTK for dialog boxes...
121213 + When selecting an image, you can add a directory to the favorites tab to quickly get back there in the future!
121214 + Volume settings are persistant from session to session.
121215 +
121216 +ENTIRELY REWRITTEN FROM SCRATCH!!!
121217 + Uses C++ for nearly everything, external libraries for guis, audio, and compression.
121218 + GPL'd code for anyone out there to see.
121219 +
121220 +For those of you who are using 1.6 or one of the beta versions, please upgrade to this version!!!
121221 +
121222 +If you have any questions or bugs, PLEASE let me know so I can squish them like the annoying pests they are:
121223 +http://mooby.psxfanatics.com
121224 +
121225 +
121226 +Info for building it n such...
121227 +
121228 +For this plugin, I used the following external libraries:
121229 +
121230 + zlib v1.1.4: http://www.gzip.org/zlib/ (windows only)
121231 + bzlib v1.02: http://sources.redhat.com/bzip2/ (windows only)
121232 + portaudio v18: http://www.portaudio.com/
121233 + fltk v1.1.0rc5: http://www.fltk.org/
121234 + unrarlib v.40: http://www.unrarlib.org/
121235 +
121236 +FYI, I include the bzlib and zlib files because I've taken out alot of unnecessary files from the distro, not because I edited them. Well, I did change the name of the zlib compress.c file to zcompress.c, but that was it...
121237 +
121238 +If you're trying to build....
121239 +
121240 +the windows version:
121241 + get portaudio and fltk from the sites above and build them... then set environment variables 'fltkdir' and 'portaudiodir' with the root directory where you put them (i.e. if the libs are in d:/fltk/libs then the env var would be d:/fltk). it should compile fine after that...
121242 +
121243 +for linux:
121244 + build and install fltk, then build portaudio and set the path appropriately in the makefile. if you have bzlib and zlib installed, it should compile just fine...
121245 diff -rupN original/plugins/dfbinimage2/Makefile new/plugins/dfbinimage2/Makefile
121246 --- original/plugins/dfbinimage2/Makefile 1969-12-31 20:00:00.000000000 -0400
121247 +++ new/plugins/dfbinimage2/Makefile 2008-08-24 09:57:08.000000000 -0430
121248 @@ -0,0 +1,557 @@
121249 +# Makefile.in generated by automake 1.8.2 from Makefile.am.
121250 +# plugins/dfbinimage2/Makefile. Generated from Makefile.in by configure.
121251 +
121252 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
121253 +# 2003, 2004 Free Software Foundation, Inc.
121254 +# This Makefile.in is free software; the Free Software Foundation
121255 +# gives unlimited permission to copy and/or distribute it,
121256 +# with or without modifications, as long as this notice is preserved.
121257 +
121258 +# This program is distributed in the hope that it will be useful,
121259 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
121260 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
121261 +# PARTICULAR PURPOSE.
121262 +
121263 +
121264 +
121265 +
121266 +SOURCES = $(libDFBinImage2_la_SOURCES)
121267 +
121268 +srcdir = .
121269 +top_srcdir = ../..
121270 +
121271 +pkgdatadir = $(datadir)/pcsx-df
121272 +pkglibdir = $(libdir)/pcsx-df
121273 +pkgincludedir = $(includedir)/pcsx-df
121274 +top_builddir = ../..
121275 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
121276 +INSTALL = /bin/install -c
121277 +install_sh_DATA = $(install_sh) -c -m 644
121278 +install_sh_PROGRAM = $(install_sh) -c
121279 +install_sh_SCRIPT = $(install_sh) -c
121280 +INSTALL_HEADER = $(INSTALL_DATA)
121281 +transform = $(program_transform_name)
121282 +NORMAL_INSTALL = :
121283 +PRE_INSTALL = :
121284 +POST_INSTALL = :
121285 +NORMAL_UNINSTALL = :
121286 +PRE_UNINSTALL = :
121287 +POST_UNINSTALL = :
121288 +host_triplet = i686-pc-linux-gnu
121289 +subdir = plugins/dfbinimage2
121290 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
121291 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
121292 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
121293 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
121294 + $(ACLOCAL_M4)
121295 +mkinstalldirs = $(mkdir_p)
121296 +CONFIG_HEADER = $(top_builddir)/include/config.h
121297 +CONFIG_CLEAN_FILES =
121298 +am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(gladedir)
121299 +libLTLIBRARIES_INSTALL = $(INSTALL)
121300 +LTLIBRARIES = $(lib_LTLIBRARIES)
121301 +libDFBinImage2_la_DEPENDENCIES =
121302 +am_libDFBinImage2_la_OBJECTS = About.lo PlayCDDAData.lo \
121303 + ConfigCallbacks.lo ConfigFunctions.lo TrackParser.lo \
121304 + FileInterface.lo Globals.lo Open.lo PS2Open.lo Preferences.lo \
121305 + SubchannelData.lo Utils.lo PlayOGGData.lo RipCDDAData.lo
121306 +libDFBinImage2_la_OBJECTS = $(am_libDFBinImage2_la_OBJECTS)
121307 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
121308 +depcomp = $(SHELL) $(top_srcdir)/depcomp
121309 +am__depfiles_maybe = depfiles
121310 +DEP_FILES = ./$(DEPDIR)/About.Plo \
121311 + ./$(DEPDIR)/ConfigCallbacks.Plo \
121312 + ./$(DEPDIR)/ConfigFunctions.Plo \
121313 + ./$(DEPDIR)/FileInterface.Plo \
121314 + ./$(DEPDIR)/Globals.Plo ./$(DEPDIR)/Open.Plo \
121315 + ./$(DEPDIR)/PS2Open.Plo \
121316 + ./$(DEPDIR)/PlayCDDAData.Plo \
121317 + ./$(DEPDIR)/PlayOGGData.Plo \
121318 + ./$(DEPDIR)/Preferences.Plo \
121319 + ./$(DEPDIR)/RipCDDAData.Plo \
121320 + ./$(DEPDIR)/SubchannelData.Plo \
121321 + ./$(DEPDIR)/TrackParser.Plo ./$(DEPDIR)/Utils.Plo
121322 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
121323 + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
121324 +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
121325 + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
121326 + $(AM_CXXFLAGS) $(CXXFLAGS)
121327 +CXXLD = $(CXX)
121328 +CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
121329 + $(AM_LDFLAGS) $(LDFLAGS) -o $@
121330 +SOURCES = $(libDFBinImage2_la_SOURCES)
121331 +DIST_SOURCES = $(libDFBinImage2_la_SOURCES)
121332 +gladeDATA_INSTALL = $(INSTALL_DATA)
121333 +DATA = $(glade_DATA)
121334 +ETAGS = etags
121335 +CTAGS = ctags
121336 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
121337 +ACLOCAL = ${SHELL} /home/hoshy/Projekte/pcsx/micketup/missing --run aclocal-1.8
121338 +ALSA_LIBS = -lasound
121339 +AMDEP_FALSE = #
121340 +AMDEP_TRUE =
121341 +AMTAR = ${SHELL} /home/hoshy/Projekte/pcsx/micketup/missing --run tar
121342 +AR = ar
121343 +ARCH_PPC_FALSE =
121344 +ARCH_PPC_TRUE = #
121345 +ARCH_X86_64_FALSE =
121346 +ARCH_X86_64_TRUE = #
121347 +ARCH_X86_FALSE = #
121348 +ARCH_X86_TRUE =
121349 +AUTOCONF = ${SHELL} /home/hoshy/Projekte/pcsx/micketup/missing --run autoconf
121350 +AUTOHEADER = ${SHELL} /home/hoshy/Projekte/pcsx/micketup/missing --run autoheader
121351 +AUTOMAKE = ${SHELL} /home/hoshy/Projekte/pcsx/micketup/missing --run automake-1.8
121352 +AWK = gawk
121353 +BURN_CFLAGS =
121354 +BURN_LIBS =
121355 +CC = gcc
121356 +CCAS = gcc
121357 +CCASFLAGS = -g -O2
121358 +CCDEPMODE = depmode=gcc3
121359 +CFLAGS = -g -O2
121360 +CPP = gcc -E
121361 +CPPFLAGS =
121362 +CXX = g++
121363 +CXXCPP = g++ -E
121364 +CXXDEPMODE = depmode=gcc3
121365 +CXXFLAGS = -g -O2
121366 +CYGPATH_W = echo
121367 +DEFS = -DHAVE_CONFIG_H
121368 +DEPDIR = .deps
121369 +DFBINIMAGE =
121370 +ECHO = echo
121371 +ECHO_C =
121372 +ECHO_N = -n
121373 +ECHO_T =
121374 +EGREP = grep -E
121375 +ENABLE_NAUTILUSBURN_FALSE =
121376 +ENABLE_NAUTILUSBURN_TRUE = #
121377 +EXEEXT =
121378 +F77 =
121379 +FFLAGS =
121380 +FLTKCONFIG =
121381 +FLTK_CXXFLAGS =
121382 +FLTK_LDFLAGS =
121383 +GETTEXT_PACKAGE = pcsx-df
121384 +GLADE2_CFLAGS = -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/local/include/libglade-2.0 -I/usr/local/include/gtk-2.0 -I/usr/local/include/libxml2 -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/atk-1.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libpng12
121385 +GLADE2_LIBS = -L/usr/local/lib -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
121386 +GLIB2_CFLAGS = -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include
121387 +GLIB2_LIBS = -L/usr/local/lib -lglib-2.0
121388 +GMSGFMT = /usr/bin/msgfmt
121389 +GTK2_CFLAGS = -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/atk-1.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libpng12
121390 +GTK2_LIBS = -L/usr/local/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
121391 +HAVE_ALSA_FALSE = #
121392 +HAVE_ALSA_TRUE =
121393 +INSTALL_DATA = ${INSTALL} -m 644
121394 +INSTALL_PROGRAM = ${INSTALL}
121395 +INSTALL_SCRIPT = ${INSTALL}
121396 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
121397 +INTLLIBS =
121398 +LDFLAGS =
121399 +LIBICONV = -liconv
121400 +LIBINTL =
121401 +LIBOBJS =
121402 +LIBS =
121403 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
121404 +LN_S = ln -s
121405 +LTLIBICONV = -liconv
121406 +LTLIBINTL =
121407 +LTLIBOBJS =
121408 +MAINT = #
121409 +MAINTAINER_MODE_FALSE =
121410 +MAINTAINER_MODE_TRUE = #
121411 +MAKEINFO = ${SHELL} /home/hoshy/Projekte/pcsx/micketup/missing --run makeinfo
121412 +MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
121413 +MSGFMT = /usr/bin/msgfmt
121414 +MSGMERGE = /usr/bin/msgmerge
121415 +NASM = /usr/bin/nasm
121416 +OBJEXT = o
121417 +PACKAGE = pcsx-df
121418 +PACKAGE_BUGREPORT =
121419 +PACKAGE_NAME =
121420 +PACKAGE_STRING =
121421 +PACKAGE_TARNAME =
121422 +PACKAGE_VERSION =
121423 +PATH_SEPARATOR = :
121424 +PKG_CONFIG = /usr/local/bin/pkg-config
121425 +POSUB = po
121426 +RANLIB = ranlib
121427 +SET_MAKE =
121428 +SHELL = /bin/sh
121429 +STRIP = strip
121430 +USE_NLS = yes
121431 +VERSION = 1.816a
121432 +XGETTEXT = /usr/bin/xgettext
121433 +ac_ct_AR = ar
121434 +ac_ct_CC = gcc
121435 +ac_ct_CXX = g++
121436 +ac_ct_F77 =
121437 +ac_ct_RANLIB = ranlib
121438 +ac_ct_STRIP = strip
121439 +ac_pt_PKG_CONFIG = /usr/local/bin/pkg-config
121440 +am__fastdepCC_FALSE = #
121441 +am__fastdepCC_TRUE =
121442 +am__fastdepCXX_FALSE = #
121443 +am__fastdepCXX_TRUE =
121444 +am__include = include
121445 +am__leading_dot = .
121446 +am__quote =
121447 +bindir = ${exec_prefix}/bin
121448 +build = i686-pc-linux-gnu
121449 +build_alias =
121450 +build_cpu = i686
121451 +build_os = linux-gnu
121452 +build_vendor = pc
121453 +datadir = ${prefix}/share
121454 +exec_prefix = ${prefix}
121455 +host = i686-pc-linux-gnu
121456 +host_alias =
121457 +host_cpu = i686
121458 +host_os = linux-gnu
121459 +host_vendor = pc
121460 +includedir = ${prefix}/include
121461 +infodir = ${prefix}/info
121462 +install_sh = /home/hoshy/Projekte/pcsx/micketup/install-sh
121463 +libdir = $(prefix)/lib/games/psemu/
121464 +libexecdir = ${exec_prefix}/libexec
121465 +localstatedir = ${prefix}/var
121466 +mandir = ${prefix}/man
121467 +mkdir_p = mkdir -p -- .
121468 +oldincludedir = /usr/include
121469 +prefix = /usr/local
121470 +program_transform_name = s,x,x,
121471 +sbindir = ${exec_prefix}/sbin
121472 +sharedstatedir = ${prefix}/com
121473 +sysconfdir = ${prefix}/etc
121474 +target = i686-pc-linux-gnu
121475 +target_alias =
121476 +target_cpu = i686
121477 +target_os = linux-gnu
121478 +target_vendor = pc
121479 +INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
121480 + -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
121481 + -DLOCALE_DIR=\"${datadir}/locale/\" \
121482 + -D__LINUX__ \
121483 + -DREVISION=3 \
121484 + -DBUILD=0 \
121485 + -DDATADIR=\"${datadir}/psemu/\" \
121486 + `pkg-config --cflags sdl vorbisfile libglade-2.0 gtk+-2.0`
121487 +
121488 +lib_LTLIBRARIES = libDFBinImage2.la
121489 +libDFBinImage2_la_LIBADD = -lstdc++ -lz -lbz2 -lpthread -lvorbis
121490 +libDFBinImage2_la_LDFLAGS = -module -avoid-version \
121491 + `pkg-config --libs sdl vorbisfile libglade-2.0 gtk+-2.0`
121492 +
121493 +libDFBinImage2_la_SOURCES = About.cpp PlayCDDAData.cpp ConfigCallbacks.cpp \
121494 + ConfigFunctions.cpp TrackParser.cpp FileInterface.cpp Globals.cpp \
121495 + Open.cpp PS2Open.cpp Preferences.cpp SubchannelData.cpp Utils.cpp \
121496 + PlayOGGData.cpp RipCDDAData.cpp
121497 +
121498 +glade_DATA = dfbinimage.glade2
121499 +gladedir = $(datadir)/psemu/
121500 +EXTRA_DIST = $(glade_DATA)
121501 +all: all-am
121502 +
121503 +.SUFFIXES:
121504 +.SUFFIXES: .cpp .lo .o .obj
121505 +$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
121506 + @for dep in $?; do \
121507 + case '$(am__configure_deps)' in \
121508 + *$$dep*) \
121509 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
121510 + && exit 0; \
121511 + exit 1;; \
121512 + esac; \
121513 + done; \
121514 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfbinimage2/Makefile'; \
121515 + cd $(top_srcdir) && \
121516 + $(AUTOMAKE) --gnu plugins/dfbinimage2/Makefile
121517 +.PRECIOUS: Makefile
121518 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
121519 + @case '$?' in \
121520 + *config.status*) \
121521 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
121522 + *) \
121523 + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
121524 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
121525 + esac;
121526 +
121527 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
121528 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
121529 +
121530 +$(top_srcdir)/configure: # $(am__configure_deps)
121531 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
121532 +$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
121533 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
121534 +install-libLTLIBRARIES: $(lib_LTLIBRARIES)
121535 + @$(NORMAL_INSTALL)
121536 + $(mkdir_p) $(DESTDIR)$(libdir)
121537 + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
121538 + if test -f $$p; then \
121539 + f="`echo $$p | sed -e 's|^.*/||'`"; \
121540 + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
121541 + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
121542 + else :; fi; \
121543 + done
121544 +
121545 +uninstall-libLTLIBRARIES:
121546 + @$(NORMAL_UNINSTALL)
121547 + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
121548 + p="`echo $$p | sed -e 's|^.*/||'`"; \
121549 + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
121550 + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
121551 + done
121552 +
121553 +clean-libLTLIBRARIES:
121554 + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
121555 + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
121556 + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
121557 + test "$$dir" = "$$p" && dir=.; \
121558 + echo "rm -f \"$${dir}/so_locations\""; \
121559 + rm -f "$${dir}/so_locations"; \
121560 + done
121561 +libDFBinImage2.la: $(libDFBinImage2_la_OBJECTS) $(libDFBinImage2_la_DEPENDENCIES)
121562 + $(CXXLINK) -rpath $(libdir) $(libDFBinImage2_la_LDFLAGS) $(libDFBinImage2_la_OBJECTS) $(libDFBinImage2_la_LIBADD) $(LIBS)
121563 +
121564 +mostlyclean-compile:
121565 + -rm -f *.$(OBJEXT)
121566 +
121567 +distclean-compile:
121568 + -rm -f *.tab.c
121569 +
121570 +include ./$(DEPDIR)/About.Plo
121571 +include ./$(DEPDIR)/ConfigCallbacks.Plo
121572 +include ./$(DEPDIR)/ConfigFunctions.Plo
121573 +include ./$(DEPDIR)/FileInterface.Plo
121574 +include ./$(DEPDIR)/Globals.Plo
121575 +include ./$(DEPDIR)/Open.Plo
121576 +include ./$(DEPDIR)/PS2Open.Plo
121577 +include ./$(DEPDIR)/PlayCDDAData.Plo
121578 +include ./$(DEPDIR)/PlayOGGData.Plo
121579 +include ./$(DEPDIR)/Preferences.Plo
121580 +include ./$(DEPDIR)/RipCDDAData.Plo
121581 +include ./$(DEPDIR)/SubchannelData.Plo
121582 +include ./$(DEPDIR)/TrackParser.Plo
121583 +include ./$(DEPDIR)/Utils.Plo
121584 +
121585 +.cpp.o:
121586 + if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
121587 + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
121588 +# source='$<' object='$@' libtool=no \
121589 +# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
121590 +# $(CXXDEPMODE) $(depcomp) \
121591 +# $(CXXCOMPILE) -c -o $@ $<
121592 +
121593 +.cpp.obj:
121594 + if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
121595 + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
121596 +# source='$<' object='$@' libtool=no \
121597 +# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
121598 +# $(CXXDEPMODE) $(depcomp) \
121599 +# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
121600 +
121601 +.cpp.lo:
121602 + if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
121603 + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
121604 +# source='$<' object='$@' libtool=yes \
121605 +# depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
121606 +# $(CXXDEPMODE) $(depcomp) \
121607 +# $(LTCXXCOMPILE) -c -o $@ $<
121608 +
121609 +mostlyclean-libtool:
121610 + -rm -f *.lo
121611 +
121612 +clean-libtool:
121613 + -rm -rf .libs _libs
121614 +
121615 +distclean-libtool:
121616 + -rm -f libtool
121617 +uninstall-info-am:
121618 +install-gladeDATA: $(glade_DATA)
121619 + @$(NORMAL_INSTALL)
121620 + $(mkdir_p) $(DESTDIR)$(gladedir)
121621 + @list='$(glade_DATA)'; for p in $$list; do \
121622 + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
121623 + f="`echo $$p | sed -e 's|^.*/||'`"; \
121624 + echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \
121625 + $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \
121626 + done
121627 +
121628 +uninstall-gladeDATA:
121629 + @$(NORMAL_UNINSTALL)
121630 + @list='$(glade_DATA)'; for p in $$list; do \
121631 + f="`echo $$p | sed -e 's|^.*/||'`"; \
121632 + echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \
121633 + rm -f $(DESTDIR)$(gladedir)/$$f; \
121634 + done
121635 +
121636 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
121637 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
121638 + unique=`for i in $$list; do \
121639 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
121640 + done | \
121641 + $(AWK) ' { files[$$0] = 1; } \
121642 + END { for (i in files) print i; }'`; \
121643 + mkid -fID $$unique
121644 +tags: TAGS
121645 +
121646 +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
121647 + $(TAGS_FILES) $(LISP)
121648 + tags=; \
121649 + here=`pwd`; \
121650 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
121651 + unique=`for i in $$list; do \
121652 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
121653 + done | \
121654 + $(AWK) ' { files[$$0] = 1; } \
121655 + END { for (i in files) print i; }'`; \
121656 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
121657 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
121658 + $$tags $$unique
121659 +ctags: CTAGS
121660 +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
121661 + $(TAGS_FILES) $(LISP)
121662 + tags=; \
121663 + here=`pwd`; \
121664 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
121665 + unique=`for i in $$list; do \
121666 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
121667 + done | \
121668 + $(AWK) ' { files[$$0] = 1; } \
121669 + END { for (i in files) print i; }'`; \
121670 + test -z "$(CTAGS_ARGS)$$tags$$unique" \
121671 + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
121672 + $$tags $$unique
121673 +
121674 +GTAGS:
121675 + here=`$(am__cd) $(top_builddir) && pwd` \
121676 + && cd $(top_srcdir) \
121677 + && gtags -i $(GTAGS_ARGS) $$here
121678 +
121679 +distclean-tags:
121680 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
121681 +
121682 +distdir: $(DISTFILES)
121683 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
121684 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
121685 + list='$(DISTFILES)'; for file in $$list; do \
121686 + case $$file in \
121687 + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
121688 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
121689 + esac; \
121690 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
121691 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
121692 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
121693 + dir="/$$dir"; \
121694 + $(mkdir_p) "$(distdir)$$dir"; \
121695 + else \
121696 + dir=''; \
121697 + fi; \
121698 + if test -d $$d/$$file; then \
121699 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
121700 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
121701 + fi; \
121702 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
121703 + else \
121704 + test -f $(distdir)/$$file \
121705 + || cp -p $$d/$$file $(distdir)/$$file \
121706 + || exit 1; \
121707 + fi; \
121708 + done
121709 +check-am: all-am
121710 +check: check-am
121711 +all-am: Makefile $(LTLIBRARIES) $(DATA)
121712 +installdirs:
121713 + $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(gladedir)
121714 +install: install-am
121715 +install-exec: install-exec-am
121716 +install-data: install-data-am
121717 +uninstall: uninstall-am
121718 +
121719 +install-am: all-am
121720 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
121721 +
121722 +installcheck: installcheck-am
121723 +install-strip:
121724 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
121725 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
121726 + `test -z '$(STRIP)' || \
121727 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
121728 +mostlyclean-generic:
121729 +
121730 +clean-generic:
121731 +
121732 +distclean-generic:
121733 + -rm -f $(CONFIG_CLEAN_FILES)
121734 +
121735 +maintainer-clean-generic:
121736 + @echo "This command is intended for maintainers to use"
121737 + @echo "it deletes files that may require special tools to rebuild."
121738 +clean: clean-am
121739 +
121740 +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
121741 + mostlyclean-am
121742 +
121743 +distclean: distclean-am
121744 + -rm -rf ./$(DEPDIR)
121745 + -rm -f Makefile
121746 +distclean-am: clean-am distclean-compile distclean-generic \
121747 + distclean-libtool distclean-tags
121748 +
121749 +dvi: dvi-am
121750 +
121751 +dvi-am:
121752 +
121753 +html: html-am
121754 +
121755 +info: info-am
121756 +
121757 +info-am:
121758 +
121759 +install-data-am: install-gladeDATA
121760 +
121761 +install-exec-am: install-libLTLIBRARIES
121762 +
121763 +install-info: install-info-am
121764 +
121765 +install-man:
121766 +
121767 +installcheck-am:
121768 +
121769 +maintainer-clean: maintainer-clean-am
121770 + -rm -rf ./$(DEPDIR)
121771 + -rm -f Makefile
121772 +maintainer-clean-am: distclean-am maintainer-clean-generic
121773 +
121774 +mostlyclean: mostlyclean-am
121775 +
121776 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
121777 + mostlyclean-libtool
121778 +
121779 +pdf: pdf-am
121780 +
121781 +pdf-am:
121782 +
121783 +ps: ps-am
121784 +
121785 +ps-am:
121786 +
121787 +uninstall-am: uninstall-gladeDATA uninstall-info-am \
121788 + uninstall-libLTLIBRARIES
121789 +
121790 +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
121791 + clean-libLTLIBRARIES clean-libtool ctags distclean \
121792 + distclean-compile distclean-generic distclean-libtool \
121793 + distclean-tags distdir dvi dvi-am html html-am info info-am \
121794 + install install-am install-data install-data-am install-exec \
121795 + install-exec-am install-gladeDATA install-info install-info-am \
121796 + install-libLTLIBRARIES install-man install-strip installcheck \
121797 + installcheck-am installdirs maintainer-clean \
121798 + maintainer-clean-generic mostlyclean mostlyclean-compile \
121799 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
121800 + tags uninstall uninstall-am uninstall-gladeDATA \
121801 + uninstall-info-am uninstall-libLTLIBRARIES
121802 +
121803 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
121804 +# Otherwise a system limit (for SysV at least) may be exceeded.
121805 +.NOEXPORT:
121806 diff -rupN original/plugins/dfbinimage2/Makefile.in new/plugins/dfbinimage2/Makefile.in
121807 --- original/plugins/dfbinimage2/Makefile.in 2009-03-29 01:17:41.000000000 -0430
121808 +++ new/plugins/dfbinimage2/Makefile.in 1969-12-31 20:00:00.000000000 -0400
121809 @@ -1,605 +0,0 @@
121810 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
121811 -# @configure_input@
121812 -
121813 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
121814 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
121815 -# This Makefile.in is free software; the Free Software Foundation
121816 -# gives unlimited permission to copy and/or distribute it,
121817 -# with or without modifications, as long as this notice is preserved.
121818 -
121819 -# This program is distributed in the hope that it will be useful,
121820 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
121821 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
121822 -# PARTICULAR PURPOSE.
121823 -
121824 -@SET_MAKE@
121825 -
121826 -
121827 -VPATH = @srcdir@
121828 -pkgdatadir = $(datadir)/@PACKAGE@
121829 -pkglibdir = $(libdir)/@PACKAGE@
121830 -pkgincludedir = $(includedir)/@PACKAGE@
121831 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
121832 -install_sh_DATA = $(install_sh) -c -m 644
121833 -install_sh_PROGRAM = $(install_sh) -c
121834 -install_sh_SCRIPT = $(install_sh) -c
121835 -INSTALL_HEADER = $(INSTALL_DATA)
121836 -transform = $(program_transform_name)
121837 -NORMAL_INSTALL = :
121838 -PRE_INSTALL = :
121839 -POST_INSTALL = :
121840 -NORMAL_UNINSTALL = :
121841 -PRE_UNINSTALL = :
121842 -POST_UNINSTALL = :
121843 -build_triplet = @build@
121844 -host_triplet = @host@
121845 -target_triplet = @target@
121846 -subdir = plugins/dfbinimage2
121847 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
121848 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
121849 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
121850 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
121851 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
121852 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
121853 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
121854 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
121855 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
121856 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
121857 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
121858 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
121859 - $(top_srcdir)/configure.ac
121860 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
121861 - $(ACLOCAL_M4)
121862 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
121863 -CONFIG_HEADER = $(top_builddir)/include/config.h
121864 -CONFIG_CLEAN_FILES =
121865 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
121866 -am__vpath_adj = case $$p in \
121867 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
121868 - *) f=$$p;; \
121869 - esac;
121870 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
121871 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gladedir)"
121872 -libLTLIBRARIES_INSTALL = $(INSTALL)
121873 -LTLIBRARIES = $(lib_LTLIBRARIES)
121874 -libDFBinImage2_la_DEPENDENCIES =
121875 -am_libDFBinImage2_la_OBJECTS = About.lo PlayCDDAData.lo \
121876 - ConfigCallbacks.lo ConfigFunctions.lo TrackParser.lo \
121877 - FileInterface.lo Globals.lo Open.lo PS2Open.lo Preferences.lo \
121878 - SubchannelData.lo Utils.lo PlayOGGData.lo RipCDDAData.lo
121879 -libDFBinImage2_la_OBJECTS = $(am_libDFBinImage2_la_OBJECTS)
121880 -libDFBinImage2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
121881 - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
121882 - $(CXXFLAGS) $(libDFBinImage2_la_LDFLAGS) $(LDFLAGS) -o $@
121883 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
121884 -depcomp = $(SHELL) $(top_srcdir)/depcomp
121885 -am__depfiles_maybe = depfiles
121886 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
121887 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
121888 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
121889 - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
121890 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
121891 -CXXLD = $(CXX)
121892 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
121893 - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
121894 - $(LDFLAGS) -o $@
121895 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
121896 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
121897 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
121898 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
121899 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
121900 -CCLD = $(CC)
121901 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
121902 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
121903 - $(LDFLAGS) -o $@
121904 -SOURCES = $(libDFBinImage2_la_SOURCES)
121905 -DIST_SOURCES = $(libDFBinImage2_la_SOURCES)
121906 -gladeDATA_INSTALL = $(INSTALL_DATA)
121907 -DATA = $(glade_DATA)
121908 -ETAGS = etags
121909 -CTAGS = ctags
121910 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
121911 -ACLOCAL = @ACLOCAL@
121912 -ALLOCA = @ALLOCA@
121913 -ALL_LINGUAS = @ALL_LINGUAS@
121914 -ALSA_LIBS = @ALSA_LIBS@
121915 -AMTAR = @AMTAR@
121916 -AR = @AR@
121917 -AUTOCONF = @AUTOCONF@
121918 -AUTOHEADER = @AUTOHEADER@
121919 -AUTOMAKE = @AUTOMAKE@
121920 -AWK = @AWK@
121921 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
121922 -BURN_CFLAGS = @BURN_CFLAGS@
121923 -BURN_LIBS = @BURN_LIBS@
121924 -CATOBJEXT = @CATOBJEXT@
121925 -CC = @CC@
121926 -CCAS = @CCAS@
121927 -CCASDEPMODE = @CCASDEPMODE@
121928 -CCASFLAGS = @CCASFLAGS@
121929 -CCDEPMODE = @CCDEPMODE@
121930 -CFLAGS = @CFLAGS@
121931 -CPP = @CPP@
121932 -CPPFLAGS = @CPPFLAGS@
121933 -CXX = @CXX@
121934 -CXXCPP = @CXXCPP@
121935 -CXXDEPMODE = @CXXDEPMODE@
121936 -CXXFLAGS = @CXXFLAGS@
121937 -CYGPATH_W = @CYGPATH_W@
121938 -DATADIRNAME = @DATADIRNAME@
121939 -DEFS = @DEFS@
121940 -DEPDIR = @DEPDIR@
121941 -DFBINIMAGE = @DFBINIMAGE@
121942 -DSYMUTIL = @DSYMUTIL@
121943 -ECHO = @ECHO@
121944 -ECHO_C = @ECHO_C@
121945 -ECHO_N = @ECHO_N@
121946 -ECHO_T = @ECHO_T@
121947 -EGREP = @EGREP@
121948 -EXEEXT = @EXEEXT@
121949 -F77 = @F77@
121950 -FFLAGS = @FFLAGS@
121951 -FLTKCONFIG = @FLTKCONFIG@
121952 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
121953 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
121954 -GENCAT = @GENCAT@
121955 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
121956 -GIO2_CFLAGS = @GIO2_CFLAGS@
121957 -GIO2_LIBS = @GIO2_LIBS@
121958 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
121959 -GLADE2_LIBS = @GLADE2_LIBS@
121960 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
121961 -GLIB2_LIBS = @GLIB2_LIBS@
121962 -GLIBC21 = @GLIBC21@
121963 -GMSGFMT = @GMSGFMT@
121964 -GREP = @GREP@
121965 -GTK2_CFLAGS = @GTK2_CFLAGS@
121966 -GTK2_LIBS = @GTK2_LIBS@
121967 -INSTALL = @INSTALL@
121968 -INSTALL_DATA = @INSTALL_DATA@
121969 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
121970 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
121971 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
121972 -INSTOBJEXT = @INSTOBJEXT@
121973 -INTLBISON = @INTLBISON@
121974 -INTLLIBS = @INTLLIBS@
121975 -INTLOBJS = @INTLOBJS@
121976 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
121977 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
121978 -INTLTOOL_PERL = @INTLTOOL_PERL@
121979 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
121980 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
121981 -LDFLAGS = @LDFLAGS@
121982 -LIBICONV = @LIBICONV@
121983 -LIBINTL = @LIBINTL@
121984 -LIBOBJS = @LIBOBJS@
121985 -LIBS = @LIBS@
121986 -LIBTOOL = @LIBTOOL@
121987 -LN_S = @LN_S@
121988 -LTLIBICONV = @LTLIBICONV@
121989 -LTLIBINTL = @LTLIBINTL@
121990 -LTLIBOBJS = @LTLIBOBJS@
121991 -MAINT = @MAINT@
121992 -MAKEINFO = @MAKEINFO@
121993 -MKDIR_P = @MKDIR_P@
121994 -MKINSTALLDIRS = @MKINSTALLDIRS@
121995 -MSGFMT = @MSGFMT@
121996 -MSGMERGE = @MSGMERGE@
121997 -NASM = @NASM@
121998 -NMEDIT = @NMEDIT@
121999 -OBJEXT = @OBJEXT@
122000 -PACKAGE = @PACKAGE@
122001 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
122002 -PACKAGE_NAME = @PACKAGE_NAME@
122003 -PACKAGE_STRING = @PACKAGE_STRING@
122004 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
122005 -PACKAGE_VERSION = @PACKAGE_VERSION@
122006 -PATH_SEPARATOR = @PATH_SEPARATOR@
122007 -PKG_CONFIG = @PKG_CONFIG@
122008 -POSUB = @POSUB@
122009 -RANLIB = @RANLIB@
122010 -SED = @SED@
122011 -SET_MAKE = @SET_MAKE@
122012 -SHELL = @SHELL@
122013 -STRIP = @STRIP@
122014 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
122015 -USE_NLS = @USE_NLS@
122016 -VERSION = @VERSION@
122017 -XGETTEXT = @XGETTEXT@
122018 -abs_builddir = @abs_builddir@
122019 -abs_srcdir = @abs_srcdir@
122020 -abs_top_builddir = @abs_top_builddir@
122021 -abs_top_srcdir = @abs_top_srcdir@
122022 -ac_ct_CC = @ac_ct_CC@
122023 -ac_ct_CXX = @ac_ct_CXX@
122024 -ac_ct_F77 = @ac_ct_F77@
122025 -am__include = @am__include@
122026 -am__leading_dot = @am__leading_dot@
122027 -am__quote = @am__quote@
122028 -am__tar = @am__tar@
122029 -am__untar = @am__untar@
122030 -bindir = @bindir@
122031 -build = @build@
122032 -build_alias = @build_alias@
122033 -build_cpu = @build_cpu@
122034 -build_os = @build_os@
122035 -build_vendor = @build_vendor@
122036 -builddir = @builddir@
122037 -datadir = @datadir@
122038 -datarootdir = @datarootdir@
122039 -docdir = @docdir@
122040 -dvidir = @dvidir@
122041 -exec_prefix = @exec_prefix@
122042 -host = @host@
122043 -host_alias = @host_alias@
122044 -host_cpu = @host_cpu@
122045 -host_os = @host_os@
122046 -host_vendor = @host_vendor@
122047 -htmldir = @htmldir@
122048 -includedir = @includedir@
122049 -infodir = @infodir@
122050 -install_sh = @install_sh@
122051 -libdir = $(prefix)/lib/games/psemu/
122052 -libexecdir = @libexecdir@
122053 -localedir = @localedir@
122054 -localstatedir = @localstatedir@
122055 -mandir = @mandir@
122056 -mkdir_p = @mkdir_p@
122057 -oldincludedir = @oldincludedir@
122058 -pdfdir = @pdfdir@
122059 -prefix = @prefix@
122060 -program_transform_name = @program_transform_name@
122061 -psdir = @psdir@
122062 -sbindir = @sbindir@
122063 -sharedstatedir = @sharedstatedir@
122064 -srcdir = @srcdir@
122065 -sysconfdir = @sysconfdir@
122066 -target = @target@
122067 -target_alias = @target_alias@
122068 -target_cpu = @target_cpu@
122069 -target_os = @target_os@
122070 -target_vendor = @target_vendor@
122071 -top_build_prefix = @top_build_prefix@
122072 -top_builddir = @top_builddir@
122073 -top_srcdir = @top_srcdir@
122074 -INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
122075 - -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
122076 - -DLOCALE_DIR=\"${datadir}/locale/\" \
122077 - -D__LINUX__ \
122078 - -DREVISION=3 \
122079 - -DBUILD=0 \
122080 - -DDATADIR=\"${datadir}/psemu/\" \
122081 - `pkg-config --cflags sdl vorbisfile libglade-2.0 gtk+-2.0`
122082 -
122083 -lib_LTLIBRARIES = libDFBinImage2.la
122084 -libDFBinImage2_la_LIBADD = -lstdc++ -lz -lbz2 -lpthread -lvorbis
122085 -libDFBinImage2_la_LDFLAGS = -module -avoid-version \
122086 - `pkg-config --libs sdl vorbisfile libglade-2.0 gtk+-2.0`
122087 -
122088 -libDFBinImage2_la_SOURCES = About.cpp PlayCDDAData.cpp \
122089 - CDDAData.hpp ConfigCallbacks.cpp ConfigCallbacks.hpp \
122090 - ConfigFunctions.cpp TrackParser.cpp TrackParser.hpp \
122091 - FileInterface.cpp FileInterface.hpp Globals.cpp \
122092 - Open.cpp PS2Open.cpp Preferences.cpp Preferences.hpp \
122093 - SubchannelData.cpp SubchannelData.hpp \
122094 - Utils.cpp Utils.hpp \
122095 - PlayOGGData.cpp RipCDDAData.cpp RipCDDAData.hpp \
122096 - defines.h externs.h
122097 -
122098 -glade_DATA = dfbinimage.glade2
122099 -gladedir = $(datadir)/psemu/
122100 -EXTRA_DIST = $(glade_DATA) CDInterface.hpp CDTime.hpp Exception.hpp \
122101 - Frame.hpp TimeCache.hpp TrackInfo.hpp \
122102 - OGG_README.txt notes.txt
122103 -
122104 -all: all-am
122105 -
122106 -.SUFFIXES:
122107 -.SUFFIXES: .cpp .lo .o .obj
122108 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
122109 - @for dep in $?; do \
122110 - case '$(am__configure_deps)' in \
122111 - *$$dep*) \
122112 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
122113 - && exit 0; \
122114 - exit 1;; \
122115 - esac; \
122116 - done; \
122117 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfbinimage2/Makefile'; \
122118 - cd $(top_srcdir) && \
122119 - $(AUTOMAKE) --gnu plugins/dfbinimage2/Makefile
122120 -.PRECIOUS: Makefile
122121 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
122122 - @case '$?' in \
122123 - *config.status*) \
122124 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
122125 - *) \
122126 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
122127 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
122128 - esac;
122129 -
122130 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
122131 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
122132 -
122133 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
122134 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
122135 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
122136 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
122137 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
122138 - @$(NORMAL_INSTALL)
122139 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
122140 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
122141 - if test -f $$p; then \
122142 - f=$(am__strip_dir) \
122143 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
122144 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
122145 - else :; fi; \
122146 - done
122147 -
122148 -uninstall-libLTLIBRARIES:
122149 - @$(NORMAL_UNINSTALL)
122150 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
122151 - p=$(am__strip_dir) \
122152 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
122153 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
122154 - done
122155 -
122156 -clean-libLTLIBRARIES:
122157 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
122158 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
122159 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
122160 - test "$$dir" != "$$p" || dir=.; \
122161 - echo "rm -f \"$${dir}/so_locations\""; \
122162 - rm -f "$${dir}/so_locations"; \
122163 - done
122164 -libDFBinImage2.la: $(libDFBinImage2_la_OBJECTS) $(libDFBinImage2_la_DEPENDENCIES)
122165 - $(libDFBinImage2_la_LINK) -rpath $(libdir) $(libDFBinImage2_la_OBJECTS) $(libDFBinImage2_la_LIBADD) $(LIBS)
122166 -
122167 -mostlyclean-compile:
122168 - -rm -f *.$(OBJEXT)
122169 -
122170 -distclean-compile:
122171 - -rm -f *.tab.c
122172 -
122173 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/About.Plo@am__quote@
122174 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigCallbacks.Plo@am__quote@
122175 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigFunctions.Plo@am__quote@
122176 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileInterface.Plo@am__quote@
122177 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Globals.Plo@am__quote@
122178 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Open.Plo@am__quote@
122179 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PS2Open.Plo@am__quote@
122180 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayCDDAData.Plo@am__quote@
122181 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayOGGData.Plo@am__quote@
122182 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Preferences.Plo@am__quote@
122183 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RipCDDAData.Plo@am__quote@
122184 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SubchannelData.Plo@am__quote@
122185 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrackParser.Plo@am__quote@
122186 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Utils.Plo@am__quote@
122187 -
122188 -.cpp.o:
122189 -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
122190 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
122191 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
122192 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
122193 -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
122194 -
122195 -.cpp.obj:
122196 -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
122197 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
122198 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
122199 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
122200 -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
122201 -
122202 -.cpp.lo:
122203 -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
122204 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
122205 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
122206 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
122207 -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
122208 -
122209 -mostlyclean-libtool:
122210 - -rm -f *.lo
122211 -
122212 -clean-libtool:
122213 - -rm -rf .libs _libs
122214 -install-gladeDATA: $(glade_DATA)
122215 - @$(NORMAL_INSTALL)
122216 - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
122217 - @list='$(glade_DATA)'; for p in $$list; do \
122218 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
122219 - f=$(am__strip_dir) \
122220 - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
122221 - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
122222 - done
122223 -
122224 -uninstall-gladeDATA:
122225 - @$(NORMAL_UNINSTALL)
122226 - @list='$(glade_DATA)'; for p in $$list; do \
122227 - f=$(am__strip_dir) \
122228 - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
122229 - rm -f "$(DESTDIR)$(gladedir)/$$f"; \
122230 - done
122231 -
122232 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
122233 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
122234 - unique=`for i in $$list; do \
122235 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
122236 - done | \
122237 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
122238 - END { if (nonempty) { for (i in files) print i; }; }'`; \
122239 - mkid -fID $$unique
122240 -tags: TAGS
122241 -
122242 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
122243 - $(TAGS_FILES) $(LISP)
122244 - tags=; \
122245 - here=`pwd`; \
122246 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
122247 - unique=`for i in $$list; do \
122248 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
122249 - done | \
122250 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
122251 - END { if (nonempty) { for (i in files) print i; }; }'`; \
122252 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
122253 - test -n "$$unique" || unique=$$empty_fix; \
122254 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
122255 - $$tags $$unique; \
122256 - fi
122257 -ctags: CTAGS
122258 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
122259 - $(TAGS_FILES) $(LISP)
122260 - tags=; \
122261 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
122262 - unique=`for i in $$list; do \
122263 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
122264 - done | \
122265 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
122266 - END { if (nonempty) { for (i in files) print i; }; }'`; \
122267 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
122268 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
122269 - $$tags $$unique
122270 -
122271 -GTAGS:
122272 - here=`$(am__cd) $(top_builddir) && pwd` \
122273 - && cd $(top_srcdir) \
122274 - && gtags -i $(GTAGS_ARGS) $$here
122275 -
122276 -distclean-tags:
122277 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
122278 -
122279 -distdir: $(DISTFILES)
122280 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
122281 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
122282 - list='$(DISTFILES)'; \
122283 - dist_files=`for file in $$list; do echo $$file; done | \
122284 - sed -e "s|^$$srcdirstrip/||;t" \
122285 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
122286 - case $$dist_files in \
122287 - */*) $(MKDIR_P) `echo "$$dist_files" | \
122288 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
122289 - sort -u` ;; \
122290 - esac; \
122291 - for file in $$dist_files; do \
122292 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
122293 - if test -d $$d/$$file; then \
122294 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
122295 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
122296 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
122297 - fi; \
122298 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
122299 - else \
122300 - test -f $(distdir)/$$file \
122301 - || cp -p $$d/$$file $(distdir)/$$file \
122302 - || exit 1; \
122303 - fi; \
122304 - done
122305 -check-am: all-am
122306 -check: check-am
122307 -all-am: Makefile $(LTLIBRARIES) $(DATA)
122308 -installdirs:
122309 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gladedir)"; do \
122310 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
122311 - done
122312 -install: install-am
122313 -install-exec: install-exec-am
122314 -install-data: install-data-am
122315 -uninstall: uninstall-am
122316 -
122317 -install-am: all-am
122318 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
122319 -
122320 -installcheck: installcheck-am
122321 -install-strip:
122322 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
122323 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
122324 - `test -z '$(STRIP)' || \
122325 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
122326 -mostlyclean-generic:
122327 -
122328 -clean-generic:
122329 -
122330 -distclean-generic:
122331 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
122332 -
122333 -maintainer-clean-generic:
122334 - @echo "This command is intended for maintainers to use"
122335 - @echo "it deletes files that may require special tools to rebuild."
122336 -clean: clean-am
122337 -
122338 -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
122339 - mostlyclean-am
122340 -
122341 -distclean: distclean-am
122342 - -rm -rf ./$(DEPDIR)
122343 - -rm -f Makefile
122344 -distclean-am: clean-am distclean-compile distclean-generic \
122345 - distclean-tags
122346 -
122347 -dvi: dvi-am
122348 -
122349 -dvi-am:
122350 -
122351 -html: html-am
122352 -
122353 -info: info-am
122354 -
122355 -info-am:
122356 -
122357 -install-data-am: install-gladeDATA
122358 -
122359 -install-dvi: install-dvi-am
122360 -
122361 -install-exec-am: install-libLTLIBRARIES
122362 -
122363 -install-html: install-html-am
122364 -
122365 -install-info: install-info-am
122366 -
122367 -install-man:
122368 -
122369 -install-pdf: install-pdf-am
122370 -
122371 -install-ps: install-ps-am
122372 -
122373 -installcheck-am:
122374 -
122375 -maintainer-clean: maintainer-clean-am
122376 - -rm -rf ./$(DEPDIR)
122377 - -rm -f Makefile
122378 -maintainer-clean-am: distclean-am maintainer-clean-generic
122379 -
122380 -mostlyclean: mostlyclean-am
122381 -
122382 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
122383 - mostlyclean-libtool
122384 -
122385 -pdf: pdf-am
122386 -
122387 -pdf-am:
122388 -
122389 -ps: ps-am
122390 -
122391 -ps-am:
122392 -
122393 -uninstall-am: uninstall-gladeDATA uninstall-libLTLIBRARIES
122394 -
122395 -.MAKE: install-am install-strip
122396 -
122397 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
122398 - clean-libLTLIBRARIES clean-libtool ctags distclean \
122399 - distclean-compile distclean-generic distclean-libtool \
122400 - distclean-tags distdir dvi dvi-am html html-am info info-am \
122401 - install install-am install-data install-data-am install-dvi \
122402 - install-dvi-am install-exec install-exec-am install-gladeDATA \
122403 - install-html install-html-am install-info install-info-am \
122404 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
122405 - install-ps install-ps-am install-strip installcheck \
122406 - installcheck-am installdirs maintainer-clean \
122407 - maintainer-clean-generic mostlyclean mostlyclean-compile \
122408 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
122409 - tags uninstall uninstall-am uninstall-gladeDATA \
122410 - uninstall-libLTLIBRARIES
122411 -
122412 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
122413 -# Otherwise a system limit (for SysV at least) may be exceeded.
122414 -.NOEXPORT:
122415 diff -rupN original/plugins/dfcdrom/Makefile.in new/plugins/dfcdrom/Makefile.in
122416 --- original/plugins/dfcdrom/Makefile.in 2009-03-29 01:17:41.000000000 -0430
122417 +++ new/plugins/dfcdrom/Makefile.in 1969-12-31 20:00:00.000000000 -0400
122418 @@ -1,594 +0,0 @@
122419 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
122420 -# @configure_input@
122421 -
122422 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
122423 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
122424 -# This Makefile.in is free software; the Free Software Foundation
122425 -# gives unlimited permission to copy and/or distribute it,
122426 -# with or without modifications, as long as this notice is preserved.
122427 -
122428 -# This program is distributed in the hope that it will be useful,
122429 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
122430 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
122431 -# PARTICULAR PURPOSE.
122432 -
122433 -@SET_MAKE@
122434 -
122435 -
122436 -VPATH = @srcdir@
122437 -pkgdatadir = $(datadir)/@PACKAGE@
122438 -pkglibdir = $(libdir)/@PACKAGE@
122439 -pkgincludedir = $(includedir)/@PACKAGE@
122440 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
122441 -install_sh_DATA = $(install_sh) -c -m 644
122442 -install_sh_PROGRAM = $(install_sh) -c
122443 -install_sh_SCRIPT = $(install_sh) -c
122444 -INSTALL_HEADER = $(INSTALL_DATA)
122445 -transform = $(program_transform_name)
122446 -NORMAL_INSTALL = :
122447 -PRE_INSTALL = :
122448 -POST_INSTALL = :
122449 -NORMAL_UNINSTALL = :
122450 -PRE_UNINSTALL = :
122451 -POST_UNINSTALL = :
122452 -build_triplet = @build@
122453 -host_triplet = @host@
122454 -target_triplet = @target@
122455 -bin_PROGRAMS = cfgDFCdrom$(EXEEXT)
122456 -subdir = plugins/dfcdrom
122457 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
122458 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
122459 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
122460 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
122461 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
122462 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
122463 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
122464 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
122465 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
122466 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
122467 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
122468 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
122469 - $(top_srcdir)/configure.ac
122470 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
122471 - $(ACLOCAL_M4)
122472 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
122473 -CONFIG_HEADER = $(top_builddir)/include/config.h
122474 -CONFIG_CLEAN_FILES =
122475 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
122476 -am__vpath_adj = case $$p in \
122477 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
122478 - *) f=$$p;; \
122479 - esac;
122480 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
122481 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
122482 -libLTLIBRARIES_INSTALL = $(INSTALL)
122483 -LTLIBRARIES = $(lib_LTLIBRARIES)
122484 -libDFCdrom_la_LIBADD =
122485 -am_libDFCdrom_la_OBJECTS = cdr.lo cfg.lo
122486 -libDFCdrom_la_OBJECTS = $(am_libDFCdrom_la_OBJECTS)
122487 -libDFCdrom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
122488 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
122489 - $(libDFCdrom_la_LDFLAGS) $(LDFLAGS) -o $@
122490 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
122491 -PROGRAMS = $(bin_PROGRAMS)
122492 -am_cfgDFCdrom_OBJECTS = cfg-gtk2.$(OBJEXT) main.$(OBJEXT) \
122493 - support.$(OBJEXT) interface.$(OBJEXT) callbacks.$(OBJEXT)
122494 -cfgDFCdrom_OBJECTS = $(am_cfgDFCdrom_OBJECTS)
122495 -am__DEPENDENCIES_1 =
122496 -cfgDFCdrom_DEPENDENCIES = $(am__DEPENDENCIES_1)
122497 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
122498 -depcomp = $(SHELL) $(top_srcdir)/depcomp
122499 -am__depfiles_maybe = depfiles
122500 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
122501 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
122502 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
122503 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
122504 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
122505 -CCLD = $(CC)
122506 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
122507 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
122508 - $(LDFLAGS) -o $@
122509 -SOURCES = $(libDFCdrom_la_SOURCES) $(cfgDFCdrom_SOURCES)
122510 -DIST_SOURCES = $(libDFCdrom_la_SOURCES) $(cfgDFCdrom_SOURCES)
122511 -ETAGS = etags
122512 -CTAGS = ctags
122513 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
122514 -ACLOCAL = @ACLOCAL@
122515 -ALLOCA = @ALLOCA@
122516 -ALL_LINGUAS = @ALL_LINGUAS@
122517 -ALSA_LIBS = @ALSA_LIBS@
122518 -AMTAR = @AMTAR@
122519 -AR = @AR@
122520 -AUTOCONF = @AUTOCONF@
122521 -AUTOHEADER = @AUTOHEADER@
122522 -AUTOMAKE = @AUTOMAKE@
122523 -AWK = @AWK@
122524 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
122525 -BURN_CFLAGS = @BURN_CFLAGS@
122526 -BURN_LIBS = @BURN_LIBS@
122527 -CATOBJEXT = @CATOBJEXT@
122528 -CC = @CC@
122529 -CCAS = @CCAS@
122530 -CCASDEPMODE = @CCASDEPMODE@
122531 -CCASFLAGS = @CCASFLAGS@
122532 -CCDEPMODE = @CCDEPMODE@
122533 -CFLAGS = @CFLAGS@
122534 -CPP = @CPP@
122535 -CPPFLAGS = @CPPFLAGS@
122536 -CXX = @CXX@
122537 -CXXCPP = @CXXCPP@
122538 -CXXDEPMODE = @CXXDEPMODE@
122539 -CXXFLAGS = @CXXFLAGS@
122540 -CYGPATH_W = @CYGPATH_W@
122541 -DATADIRNAME = @DATADIRNAME@
122542 -DEFS = @DEFS@
122543 -DEPDIR = @DEPDIR@
122544 -DFBINIMAGE = @DFBINIMAGE@
122545 -DSYMUTIL = @DSYMUTIL@
122546 -ECHO = @ECHO@
122547 -ECHO_C = @ECHO_C@
122548 -ECHO_N = @ECHO_N@
122549 -ECHO_T = @ECHO_T@
122550 -EGREP = @EGREP@
122551 -EXEEXT = @EXEEXT@
122552 -F77 = @F77@
122553 -FFLAGS = @FFLAGS@
122554 -FLTKCONFIG = @FLTKCONFIG@
122555 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
122556 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
122557 -GENCAT = @GENCAT@
122558 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
122559 -GIO2_CFLAGS = @GIO2_CFLAGS@
122560 -GIO2_LIBS = @GIO2_LIBS@
122561 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
122562 -GLADE2_LIBS = @GLADE2_LIBS@
122563 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
122564 -GLIB2_LIBS = @GLIB2_LIBS@
122565 -GLIBC21 = @GLIBC21@
122566 -GMSGFMT = @GMSGFMT@
122567 -GREP = @GREP@
122568 -GTK2_CFLAGS = @GTK2_CFLAGS@
122569 -GTK2_LIBS = @GTK2_LIBS@
122570 -INSTALL = @INSTALL@
122571 -INSTALL_DATA = @INSTALL_DATA@
122572 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
122573 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
122574 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
122575 -INSTOBJEXT = @INSTOBJEXT@
122576 -INTLBISON = @INTLBISON@
122577 -INTLLIBS = @INTLLIBS@
122578 -INTLOBJS = @INTLOBJS@
122579 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
122580 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
122581 -INTLTOOL_PERL = @INTLTOOL_PERL@
122582 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
122583 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
122584 -LDFLAGS = @LDFLAGS@
122585 -LIBICONV = @LIBICONV@
122586 -LIBINTL = @LIBINTL@
122587 -LIBOBJS = @LIBOBJS@
122588 -LIBS = @LIBS@
122589 -LIBTOOL = @LIBTOOL@
122590 -LN_S = @LN_S@
122591 -LTLIBICONV = @LTLIBICONV@
122592 -LTLIBINTL = @LTLIBINTL@
122593 -LTLIBOBJS = @LTLIBOBJS@
122594 -MAINT = @MAINT@
122595 -MAKEINFO = @MAKEINFO@
122596 -MKDIR_P = @MKDIR_P@
122597 -MKINSTALLDIRS = @MKINSTALLDIRS@
122598 -MSGFMT = @MSGFMT@
122599 -MSGMERGE = @MSGMERGE@
122600 -NASM = @NASM@
122601 -NMEDIT = @NMEDIT@
122602 -OBJEXT = @OBJEXT@
122603 -PACKAGE = @PACKAGE@
122604 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
122605 -PACKAGE_NAME = @PACKAGE_NAME@
122606 -PACKAGE_STRING = @PACKAGE_STRING@
122607 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
122608 -PACKAGE_VERSION = @PACKAGE_VERSION@
122609 -PATH_SEPARATOR = @PATH_SEPARATOR@
122610 -PKG_CONFIG = @PKG_CONFIG@
122611 -POSUB = @POSUB@
122612 -RANLIB = @RANLIB@
122613 -SED = @SED@
122614 -SET_MAKE = @SET_MAKE@
122615 -SHELL = @SHELL@
122616 -STRIP = @STRIP@
122617 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
122618 -USE_NLS = @USE_NLS@
122619 -VERSION = @VERSION@
122620 -XGETTEXT = @XGETTEXT@
122621 -abs_builddir = @abs_builddir@
122622 -abs_srcdir = @abs_srcdir@
122623 -abs_top_builddir = @abs_top_builddir@
122624 -abs_top_srcdir = @abs_top_srcdir@
122625 -ac_ct_CC = @ac_ct_CC@
122626 -ac_ct_CXX = @ac_ct_CXX@
122627 -ac_ct_F77 = @ac_ct_F77@
122628 -am__include = @am__include@
122629 -am__leading_dot = @am__leading_dot@
122630 -am__quote = @am__quote@
122631 -am__tar = @am__tar@
122632 -am__untar = @am__untar@
122633 -bindir = $(prefix)/lib/games/psemu/
122634 -build = @build@
122635 -build_alias = @build_alias@
122636 -build_cpu = @build_cpu@
122637 -build_os = @build_os@
122638 -build_vendor = @build_vendor@
122639 -builddir = @builddir@
122640 -datadir = @datadir@
122641 -datarootdir = @datarootdir@
122642 -docdir = @docdir@
122643 -dvidir = @dvidir@
122644 -exec_prefix = @exec_prefix@
122645 -host = @host@
122646 -host_alias = @host_alias@
122647 -host_cpu = @host_cpu@
122648 -host_os = @host_os@
122649 -host_vendor = @host_vendor@
122650 -htmldir = @htmldir@
122651 -includedir = @includedir@
122652 -infodir = @infodir@
122653 -install_sh = @install_sh@
122654 -libdir = $(prefix)/lib/games/psemu/
122655 -libexecdir = @libexecdir@
122656 -localedir = @localedir@
122657 -localstatedir = @localstatedir@
122658 -mandir = @mandir@
122659 -mkdir_p = @mkdir_p@
122660 -oldincludedir = @oldincludedir@
122661 -pdfdir = @pdfdir@
122662 -prefix = @prefix@
122663 -program_transform_name = @program_transform_name@
122664 -psdir = @psdir@
122665 -sbindir = @sbindir@
122666 -sharedstatedir = @sharedstatedir@
122667 -srcdir = @srcdir@
122668 -sysconfdir = @sysconfdir@
122669 -target = @target@
122670 -target_alias = @target_alias@
122671 -target_cpu = @target_cpu@
122672 -target_os = @target_os@
122673 -target_vendor = @target_vendor@
122674 -top_build_prefix = @top_build_prefix@
122675 -top_builddir = @top_builddir@
122676 -top_srcdir = @top_srcdir@
122677 -lib_LTLIBRARIES = libDFCdrom.la
122678 -libDFCdrom_la_SOURCES = cdr.c cdr.h cfg.c
122679 -libDFCdrom_la_LDFLAGS = -module -avoid-version -lpthread
122680 -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
122681 - -DLOCALE_DIR=\"${datadir}/locale/\" \
122682 - -DDATADIR=\"${datadir}/psemu/\" \
122683 - $(GTK2_CFLAGS) \
122684 - -DREVISION=1 -DBUILD=0
122685 -
122686 -cfgDFCdrom_SOURCES = cfg-gtk2.c main.c \
122687 - support.c support.h interface.c interface.h \
122688 - callbacks.c callbacks.h \
122689 - PSEmu_Plugin_Defs.h
122690 -
122691 -cfgDFCdrom_LDADD = $(GTK2_LIBS)
122692 -EXTRA_DIST = cfgCdr.glade cfgCdr.gladep
122693 -all: all-am
122694 -
122695 -.SUFFIXES:
122696 -.SUFFIXES: .c .lo .o .obj
122697 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
122698 - @for dep in $?; do \
122699 - case '$(am__configure_deps)' in \
122700 - *$$dep*) \
122701 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
122702 - && exit 0; \
122703 - exit 1;; \
122704 - esac; \
122705 - done; \
122706 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfcdrom/Makefile'; \
122707 - cd $(top_srcdir) && \
122708 - $(AUTOMAKE) --gnu plugins/dfcdrom/Makefile
122709 -.PRECIOUS: Makefile
122710 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
122711 - @case '$?' in \
122712 - *config.status*) \
122713 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
122714 - *) \
122715 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
122716 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
122717 - esac;
122718 -
122719 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
122720 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
122721 -
122722 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
122723 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
122724 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
122725 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
122726 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
122727 - @$(NORMAL_INSTALL)
122728 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
122729 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
122730 - if test -f $$p; then \
122731 - f=$(am__strip_dir) \
122732 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
122733 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
122734 - else :; fi; \
122735 - done
122736 -
122737 -uninstall-libLTLIBRARIES:
122738 - @$(NORMAL_UNINSTALL)
122739 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
122740 - p=$(am__strip_dir) \
122741 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
122742 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
122743 - done
122744 -
122745 -clean-libLTLIBRARIES:
122746 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
122747 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
122748 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
122749 - test "$$dir" != "$$p" || dir=.; \
122750 - echo "rm -f \"$${dir}/so_locations\""; \
122751 - rm -f "$${dir}/so_locations"; \
122752 - done
122753 -libDFCdrom.la: $(libDFCdrom_la_OBJECTS) $(libDFCdrom_la_DEPENDENCIES)
122754 - $(libDFCdrom_la_LINK) -rpath $(libdir) $(libDFCdrom_la_OBJECTS) $(libDFCdrom_la_LIBADD) $(LIBS)
122755 -install-binPROGRAMS: $(bin_PROGRAMS)
122756 - @$(NORMAL_INSTALL)
122757 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
122758 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
122759 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
122760 - if test -f $$p \
122761 - || test -f $$p1 \
122762 - ; then \
122763 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
122764 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
122765 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
122766 - else :; fi; \
122767 - done
122768 -
122769 -uninstall-binPROGRAMS:
122770 - @$(NORMAL_UNINSTALL)
122771 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
122772 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
122773 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
122774 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
122775 - done
122776 -
122777 -clean-binPROGRAMS:
122778 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
122779 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
122780 - echo " rm -f $$p $$f"; \
122781 - rm -f $$p $$f ; \
122782 - done
122783 -cfgDFCdrom$(EXEEXT): $(cfgDFCdrom_OBJECTS) $(cfgDFCdrom_DEPENDENCIES)
122784 - @rm -f cfgDFCdrom$(EXEEXT)
122785 - $(LINK) $(cfgDFCdrom_OBJECTS) $(cfgDFCdrom_LDADD) $(LIBS)
122786 -
122787 -mostlyclean-compile:
122788 - -rm -f *.$(OBJEXT)
122789 -
122790 -distclean-compile:
122791 - -rm -f *.tab.c
122792 -
122793 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks.Po@am__quote@
122794 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdr.Plo@am__quote@
122795 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg-gtk2.Po@am__quote@
122796 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
122797 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
122798 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
122799 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@
122800 -
122801 -.c.o:
122802 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
122803 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
122804 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
122805 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
122806 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
122807 -
122808 -.c.obj:
122809 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
122810 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
122811 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
122812 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
122813 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
122814 -
122815 -.c.lo:
122816 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
122817 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
122818 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
122819 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
122820 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
122821 -
122822 -mostlyclean-libtool:
122823 - -rm -f *.lo
122824 -
122825 -clean-libtool:
122826 - -rm -rf .libs _libs
122827 -
122828 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
122829 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
122830 - unique=`for i in $$list; do \
122831 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
122832 - done | \
122833 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
122834 - END { if (nonempty) { for (i in files) print i; }; }'`; \
122835 - mkid -fID $$unique
122836 -tags: TAGS
122837 -
122838 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
122839 - $(TAGS_FILES) $(LISP)
122840 - tags=; \
122841 - here=`pwd`; \
122842 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
122843 - unique=`for i in $$list; do \
122844 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
122845 - done | \
122846 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
122847 - END { if (nonempty) { for (i in files) print i; }; }'`; \
122848 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
122849 - test -n "$$unique" || unique=$$empty_fix; \
122850 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
122851 - $$tags $$unique; \
122852 - fi
122853 -ctags: CTAGS
122854 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
122855 - $(TAGS_FILES) $(LISP)
122856 - tags=; \
122857 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
122858 - unique=`for i in $$list; do \
122859 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
122860 - done | \
122861 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
122862 - END { if (nonempty) { for (i in files) print i; }; }'`; \
122863 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
122864 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
122865 - $$tags $$unique
122866 -
122867 -GTAGS:
122868 - here=`$(am__cd) $(top_builddir) && pwd` \
122869 - && cd $(top_srcdir) \
122870 - && gtags -i $(GTAGS_ARGS) $$here
122871 -
122872 -distclean-tags:
122873 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
122874 -
122875 -distdir: $(DISTFILES)
122876 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
122877 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
122878 - list='$(DISTFILES)'; \
122879 - dist_files=`for file in $$list; do echo $$file; done | \
122880 - sed -e "s|^$$srcdirstrip/||;t" \
122881 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
122882 - case $$dist_files in \
122883 - */*) $(MKDIR_P) `echo "$$dist_files" | \
122884 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
122885 - sort -u` ;; \
122886 - esac; \
122887 - for file in $$dist_files; do \
122888 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
122889 - if test -d $$d/$$file; then \
122890 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
122891 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
122892 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
122893 - fi; \
122894 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
122895 - else \
122896 - test -f $(distdir)/$$file \
122897 - || cp -p $$d/$$file $(distdir)/$$file \
122898 - || exit 1; \
122899 - fi; \
122900 - done
122901 -check-am: all-am
122902 -check: check-am
122903 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
122904 -install-binPROGRAMS: install-libLTLIBRARIES
122905 -
122906 -installdirs:
122907 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
122908 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
122909 - done
122910 -install: install-am
122911 -install-exec: install-exec-am
122912 -install-data: install-data-am
122913 -uninstall: uninstall-am
122914 -
122915 -install-am: all-am
122916 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
122917 -
122918 -installcheck: installcheck-am
122919 -install-strip:
122920 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
122921 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
122922 - `test -z '$(STRIP)' || \
122923 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
122924 -mostlyclean-generic:
122925 -
122926 -clean-generic:
122927 -
122928 -distclean-generic:
122929 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
122930 -
122931 -maintainer-clean-generic:
122932 - @echo "This command is intended for maintainers to use"
122933 - @echo "it deletes files that may require special tools to rebuild."
122934 -clean: clean-am
122935 -
122936 -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
122937 - clean-libtool mostlyclean-am
122938 -
122939 -distclean: distclean-am
122940 - -rm -rf ./$(DEPDIR)
122941 - -rm -f Makefile
122942 -distclean-am: clean-am distclean-compile distclean-generic \
122943 - distclean-tags
122944 -
122945 -dvi: dvi-am
122946 -
122947 -dvi-am:
122948 -
122949 -html: html-am
122950 -
122951 -info: info-am
122952 -
122953 -info-am:
122954 -
122955 -install-data-am:
122956 -
122957 -install-dvi: install-dvi-am
122958 -
122959 -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
122960 -
122961 -install-html: install-html-am
122962 -
122963 -install-info: install-info-am
122964 -
122965 -install-man:
122966 -
122967 -install-pdf: install-pdf-am
122968 -
122969 -install-ps: install-ps-am
122970 -
122971 -installcheck-am:
122972 -
122973 -maintainer-clean: maintainer-clean-am
122974 - -rm -rf ./$(DEPDIR)
122975 - -rm -f Makefile
122976 -maintainer-clean-am: distclean-am maintainer-clean-generic
122977 -
122978 -mostlyclean: mostlyclean-am
122979 -
122980 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
122981 - mostlyclean-libtool
122982 -
122983 -pdf: pdf-am
122984 -
122985 -pdf-am:
122986 -
122987 -ps: ps-am
122988 -
122989 -ps-am:
122990 -
122991 -uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
122992 -
122993 -.MAKE: install-am install-strip
122994 -
122995 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
122996 - clean-generic clean-libLTLIBRARIES clean-libtool ctags \
122997 - distclean distclean-compile distclean-generic \
122998 - distclean-libtool distclean-tags distdir dvi dvi-am html \
122999 - html-am info info-am install install-am install-binPROGRAMS \
123000 - install-data install-data-am install-dvi install-dvi-am \
123001 - install-exec install-exec-am install-html install-html-am \
123002 - install-info install-info-am install-libLTLIBRARIES \
123003 - install-man install-pdf install-pdf-am install-ps \
123004 - install-ps-am install-strip installcheck installcheck-am \
123005 - installdirs maintainer-clean maintainer-clean-generic \
123006 - mostlyclean mostlyclean-compile mostlyclean-generic \
123007 - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
123008 - uninstall-am uninstall-binPROGRAMS uninstall-libLTLIBRARIES
123009 -
123010 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
123011 -# Otherwise a system limit (for SysV at least) may be exceeded.
123012 -.NOEXPORT:
123013 diff -rupN original/plugins/dfinput/Makefile.in new/plugins/dfinput/Makefile.in
123014 --- original/plugins/dfinput/Makefile.in 2009-03-29 01:17:41.000000000 -0430
123015 +++ new/plugins/dfinput/Makefile.in 1969-12-31 20:00:00.000000000 -0400
123016 @@ -1,609 +0,0 @@
123017 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
123018 -# @configure_input@
123019 -
123020 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
123021 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
123022 -# This Makefile.in is free software; the Free Software Foundation
123023 -# gives unlimited permission to copy and/or distribute it,
123024 -# with or without modifications, as long as this notice is preserved.
123025 -
123026 -# This program is distributed in the hope that it will be useful,
123027 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
123028 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
123029 -# PARTICULAR PURPOSE.
123030 -
123031 -@SET_MAKE@
123032 -
123033 -
123034 -
123035 -VPATH = @srcdir@
123036 -pkgdatadir = $(datadir)/@PACKAGE@
123037 -pkglibdir = $(libdir)/@PACKAGE@
123038 -pkgincludedir = $(includedir)/@PACKAGE@
123039 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
123040 -install_sh_DATA = $(install_sh) -c -m 644
123041 -install_sh_PROGRAM = $(install_sh) -c
123042 -install_sh_SCRIPT = $(install_sh) -c
123043 -INSTALL_HEADER = $(INSTALL_DATA)
123044 -transform = $(program_transform_name)
123045 -NORMAL_INSTALL = :
123046 -PRE_INSTALL = :
123047 -POST_INSTALL = :
123048 -NORMAL_UNINSTALL = :
123049 -PRE_UNINSTALL = :
123050 -POST_UNINSTALL = :
123051 -build_triplet = @build@
123052 -host_triplet = @host@
123053 -target_triplet = @target@
123054 -bin_PROGRAMS = cfgDFInput$(EXEEXT)
123055 -subdir = plugins/dfinput
123056 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
123057 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
123058 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
123059 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
123060 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
123061 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
123062 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
123063 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
123064 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
123065 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
123066 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
123067 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
123068 - $(top_srcdir)/configure.ac
123069 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
123070 - $(ACLOCAL_M4)
123071 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
123072 -CONFIG_HEADER = $(top_builddir)/include/config.h
123073 -CONFIG_CLEAN_FILES =
123074 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
123075 -am__vpath_adj = case $$p in \
123076 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
123077 - *) f=$$p;; \
123078 - esac;
123079 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
123080 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
123081 - "$(DESTDIR)$(gladedir)"
123082 -libLTLIBRARIES_INSTALL = $(INSTALL)
123083 -LTLIBRARIES = $(lib_LTLIBRARIES)
123084 -libDFInput_la_LIBADD =
123085 -am_libDFInput_la_OBJECTS = pad.lo
123086 -libDFInput_la_OBJECTS = $(am_libDFInput_la_OBJECTS)
123087 -libDFInput_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
123088 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
123089 - $(libDFInput_la_LDFLAGS) $(LDFLAGS) -o $@
123090 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
123091 -PROGRAMS = $(bin_PROGRAMS)
123092 -am_cfgDFInput_OBJECTS = cfg.$(OBJEXT)
123093 -cfgDFInput_OBJECTS = $(am_cfgDFInput_OBJECTS)
123094 -am__DEPENDENCIES_1 =
123095 -cfgDFInput_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
123096 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
123097 -depcomp = $(SHELL) $(top_srcdir)/depcomp
123098 -am__depfiles_maybe = depfiles
123099 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
123100 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
123101 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
123102 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
123103 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
123104 -CCLD = $(CC)
123105 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
123106 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
123107 - $(LDFLAGS) -o $@
123108 -SOURCES = $(libDFInput_la_SOURCES) $(cfgDFInput_SOURCES)
123109 -DIST_SOURCES = $(libDFInput_la_SOURCES) $(cfgDFInput_SOURCES)
123110 -gladeDATA_INSTALL = $(INSTALL_DATA)
123111 -DATA = $(glade_DATA)
123112 -ETAGS = etags
123113 -CTAGS = ctags
123114 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
123115 -ACLOCAL = @ACLOCAL@
123116 -ALLOCA = @ALLOCA@
123117 -ALL_LINGUAS = @ALL_LINGUAS@
123118 -ALSA_LIBS = @ALSA_LIBS@
123119 -AMTAR = @AMTAR@
123120 -AR = @AR@
123121 -AUTOCONF = @AUTOCONF@
123122 -AUTOHEADER = @AUTOHEADER@
123123 -AUTOMAKE = @AUTOMAKE@
123124 -AWK = @AWK@
123125 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
123126 -BURN_CFLAGS = @BURN_CFLAGS@
123127 -BURN_LIBS = @BURN_LIBS@
123128 -CATOBJEXT = @CATOBJEXT@
123129 -CC = @CC@
123130 -CCAS = @CCAS@
123131 -CCASDEPMODE = @CCASDEPMODE@
123132 -CCASFLAGS = @CCASFLAGS@
123133 -CCDEPMODE = @CCDEPMODE@
123134 -CFLAGS = @CFLAGS@
123135 -CPP = @CPP@
123136 -CPPFLAGS = @CPPFLAGS@
123137 -CXX = @CXX@
123138 -CXXCPP = @CXXCPP@
123139 -CXXDEPMODE = @CXXDEPMODE@
123140 -CXXFLAGS = @CXXFLAGS@
123141 -CYGPATH_W = @CYGPATH_W@
123142 -DATADIRNAME = @DATADIRNAME@
123143 -DEFS = @DEFS@
123144 -DEPDIR = @DEPDIR@
123145 -DFBINIMAGE = @DFBINIMAGE@
123146 -DSYMUTIL = @DSYMUTIL@
123147 -ECHO = @ECHO@
123148 -ECHO_C = @ECHO_C@
123149 -ECHO_N = @ECHO_N@
123150 -ECHO_T = @ECHO_T@
123151 -EGREP = @EGREP@
123152 -EXEEXT = @EXEEXT@
123153 -F77 = @F77@
123154 -FFLAGS = @FFLAGS@
123155 -FLTKCONFIG = @FLTKCONFIG@
123156 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
123157 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
123158 -GENCAT = @GENCAT@
123159 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
123160 -GIO2_CFLAGS = @GIO2_CFLAGS@
123161 -GIO2_LIBS = @GIO2_LIBS@
123162 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
123163 -GLADE2_LIBS = @GLADE2_LIBS@
123164 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
123165 -GLIB2_LIBS = @GLIB2_LIBS@
123166 -GLIBC21 = @GLIBC21@
123167 -GMSGFMT = @GMSGFMT@
123168 -GREP = @GREP@
123169 -GTK2_CFLAGS = @GTK2_CFLAGS@
123170 -GTK2_LIBS = @GTK2_LIBS@
123171 -INSTALL = @INSTALL@
123172 -INSTALL_DATA = @INSTALL_DATA@
123173 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
123174 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
123175 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
123176 -INSTOBJEXT = @INSTOBJEXT@
123177 -INTLBISON = @INTLBISON@
123178 -INTLLIBS = @INTLLIBS@
123179 -INTLOBJS = @INTLOBJS@
123180 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
123181 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
123182 -INTLTOOL_PERL = @INTLTOOL_PERL@
123183 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
123184 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
123185 -LDFLAGS = @LDFLAGS@
123186 -LIBICONV = @LIBICONV@
123187 -LIBINTL = @LIBINTL@
123188 -LIBOBJS = @LIBOBJS@
123189 -LIBS = @LIBS@
123190 -LIBTOOL = @LIBTOOL@
123191 -LN_S = @LN_S@
123192 -LTLIBICONV = @LTLIBICONV@
123193 -LTLIBINTL = @LTLIBINTL@
123194 -LTLIBOBJS = @LTLIBOBJS@
123195 -MAINT = @MAINT@
123196 -MAKEINFO = @MAKEINFO@
123197 -MKDIR_P = @MKDIR_P@
123198 -MKINSTALLDIRS = @MKINSTALLDIRS@
123199 -MSGFMT = @MSGFMT@
123200 -MSGMERGE = @MSGMERGE@
123201 -NASM = @NASM@
123202 -NMEDIT = @NMEDIT@
123203 -OBJEXT = @OBJEXT@
123204 -PACKAGE = @PACKAGE@
123205 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
123206 -PACKAGE_NAME = @PACKAGE_NAME@
123207 -PACKAGE_STRING = @PACKAGE_STRING@
123208 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
123209 -PACKAGE_VERSION = @PACKAGE_VERSION@
123210 -PATH_SEPARATOR = @PATH_SEPARATOR@
123211 -PKG_CONFIG = @PKG_CONFIG@
123212 -POSUB = @POSUB@
123213 -RANLIB = @RANLIB@
123214 -SED = @SED@
123215 -SET_MAKE = @SET_MAKE@
123216 -SHELL = @SHELL@
123217 -STRIP = @STRIP@
123218 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
123219 -USE_NLS = @USE_NLS@
123220 -VERSION = @VERSION@
123221 -XGETTEXT = @XGETTEXT@
123222 -abs_builddir = @abs_builddir@
123223 -abs_srcdir = @abs_srcdir@
123224 -abs_top_builddir = @abs_top_builddir@
123225 -abs_top_srcdir = @abs_top_srcdir@
123226 -ac_ct_CC = @ac_ct_CC@
123227 -ac_ct_CXX = @ac_ct_CXX@
123228 -ac_ct_F77 = @ac_ct_F77@
123229 -am__include = @am__include@
123230 -am__leading_dot = @am__leading_dot@
123231 -am__quote = @am__quote@
123232 -am__tar = @am__tar@
123233 -am__untar = @am__untar@
123234 -bindir = $(prefix)/lib/games/psemu/
123235 -build = @build@
123236 -build_alias = @build_alias@
123237 -build_cpu = @build_cpu@
123238 -build_os = @build_os@
123239 -build_vendor = @build_vendor@
123240 -builddir = @builddir@
123241 -datadir = @datadir@
123242 -datarootdir = @datarootdir@
123243 -docdir = @docdir@
123244 -dvidir = @dvidir@
123245 -exec_prefix = @exec_prefix@
123246 -host = @host@
123247 -host_alias = @host_alias@
123248 -host_cpu = @host_cpu@
123249 -host_os = @host_os@
123250 -host_vendor = @host_vendor@
123251 -htmldir = @htmldir@
123252 -includedir = @includedir@
123253 -infodir = @infodir@
123254 -install_sh = @install_sh@
123255 -libdir = $(prefix)/lib/games/psemu/
123256 -libexecdir = @libexecdir@
123257 -localedir = @localedir@
123258 -localstatedir = @localstatedir@
123259 -mandir = @mandir@
123260 -mkdir_p = @mkdir_p@
123261 -oldincludedir = @oldincludedir@
123262 -pdfdir = @pdfdir@
123263 -prefix = @prefix@
123264 -program_transform_name = @program_transform_name@
123265 -psdir = @psdir@
123266 -sbindir = @sbindir@
123267 -sharedstatedir = @sharedstatedir@
123268 -srcdir = @srcdir@
123269 -sysconfdir = @sysconfdir@
123270 -target = @target@
123271 -target_alias = @target_alias@
123272 -target_cpu = @target_cpu@
123273 -target_os = @target_os@
123274 -target_vendor = @target_vendor@
123275 -top_build_prefix = @top_build_prefix@
123276 -top_builddir = @top_builddir@
123277 -top_srcdir = @top_srcdir@
123278 -lib_LTLIBRARIES = libDFInput.la
123279 -libDFInput_la_SOURCES = pad.c padjoy.h
123280 -libDFInput_la_LDFLAGS = -version-info 0:1:0 -lpthread
123281 -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
123282 - -DLOCALE_DIR=\"${datadir}/locale/\" \
123283 - -DDATADIR=\"${datadir}/psemu/\" \
123284 - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
123285 - -DVERSION=0 -DREVISION=1 -DBUILD=0
123286 -
123287 -cfgDFInput_SOURCES = cfg.c padjoy.h
123288 -cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
123289 -glade_DATA = dfinput.glade2
123290 -gladedir = $(datadir)/psemu/
123291 -EXTRA_DIST = $(glade_DATA) readme.txt Makefile.noautoconf
123292 -all: all-am
123293 -
123294 -.SUFFIXES:
123295 -.SUFFIXES: .c .lo .o .obj
123296 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
123297 - @for dep in $?; do \
123298 - case '$(am__configure_deps)' in \
123299 - *$$dep*) \
123300 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
123301 - && exit 0; \
123302 - exit 1;; \
123303 - esac; \
123304 - done; \
123305 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfinput/Makefile'; \
123306 - cd $(top_srcdir) && \
123307 - $(AUTOMAKE) --gnu plugins/dfinput/Makefile
123308 -.PRECIOUS: Makefile
123309 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
123310 - @case '$?' in \
123311 - *config.status*) \
123312 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
123313 - *) \
123314 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
123315 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
123316 - esac;
123317 -
123318 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
123319 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
123320 -
123321 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
123322 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
123323 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
123324 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
123325 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
123326 - @$(NORMAL_INSTALL)
123327 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
123328 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
123329 - if test -f $$p; then \
123330 - f=$(am__strip_dir) \
123331 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
123332 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
123333 - else :; fi; \
123334 - done
123335 -
123336 -uninstall-libLTLIBRARIES:
123337 - @$(NORMAL_UNINSTALL)
123338 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
123339 - p=$(am__strip_dir) \
123340 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
123341 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
123342 - done
123343 -
123344 -clean-libLTLIBRARIES:
123345 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
123346 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
123347 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
123348 - test "$$dir" != "$$p" || dir=.; \
123349 - echo "rm -f \"$${dir}/so_locations\""; \
123350 - rm -f "$${dir}/so_locations"; \
123351 - done
123352 -libDFInput.la: $(libDFInput_la_OBJECTS) $(libDFInput_la_DEPENDENCIES)
123353 - $(libDFInput_la_LINK) -rpath $(libdir) $(libDFInput_la_OBJECTS) $(libDFInput_la_LIBADD) $(LIBS)
123354 -install-binPROGRAMS: $(bin_PROGRAMS)
123355 - @$(NORMAL_INSTALL)
123356 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
123357 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
123358 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
123359 - if test -f $$p \
123360 - || test -f $$p1 \
123361 - ; then \
123362 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
123363 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
123364 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
123365 - else :; fi; \
123366 - done
123367 -
123368 -uninstall-binPROGRAMS:
123369 - @$(NORMAL_UNINSTALL)
123370 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
123371 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
123372 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
123373 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
123374 - done
123375 -
123376 -clean-binPROGRAMS:
123377 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
123378 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
123379 - echo " rm -f $$p $$f"; \
123380 - rm -f $$p $$f ; \
123381 - done
123382 -cfgDFInput$(EXEEXT): $(cfgDFInput_OBJECTS) $(cfgDFInput_DEPENDENCIES)
123383 - @rm -f cfgDFInput$(EXEEXT)
123384 - $(LINK) $(cfgDFInput_OBJECTS) $(cfgDFInput_LDADD) $(LIBS)
123385 -
123386 -mostlyclean-compile:
123387 - -rm -f *.$(OBJEXT)
123388 -
123389 -distclean-compile:
123390 - -rm -f *.tab.c
123391 -
123392 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Po@am__quote@
123393 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pad.Plo@am__quote@
123394 -
123395 -.c.o:
123396 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
123397 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
123398 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
123399 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
123400 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
123401 -
123402 -.c.obj:
123403 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
123404 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
123405 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
123406 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
123407 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
123408 -
123409 -.c.lo:
123410 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
123411 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
123412 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
123413 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
123414 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
123415 -
123416 -mostlyclean-libtool:
123417 - -rm -f *.lo
123418 -
123419 -clean-libtool:
123420 - -rm -rf .libs _libs
123421 -install-gladeDATA: $(glade_DATA)
123422 - @$(NORMAL_INSTALL)
123423 - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
123424 - @list='$(glade_DATA)'; for p in $$list; do \
123425 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
123426 - f=$(am__strip_dir) \
123427 - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
123428 - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
123429 - done
123430 -
123431 -uninstall-gladeDATA:
123432 - @$(NORMAL_UNINSTALL)
123433 - @list='$(glade_DATA)'; for p in $$list; do \
123434 - f=$(am__strip_dir) \
123435 - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
123436 - rm -f "$(DESTDIR)$(gladedir)/$$f"; \
123437 - done
123438 -
123439 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
123440 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
123441 - unique=`for i in $$list; do \
123442 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
123443 - done | \
123444 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
123445 - END { if (nonempty) { for (i in files) print i; }; }'`; \
123446 - mkid -fID $$unique
123447 -tags: TAGS
123448 -
123449 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
123450 - $(TAGS_FILES) $(LISP)
123451 - tags=; \
123452 - here=`pwd`; \
123453 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
123454 - unique=`for i in $$list; do \
123455 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
123456 - done | \
123457 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
123458 - END { if (nonempty) { for (i in files) print i; }; }'`; \
123459 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
123460 - test -n "$$unique" || unique=$$empty_fix; \
123461 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
123462 - $$tags $$unique; \
123463 - fi
123464 -ctags: CTAGS
123465 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
123466 - $(TAGS_FILES) $(LISP)
123467 - tags=; \
123468 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
123469 - unique=`for i in $$list; do \
123470 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
123471 - done | \
123472 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
123473 - END { if (nonempty) { for (i in files) print i; }; }'`; \
123474 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
123475 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
123476 - $$tags $$unique
123477 -
123478 -GTAGS:
123479 - here=`$(am__cd) $(top_builddir) && pwd` \
123480 - && cd $(top_srcdir) \
123481 - && gtags -i $(GTAGS_ARGS) $$here
123482 -
123483 -distclean-tags:
123484 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
123485 -
123486 -distdir: $(DISTFILES)
123487 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
123488 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
123489 - list='$(DISTFILES)'; \
123490 - dist_files=`for file in $$list; do echo $$file; done | \
123491 - sed -e "s|^$$srcdirstrip/||;t" \
123492 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
123493 - case $$dist_files in \
123494 - */*) $(MKDIR_P) `echo "$$dist_files" | \
123495 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
123496 - sort -u` ;; \
123497 - esac; \
123498 - for file in $$dist_files; do \
123499 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
123500 - if test -d $$d/$$file; then \
123501 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
123502 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
123503 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
123504 - fi; \
123505 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
123506 - else \
123507 - test -f $(distdir)/$$file \
123508 - || cp -p $$d/$$file $(distdir)/$$file \
123509 - || exit 1; \
123510 - fi; \
123511 - done
123512 -check-am: all-am
123513 -check: check-am
123514 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
123515 -install-binPROGRAMS: install-libLTLIBRARIES
123516 -
123517 -installdirs:
123518 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
123519 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
123520 - done
123521 -install: install-am
123522 -install-exec: install-exec-am
123523 -install-data: install-data-am
123524 -uninstall: uninstall-am
123525 -
123526 -install-am: all-am
123527 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
123528 -
123529 -installcheck: installcheck-am
123530 -install-strip:
123531 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
123532 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
123533 - `test -z '$(STRIP)' || \
123534 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
123535 -mostlyclean-generic:
123536 -
123537 -clean-generic:
123538 -
123539 -distclean-generic:
123540 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
123541 -
123542 -maintainer-clean-generic:
123543 - @echo "This command is intended for maintainers to use"
123544 - @echo "it deletes files that may require special tools to rebuild."
123545 -clean: clean-am
123546 -
123547 -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
123548 - clean-libtool mostlyclean-am
123549 -
123550 -distclean: distclean-am
123551 - -rm -rf ./$(DEPDIR)
123552 - -rm -f Makefile
123553 -distclean-am: clean-am distclean-compile distclean-generic \
123554 - distclean-tags
123555 -
123556 -dvi: dvi-am
123557 -
123558 -dvi-am:
123559 -
123560 -html: html-am
123561 -
123562 -info: info-am
123563 -
123564 -info-am:
123565 -
123566 -install-data-am: install-gladeDATA
123567 -
123568 -install-dvi: install-dvi-am
123569 -
123570 -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
123571 -
123572 -install-html: install-html-am
123573 -
123574 -install-info: install-info-am
123575 -
123576 -install-man:
123577 -
123578 -install-pdf: install-pdf-am
123579 -
123580 -install-ps: install-ps-am
123581 -
123582 -installcheck-am:
123583 -
123584 -maintainer-clean: maintainer-clean-am
123585 - -rm -rf ./$(DEPDIR)
123586 - -rm -f Makefile
123587 -maintainer-clean-am: distclean-am maintainer-clean-generic
123588 -
123589 -mostlyclean: mostlyclean-am
123590 -
123591 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
123592 - mostlyclean-libtool
123593 -
123594 -pdf: pdf-am
123595 -
123596 -pdf-am:
123597 -
123598 -ps: ps-am
123599 -
123600 -ps-am:
123601 -
123602 -uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
123603 - uninstall-libLTLIBRARIES
123604 -
123605 -.MAKE: install-am install-strip
123606 -
123607 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
123608 - clean-generic clean-libLTLIBRARIES clean-libtool ctags \
123609 - distclean distclean-compile distclean-generic \
123610 - distclean-libtool distclean-tags distdir dvi dvi-am html \
123611 - html-am info info-am install install-am install-binPROGRAMS \
123612 - install-data install-data-am install-dvi install-dvi-am \
123613 - install-exec install-exec-am install-gladeDATA install-html \
123614 - install-html-am install-info install-info-am \
123615 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
123616 - install-ps install-ps-am install-strip installcheck \
123617 - installcheck-am installdirs maintainer-clean \
123618 - maintainer-clean-generic mostlyclean mostlyclean-compile \
123619 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
123620 - tags uninstall uninstall-am uninstall-binPROGRAMS \
123621 - uninstall-gladeDATA uninstall-libLTLIBRARIES
123622 -
123623 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
123624 -# Otherwise a system limit (for SysV at least) may be exceeded.
123625 -.NOEXPORT:
123626 diff -rupN original/plugins/dfinput/dfinput.glade2p new/plugins/dfinput/dfinput.glade2p
123627 --- original/plugins/dfinput/dfinput.glade2p 1969-12-31 20:00:00.000000000 -0400
123628 +++ new/plugins/dfinput/dfinput.glade2p 2007-10-08 17:13:28.000000000 -0400
123629 @@ -0,0 +1,8 @@
123630 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
123631 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
123632 +
123633 +<glade-project>
123634 + <name></name>
123635 + <program_name></program_name>
123636 + <gnome_support>FALSE</gnome_support>
123637 +</glade-project>
123638 diff -rupN original/plugins/dfiso/Makefile.in new/plugins/dfiso/Makefile.in
123639 --- original/plugins/dfiso/Makefile.in 2009-03-29 01:17:41.000000000 -0430
123640 +++ new/plugins/dfiso/Makefile.in 1969-12-31 20:00:00.000000000 -0400
123641 @@ -1,653 +0,0 @@
123642 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
123643 -# @configure_input@
123644 -
123645 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
123646 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
123647 -# This Makefile.in is free software; the Free Software Foundation
123648 -# gives unlimited permission to copy and/or distribute it,
123649 -# with or without modifications, as long as this notice is preserved.
123650 -
123651 -# This program is distributed in the hope that it will be useful,
123652 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
123653 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
123654 -# PARTICULAR PURPOSE.
123655 -
123656 -@SET_MAKE@
123657 -
123658 -
123659 -
123660 -VPATH = @srcdir@
123661 -pkgdatadir = $(datadir)/@PACKAGE@
123662 -pkglibdir = $(libdir)/@PACKAGE@
123663 -pkgincludedir = $(includedir)/@PACKAGE@
123664 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
123665 -install_sh_DATA = $(install_sh) -c -m 644
123666 -install_sh_PROGRAM = $(install_sh) -c
123667 -install_sh_SCRIPT = $(install_sh) -c
123668 -INSTALL_HEADER = $(INSTALL_DATA)
123669 -transform = $(program_transform_name)
123670 -NORMAL_INSTALL = :
123671 -PRE_INSTALL = :
123672 -POST_INSTALL = :
123673 -NORMAL_UNINSTALL = :
123674 -PRE_UNINSTALL = :
123675 -POST_UNINSTALL = :
123676 -build_triplet = @build@
123677 -host_triplet = @host@
123678 -target_triplet = @target@
123679 -@ENABLE_NAUTILUSBURN_TRUE@am__append_1 = -DENABLE_NAUTILUSBURN
123680 -bin_PROGRAMS = cfgDFIso$(EXEEXT)
123681 -subdir = plugins/dfiso
123682 -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
123683 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
123684 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
123685 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
123686 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
123687 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
123688 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
123689 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
123690 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
123691 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
123692 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
123693 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
123694 - $(top_srcdir)/configure.ac
123695 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
123696 - $(ACLOCAL_M4)
123697 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
123698 -CONFIG_HEADER = $(top_builddir)/include/config.h
123699 -CONFIG_CLEAN_FILES =
123700 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
123701 -am__vpath_adj = case $$p in \
123702 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
123703 - *) f=$$p;; \
123704 - esac;
123705 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
123706 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
123707 - "$(DESTDIR)$(gladedir)"
123708 -libLTLIBRARIES_INSTALL = $(INSTALL)
123709 -LTLIBRARIES = $(lib_LTLIBRARIES)
123710 -libDFIso_la_DEPENDENCIES =
123711 -am_libDFIso_la_OBJECTS = cdriso.lo Config.lo alsaplay.lo cddaplay.lo \
123712 - tocparser.lo
123713 -libDFIso_la_OBJECTS = $(am_libDFIso_la_OBJECTS)
123714 -libDFIso_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
123715 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
123716 - $(libDFIso_la_LDFLAGS) $(LDFLAGS) -o $@
123717 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
123718 -PROGRAMS = $(bin_PROGRAMS)
123719 -am_cfgDFIso_OBJECTS = cfgDFIso-conf.$(OBJEXT) \
123720 - cfgDFIso-Config.$(OBJEXT)
123721 -cfgDFIso_OBJECTS = $(am_cfgDFIso_OBJECTS)
123722 -am__DEPENDENCIES_1 =
123723 -cfgDFIso_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
123724 - $(am__DEPENDENCIES_1)
123725 -cfgDFIso_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
123726 - --mode=link $(CCLD) $(cfgDFIso_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
123727 - $(LDFLAGS) -o $@
123728 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
123729 -depcomp = $(SHELL) $(top_srcdir)/depcomp
123730 -am__depfiles_maybe = depfiles
123731 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
123732 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
123733 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
123734 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
123735 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
123736 -CCLD = $(CC)
123737 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
123738 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
123739 - $(LDFLAGS) -o $@
123740 -SOURCES = $(libDFIso_la_SOURCES) $(cfgDFIso_SOURCES)
123741 -DIST_SOURCES = $(libDFIso_la_SOURCES) $(cfgDFIso_SOURCES)
123742 -gladeDATA_INSTALL = $(INSTALL_DATA)
123743 -DATA = $(glade_DATA)
123744 -ETAGS = etags
123745 -CTAGS = ctags
123746 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
123747 -ACLOCAL = @ACLOCAL@
123748 -ALLOCA = @ALLOCA@
123749 -ALL_LINGUAS = @ALL_LINGUAS@
123750 -ALSA_LIBS = @ALSA_LIBS@
123751 -AMTAR = @AMTAR@
123752 -AR = @AR@
123753 -AUTOCONF = @AUTOCONF@
123754 -AUTOHEADER = @AUTOHEADER@
123755 -AUTOMAKE = @AUTOMAKE@
123756 -AWK = @AWK@
123757 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
123758 -BURN_CFLAGS = @BURN_CFLAGS@
123759 -BURN_LIBS = @BURN_LIBS@
123760 -CATOBJEXT = @CATOBJEXT@
123761 -CC = @CC@
123762 -CCAS = @CCAS@
123763 -CCASDEPMODE = @CCASDEPMODE@
123764 -CCASFLAGS = @CCASFLAGS@
123765 -CCDEPMODE = @CCDEPMODE@
123766 -CFLAGS = @CFLAGS@
123767 -CPP = @CPP@
123768 -CPPFLAGS = @CPPFLAGS@
123769 -CXX = @CXX@
123770 -CXXCPP = @CXXCPP@
123771 -CXXDEPMODE = @CXXDEPMODE@
123772 -CXXFLAGS = @CXXFLAGS@
123773 -CYGPATH_W = @CYGPATH_W@
123774 -DATADIRNAME = @DATADIRNAME@
123775 -DEFS = @DEFS@
123776 -DEPDIR = @DEPDIR@
123777 -DFBINIMAGE = @DFBINIMAGE@
123778 -DSYMUTIL = @DSYMUTIL@
123779 -ECHO = @ECHO@
123780 -ECHO_C = @ECHO_C@
123781 -ECHO_N = @ECHO_N@
123782 -ECHO_T = @ECHO_T@
123783 -EGREP = @EGREP@
123784 -EXEEXT = @EXEEXT@
123785 -F77 = @F77@
123786 -FFLAGS = @FFLAGS@
123787 -FLTKCONFIG = @FLTKCONFIG@
123788 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
123789 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
123790 -GENCAT = @GENCAT@
123791 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
123792 -GIO2_CFLAGS = @GIO2_CFLAGS@
123793 -GIO2_LIBS = @GIO2_LIBS@
123794 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
123795 -GLADE2_LIBS = @GLADE2_LIBS@
123796 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
123797 -GLIB2_LIBS = @GLIB2_LIBS@
123798 -GLIBC21 = @GLIBC21@
123799 -GMSGFMT = @GMSGFMT@
123800 -GREP = @GREP@
123801 -GTK2_CFLAGS = @GTK2_CFLAGS@
123802 -GTK2_LIBS = @GTK2_LIBS@
123803 -INSTALL = @INSTALL@
123804 -INSTALL_DATA = @INSTALL_DATA@
123805 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
123806 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
123807 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
123808 -INSTOBJEXT = @INSTOBJEXT@
123809 -INTLBISON = @INTLBISON@
123810 -INTLLIBS = @INTLLIBS@
123811 -INTLOBJS = @INTLOBJS@
123812 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
123813 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
123814 -INTLTOOL_PERL = @INTLTOOL_PERL@
123815 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
123816 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
123817 -LDFLAGS = @LDFLAGS@
123818 -LIBICONV = @LIBICONV@
123819 -LIBINTL = @LIBINTL@
123820 -LIBOBJS = @LIBOBJS@
123821 -LIBS = @LIBS@
123822 -LIBTOOL = @LIBTOOL@
123823 -LN_S = @LN_S@
123824 -LTLIBICONV = @LTLIBICONV@
123825 -LTLIBINTL = @LTLIBINTL@
123826 -LTLIBOBJS = @LTLIBOBJS@
123827 -MAINT = @MAINT@
123828 -MAKEINFO = @MAKEINFO@
123829 -MKDIR_P = @MKDIR_P@
123830 -MKINSTALLDIRS = @MKINSTALLDIRS@
123831 -MSGFMT = @MSGFMT@
123832 -MSGMERGE = @MSGMERGE@
123833 -NASM = @NASM@
123834 -NMEDIT = @NMEDIT@
123835 -OBJEXT = @OBJEXT@
123836 -PACKAGE = @PACKAGE@
123837 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
123838 -PACKAGE_NAME = @PACKAGE_NAME@
123839 -PACKAGE_STRING = @PACKAGE_STRING@
123840 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
123841 -PACKAGE_VERSION = @PACKAGE_VERSION@
123842 -PATH_SEPARATOR = @PATH_SEPARATOR@
123843 -PKG_CONFIG = @PKG_CONFIG@
123844 -POSUB = @POSUB@
123845 -RANLIB = @RANLIB@
123846 -SED = @SED@
123847 -SET_MAKE = @SET_MAKE@
123848 -SHELL = @SHELL@
123849 -STRIP = @STRIP@
123850 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
123851 -USE_NLS = @USE_NLS@
123852 -VERSION = @VERSION@
123853 -XGETTEXT = @XGETTEXT@
123854 -abs_builddir = @abs_builddir@
123855 -abs_srcdir = @abs_srcdir@
123856 -abs_top_builddir = @abs_top_builddir@
123857 -abs_top_srcdir = @abs_top_srcdir@
123858 -ac_ct_CC = @ac_ct_CC@
123859 -ac_ct_CXX = @ac_ct_CXX@
123860 -ac_ct_F77 = @ac_ct_F77@
123861 -am__include = @am__include@
123862 -am__leading_dot = @am__leading_dot@
123863 -am__quote = @am__quote@
123864 -am__tar = @am__tar@
123865 -am__untar = @am__untar@
123866 -bindir = $(prefix)/lib/games/psemu/
123867 -build = @build@
123868 -build_alias = @build_alias@
123869 -build_cpu = @build_cpu@
123870 -build_os = @build_os@
123871 -build_vendor = @build_vendor@
123872 -builddir = @builddir@
123873 -datadir = @datadir@
123874 -datarootdir = @datarootdir@
123875 -docdir = @docdir@
123876 -dvidir = @dvidir@
123877 -exec_prefix = @exec_prefix@
123878 -host = @host@
123879 -host_alias = @host_alias@
123880 -host_cpu = @host_cpu@
123881 -host_os = @host_os@
123882 -host_vendor = @host_vendor@
123883 -htmldir = @htmldir@
123884 -includedir = @includedir@
123885 -infodir = @infodir@
123886 -install_sh = @install_sh@
123887 -libdir = $(prefix)/lib/games/psemu/
123888 -libexecdir = @libexecdir@
123889 -localedir = @localedir@
123890 -localstatedir = @localstatedir@
123891 -mandir = @mandir@
123892 -mkdir_p = @mkdir_p@
123893 -oldincludedir = @oldincludedir@
123894 -pdfdir = @pdfdir@
123895 -prefix = @prefix@
123896 -program_transform_name = @program_transform_name@
123897 -psdir = @psdir@
123898 -sbindir = @sbindir@
123899 -sharedstatedir = @sharedstatedir@
123900 -srcdir = @srcdir@
123901 -sysconfdir = @sysconfdir@
123902 -target = @target@
123903 -target_alias = @target_alias@
123904 -target_cpu = @target_cpu@
123905 -target_os = @target_os@
123906 -target_vendor = @target_vendor@
123907 -top_build_prefix = @top_build_prefix@
123908 -top_builddir = @top_builddir@
123909 -top_srcdir = @top_srcdir@
123910 -lib_LTLIBRARIES = libDFIso.la
123911 -libDFIso_la_SOURCES = cdriso.c cdriso.h Config.c Config.h \
123912 - alsaplay.c alsaplay.h cddaplay.c cddaplay.h \
123913 - tocparser.c tocparser.h
123914 -
123915 -libDFIso_la_LIBADD = -lasound -lpthread
123916 -libDFIso_la_LDFLAGS = -module -avoid-version
123917 -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
123918 - -DLOCALE_DIR=\"${datadir}/locale/\" \
123919 - -DDATADIR=\"${datadir}/psemu/\" $(GTK2_CFLAGS) \
123920 - $(GLADE2_CFLAGS) $(BURN_CFLAGS) -DREVISION=1 -DBUILD=0 \
123921 - -D__LINUX__ $(am__append_1)
123922 -cfgDFIso_SOURCES = conf.c Config.c
123923 -cfgDFIso_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) $(BURN_LIBS) -lasound -lpthread
123924 -cfgDFIso_CFLAGS = $(AM_CFLAGS)
123925 -glade_DATA = dfiso.glade2
123926 -gladedir = $(datadir)/psemu/
123927 -EXTRA_DIST = $(glade_DATA)
123928 -all: all-am
123929 -
123930 -.SUFFIXES:
123931 -.SUFFIXES: .c .lo .o .obj
123932 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
123933 - @for dep in $?; do \
123934 - case '$(am__configure_deps)' in \
123935 - *$$dep*) \
123936 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
123937 - && exit 0; \
123938 - exit 1;; \
123939 - esac; \
123940 - done; \
123941 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfiso/Makefile'; \
123942 - cd $(top_srcdir) && \
123943 - $(AUTOMAKE) --gnu plugins/dfiso/Makefile
123944 -.PRECIOUS: Makefile
123945 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
123946 - @case '$?' in \
123947 - *config.status*) \
123948 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
123949 - *) \
123950 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
123951 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
123952 - esac;
123953 -
123954 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
123955 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
123956 -
123957 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
123958 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
123959 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
123960 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
123961 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
123962 - @$(NORMAL_INSTALL)
123963 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
123964 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
123965 - if test -f $$p; then \
123966 - f=$(am__strip_dir) \
123967 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
123968 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
123969 - else :; fi; \
123970 - done
123971 -
123972 -uninstall-libLTLIBRARIES:
123973 - @$(NORMAL_UNINSTALL)
123974 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
123975 - p=$(am__strip_dir) \
123976 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
123977 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
123978 - done
123979 -
123980 -clean-libLTLIBRARIES:
123981 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
123982 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
123983 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
123984 - test "$$dir" != "$$p" || dir=.; \
123985 - echo "rm -f \"$${dir}/so_locations\""; \
123986 - rm -f "$${dir}/so_locations"; \
123987 - done
123988 -libDFIso.la: $(libDFIso_la_OBJECTS) $(libDFIso_la_DEPENDENCIES)
123989 - $(libDFIso_la_LINK) -rpath $(libdir) $(libDFIso_la_OBJECTS) $(libDFIso_la_LIBADD) $(LIBS)
123990 -install-binPROGRAMS: $(bin_PROGRAMS)
123991 - @$(NORMAL_INSTALL)
123992 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
123993 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
123994 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
123995 - if test -f $$p \
123996 - || test -f $$p1 \
123997 - ; then \
123998 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
123999 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
124000 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
124001 - else :; fi; \
124002 - done
124003 -
124004 -uninstall-binPROGRAMS:
124005 - @$(NORMAL_UNINSTALL)
124006 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
124007 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
124008 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
124009 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
124010 - done
124011 -
124012 -clean-binPROGRAMS:
124013 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
124014 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
124015 - echo " rm -f $$p $$f"; \
124016 - rm -f $$p $$f ; \
124017 - done
124018 -cfgDFIso$(EXEEXT): $(cfgDFIso_OBJECTS) $(cfgDFIso_DEPENDENCIES)
124019 - @rm -f cfgDFIso$(EXEEXT)
124020 - $(cfgDFIso_LINK) $(cfgDFIso_OBJECTS) $(cfgDFIso_LDADD) $(LIBS)
124021 -
124022 -mostlyclean-compile:
124023 - -rm -f *.$(OBJEXT)
124024 -
124025 -distclean-compile:
124026 - -rm -f *.tab.c
124027 -
124028 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Config.Plo@am__quote@
124029 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsaplay.Plo@am__quote@
124030 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddaplay.Plo@am__quote@
124031 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdriso.Plo@am__quote@
124032 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgDFIso-Config.Po@am__quote@
124033 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgDFIso-conf.Po@am__quote@
124034 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tocparser.Plo@am__quote@
124035 -
124036 -.c.o:
124037 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
124038 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
124039 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
124040 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124041 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
124042 -
124043 -.c.obj:
124044 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
124045 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
124046 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
124047 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124048 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
124049 -
124050 -.c.lo:
124051 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
124052 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
124053 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
124054 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124055 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
124056 -
124057 -cfgDFIso-conf.o: conf.c
124058 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -MT cfgDFIso-conf.o -MD -MP -MF $(DEPDIR)/cfgDFIso-conf.Tpo -c -o cfgDFIso-conf.o `test -f 'conf.c' || echo '$(srcdir)/'`conf.c
124059 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cfgDFIso-conf.Tpo $(DEPDIR)/cfgDFIso-conf.Po
124060 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='conf.c' object='cfgDFIso-conf.o' libtool=no @AMDEPBACKSLASH@
124061 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124062 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -c -o cfgDFIso-conf.o `test -f 'conf.c' || echo '$(srcdir)/'`conf.c
124063 -
124064 -cfgDFIso-conf.obj: conf.c
124065 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -MT cfgDFIso-conf.obj -MD -MP -MF $(DEPDIR)/cfgDFIso-conf.Tpo -c -o cfgDFIso-conf.obj `if test -f 'conf.c'; then $(CYGPATH_W) 'conf.c'; else $(CYGPATH_W) '$(srcdir)/conf.c'; fi`
124066 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cfgDFIso-conf.Tpo $(DEPDIR)/cfgDFIso-conf.Po
124067 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='conf.c' object='cfgDFIso-conf.obj' libtool=no @AMDEPBACKSLASH@
124068 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124069 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -c -o cfgDFIso-conf.obj `if test -f 'conf.c'; then $(CYGPATH_W) 'conf.c'; else $(CYGPATH_W) '$(srcdir)/conf.c'; fi`
124070 -
124071 -cfgDFIso-Config.o: Config.c
124072 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -MT cfgDFIso-Config.o -MD -MP -MF $(DEPDIR)/cfgDFIso-Config.Tpo -c -o cfgDFIso-Config.o `test -f 'Config.c' || echo '$(srcdir)/'`Config.c
124073 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cfgDFIso-Config.Tpo $(DEPDIR)/cfgDFIso-Config.Po
124074 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Config.c' object='cfgDFIso-Config.o' libtool=no @AMDEPBACKSLASH@
124075 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124076 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -c -o cfgDFIso-Config.o `test -f 'Config.c' || echo '$(srcdir)/'`Config.c
124077 -
124078 -cfgDFIso-Config.obj: Config.c
124079 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -MT cfgDFIso-Config.obj -MD -MP -MF $(DEPDIR)/cfgDFIso-Config.Tpo -c -o cfgDFIso-Config.obj `if test -f 'Config.c'; then $(CYGPATH_W) 'Config.c'; else $(CYGPATH_W) '$(srcdir)/Config.c'; fi`
124080 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cfgDFIso-Config.Tpo $(DEPDIR)/cfgDFIso-Config.Po
124081 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Config.c' object='cfgDFIso-Config.obj' libtool=no @AMDEPBACKSLASH@
124082 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124083 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cfgDFIso_CFLAGS) $(CFLAGS) -c -o cfgDFIso-Config.obj `if test -f 'Config.c'; then $(CYGPATH_W) 'Config.c'; else $(CYGPATH_W) '$(srcdir)/Config.c'; fi`
124084 -
124085 -mostlyclean-libtool:
124086 - -rm -f *.lo
124087 -
124088 -clean-libtool:
124089 - -rm -rf .libs _libs
124090 -install-gladeDATA: $(glade_DATA)
124091 - @$(NORMAL_INSTALL)
124092 - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
124093 - @list='$(glade_DATA)'; for p in $$list; do \
124094 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
124095 - f=$(am__strip_dir) \
124096 - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
124097 - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
124098 - done
124099 -
124100 -uninstall-gladeDATA:
124101 - @$(NORMAL_UNINSTALL)
124102 - @list='$(glade_DATA)'; for p in $$list; do \
124103 - f=$(am__strip_dir) \
124104 - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
124105 - rm -f "$(DESTDIR)$(gladedir)/$$f"; \
124106 - done
124107 -
124108 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
124109 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
124110 - unique=`for i in $$list; do \
124111 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
124112 - done | \
124113 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
124114 - END { if (nonempty) { for (i in files) print i; }; }'`; \
124115 - mkid -fID $$unique
124116 -tags: TAGS
124117 -
124118 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
124119 - $(TAGS_FILES) $(LISP)
124120 - tags=; \
124121 - here=`pwd`; \
124122 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
124123 - unique=`for i in $$list; do \
124124 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
124125 - done | \
124126 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
124127 - END { if (nonempty) { for (i in files) print i; }; }'`; \
124128 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
124129 - test -n "$$unique" || unique=$$empty_fix; \
124130 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
124131 - $$tags $$unique; \
124132 - fi
124133 -ctags: CTAGS
124134 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
124135 - $(TAGS_FILES) $(LISP)
124136 - tags=; \
124137 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
124138 - unique=`for i in $$list; do \
124139 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
124140 - done | \
124141 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
124142 - END { if (nonempty) { for (i in files) print i; }; }'`; \
124143 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
124144 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
124145 - $$tags $$unique
124146 -
124147 -GTAGS:
124148 - here=`$(am__cd) $(top_builddir) && pwd` \
124149 - && cd $(top_srcdir) \
124150 - && gtags -i $(GTAGS_ARGS) $$here
124151 -
124152 -distclean-tags:
124153 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
124154 -
124155 -distdir: $(DISTFILES)
124156 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
124157 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
124158 - list='$(DISTFILES)'; \
124159 - dist_files=`for file in $$list; do echo $$file; done | \
124160 - sed -e "s|^$$srcdirstrip/||;t" \
124161 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
124162 - case $$dist_files in \
124163 - */*) $(MKDIR_P) `echo "$$dist_files" | \
124164 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
124165 - sort -u` ;; \
124166 - esac; \
124167 - for file in $$dist_files; do \
124168 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
124169 - if test -d $$d/$$file; then \
124170 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
124171 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
124172 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
124173 - fi; \
124174 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
124175 - else \
124176 - test -f $(distdir)/$$file \
124177 - || cp -p $$d/$$file $(distdir)/$$file \
124178 - || exit 1; \
124179 - fi; \
124180 - done
124181 -check-am: all-am
124182 -check: check-am
124183 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
124184 -install-binPROGRAMS: install-libLTLIBRARIES
124185 -
124186 -installdirs:
124187 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
124188 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
124189 - done
124190 -install: install-am
124191 -install-exec: install-exec-am
124192 -install-data: install-data-am
124193 -uninstall: uninstall-am
124194 -
124195 -install-am: all-am
124196 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
124197 -
124198 -installcheck: installcheck-am
124199 -install-strip:
124200 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
124201 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
124202 - `test -z '$(STRIP)' || \
124203 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
124204 -mostlyclean-generic:
124205 -
124206 -clean-generic:
124207 -
124208 -distclean-generic:
124209 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
124210 -
124211 -maintainer-clean-generic:
124212 - @echo "This command is intended for maintainers to use"
124213 - @echo "it deletes files that may require special tools to rebuild."
124214 -clean: clean-am
124215 -
124216 -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
124217 - clean-libtool mostlyclean-am
124218 -
124219 -distclean: distclean-am
124220 - -rm -rf ./$(DEPDIR)
124221 - -rm -f Makefile
124222 -distclean-am: clean-am distclean-compile distclean-generic \
124223 - distclean-tags
124224 -
124225 -dvi: dvi-am
124226 -
124227 -dvi-am:
124228 -
124229 -html: html-am
124230 -
124231 -info: info-am
124232 -
124233 -info-am:
124234 -
124235 -install-data-am: install-gladeDATA
124236 -
124237 -install-dvi: install-dvi-am
124238 -
124239 -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
124240 -
124241 -install-html: install-html-am
124242 -
124243 -install-info: install-info-am
124244 -
124245 -install-man:
124246 -
124247 -install-pdf: install-pdf-am
124248 -
124249 -install-ps: install-ps-am
124250 -
124251 -installcheck-am:
124252 -
124253 -maintainer-clean: maintainer-clean-am
124254 - -rm -rf ./$(DEPDIR)
124255 - -rm -f Makefile
124256 -maintainer-clean-am: distclean-am maintainer-clean-generic
124257 -
124258 -mostlyclean: mostlyclean-am
124259 -
124260 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
124261 - mostlyclean-libtool
124262 -
124263 -pdf: pdf-am
124264 -
124265 -pdf-am:
124266 -
124267 -ps: ps-am
124268 -
124269 -ps-am:
124270 -
124271 -uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
124272 - uninstall-libLTLIBRARIES
124273 -
124274 -.MAKE: install-am install-strip
124275 -
124276 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
124277 - clean-generic clean-libLTLIBRARIES clean-libtool ctags \
124278 - distclean distclean-compile distclean-generic \
124279 - distclean-libtool distclean-tags distdir dvi dvi-am html \
124280 - html-am info info-am install install-am install-binPROGRAMS \
124281 - install-data install-data-am install-dvi install-dvi-am \
124282 - install-exec install-exec-am install-gladeDATA install-html \
124283 - install-html-am install-info install-info-am \
124284 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
124285 - install-ps install-ps-am install-strip installcheck \
124286 - installcheck-am installdirs maintainer-clean \
124287 - maintainer-clean-generic mostlyclean mostlyclean-compile \
124288 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
124289 - tags uninstall uninstall-am uninstall-binPROGRAMS \
124290 - uninstall-gladeDATA uninstall-libLTLIBRARIES
124291 -
124292 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
124293 -# Otherwise a system limit (for SysV at least) may be exceeded.
124294 -.NOEXPORT:
124295 diff -rupN original/plugins/dfsound/Makefile.in new/plugins/dfsound/Makefile.in
124296 --- original/plugins/dfsound/Makefile.in 2009-03-29 01:17:41.000000000 -0430
124297 +++ new/plugins/dfsound/Makefile.in 1969-12-31 20:00:00.000000000 -0400
124298 @@ -1,649 +0,0 @@
124299 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
124300 -# @configure_input@
124301 -
124302 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
124303 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
124304 -# This Makefile.in is free software; the Free Software Foundation
124305 -# gives unlimited permission to copy and/or distribute it,
124306 -# with or without modifications, as long as this notice is preserved.
124307 -
124308 -# This program is distributed in the hope that it will be useful,
124309 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
124310 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
124311 -# PARTICULAR PURPOSE.
124312 -
124313 -@SET_MAKE@
124314 -
124315 -
124316 -
124317 -VPATH = @srcdir@
124318 -pkgdatadir = $(datadir)/@PACKAGE@
124319 -pkglibdir = $(libdir)/@PACKAGE@
124320 -pkgincludedir = $(includedir)/@PACKAGE@
124321 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
124322 -install_sh_DATA = $(install_sh) -c -m 644
124323 -install_sh_PROGRAM = $(install_sh) -c
124324 -install_sh_SCRIPT = $(install_sh) -c
124325 -INSTALL_HEADER = $(INSTALL_DATA)
124326 -transform = $(program_transform_name)
124327 -NORMAL_INSTALL = :
124328 -PRE_INSTALL = :
124329 -POST_INSTALL = :
124330 -NORMAL_UNINSTALL = :
124331 -PRE_UNINSTALL = :
124332 -POST_UNINSTALL = :
124333 -build_triplet = @build@
124334 -host_triplet = @host@
124335 -target_triplet = @target@
124336 -@HAVE_ALSA_TRUE@am__append_1 = alsa.c alsa.h
124337 -@HAVE_ALSA_TRUE@am__append_2 = -DUSEALSA
124338 -@HAVE_ALSA_FALSE@am__append_3 = oss.c oss.h
124339 -@HAVE_ALSA_TRUE@am__append_4 = $(ALSA_LIBS)
124340 -bin_PROGRAMS = cfgDFSound$(EXEEXT)
124341 -subdir = plugins/dfsound
124342 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
124343 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
124344 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
124345 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
124346 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
124347 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
124348 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
124349 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
124350 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
124351 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
124352 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
124353 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
124354 - $(top_srcdir)/configure.ac
124355 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
124356 - $(ACLOCAL_M4)
124357 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
124358 -CONFIG_HEADER = $(top_builddir)/include/config.h
124359 -CONFIG_CLEAN_FILES =
124360 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
124361 -am__vpath_adj = case $$p in \
124362 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
124363 - *) f=$$p;; \
124364 - esac;
124365 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
124366 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
124367 - "$(DESTDIR)$(gladedir)"
124368 -libLTLIBRARIES_INSTALL = $(INSTALL)
124369 -LTLIBRARIES = $(lib_LTLIBRARIES)
124370 -libDFSound_la_LIBADD =
124371 -am__libDFSound_la_SOURCES_DIST = spu.c spu.h cfg.c cfg.h dma.c dma.h \
124372 - freeze.c psemu.c registers.c registers.h alsa.c alsa.h oss.c \
124373 - oss.h
124374 -@HAVE_ALSA_TRUE@am__objects_1 = alsa.lo
124375 -@HAVE_ALSA_FALSE@am__objects_2 = oss.lo
124376 -am_libDFSound_la_OBJECTS = spu.lo cfg.lo dma.lo freeze.lo psemu.lo \
124377 - registers.lo $(am__objects_1) $(am__objects_2)
124378 -libDFSound_la_OBJECTS = $(am_libDFSound_la_OBJECTS)
124379 -libDFSound_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
124380 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
124381 - $(libDFSound_la_LDFLAGS) $(LDFLAGS) -o $@
124382 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
124383 -PROGRAMS = $(bin_PROGRAMS)
124384 -am_cfgDFSound_OBJECTS = main.$(OBJEXT)
124385 -cfgDFSound_OBJECTS = $(am_cfgDFSound_OBJECTS)
124386 -am__DEPENDENCIES_1 =
124387 -cfgDFSound_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
124388 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
124389 -depcomp = $(SHELL) $(top_srcdir)/depcomp
124390 -am__depfiles_maybe = depfiles
124391 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
124392 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
124393 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
124394 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
124395 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
124396 -CCLD = $(CC)
124397 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
124398 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
124399 - $(LDFLAGS) -o $@
124400 -SOURCES = $(libDFSound_la_SOURCES) $(cfgDFSound_SOURCES)
124401 -DIST_SOURCES = $(am__libDFSound_la_SOURCES_DIST) $(cfgDFSound_SOURCES)
124402 -gladeDATA_INSTALL = $(INSTALL_DATA)
124403 -DATA = $(glade_DATA)
124404 -ETAGS = etags
124405 -CTAGS = ctags
124406 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
124407 -ACLOCAL = @ACLOCAL@
124408 -ALLOCA = @ALLOCA@
124409 -ALL_LINGUAS = @ALL_LINGUAS@
124410 -ALSA_LIBS = @ALSA_LIBS@
124411 -AMTAR = @AMTAR@
124412 -AR = @AR@
124413 -AUTOCONF = @AUTOCONF@
124414 -AUTOHEADER = @AUTOHEADER@
124415 -AUTOMAKE = @AUTOMAKE@
124416 -AWK = @AWK@
124417 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
124418 -BURN_CFLAGS = @BURN_CFLAGS@
124419 -BURN_LIBS = @BURN_LIBS@
124420 -CATOBJEXT = @CATOBJEXT@
124421 -CC = @CC@
124422 -CCAS = @CCAS@
124423 -CCASDEPMODE = @CCASDEPMODE@
124424 -CCASFLAGS = @CCASFLAGS@
124425 -CCDEPMODE = @CCDEPMODE@
124426 -CFLAGS = @CFLAGS@
124427 -CPP = @CPP@
124428 -CPPFLAGS = @CPPFLAGS@
124429 -CXX = @CXX@
124430 -CXXCPP = @CXXCPP@
124431 -CXXDEPMODE = @CXXDEPMODE@
124432 -CXXFLAGS = @CXXFLAGS@
124433 -CYGPATH_W = @CYGPATH_W@
124434 -DATADIRNAME = @DATADIRNAME@
124435 -DEFS = @DEFS@
124436 -DEPDIR = @DEPDIR@
124437 -DFBINIMAGE = @DFBINIMAGE@
124438 -DSYMUTIL = @DSYMUTIL@
124439 -ECHO = @ECHO@
124440 -ECHO_C = @ECHO_C@
124441 -ECHO_N = @ECHO_N@
124442 -ECHO_T = @ECHO_T@
124443 -EGREP = @EGREP@
124444 -EXEEXT = @EXEEXT@
124445 -F77 = @F77@
124446 -FFLAGS = @FFLAGS@
124447 -FLTKCONFIG = @FLTKCONFIG@
124448 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
124449 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
124450 -GENCAT = @GENCAT@
124451 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
124452 -GIO2_CFLAGS = @GIO2_CFLAGS@
124453 -GIO2_LIBS = @GIO2_LIBS@
124454 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
124455 -GLADE2_LIBS = @GLADE2_LIBS@
124456 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
124457 -GLIB2_LIBS = @GLIB2_LIBS@
124458 -GLIBC21 = @GLIBC21@
124459 -GMSGFMT = @GMSGFMT@
124460 -GREP = @GREP@
124461 -GTK2_CFLAGS = @GTK2_CFLAGS@
124462 -GTK2_LIBS = @GTK2_LIBS@
124463 -INSTALL = @INSTALL@
124464 -INSTALL_DATA = @INSTALL_DATA@
124465 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
124466 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
124467 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
124468 -INSTOBJEXT = @INSTOBJEXT@
124469 -INTLBISON = @INTLBISON@
124470 -INTLLIBS = @INTLLIBS@
124471 -INTLOBJS = @INTLOBJS@
124472 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
124473 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
124474 -INTLTOOL_PERL = @INTLTOOL_PERL@
124475 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
124476 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
124477 -LDFLAGS = @LDFLAGS@
124478 -LIBICONV = @LIBICONV@
124479 -LIBINTL = @LIBINTL@
124480 -LIBOBJS = @LIBOBJS@
124481 -LIBS = @LIBS@
124482 -LIBTOOL = @LIBTOOL@
124483 -LN_S = @LN_S@
124484 -LTLIBICONV = @LTLIBICONV@
124485 -LTLIBINTL = @LTLIBINTL@
124486 -LTLIBOBJS = @LTLIBOBJS@
124487 -MAINT = @MAINT@
124488 -MAKEINFO = @MAKEINFO@
124489 -MKDIR_P = @MKDIR_P@
124490 -MKINSTALLDIRS = @MKINSTALLDIRS@
124491 -MSGFMT = @MSGFMT@
124492 -MSGMERGE = @MSGMERGE@
124493 -NASM = @NASM@
124494 -NMEDIT = @NMEDIT@
124495 -OBJEXT = @OBJEXT@
124496 -PACKAGE = @PACKAGE@
124497 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
124498 -PACKAGE_NAME = @PACKAGE_NAME@
124499 -PACKAGE_STRING = @PACKAGE_STRING@
124500 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
124501 -PACKAGE_VERSION = @PACKAGE_VERSION@
124502 -PATH_SEPARATOR = @PATH_SEPARATOR@
124503 -PKG_CONFIG = @PKG_CONFIG@
124504 -POSUB = @POSUB@
124505 -RANLIB = @RANLIB@
124506 -SED = @SED@
124507 -SET_MAKE = @SET_MAKE@
124508 -SHELL = @SHELL@
124509 -STRIP = @STRIP@
124510 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
124511 -USE_NLS = @USE_NLS@
124512 -VERSION = @VERSION@
124513 -XGETTEXT = @XGETTEXT@
124514 -abs_builddir = @abs_builddir@
124515 -abs_srcdir = @abs_srcdir@
124516 -abs_top_builddir = @abs_top_builddir@
124517 -abs_top_srcdir = @abs_top_srcdir@
124518 -ac_ct_CC = @ac_ct_CC@
124519 -ac_ct_CXX = @ac_ct_CXX@
124520 -ac_ct_F77 = @ac_ct_F77@
124521 -am__include = @am__include@
124522 -am__leading_dot = @am__leading_dot@
124523 -am__quote = @am__quote@
124524 -am__tar = @am__tar@
124525 -am__untar = @am__untar@
124526 -bindir = $(prefix)/lib/games/psemu/
124527 -build = @build@
124528 -build_alias = @build_alias@
124529 -build_cpu = @build_cpu@
124530 -build_os = @build_os@
124531 -build_vendor = @build_vendor@
124532 -builddir = @builddir@
124533 -datadir = @datadir@
124534 -datarootdir = @datarootdir@
124535 -docdir = @docdir@
124536 -dvidir = @dvidir@
124537 -exec_prefix = @exec_prefix@
124538 -host = @host@
124539 -host_alias = @host_alias@
124540 -host_cpu = @host_cpu@
124541 -host_os = @host_os@
124542 -host_vendor = @host_vendor@
124543 -htmldir = @htmldir@
124544 -includedir = @includedir@
124545 -infodir = @infodir@
124546 -install_sh = @install_sh@
124547 -libdir = $(prefix)/lib/games/psemu/
124548 -libexecdir = @libexecdir@
124549 -localedir = @localedir@
124550 -localstatedir = @localstatedir@
124551 -mandir = @mandir@
124552 -mkdir_p = @mkdir_p@
124553 -oldincludedir = @oldincludedir@
124554 -pdfdir = @pdfdir@
124555 -prefix = @prefix@
124556 -program_transform_name = @program_transform_name@
124557 -psdir = @psdir@
124558 -sbindir = @sbindir@
124559 -sharedstatedir = @sharedstatedir@
124560 -srcdir = @srcdir@
124561 -sysconfdir = @sysconfdir@
124562 -target = @target@
124563 -target_alias = @target_alias@
124564 -target_cpu = @target_cpu@
124565 -target_os = @target_os@
124566 -target_vendor = @target_vendor@
124567 -top_build_prefix = @top_build_prefix@
124568 -top_builddir = @top_builddir@
124569 -top_srcdir = @top_srcdir@
124570 -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
124571 - -DLOCALE_DIR=\"${datadir}/locale/\" \
124572 - -DDATADIR=\"${datadir}/psemu/\" $(GTK2_CFLAGS) \
124573 - $(GLADE2_CFLAGS) -DVERSION=0 -DREVISION=1 -DBUILD=0 \
124574 - $(am__append_2)
124575 -lib_LTLIBRARIES = libDFSound.la
124576 -libDFSound_la_SOURCES = spu.c spu.h cfg.c cfg.h dma.c dma.h freeze.c \
124577 - psemu.c registers.c registers.h $(am__append_1) \
124578 - $(am__append_3)
124579 -libDFSound_la_LDFLAGS = -module -avoid-version $(am__append_4)
124580 -cfgDFSound_SOURCES = spucfg-0.1df/main.c
124581 -cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
124582 -glade_DATA = spucfg-0.1df/dfsound.glade2
124583 -gladedir = $(datadir)/psemu/
124584 -EXTRA_DIST = $(glade_DATA) \
124585 - externals.h dsoundoss.h regs.h debug.c debug.h \
124586 - record.c record.h resource.h xa.c xa.h gauss_i.h \
124587 - adsr.c adsr.h reverb.c reverb.h stdafx.c stdafx.h \
124588 - regs.h psemuxa.h \
124589 - changelog.txt Filemap.txt License.txt spuPeopsSound.c \
124590 - spuPeopsSound.def \
124591 - spucfg-0.1df/HACKING
124592 -
124593 -all: all-am
124594 -
124595 -.SUFFIXES:
124596 -.SUFFIXES: .c .lo .o .obj
124597 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
124598 - @for dep in $?; do \
124599 - case '$(am__configure_deps)' in \
124600 - *$$dep*) \
124601 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
124602 - && exit 0; \
124603 - exit 1;; \
124604 - esac; \
124605 - done; \
124606 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfsound/Makefile'; \
124607 - cd $(top_srcdir) && \
124608 - $(AUTOMAKE) --gnu plugins/dfsound/Makefile
124609 -.PRECIOUS: Makefile
124610 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
124611 - @case '$?' in \
124612 - *config.status*) \
124613 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
124614 - *) \
124615 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
124616 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
124617 - esac;
124618 -
124619 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
124620 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
124621 -
124622 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
124623 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
124624 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
124625 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
124626 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
124627 - @$(NORMAL_INSTALL)
124628 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
124629 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
124630 - if test -f $$p; then \
124631 - f=$(am__strip_dir) \
124632 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
124633 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
124634 - else :; fi; \
124635 - done
124636 -
124637 -uninstall-libLTLIBRARIES:
124638 - @$(NORMAL_UNINSTALL)
124639 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
124640 - p=$(am__strip_dir) \
124641 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
124642 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
124643 - done
124644 -
124645 -clean-libLTLIBRARIES:
124646 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
124647 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
124648 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
124649 - test "$$dir" != "$$p" || dir=.; \
124650 - echo "rm -f \"$${dir}/so_locations\""; \
124651 - rm -f "$${dir}/so_locations"; \
124652 - done
124653 -libDFSound.la: $(libDFSound_la_OBJECTS) $(libDFSound_la_DEPENDENCIES)
124654 - $(libDFSound_la_LINK) -rpath $(libdir) $(libDFSound_la_OBJECTS) $(libDFSound_la_LIBADD) $(LIBS)
124655 -install-binPROGRAMS: $(bin_PROGRAMS)
124656 - @$(NORMAL_INSTALL)
124657 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
124658 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
124659 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
124660 - if test -f $$p \
124661 - || test -f $$p1 \
124662 - ; then \
124663 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
124664 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
124665 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
124666 - else :; fi; \
124667 - done
124668 -
124669 -uninstall-binPROGRAMS:
124670 - @$(NORMAL_UNINSTALL)
124671 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
124672 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
124673 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
124674 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
124675 - done
124676 -
124677 -clean-binPROGRAMS:
124678 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
124679 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
124680 - echo " rm -f $$p $$f"; \
124681 - rm -f $$p $$f ; \
124682 - done
124683 -cfgDFSound$(EXEEXT): $(cfgDFSound_OBJECTS) $(cfgDFSound_DEPENDENCIES)
124684 - @rm -f cfgDFSound$(EXEEXT)
124685 - $(LINK) $(cfgDFSound_OBJECTS) $(cfgDFSound_LDADD) $(LIBS)
124686 -
124687 -mostlyclean-compile:
124688 - -rm -f *.$(OBJEXT)
124689 -
124690 -distclean-compile:
124691 - -rm -f *.tab.c
124692 -
124693 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsa.Plo@am__quote@
124694 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
124695 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dma.Plo@am__quote@
124696 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freeze.Plo@am__quote@
124697 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
124698 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oss.Plo@am__quote@
124699 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psemu.Plo@am__quote@
124700 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/registers.Plo@am__quote@
124701 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spu.Plo@am__quote@
124702 -
124703 -.c.o:
124704 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
124705 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
124706 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
124707 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124708 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
124709 -
124710 -.c.obj:
124711 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
124712 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
124713 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
124714 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124715 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
124716 -
124717 -.c.lo:
124718 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
124719 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
124720 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
124721 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124722 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
124723 -
124724 -main.o: spucfg-0.1df/main.c
124725 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'spucfg-0.1df/main.c' || echo '$(srcdir)/'`spucfg-0.1df/main.c
124726 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
124727 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='spucfg-0.1df/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
124728 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124729 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'spucfg-0.1df/main.c' || echo '$(srcdir)/'`spucfg-0.1df/main.c
124730 -
124731 -main.obj: spucfg-0.1df/main.c
124732 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'spucfg-0.1df/main.c'; then $(CYGPATH_W) 'spucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/spucfg-0.1df/main.c'; fi`
124733 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
124734 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='spucfg-0.1df/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
124735 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
124736 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'spucfg-0.1df/main.c'; then $(CYGPATH_W) 'spucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/spucfg-0.1df/main.c'; fi`
124737 -
124738 -mostlyclean-libtool:
124739 - -rm -f *.lo
124740 -
124741 -clean-libtool:
124742 - -rm -rf .libs _libs
124743 -install-gladeDATA: $(glade_DATA)
124744 - @$(NORMAL_INSTALL)
124745 - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
124746 - @list='$(glade_DATA)'; for p in $$list; do \
124747 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
124748 - f=$(am__strip_dir) \
124749 - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
124750 - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
124751 - done
124752 -
124753 -uninstall-gladeDATA:
124754 - @$(NORMAL_UNINSTALL)
124755 - @list='$(glade_DATA)'; for p in $$list; do \
124756 - f=$(am__strip_dir) \
124757 - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
124758 - rm -f "$(DESTDIR)$(gladedir)/$$f"; \
124759 - done
124760 -
124761 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
124762 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
124763 - unique=`for i in $$list; do \
124764 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
124765 - done | \
124766 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
124767 - END { if (nonempty) { for (i in files) print i; }; }'`; \
124768 - mkid -fID $$unique
124769 -tags: TAGS
124770 -
124771 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
124772 - $(TAGS_FILES) $(LISP)
124773 - tags=; \
124774 - here=`pwd`; \
124775 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
124776 - unique=`for i in $$list; do \
124777 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
124778 - done | \
124779 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
124780 - END { if (nonempty) { for (i in files) print i; }; }'`; \
124781 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
124782 - test -n "$$unique" || unique=$$empty_fix; \
124783 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
124784 - $$tags $$unique; \
124785 - fi
124786 -ctags: CTAGS
124787 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
124788 - $(TAGS_FILES) $(LISP)
124789 - tags=; \
124790 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
124791 - unique=`for i in $$list; do \
124792 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
124793 - done | \
124794 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
124795 - END { if (nonempty) { for (i in files) print i; }; }'`; \
124796 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
124797 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
124798 - $$tags $$unique
124799 -
124800 -GTAGS:
124801 - here=`$(am__cd) $(top_builddir) && pwd` \
124802 - && cd $(top_srcdir) \
124803 - && gtags -i $(GTAGS_ARGS) $$here
124804 -
124805 -distclean-tags:
124806 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
124807 -
124808 -distdir: $(DISTFILES)
124809 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
124810 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
124811 - list='$(DISTFILES)'; \
124812 - dist_files=`for file in $$list; do echo $$file; done | \
124813 - sed -e "s|^$$srcdirstrip/||;t" \
124814 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
124815 - case $$dist_files in \
124816 - */*) $(MKDIR_P) `echo "$$dist_files" | \
124817 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
124818 - sort -u` ;; \
124819 - esac; \
124820 - for file in $$dist_files; do \
124821 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
124822 - if test -d $$d/$$file; then \
124823 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
124824 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
124825 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
124826 - fi; \
124827 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
124828 - else \
124829 - test -f $(distdir)/$$file \
124830 - || cp -p $$d/$$file $(distdir)/$$file \
124831 - || exit 1; \
124832 - fi; \
124833 - done
124834 -check-am: all-am
124835 -check: check-am
124836 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
124837 -install-binPROGRAMS: install-libLTLIBRARIES
124838 -
124839 -installdirs:
124840 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
124841 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
124842 - done
124843 -install: install-am
124844 -install-exec: install-exec-am
124845 -install-data: install-data-am
124846 -uninstall: uninstall-am
124847 -
124848 -install-am: all-am
124849 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
124850 -
124851 -installcheck: installcheck-am
124852 -install-strip:
124853 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
124854 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
124855 - `test -z '$(STRIP)' || \
124856 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
124857 -mostlyclean-generic:
124858 -
124859 -clean-generic:
124860 -
124861 -distclean-generic:
124862 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
124863 -
124864 -maintainer-clean-generic:
124865 - @echo "This command is intended for maintainers to use"
124866 - @echo "it deletes files that may require special tools to rebuild."
124867 -clean: clean-am
124868 -
124869 -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
124870 - clean-libtool mostlyclean-am
124871 -
124872 -distclean: distclean-am
124873 - -rm -rf ./$(DEPDIR)
124874 - -rm -f Makefile
124875 -distclean-am: clean-am distclean-compile distclean-generic \
124876 - distclean-tags
124877 -
124878 -dvi: dvi-am
124879 -
124880 -dvi-am:
124881 -
124882 -html: html-am
124883 -
124884 -info: info-am
124885 -
124886 -info-am:
124887 -
124888 -install-data-am: install-gladeDATA
124889 -
124890 -install-dvi: install-dvi-am
124891 -
124892 -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
124893 -
124894 -install-html: install-html-am
124895 -
124896 -install-info: install-info-am
124897 -
124898 -install-man:
124899 -
124900 -install-pdf: install-pdf-am
124901 -
124902 -install-ps: install-ps-am
124903 -
124904 -installcheck-am:
124905 -
124906 -maintainer-clean: maintainer-clean-am
124907 - -rm -rf ./$(DEPDIR)
124908 - -rm -f Makefile
124909 -maintainer-clean-am: distclean-am maintainer-clean-generic
124910 -
124911 -mostlyclean: mostlyclean-am
124912 -
124913 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
124914 - mostlyclean-libtool
124915 -
124916 -pdf: pdf-am
124917 -
124918 -pdf-am:
124919 -
124920 -ps: ps-am
124921 -
124922 -ps-am:
124923 -
124924 -uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
124925 - uninstall-libLTLIBRARIES
124926 -
124927 -.MAKE: install-am install-strip
124928 -
124929 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
124930 - clean-generic clean-libLTLIBRARIES clean-libtool ctags \
124931 - distclean distclean-compile distclean-generic \
124932 - distclean-libtool distclean-tags distdir dvi dvi-am html \
124933 - html-am info info-am install install-am install-binPROGRAMS \
124934 - install-data install-data-am install-dvi install-dvi-am \
124935 - install-exec install-exec-am install-gladeDATA install-html \
124936 - install-html-am install-info install-info-am \
124937 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
124938 - install-ps install-ps-am install-strip installcheck \
124939 - installcheck-am installdirs maintainer-clean \
124940 - maintainer-clean-generic mostlyclean mostlyclean-compile \
124941 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
124942 - tags uninstall uninstall-am uninstall-binPROGRAMS \
124943 - uninstall-gladeDATA uninstall-libLTLIBRARIES
124944 -
124945 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
124946 -# Otherwise a system limit (for SysV at least) may be exceeded.
124947 -.NOEXPORT:
124948 diff -rupN original/plugins/dfsound/Makefile.noautoconf new/plugins/dfsound/Makefile.noautoconf
124949 --- original/plugins/dfsound/Makefile.noautoconf 1969-12-31 20:00:00.000000000 -0400
124950 +++ new/plugins/dfsound/Makefile.noautoconf 2007-10-08 17:13:28.000000000 -0400
124951 @@ -0,0 +1,71 @@
124952 +##############################################################################
124953 +# MAKEFILE FOR THE PEOPS OSS SPU... just run "make"
124954 +##############################################################################
124955 +
124956 +##############################################################################
124957 +# 1. SETS (CCFLAGS3 is used)
124958 +##############################################################################
124959 +
124960 +# Set to TRUE to build the ALSA support
124961 +USEALSA = TRUE
124962 +# Set to TRUE to disable the thread library support - helpful for some Linux distros
124963 +NOTHREADLIB = FALSE
124964 +
124965 +##############################################################################
124966 +
124967 +CC = gcc
124968 +CCFLAGS3 = -fPIC -c -Wall -O2 -g
124969 +INCLUDE =
124970 +LINK = gcc
124971 +OBJ = spu.o cfg.o dma.o freeze.o psemu.o registers.o
124972 +LIB = -lc -lm -L/usr/X11R6/lib -L/usr/lib
124973 +
124974 +ifeq ($(USEALSA), TRUE)
124975 + OBJ+= alsa.o
124976 + LIB+= -lasound
124977 + LINKFLAGS = -shared -Wl,-soname,libDFSoundALSA.so -o libDFSoundALSA.1.0.7.so
124978 + CCFLAGS3+= -DUSEALSA
124979 +else
124980 + OBJ+= oss.o
124981 + LINKFLAGS = -shared -Wl,-soname,libDFSoundOSS.so -o libDFSoundOSS.1.0.7.so
124982 +endif
124983 +
124984 +ifeq ($(NOTHREADLIB), TRUE)
124985 + CCFLAGS3+= -DNOTHREADLIB
124986 +else
124987 + LIB+= -lpthread
124988 +endif
124989 +
124990 +
124991 +
124992 +##############################################################################
124993 +# 2. MAIN RULE
124994 +##############################################################################
124995 +
124996 +spuPeopsOSS : $(OBJ)
124997 + $(LINK) $(LINKFLAGS) $(OBJ) $(LIB)
124998 +
124999 +##############################################################################
125000 +# 3. GENERAL RULES
125001 +##############################################################################
125002 +
125003 +%.o : %.c
125004 + $(CC) $(CCFLAGS3) $(INCLUDE) $<
125005 +
125006 +##############################################################################
125007 +# 4. SPECIFIC RULES
125008 +##############################################################################
125009 +
125010 +spu.o : spu.c stdafx.h externals.h cfg.h dsoundoss.h regs.h debug.h xa.c reverb.c adsr.c
125011 +cfg.o : cfg.c stdafx.h externals.h
125012 +dma.o : dma.c stdafx.h externals.h
125013 +freeze.o : freeze.c stdafx.h externals.h registers.h spu.h regs.h
125014 +oss.o : oss.c stdafx.h externals.h
125015 +alsa.o : alsa.h stdafx.h externals.h
125016 +psemu.o : psemu.c stdafx.h externals.h regs.h dma.h
125017 +registers.o : registers.c stdafx.h externals.h registers.h regs.h reverb.h
125018 +
125019 +.PHONY: clean cfgDFSound
125020 +
125021 +clean:
125022 + rm -f *.o *.so
125023 diff -rupN original/plugins/dfsound/spucfg-0.1df/spucfg2.gladep new/plugins/dfsound/spucfg-0.1df/spucfg2.gladep
125024 --- original/plugins/dfsound/spucfg-0.1df/spucfg2.gladep 1969-12-31 20:00:00.000000000 -0400
125025 +++ new/plugins/dfsound/spucfg-0.1df/spucfg2.gladep 2007-10-08 17:13:28.000000000 -0400
125026 @@ -0,0 +1,13 @@
125027 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
125028 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
125029 +
125030 +<glade-project>
125031 + <name>spucfg</name>
125032 + <program_name>spucfg</program_name>
125033 + <source_directory>.</source_directory>
125034 + <pixmaps_directory>.</pixmaps_directory>
125035 + <gnome_support>FALSE</gnome_support>
125036 + <output_main_file>FALSE</output_main_file>
125037 + <output_build_files>FALSE</output_build_files>
125038 + <backup_source_files>FALSE</backup_source_files>
125039 +</glade-project>
125040 diff -rupN original/plugins/dfxvideo/Makefile.in new/plugins/dfxvideo/Makefile.in
125041 --- original/plugins/dfxvideo/Makefile.in 2009-03-29 01:17:42.000000000 -0430
125042 +++ new/plugins/dfxvideo/Makefile.in 1969-12-31 20:00:00.000000000 -0400
125043 @@ -1,654 +0,0 @@
125044 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
125045 -# @configure_input@
125046 -
125047 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
125048 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
125049 -# This Makefile.in is free software; the Free Software Foundation
125050 -# gives unlimited permission to copy and/or distribute it,
125051 -# with or without modifications, as long as this notice is preserved.
125052 -
125053 -# This program is distributed in the hope that it will be useful,
125054 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
125055 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
125056 -# PARTICULAR PURPOSE.
125057 -
125058 -@SET_MAKE@
125059 -
125060 -
125061 -
125062 -VPATH = @srcdir@
125063 -pkgdatadir = $(datadir)/@PACKAGE@
125064 -pkglibdir = $(libdir)/@PACKAGE@
125065 -pkgincludedir = $(includedir)/@PACKAGE@
125066 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
125067 -install_sh_DATA = $(install_sh) -c -m 644
125068 -install_sh_PROGRAM = $(install_sh) -c
125069 -install_sh_SCRIPT = $(install_sh) -c
125070 -INSTALL_HEADER = $(INSTALL_DATA)
125071 -transform = $(program_transform_name)
125072 -NORMAL_INSTALL = :
125073 -PRE_INSTALL = :
125074 -POST_INSTALL = :
125075 -NORMAL_UNINSTALL = :
125076 -PRE_UNINSTALL = :
125077 -POST_UNINSTALL = :
125078 -build_triplet = @build@
125079 -host_triplet = @host@
125080 -target_triplet = @target@
125081 -@ARCH_X86_TRUE@am__append_1 = i386.asm
125082 -bin_PROGRAMS = cfgDFXVideo$(EXEEXT)
125083 -subdir = plugins/dfxvideo
125084 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
125085 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
125086 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
125087 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
125088 - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
125089 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
125090 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
125091 - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
125092 - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
125093 - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
125094 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \
125095 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
125096 - $(top_srcdir)/configure.ac
125097 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
125098 - $(ACLOCAL_M4)
125099 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
125100 -CONFIG_HEADER = $(top_builddir)/include/config.h
125101 -CONFIG_CLEAN_FILES =
125102 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
125103 -am__vpath_adj = case $$p in \
125104 - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
125105 - *) f=$$p;; \
125106 - esac;
125107 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
125108 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
125109 - "$(DESTDIR)$(gladedir)"
125110 -libLTLIBRARIES_INSTALL = $(INSTALL)
125111 -LTLIBRARIES = $(lib_LTLIBRARIES)
125112 -libDFXVideo_la_LIBADD =
125113 -am__libDFXVideo_la_SOURCES_DIST = gpu.c gpu.h cfg.c cfg.h draw.c \
125114 - draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h \
125115 - soft.c soft.h zn.c i386.asm
125116 -@ARCH_X86_TRUE@am__objects_1 = i386.lo
125117 -am_libDFXVideo_la_OBJECTS = gpu.lo cfg.lo draw.lo fps.lo key.lo \
125118 - menu.lo prim.lo soft.lo zn.lo $(am__objects_1)
125119 -libDFXVideo_la_OBJECTS = $(am_libDFXVideo_la_OBJECTS)
125120 -libDFXVideo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
125121 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
125122 - $(libDFXVideo_la_LDFLAGS) $(LDFLAGS) -o $@
125123 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
125124 -PROGRAMS = $(bin_PROGRAMS)
125125 -am_cfgDFXVideo_OBJECTS = main.$(OBJEXT)
125126 -cfgDFXVideo_OBJECTS = $(am_cfgDFXVideo_OBJECTS)
125127 -am__DEPENDENCIES_1 =
125128 -cfgDFXVideo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
125129 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
125130 -depcomp = $(SHELL) $(top_srcdir)/depcomp
125131 -am__depfiles_maybe = depfiles
125132 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
125133 - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
125134 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
125135 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
125136 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
125137 -CCLD = $(CC)
125138 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
125139 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
125140 - $(LDFLAGS) -o $@
125141 -SOURCES = $(libDFXVideo_la_SOURCES) $(cfgDFXVideo_SOURCES)
125142 -DIST_SOURCES = $(am__libDFXVideo_la_SOURCES_DIST) \
125143 - $(cfgDFXVideo_SOURCES)
125144 -gladeDATA_INSTALL = $(INSTALL_DATA)
125145 -DATA = $(glade_DATA)
125146 -ETAGS = etags
125147 -CTAGS = ctags
125148 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
125149 -ACLOCAL = @ACLOCAL@
125150 -ALLOCA = @ALLOCA@
125151 -ALL_LINGUAS = @ALL_LINGUAS@
125152 -ALSA_LIBS = @ALSA_LIBS@
125153 -AMTAR = @AMTAR@
125154 -AR = @AR@
125155 -AUTOCONF = @AUTOCONF@
125156 -AUTOHEADER = @AUTOHEADER@
125157 -AUTOMAKE = @AUTOMAKE@
125158 -AWK = @AWK@
125159 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
125160 -BURN_CFLAGS = @BURN_CFLAGS@
125161 -BURN_LIBS = @BURN_LIBS@
125162 -CATOBJEXT = @CATOBJEXT@
125163 -CC = @CC@
125164 -CCAS = @CCAS@
125165 -CCASDEPMODE = @CCASDEPMODE@
125166 -CCASFLAGS = @CCASFLAGS@
125167 -CCDEPMODE = @CCDEPMODE@
125168 -CFLAGS = @CFLAGS@
125169 -CPP = @CPP@
125170 -CPPFLAGS = @CPPFLAGS@
125171 -CXX = @CXX@
125172 -CXXCPP = @CXXCPP@
125173 -CXXDEPMODE = @CXXDEPMODE@
125174 -CXXFLAGS = @CXXFLAGS@
125175 -CYGPATH_W = @CYGPATH_W@
125176 -DATADIRNAME = @DATADIRNAME@
125177 -DEFS = @DEFS@
125178 -DEPDIR = @DEPDIR@
125179 -DFBINIMAGE = @DFBINIMAGE@
125180 -DSYMUTIL = @DSYMUTIL@
125181 -ECHO = @ECHO@
125182 -ECHO_C = @ECHO_C@
125183 -ECHO_N = @ECHO_N@
125184 -ECHO_T = @ECHO_T@
125185 -EGREP = @EGREP@
125186 -EXEEXT = @EXEEXT@
125187 -F77 = @F77@
125188 -FFLAGS = @FFLAGS@
125189 -FLTKCONFIG = @FLTKCONFIG@
125190 -FLTK_CXXFLAGS = @FLTK_CXXFLAGS@
125191 -FLTK_LDFLAGS = @FLTK_LDFLAGS@
125192 -GENCAT = @GENCAT@
125193 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
125194 -GIO2_CFLAGS = @GIO2_CFLAGS@
125195 -GIO2_LIBS = @GIO2_LIBS@
125196 -GLADE2_CFLAGS = @GLADE2_CFLAGS@
125197 -GLADE2_LIBS = @GLADE2_LIBS@
125198 -GLIB2_CFLAGS = @GLIB2_CFLAGS@
125199 -GLIB2_LIBS = @GLIB2_LIBS@
125200 -GLIBC21 = @GLIBC21@
125201 -GMSGFMT = @GMSGFMT@
125202 -GREP = @GREP@
125203 -GTK2_CFLAGS = @GTK2_CFLAGS@
125204 -GTK2_LIBS = @GTK2_LIBS@
125205 -INSTALL = @INSTALL@
125206 -INSTALL_DATA = @INSTALL_DATA@
125207 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
125208 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
125209 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
125210 -INSTOBJEXT = @INSTOBJEXT@
125211 -INTLBISON = @INTLBISON@
125212 -INTLLIBS = @INTLLIBS@
125213 -INTLOBJS = @INTLOBJS@
125214 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
125215 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
125216 -INTLTOOL_PERL = @INTLTOOL_PERL@
125217 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
125218 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
125219 -LDFLAGS = @LDFLAGS@
125220 -LIBICONV = @LIBICONV@
125221 -LIBINTL = @LIBINTL@
125222 -LIBOBJS = @LIBOBJS@
125223 -LIBS = @LIBS@
125224 -LIBTOOL = @LIBTOOL@
125225 -LN_S = @LN_S@
125226 -LTLIBICONV = @LTLIBICONV@
125227 -LTLIBINTL = @LTLIBINTL@
125228 -LTLIBOBJS = @LTLIBOBJS@
125229 -MAINT = @MAINT@
125230 -MAKEINFO = @MAKEINFO@
125231 -MKDIR_P = @MKDIR_P@
125232 -MKINSTALLDIRS = @MKINSTALLDIRS@
125233 -MSGFMT = @MSGFMT@
125234 -MSGMERGE = @MSGMERGE@
125235 -NASM = @NASM@
125236 -NMEDIT = @NMEDIT@
125237 -OBJEXT = @OBJEXT@
125238 -PACKAGE = @PACKAGE@
125239 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
125240 -PACKAGE_NAME = @PACKAGE_NAME@
125241 -PACKAGE_STRING = @PACKAGE_STRING@
125242 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
125243 -PACKAGE_VERSION = @PACKAGE_VERSION@
125244 -PATH_SEPARATOR = @PATH_SEPARATOR@
125245 -PKG_CONFIG = @PKG_CONFIG@
125246 -POSUB = @POSUB@
125247 -RANLIB = @RANLIB@
125248 -SED = @SED@
125249 -SET_MAKE = @SET_MAKE@
125250 -SHELL = @SHELL@
125251 -STRIP = @STRIP@
125252 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
125253 -USE_NLS = @USE_NLS@
125254 -VERSION = @VERSION@
125255 -XGETTEXT = @XGETTEXT@
125256 -abs_builddir = @abs_builddir@
125257 -abs_srcdir = @abs_srcdir@
125258 -abs_top_builddir = @abs_top_builddir@
125259 -abs_top_srcdir = @abs_top_srcdir@
125260 -ac_ct_CC = @ac_ct_CC@
125261 -ac_ct_CXX = @ac_ct_CXX@
125262 -ac_ct_F77 = @ac_ct_F77@
125263 -am__include = @am__include@
125264 -am__leading_dot = @am__leading_dot@
125265 -am__quote = @am__quote@
125266 -am__tar = @am__tar@
125267 -am__untar = @am__untar@
125268 -bindir = $(prefix)/lib/games/psemu/
125269 -build = @build@
125270 -build_alias = @build_alias@
125271 -build_cpu = @build_cpu@
125272 -build_os = @build_os@
125273 -build_vendor = @build_vendor@
125274 -builddir = @builddir@
125275 -datadir = @datadir@
125276 -datarootdir = @datarootdir@
125277 -docdir = @docdir@
125278 -dvidir = @dvidir@
125279 -exec_prefix = @exec_prefix@
125280 -host = @host@
125281 -host_alias = @host_alias@
125282 -host_cpu = @host_cpu@
125283 -host_os = @host_os@
125284 -host_vendor = @host_vendor@
125285 -htmldir = @htmldir@
125286 -includedir = @includedir@
125287 -infodir = @infodir@
125288 -install_sh = @install_sh@
125289 -libdir = $(prefix)/lib/games/psemu/
125290 -libexecdir = @libexecdir@
125291 -localedir = @localedir@
125292 -localstatedir = @localstatedir@
125293 -mandir = @mandir@
125294 -mkdir_p = @mkdir_p@
125295 -oldincludedir = @oldincludedir@
125296 -pdfdir = @pdfdir@
125297 -prefix = @prefix@
125298 -program_transform_name = @program_transform_name@
125299 -psdir = @psdir@
125300 -sbindir = @sbindir@
125301 -sharedstatedir = @sharedstatedir@
125302 -srcdir = @srcdir@
125303 -sysconfdir = @sysconfdir@
125304 -target = @target@
125305 -target_alias = @target_alias@
125306 -target_cpu = @target_cpu@
125307 -target_os = @target_os@
125308 -target_vendor = @target_vendor@
125309 -top_build_prefix = @top_build_prefix@
125310 -top_builddir = @top_builddir@
125311 -top_srcdir = @top_srcdir@
125312 -STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
125313 -SUFFIXES = .asm
125314 -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
125315 - -DLOCALE_DIR=\"${datadir}/locale/\" \
125316 - -DDATADIR=\"${datadir}/psemu/\" \
125317 - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
125318 - -DVERSION=XVideo -DNUMBER=0.1.0
125319 -
125320 -lib_LTLIBRARIES = libDFXVideo.la
125321 -libDFXVideo_la_SOURCES = gpu.c gpu.h cfg.c cfg.h draw.c draw.h fps.c \
125322 - fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h \
125323 - zn.c $(am__append_1)
125324 -libDFXVideo_la_LDFLAGS = -module -avoid-version -lXv -lXext
125325 -cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c
125326 -cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
125327 -glade_DATA = gpucfg-0.1df/dfxvideo.glade2 gpucfg-0.1df/gpucfg.gladep
125328 -gladedir = $(datadir)/psemu/
125329 -EXTRA_DIST = $(glade_DATA) \
125330 - externals.h psemu.h swap.h \
125331 - changelog.txt filemap.txt hq2x.h hq3x.h \
125332 - support.c support.h interface.c interface.h \
125333 - callbacks.c callbacks.h \
125334 - interp.h license.txt macros.inc \
125335 - res/gpu.bmp \
125336 - gpucfg-0.1df/HACKING
125337 -
125338 -all: all-am
125339 -
125340 -.SUFFIXES:
125341 -.SUFFIXES: .asm .c .lo .o .obj
125342 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
125343 - @for dep in $?; do \
125344 - case '$(am__configure_deps)' in \
125345 - *$$dep*) \
125346 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
125347 - && exit 0; \
125348 - exit 1;; \
125349 - esac; \
125350 - done; \
125351 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfxvideo/Makefile'; \
125352 - cd $(top_srcdir) && \
125353 - $(AUTOMAKE) --gnu plugins/dfxvideo/Makefile
125354 -.PRECIOUS: Makefile
125355 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
125356 - @case '$?' in \
125357 - *config.status*) \
125358 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
125359 - *) \
125360 - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
125361 - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
125362 - esac;
125363 -
125364 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
125365 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
125366 -
125367 -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
125368 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
125369 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
125370 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
125371 -install-libLTLIBRARIES: $(lib_LTLIBRARIES)
125372 - @$(NORMAL_INSTALL)
125373 - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
125374 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
125375 - if test -f $$p; then \
125376 - f=$(am__strip_dir) \
125377 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
125378 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
125379 - else :; fi; \
125380 - done
125381 -
125382 -uninstall-libLTLIBRARIES:
125383 - @$(NORMAL_UNINSTALL)
125384 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
125385 - p=$(am__strip_dir) \
125386 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
125387 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
125388 - done
125389 -
125390 -clean-libLTLIBRARIES:
125391 - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
125392 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
125393 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
125394 - test "$$dir" != "$$p" || dir=.; \
125395 - echo "rm -f \"$${dir}/so_locations\""; \
125396 - rm -f "$${dir}/so_locations"; \
125397 - done
125398 -libDFXVideo.la: $(libDFXVideo_la_OBJECTS) $(libDFXVideo_la_DEPENDENCIES)
125399 - $(libDFXVideo_la_LINK) -rpath $(libdir) $(libDFXVideo_la_OBJECTS) $(libDFXVideo_la_LIBADD) $(LIBS)
125400 -install-binPROGRAMS: $(bin_PROGRAMS)
125401 - @$(NORMAL_INSTALL)
125402 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
125403 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
125404 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
125405 - if test -f $$p \
125406 - || test -f $$p1 \
125407 - ; then \
125408 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
125409 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
125410 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
125411 - else :; fi; \
125412 - done
125413 -
125414 -uninstall-binPROGRAMS:
125415 - @$(NORMAL_UNINSTALL)
125416 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
125417 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
125418 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
125419 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
125420 - done
125421 -
125422 -clean-binPROGRAMS:
125423 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
125424 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
125425 - echo " rm -f $$p $$f"; \
125426 - rm -f $$p $$f ; \
125427 - done
125428 -cfgDFXVideo$(EXEEXT): $(cfgDFXVideo_OBJECTS) $(cfgDFXVideo_DEPENDENCIES)
125429 - @rm -f cfgDFXVideo$(EXEEXT)
125430 - $(LINK) $(cfgDFXVideo_OBJECTS) $(cfgDFXVideo_LDADD) $(LIBS)
125431 -
125432 -mostlyclean-compile:
125433 - -rm -f *.$(OBJEXT)
125434 -
125435 -distclean-compile:
125436 - -rm -f *.tab.c
125437 -
125438 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
125439 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Plo@am__quote@
125440 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fps.Plo@am__quote@
125441 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpu.Plo@am__quote@
125442 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key.Plo@am__quote@
125443 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
125444 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Plo@am__quote@
125445 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim.Plo@am__quote@
125446 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soft.Plo@am__quote@
125447 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zn.Plo@am__quote@
125448 -
125449 -.c.o:
125450 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
125451 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
125452 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
125453 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
125454 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
125455 -
125456 -.c.obj:
125457 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
125458 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
125459 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
125460 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
125461 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
125462 -
125463 -.c.lo:
125464 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
125465 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
125466 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
125467 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
125468 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
125469 -
125470 -main.o: gpucfg-0.1df/main.c
125471 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'gpucfg-0.1df/main.c' || echo '$(srcdir)/'`gpucfg-0.1df/main.c
125472 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
125473 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gpucfg-0.1df/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
125474 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
125475 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'gpucfg-0.1df/main.c' || echo '$(srcdir)/'`gpucfg-0.1df/main.c
125476 -
125477 -main.obj: gpucfg-0.1df/main.c
125478 -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'gpucfg-0.1df/main.c'; then $(CYGPATH_W) 'gpucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg-0.1df/main.c'; fi`
125479 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
125480 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gpucfg-0.1df/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
125481 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
125482 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'gpucfg-0.1df/main.c'; then $(CYGPATH_W) 'gpucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg-0.1df/main.c'; fi`
125483 -
125484 -mostlyclean-libtool:
125485 - -rm -f *.lo
125486 -
125487 -clean-libtool:
125488 - -rm -rf .libs _libs
125489 -install-gladeDATA: $(glade_DATA)
125490 - @$(NORMAL_INSTALL)
125491 - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
125492 - @list='$(glade_DATA)'; for p in $$list; do \
125493 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
125494 - f=$(am__strip_dir) \
125495 - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
125496 - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
125497 - done
125498 -
125499 -uninstall-gladeDATA:
125500 - @$(NORMAL_UNINSTALL)
125501 - @list='$(glade_DATA)'; for p in $$list; do \
125502 - f=$(am__strip_dir) \
125503 - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
125504 - rm -f "$(DESTDIR)$(gladedir)/$$f"; \
125505 - done
125506 -
125507 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
125508 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
125509 - unique=`for i in $$list; do \
125510 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
125511 - done | \
125512 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
125513 - END { if (nonempty) { for (i in files) print i; }; }'`; \
125514 - mkid -fID $$unique
125515 -tags: TAGS
125516 -
125517 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
125518 - $(TAGS_FILES) $(LISP)
125519 - tags=; \
125520 - here=`pwd`; \
125521 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
125522 - unique=`for i in $$list; do \
125523 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
125524 - done | \
125525 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
125526 - END { if (nonempty) { for (i in files) print i; }; }'`; \
125527 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
125528 - test -n "$$unique" || unique=$$empty_fix; \
125529 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
125530 - $$tags $$unique; \
125531 - fi
125532 -ctags: CTAGS
125533 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
125534 - $(TAGS_FILES) $(LISP)
125535 - tags=; \
125536 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
125537 - unique=`for i in $$list; do \
125538 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
125539 - done | \
125540 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
125541 - END { if (nonempty) { for (i in files) print i; }; }'`; \
125542 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
125543 - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
125544 - $$tags $$unique
125545 -
125546 -GTAGS:
125547 - here=`$(am__cd) $(top_builddir) && pwd` \
125548 - && cd $(top_srcdir) \
125549 - && gtags -i $(GTAGS_ARGS) $$here
125550 -
125551 -distclean-tags:
125552 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
125553 -
125554 -distdir: $(DISTFILES)
125555 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
125556 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
125557 - list='$(DISTFILES)'; \
125558 - dist_files=`for file in $$list; do echo $$file; done | \
125559 - sed -e "s|^$$srcdirstrip/||;t" \
125560 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
125561 - case $$dist_files in \
125562 - */*) $(MKDIR_P) `echo "$$dist_files" | \
125563 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
125564 - sort -u` ;; \
125565 - esac; \
125566 - for file in $$dist_files; do \
125567 - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
125568 - if test -d $$d/$$file; then \
125569 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
125570 - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
125571 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
125572 - fi; \
125573 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
125574 - else \
125575 - test -f $(distdir)/$$file \
125576 - || cp -p $$d/$$file $(distdir)/$$file \
125577 - || exit 1; \
125578 - fi; \
125579 - done
125580 -check-am: all-am
125581 -check: check-am
125582 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
125583 -install-binPROGRAMS: install-libLTLIBRARIES
125584 -
125585 -installdirs:
125586 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
125587 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
125588 - done
125589 -install: install-am
125590 -install-exec: install-exec-am
125591 -install-data: install-data-am
125592 -uninstall: uninstall-am
125593 -
125594 -install-am: all-am
125595 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
125596 -
125597 -installcheck: installcheck-am
125598 -install-strip:
125599 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
125600 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
125601 - `test -z '$(STRIP)' || \
125602 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
125603 -mostlyclean-generic:
125604 -
125605 -clean-generic:
125606 -
125607 -distclean-generic:
125608 - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
125609 -
125610 -maintainer-clean-generic:
125611 - @echo "This command is intended for maintainers to use"
125612 - @echo "it deletes files that may require special tools to rebuild."
125613 -clean: clean-am
125614 -
125615 -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
125616 - clean-libtool mostlyclean-am
125617 -
125618 -distclean: distclean-am
125619 - -rm -rf ./$(DEPDIR)
125620 - -rm -f Makefile
125621 -distclean-am: clean-am distclean-compile distclean-generic \
125622 - distclean-tags
125623 -
125624 -dvi: dvi-am
125625 -
125626 -dvi-am:
125627 -
125628 -html: html-am
125629 -
125630 -info: info-am
125631 -
125632 -info-am:
125633 -
125634 -install-data-am: install-gladeDATA
125635 -
125636 -install-dvi: install-dvi-am
125637 -
125638 -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
125639 -
125640 -install-html: install-html-am
125641 -
125642 -install-info: install-info-am
125643 -
125644 -install-man:
125645 -
125646 -install-pdf: install-pdf-am
125647 -
125648 -install-ps: install-ps-am
125649 -
125650 -installcheck-am:
125651 -
125652 -maintainer-clean: maintainer-clean-am
125653 - -rm -rf ./$(DEPDIR)
125654 - -rm -f Makefile
125655 -maintainer-clean-am: distclean-am maintainer-clean-generic
125656 -
125657 -mostlyclean: mostlyclean-am
125658 -
125659 -mostlyclean-am: mostlyclean-compile mostlyclean-generic \
125660 - mostlyclean-libtool
125661 -
125662 -pdf: pdf-am
125663 -
125664 -pdf-am:
125665 -
125666 -ps: ps-am
125667 -
125668 -ps-am:
125669 -
125670 -uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
125671 - uninstall-libLTLIBRARIES
125672 -
125673 -.MAKE: install-am install-strip
125674 -
125675 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
125676 - clean-generic clean-libLTLIBRARIES clean-libtool ctags \
125677 - distclean distclean-compile distclean-generic \
125678 - distclean-libtool distclean-tags distdir dvi dvi-am html \
125679 - html-am info info-am install install-am install-binPROGRAMS \
125680 - install-data install-data-am install-dvi install-dvi-am \
125681 - install-exec install-exec-am install-gladeDATA install-html \
125682 - install-html-am install-info install-info-am \
125683 - install-libLTLIBRARIES install-man install-pdf install-pdf-am \
125684 - install-ps install-ps-am install-strip installcheck \
125685 - installcheck-am installdirs maintainer-clean \
125686 - maintainer-clean-generic mostlyclean mostlyclean-compile \
125687 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
125688 - tags uninstall uninstall-am uninstall-binPROGRAMS \
125689 - uninstall-gladeDATA uninstall-libLTLIBRARIES
125690 -
125691 -
125692 -.asm.lo:
125693 - $(LIBTOOL) --tag=CC --mode=compile \
125694 - $(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
125695 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
125696 -# Otherwise a system limit (for SysV at least) may be exceeded.
125697 -.NOEXPORT:
125698 Los ficheros binarios original/plugins/dfxvideo/gpucfg-0.1df/cfgDFX11Video y new/plugins/dfxvideo/gpucfg-0.1df/cfgDFX11Video son distintos
125699 diff -rupN original/po/ChangeLog new/po/ChangeLog
125700 --- original/po/ChangeLog 2009-03-28 21:55:29.000000000 -0430
125701 +++ new/po/ChangeLog 2009-04-01 04:21:41.000000000 -0430
125702 @@ -0,0 +1,8 @@
125703 +2009-04-01 19:50 adburton
125704 +
125705 + * POTFILES.in: Add support for desktop file to be translatable
125706 +
125707 +2009-04-01 19:38 adburton
125708 +
125709 + * pcsx-df.pot, LINGUAS, POTFILES.in, POTFILES.skip: Update
125710 + translation template, update list of translatable files
125711 diff -rupN original/po/LINGUAS new/po/LINGUAS
125712 --- original/po/LINGUAS 2007-10-08 17:13:28.000000000 -0400
125713 +++ new/po/LINGUAS 2009-04-01 04:09:25.000000000 -0430
125714 @@ -1 +1 @@
125715 -es ja sv
125716 +es ja sv zh_CN
125717 diff -rupN original/po/Makefile.in.in new/po/Makefile.in.in
125718 --- original/po/Makefile.in.in 2009-03-29 01:17:27.000000000 -0430
125719 +++ new/po/Makefile.in.in 2007-10-08 17:13:28.000000000 -0400
125720 @@ -1,92 +1,88 @@
125721 # Makefile for program source directory in GNU NLS utilities package.
125722 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
125723 -# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
125724 #
125725 -# This file may be copied and used freely without restrictions. It may
125726 -# be used in projects which are not available under a GNU Public License,
125727 +# This file file be copied and used freely without restrictions. It can
125728 +# be used in projects which are not available under the GNU Public License
125729 # but which still want to provide support for the GNU gettext functionality.
125730 +# Please note that the actual code is *not* freely available.
125731 #
125732 # - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
125733 # instead of PACKAGE and to look for po2tbl in ./ not in intl/
125734 #
125735 # - Modified by jacob berkman <jacob@ximian.com> to install
125736 # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
125737 -#
125738 -# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
125739 -#
125740 -# We have the following line for use by intltoolize:
125741 -# INTLTOOL_MAKEFILE
125742
125743 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
125744 PACKAGE = @PACKAGE@
125745 VERSION = @VERSION@
125746
125747 -SHELL = @SHELL@
125748 +SHELL = /bin/sh
125749 +@SET_MAKE@
125750
125751 srcdir = @srcdir@
125752 top_srcdir = @top_srcdir@
125753 -top_builddir = @top_builddir@
125754 VPATH = @srcdir@
125755
125756 prefix = @prefix@
125757 exec_prefix = @exec_prefix@
125758 datadir = @datadir@
125759 -datarootdir = @datarootdir@
125760 libdir = @libdir@
125761 -DATADIRNAME = @DATADIRNAME@
125762 -itlocaledir = $(prefix)/$(DATADIRNAME)/locale
125763 +localedir = $(libdir)/locale
125764 +gnulocaledir = $(datadir)/locale
125765 +gettextsrcdir = $(datadir)/glib-2.0/gettext/po
125766 subdir = po
125767 -install_sh = @install_sh@
125768 -# Automake >= 1.8 provides @mkdir_p@.
125769 -# Until it can be supposed, use the safe fallback:
125770 -mkdir_p = $(install_sh) -d
125771
125772 INSTALL = @INSTALL@
125773 INSTALL_DATA = @INSTALL_DATA@
125774 +MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
125775
125776 +CC = @CC@
125777 +GENCAT = @GENCAT@
125778 GMSGFMT = @GMSGFMT@
125779 MSGFMT = @MSGFMT@
125780 XGETTEXT = @XGETTEXT@
125781 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
125782 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
125783 -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
125784 -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
125785 -
125786 -ALL_LINGUAS = @ALL_LINGUAS@
125787 +MSGMERGE = msgmerge
125788
125789 -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
125790 +DEFS = @DEFS@
125791 +CFLAGS = @CFLAGS@
125792 +CPPFLAGS = @CPPFLAGS@
125793
125794 -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
125795 +INCLUDES = -I.. -I$(top_srcdir)/intl
125796
125797 -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
125798 +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
125799
125800 -POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
125801 -
125802 -DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
125803 -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
125804 +SOURCES =
125805 +POFILES = @POFILES@
125806 +GMOFILES = @GMOFILES@
125807 +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
125808 +$(POFILES) $(GMOFILES) $(SOURCES)
125809
125810 POTFILES = \
125811 -# This comment gets stripped out
125812
125813 -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
125814 +CATALOGS = @CATALOGS@
125815 +CATOBJEXT = @CATOBJEXT@
125816 +INSTOBJEXT = @INSTOBJEXT@
125817
125818 .SUFFIXES:
125819 -.SUFFIXES: .po .pox .gmo .mo .msg .cat
125820 +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
125821 +
125822 +.c.o:
125823 + $(COMPILE) $<
125824
125825 .po.pox:
125826 $(MAKE) $(GETTEXT_PACKAGE).pot
125827 - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
125828 + $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
125829
125830 .po.mo:
125831 $(MSGFMT) -o $@ $<
125832
125833 .po.gmo:
125834 - file=`echo $* | sed 's,.*/,,'`.gmo \
125835 - && rm -f $$file && $(GMSGFMT) -o $$file $<
125836 + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
125837 + && rm -f $$file && $(GMSGFMT) -c -o $$file $<
125838
125839 .po.cat:
125840 sed -f ../intl/po2msg.sed < $< > $*.msg \
125841 - && rm -f $@ && gencat $@ $*.msg
125842 + && rm -f $@ && $(GENCAT) $@ $*.msg
125843
125844
125845 all: all-@USE_NLS@
125846 @@ -94,97 +90,141 @@ all: all-@USE_NLS@
125847 all-yes: $(CATALOGS)
125848 all-no:
125849
125850 -$(GETTEXT_PACKAGE).pot: $(POTFILES)
125851 - $(GENPOT)
125852 +$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
125853 + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
125854 + --add-comments --keyword=_ --keyword=N_ \
125855 + --flag=g_strdup_printf:1:c-format \
125856 + --flag=g_string_printf:2:c-format \
125857 + --flag=g_string_append_printf:2:c-format \
125858 + --flag=g_error_new:3:c-format \
125859 + --flag=g_set_error:4:c-format \
125860 + --flag=g_markup_printf_escaped:1:c-format \
125861 + --flag=g_log:3:c-format \
125862 + --flag=g_print:1:c-format \
125863 + --flag=g_printerr:1:c-format \
125864 + --flag=g_printf:1:c-format \
125865 + --flag=g_fprintf:2:c-format \
125866 + --flag=g_sprintf:2:c-format \
125867 + --flag=g_snprintf:3:c-format \
125868 + --flag=g_scanner_error:2:c-format \
125869 + --flag=g_scanner_warn:2:c-format \
125870 + --files-from=$(srcdir)/POTFILES.in \
125871 + && test ! -f $(GETTEXT_PACKAGE).po \
125872 + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
125873 + && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
125874
125875 -install: install-data
125876 +install: install-exec install-data
125877 +install-exec:
125878 install-data: install-data-@USE_NLS@
125879 install-data-no: all
125880 install-data-yes: all
125881 - linguas="$(USE_LINGUAS)"; \
125882 - for lang in $$linguas; do \
125883 - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
125884 - $(mkdir_p) $$dir; \
125885 - if test -r $$lang.gmo; then \
125886 - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
125887 - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
125888 - else \
125889 - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
125890 - echo "installing $(srcdir)/$$lang.gmo as" \
125891 - "$$dir/$(GETTEXT_PACKAGE).mo"; \
125892 - fi; \
125893 - if test -r $$lang.gmo.m; then \
125894 - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
125895 - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
125896 - else \
125897 - if test -r $(srcdir)/$$lang.gmo.m ; then \
125898 - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
125899 - $$dir/$(GETTEXT_PACKAGE).mo.m; \
125900 - echo "installing $(srcdir)/$$lang.gmo.m as" \
125901 - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
125902 + if test -r "$(MKINSTALLDIRS)"; then \
125903 + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
125904 + else \
125905 + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
125906 + fi
125907 + @catalogs='$(CATALOGS)'; \
125908 + for cat in $$catalogs; do \
125909 + cat=`basename $$cat`; \
125910 + case "$$cat" in \
125911 + *.gmo) destdir=$(gnulocaledir);; \
125912 + *) destdir=$(localedir);; \
125913 + esac; \
125914 + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
125915 + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
125916 + if test -r "$(MKINSTALLDIRS)"; then \
125917 + $(MKINSTALLDIRS) $$dir; \
125918 + else \
125919 + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
125920 + fi; \
125921 + if test -r $$cat; then \
125922 + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
125923 + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
125924 + else \
125925 + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
125926 + echo "installing $(srcdir)/$$cat as" \
125927 + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
125928 + fi; \
125929 + if test -r $$cat.m; then \
125930 + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
125931 + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
125932 + else \
125933 + if test -r $(srcdir)/$$cat.m ; then \
125934 + $(INSTALL_DATA) $(srcdir)/$$cat.m \
125935 + $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
125936 + echo "installing $(srcdir)/$$cat as" \
125937 + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
125938 else \
125939 true; \
125940 fi; \
125941 fi; \
125942 done
125943 -
125944 -# Empty stubs to satisfy archaic automake needs
125945 -dvi info tags TAGS ID:
125946 + if test "$(PACKAGE)" = "glib"; then \
125947 + if test -r "$(MKINSTALLDIRS)"; then \
125948 + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
125949 + else \
125950 + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
125951 + fi; \
125952 + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
125953 + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
125954 + else \
125955 + : ; \
125956 + fi
125957
125958 # Define this as empty until I found a useful application.
125959 -install-exec installcheck:
125960 +installcheck:
125961
125962 uninstall:
125963 - linguas="$(USE_LINGUAS)"; \
125964 - for lang in $$linguas; do \
125965 - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
125966 - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
125967 + catalogs='$(CATALOGS)'; \
125968 + for cat in $$catalogs; do \
125969 + cat=`basename $$cat`; \
125970 + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
125971 + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
125972 + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
125973 + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
125974 + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
125975 done
125976 -
125977 -check: all $(GETTEXT_PACKAGE).pot
125978 - rm -f missing notexist
125979 - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
125980 - if [ -r missing -o -r notexist ]; then \
125981 - exit 1; \
125982 + if test "$(PACKAGE)" = "glib"; then \
125983 + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
125984 fi
125985
125986 +check: all
125987 +
125988 +dvi info tags TAGS ID:
125989 +
125990 mostlyclean:
125991 - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
125992 - rm -f .intltool-merge-cache
125993 + rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
125994 + rm -fr *.o
125995
125996 clean: mostlyclean
125997
125998 distclean: clean
125999 - rm -f Makefile Makefile.in POTFILES stamp-it
126000 - rm -f *.mo *.msg *.cat *.cat.m *.gmo
126001 + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
126002
126003 maintainer-clean: distclean
126004 @echo "This command is intended for maintainers to use;"
126005 @echo "it deletes files that may require special tools to rebuild."
126006 - rm -f Makefile.in.in
126007 + rm -f $(GMOFILES)
126008
126009 -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
126010 -dist distdir: $(DISTFILES)
126011 +distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
126012 +dist distdir: update-po $(DISTFILES)
126013 dists="$(DISTFILES)"; \
126014 - extra_dists="$(EXTRA_DISTFILES)"; \
126015 - for file in $$extra_dists; do \
126016 - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
126017 - done; \
126018 for file in $$dists; do \
126019 - test -f $$file || file="$(srcdir)/$$file"; \
126020 - ln $$file $(distdir) 2> /dev/null \
126021 - || cp -p $$file $(distdir); \
126022 + ln $(srcdir)/$$file $(distdir) 2> /dev/null \
126023 + || cp -p $(srcdir)/$$file $(distdir); \
126024 done
126025
126026 update-po: Makefile
126027 $(MAKE) $(GETTEXT_PACKAGE).pot
126028 tmpdir=`pwd`; \
126029 - linguas="$(USE_LINGUAS)"; \
126030 - for lang in $$linguas; do \
126031 + cd $(srcdir); \
126032 + catalogs='$(CATALOGS)'; \
126033 + for cat in $$catalogs; do \
126034 + cat=`basename $$cat`; \
126035 + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
126036 echo "$$lang:"; \
126037 - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
126038 - if $$result; then \
126039 - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
126040 + if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \
126041 + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
126042 rm -f $$tmpdir/$$lang.new.po; \
126043 else \
126044 if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
126045 @@ -196,20 +236,32 @@ update-po: Makefile
126046 fi; \
126047 fi; \
126048 else \
126049 - echo "msgmerge for $$lang.gmo failed!"; \
126050 + echo "msgmerge for $$cat failed!"; \
126051 rm -f $$tmpdir/$$lang.new.po; \
126052 fi; \
126053 done
126054
126055 -Makefile POTFILES: stamp-it
126056 - @if test ! -f $@; then \
126057 - rm -f stamp-it; \
126058 - $(MAKE) stamp-it; \
126059 - fi
126060 -
126061 -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
126062 - cd $(top_builddir) \
126063 - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
126064 +# POTFILES is created from POTFILES.in by stripping comments, empty lines
126065 +# and Intltool tags (enclosed in square brackets), and appending a full
126066 +# relative path to them
126067 +POTFILES: POTFILES.in
126068 + ( if test 'x$(srcdir)' != 'x.'; then \
126069 + posrcprefix='$(top_srcdir)/'; \
126070 + else \
126071 + posrcprefix="../"; \
126072 + fi; \
126073 + rm -f $@-t $@ \
126074 + && (sed -e '/^#/d' \
126075 + -e "s/^\[.*\] +//" \
126076 + -e '/^[ ]*$$/d' \
126077 + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
126078 + | sed -e '$$s/\\$$//') > $@-t \
126079 + && chmod a-w $@-t \
126080 + && mv $@-t $@ )
126081 +
126082 +Makefile: Makefile.in.in ../config.status POTFILES
126083 + cd .. \
126084 + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
126085 $(SHELL) ./config.status
126086
126087 # Tell versions [3.59,3.63) of GNU make not to export all variables.
126088 diff -rupN original/po/POTFILES.in new/po/POTFILES.in
126089 --- original/po/POTFILES.in 2007-10-08 17:13:28.000000000 -0400
126090 +++ new/po/POTFILES.in 2009-04-01 04:21:41.000000000 -0430
126091 @@ -1,8 +1,25 @@
126092 +gui/configure-dlg.c
126093 gui/Gtk2Gui.c
126094 +gui/hdebug.c
126095 gui/LnxMain.c
126096 +gui/memcard-dlg.c
126097 +gui/pcsx-main-win.c
126098 +gui/pcsx-main-win.h
126099 +gui/pcsx-memcard-handler.c
126100 gui/Plugin.c
126101 +gui/plugin-file-handler.c
126102 data/pcsx.glade2
126103 -emulator/Misc.c
126104 -emulator/PsxMem.c
126105 -emulator/Sio.c
126106 -emulator/plugins.c
126107 +data/pcsx_config.glade
126108 +data/pcsx.desktop.in
126109 +plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2
126110 +plugins/dfbinimage2/dfbinimage.glade2
126111 +plugins/dfcdrom/cfgCdr.glade
126112 +plugins/dfinput/dfinput.glade2
126113 +plugins/dfiso/dfiso.glade2
126114 +plugins/dfsound/spucfg-0.1df/dfsound.glade2
126115 +plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
126116 +libpcsxcore/misc.c
126117 +libpcsxcore/psxmem.c
126118 +libpcsxcore/sio.c
126119 +libpcsxcore/plugins.c
126120 +
126121 diff -rupN original/po/POTFILES.skip new/po/POTFILES.skip
126122 --- original/po/POTFILES.skip 1969-12-31 20:00:00.000000000 -0400
126123 +++ new/po/POTFILES.skip 2009-04-01 04:09:25.000000000 -0430
126124 @@ -0,0 +1,4 @@
126125 +libpcsxcore/ix86_64/ix86_cpudetect.c
126126 +libpcsxcore/ppc/pR3000A.c
126127 +plugins/dfxvideo/swap.h
126128 +
126129 diff -rupN original/po/Rules-quot new/po/Rules-quot
126130 --- original/po/Rules-quot 1969-12-31 20:00:00.000000000 -0400
126131 +++ new/po/Rules-quot 2007-10-08 17:13:28.000000000 -0400
126132 @@ -0,0 +1,47 @@
126133 +# Special Makefile rules for English message catalogs with quotation marks.
126134 +
126135 +DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
126136 +
126137 +.SUFFIXES: .insert-header .po-update-en
126138 +
126139 +en@quot.po-create:
126140 + $(MAKE) en@quot.po-update
126141 +en@boldquot.po-create:
126142 + $(MAKE) en@boldquot.po-update
126143 +
126144 +en@quot.po-update: en@quot.po-update-en
126145 +en@boldquot.po-update: en@boldquot.po-update-en
126146 +
126147 +.insert-header.po-update-en:
126148 + @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
126149 + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
126150 + tmpdir=`pwd`; \
126151 + echo "$$lang:"; \
126152 + ll=`echo $$lang | sed -e 's/@.*//'`; \
126153 + LC_ALL=C; export LC_ALL; \
126154 + cd $(srcdir); \
126155 + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
126156 + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
126157 + rm -f $$tmpdir/$$lang.new.po; \
126158 + else \
126159 + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
126160 + :; \
126161 + else \
126162 + echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
126163 + exit 1; \
126164 + fi; \
126165 + fi; \
126166 + else \
126167 + echo "creation of $$lang.po failed!" 1>&2; \
126168 + rm -f $$tmpdir/$$lang.new.po; \
126169 + fi
126170 +
126171 +en@quot.insert-header: insert-header.sin
126172 + sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
126173 +
126174 +en@boldquot.insert-header: insert-header.sin
126175 + sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
126176 +
126177 +mostlyclean: mostlyclean-quot
126178 +mostlyclean-quot:
126179 + rm -f *.insert-header
126180 diff -rupN original/po/boldquot.sed new/po/boldquot.sed
126181 --- original/po/boldquot.sed 1969-12-31 20:00:00.000000000 -0400
126182 +++ new/po/boldquot.sed 2007-10-08 17:13:28.000000000 -0400
126183 @@ -0,0 +1,10 @@
126184 +s/"\([^"]*\)"/“\1”/g
126185 +s/`\([^`']*\)'/‘\1’/g
126186 +s/ '\([^`']*\)' / ‘\1’ /g
126187 +s/ '\([^`']*\)'$/ ‘\1’/g
126188 +s/^'\([^`']*\)' /‘\1’ /g
126189 +s/“”/""/g
126190 +s/“/“\e[1m/g
126191 +s/”/\e[0m”/g
126192 +s/‘/‘\e[1m/g
126193 +s/’/\e[0m’/g
126194 diff -rupN original/po/en@boldquot.header new/po/en@boldquot.header
126195 --- original/po/en@boldquot.header 1969-12-31 20:00:00.000000000 -0400
126196 +++ new/po/en@boldquot.header 2007-10-08 17:13:28.000000000 -0400
126197 @@ -0,0 +1,25 @@
126198 +# All this catalog "translates" are quotation characters.
126199 +# The msgids must be ASCII and therefore cannot contain real quotation
126200 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
126201 +# and double quote (0x22). These substitutes look strange; see
126202 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
126203 +#
126204 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
126205 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
126206 +# It also translates pairs of apostrophe (0x27) to
126207 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
126208 +# and pairs of quotation mark (0x22) to
126209 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
126210 +#
126211 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
126212 +# When output to an ISO-8859-1 terminal, the single quotation marks are
126213 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
126214 +# grave/acute accent (by libiconv), and the double quotation marks are
126215 +# transliterated to 0x22.
126216 +# When output to an ASCII terminal, the single quotation marks are
126217 +# transliterated to apostrophes, and the double quotation marks are
126218 +# transliterated to 0x22.
126219 +#
126220 +# This catalog furthermore displays the text between the quotation marks in
126221 +# bold face, assuming the VT100/XTerm escape sequences.
126222 +#
126223 diff -rupN original/po/en@quot.header new/po/en@quot.header
126224 --- original/po/en@quot.header 1969-12-31 20:00:00.000000000 -0400
126225 +++ new/po/en@quot.header 2007-10-08 17:13:28.000000000 -0400
126226 @@ -0,0 +1,22 @@
126227 +# All this catalog "translates" are quotation characters.
126228 +# The msgids must be ASCII and therefore cannot contain real quotation
126229 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
126230 +# and double quote (0x22). These substitutes look strange; see
126231 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
126232 +#
126233 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
126234 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
126235 +# It also translates pairs of apostrophe (0x27) to
126236 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
126237 +# and pairs of quotation mark (0x22) to
126238 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
126239 +#
126240 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
126241 +# When output to an ISO-8859-1 terminal, the single quotation marks are
126242 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
126243 +# grave/acute accent (by libiconv), and the double quotation marks are
126244 +# transliterated to 0x22.
126245 +# When output to an ASCII terminal, the single quotation marks are
126246 +# transliterated to apostrophes, and the double quotation marks are
126247 +# transliterated to 0x22.
126248 +#
126249 Los ficheros binarios original/po/es.gmo y new/po/es.gmo son distintos
126250 diff -rupN original/po/es.po new/po/es.po
126251 --- original/po/es.po 2007-10-08 17:13:28.000000000 -0400
126252 +++ new/po/es.po 2009-04-12 13:21:53.000000000 -0430
126253 @@ -1,520 +1,547 @@
126254 -# translation of pcsx-df.po to Spanish
126255 -# Copyright (C) 2006
126256 +# Spanish translations for pcsx-df package.
126257 +# Copyright (C) 2009
126258 # This file is distributed under the same license as the pcsx-df package.
126259 +# Jose Valecillos <valecillosjg@gmail.com>, 2009.
126260 #
126261 -# Ryan Schultz <schultz.ryan@gmail.com>, 2006.
126262 msgid ""
126263 msgstr ""
126264 -"Project-Id-Version: pcsx-df\n"
126265 -"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
126266 -"POT-Creation-Date: 2006-05-24 20:52+1000\n"
126267 -"PO-Revision-Date: 2006-05-13 14:02-0400\n"
126268 -"Last-Translator: Ryan Schultz <schultz.ryan@gmail.com>\n"
126269 -"Language-Team: <en@li.org>\n"
126270 +"Project-Id-Version: pcsx-df 1.10\n"
126271 +"Report-Msgid-Bugs-To: <valecillosjg@gmail.com>\n"
126272 +"POT-Creation-Date: 2009-04-11 11:16-0430\n"
126273 +"PO-Revision-Date: 2009-04-12 13:21-0400\n"
126274 +"Last-Translator: Jose Valecillos <valecillosjg@gmail.com>\n"
126275 +"Language-Team: Spanish\n"
126276 "MIME-Version: 1.0\n"
126277 "Content-Type: text/plain; charset=UTF-8\n"
126278 "Content-Transfer-Encoding: 8bit\n"
126279 -"X-Generator: KBabel 1.11.2\n"
126280 +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
126281
126282 -#: gui/Gtk2Gui.c:327
126283 -msgid "Select PSX EXE File"
126284 -msgstr "Sellecione el PSX EXE Fichero"
126285 +#: gui/configure-dlg.c:419
126286 +#: gui/Gtk2Gui.c:1249
126287 +msgid "No configuration required"
126288 +msgstr "No requiere configuración"
126289 +
126290 +#: gui/configure-dlg.c:419
126291 +#: gui/Gtk2Gui.c:1249
126292 +msgid "This plugin doesn't need to be configured."
126293 +msgstr "Este plugin no necesita ser configurado"
126294 +
126295 +#: gui/configure-dlg.c:476
126296 +msgid "No About information"
126297 +msgstr "No hay información"
126298 +
126299 +#: gui/configure-dlg.c:476
126300 +msgid "This plugin does not provide any About information."
126301 +msgstr "Este plugin no provee información"
126302 +
126303 +#: gui/configure-dlg.c:818
126304 +#: gui/Gtk2Gui.c:368
126305 +#: data/pcsx_config.glade:7
126306 +msgid "Configure PCSX"
126307 +msgstr "Configurar PCSX"
126308 +
126309 +#: gui/Gtk2Gui.c:360
126310 +#: gui/Gtk2Gui.c:1063
126311 +msgid "Error: Glade interface could not be loaded!"
126312 +msgstr "Error: No se pudo cargar la Interfaz Glade!"
126313
126314 -#: gui/Gtk2Gui.c:381 gui/LnxMain.c:192
126315 +#: gui/Gtk2Gui.c:476
126316 +msgid "Plugins could not be loaded"
126317 +msgstr "Los plugins no se pudieron cargar"
126318 +
126319 +#: gui/Gtk2Gui.c:477
126320 +msgid "The plugins could not be loaded"
126321 +msgstr "Los plugins no se pudieron cargar"
126322 +
126323 +#: gui/Gtk2Gui.c:487
126324 +msgid "CD ROM failed"
126325 +msgstr "Falló el CD ROM"
126326 +
126327 +#: gui/Gtk2Gui.c:488
126328 +msgid "The CD does not appear to be a valid Playstation CD"
126329 +msgstr "El CD no parece ser un disco de PlayStation válido"
126330 +
126331 +#: gui/Gtk2Gui.c:497
126332 +#: gui/Gtk2Gui.c:793
126333 +msgid "Could not load CD-ROM!"
126334 +msgstr "No se pudo cargar el CD-ROM!"
126335 +
126336 +#: gui/Gtk2Gui.c:498
126337 +msgid "The CD ROM could not be loaded"
126338 +msgstr "El CD-ROM no pudo ser cargado"
126339 +
126340 +#: gui/Gtk2Gui.c:552
126341 +msgid "Not a valid PSX file"
126342 +msgstr "NO es un archivo PSX válido"
126343 +
126344 +#: gui/Gtk2Gui.c:553
126345 +msgid "The file does not appear to be a valid Playstation executable"
126346 +msgstr "El archivo no parece ser un ejecutable de PlayStation válido."
126347 +
126348 +#: gui/Gtk2Gui.c:623
126349 #, c-format
126350 -msgid "Could not load CD-ROM!\n"
126351 -msgstr "No puede cargar el CD-ROM!\n"
126352 +msgid "The Playstation CD that is currently in use is %s (%s). It is not the same CD as that used when saving the state file. The state file is looking for %s (%s)."
126353 +msgstr "El CD de PlayStation en uso es %s (%s). No es el mismo CD que se usó cuando de guardó el archivo de estado. El archivo de estado necesita a %s (%s)."
126354
126355 -#: gui/Gtk2Gui.c:468
126356 +#: gui/Gtk2Gui.c:628
126357 +#: gui/Gtk2Gui.c:892
126358 +msgid "The CD does not match the state file"
126359 +msgstr "El Cd no coincide con el archivo de estado"
126360 +
126361 +#: gui/Gtk2Gui.c:659
126362 +#: gui/Gtk2Gui.c:905
126363 #, c-format
126364 -msgid "Loaded state %d."
126365 -msgstr "Cargó el estado %d."
126366 +msgid "Error loading state %s!"
126367 +msgstr "Error cargando el estado %s!"
126368
126369 -#: gui/Gtk2Gui.c:469 gui/Plugin.c:111
126370 +#: gui/Gtk2Gui.c:665
126371 +#: gui/Gtk2Gui.c:900
126372 #, c-format
126373 -msgid "Error loading state %d!"
126374 -msgstr "Error mientras cargando el estado %d!"
126375 +msgid "Loaded state %s."
126376 +msgstr "Estado %s cargado."
126377 +
126378 +#: gui/Gtk2Gui.c:680
126379 +msgid "Select PSX EXE File"
126380 +msgstr "Elija el archivo PSX EXE"
126381
126382 -#: gui/Gtk2Gui.c:504
126383 +#: gui/Gtk2Gui.c:690
126384 +msgid "Playstation Executable Files"
126385 +msgstr "Archivos Ejecutables Playstation"
126386 +
126387 +#: gui/Gtk2Gui.c:695
126388 +msgid "All Files"
126389 +msgstr "Todos los Archivos"
126390 +
126391 +#: gui/Gtk2Gui.c:720
126392 +#: gui/Plugin.c:253
126393 +msgid "Select CD image file"
126394 +msgstr "Elija una imagen de CD"
126395 +
126396 +#: gui/Gtk2Gui.c:889
126397 #, c-format
126398 -msgid "Saved state %d."
126399 -msgstr "Ahorró el estado %d."
126400 +msgid "The Playstation CD that is currently in use is %s. It is not the same CD as that used when saving the state file. The state file is looking for %s."
126401 +msgstr "El CD de PlayStation en uso es %s. No es el mismo CD que se usó cuando de guardó el archivo de estado. El archivo de estado necesita a %s."
126402 +
126403 +#: gui/Gtk2Gui.c:917
126404 +#, c-format
126405 +msgid "Saved state %s."
126406 +msgstr "Estado %s guardado."
126407
126408 -#: gui/Gtk2Gui.c:505 gui/Plugin.c:94
126409 +#: gui/Gtk2Gui.c:919
126410 #, c-format
126411 -msgid "Error saving state %d!"
126412 -msgstr "Error mientras ahorrando el estado %d!"
126413 +msgid "Error saving state %s!"
126414 +msgstr "Error guardando el estado %s!"
126415
126416 -#: gui/Gtk2Gui.c:526 gui/Gtk2Gui.c:578
126417 +#: gui/Gtk2Gui.c:954
126418 +#: gui/Gtk2Gui.c:983
126419 msgid "Select State File"
126420 -msgstr "Sellecione el Fichero de Estado."
126421 +msgstr "Elija el Archivo de Estado"
126422
126423 -#: gui/Gtk2Gui.c:553
126424 -#, c-format
126425 -msgid "Loaded state: %s"
126426 -msgstr "Cargó el estado: %s"
126427 +#: gui/Gtk2Gui.c:1276
126428 +msgid "This plugin reports that it should work correctly."
126429 +msgstr "El Plugin informa que debería funcionar correctamente."
126430 +
126431 +#: gui/Gtk2Gui.c:1277
126432 +msgid "This plugin reports that it won't work correctly."
126433 +msgstr "El Plugin informa que no funcionará correctamente."
126434
126435 -#: gui/Gtk2Gui.c:554
126436 +#: gui/Gtk2Gui.c:1495
126437 +#: data/pcsx.glade2:730
126438 +msgid "PCSX-df Development"
126439 +msgstr "Desarollo PCSX-df"
126440 +
126441 +#: gui/Gtk2Gui.c:1500
126442 +#: plugins/dfinput/dfinput.glade2:399
126443 +msgid "translator-credits"
126444 +msgstr "Jose Valecillos <valecillosjg@gmail.com>"
126445 +
126446 +#: gui/Gtk2Gui.c:1501
126447 +#: data/pcsx.glade2:728
126448 +msgid "A Playstation emulator for GNU/Linux."
126449 +msgstr "Emulador de Playstation para GNU/Linux"
126450 +
126451 +#: gui/Gtk2Gui.c:1503
126452 +#: data/pcsx.glade2:731
126453 +msgid "PCSX is licensed under the GNU GPL; see the included COPYING file for more detail."
126454 +msgstr "PCSX esta licenciado bajo GNU GPL; revise el archivo COPYING incluido para mas detalles."
126455 +
126456 +#: gui/Gtk2Gui.c:1577
126457 +#: gui/Gtk2Gui.c:1778
126458 +msgid "Internal HLE Bios"
126459 +msgstr "Bios Interna HLE"
126460 +
126461 +#: gui/Gtk2Gui.c:1578
126462 +msgid "HLE"
126463 +msgstr "HLE"
126464 +
126465 +#: gui/Gtk2Gui.c:1620
126466 +#: gui/Gtk2Gui.c:1823
126467 #, c-format
126468 -msgid "Error loading state: %s"
126469 -msgstr "Error mientras cargando el estado: %s"
126470 +msgid "Could not open directory: '%s'\n"
126471 +msgstr "No se pudo abrir el directorio: '%s'\n"
126472
126473 -#: gui/Gtk2Gui.c:604
126474 +#: gui/Gtk2Gui.c:1680
126475 #, c-format
126476 -msgid "Saved state %s."
126477 -msgstr "Ahorró el estado %s."
126478 +msgid "Could not open BIOS directory: '%s'\n"
126479 +msgstr "No se pudo abrir el directorio de la BIOS: '%s'\n"
126480
126481 -#: gui/Gtk2Gui.c:606
126482 +#: gui/Gtk2Gui.c:1722
126483 +#: gui/plugin-file-handler.c:115
126484 #, c-format
126485 -msgid "Error saving state %s!"
126486 -msgstr "Error mientras ahorrando el estado %s!"
126487 +msgid "Could not open plugins directory: '%s'\n"
126488 +msgstr "No se pudo abrir el directorio de los plugins: '%s'\n"
126489
126490 -#: gui/Gtk2Gui.c:718 gui/Gtk2Gui.c:1859
126491 -msgid "Error: Glade interface could not be loaded!"
126492 -msgstr "Error: Interfase de Glade no puede ser cargado!"
126493 +#: gui/Gtk2Gui.c:1888
126494 +msgid "An error has occurred during emulation"
126495 +msgstr "Ocurrió un error durante la emulación"
126496 +
126497 +#: gui/LnxMain.c:97
126498 +msgid "Disabled"
126499 +msgstr "Deshabilitado"
126500
126501 -#: gui/Gtk2Gui.c:767
126502 +#: gui/memcard-dlg.c:59
126503 msgid "Icon"
126504 msgstr "Icono"
126505
126506 -#: gui/Gtk2Gui.c:776
126507 +#: gui/memcard-dlg.c:65
126508 msgid "Title"
126509 msgstr "Título"
126510
126511 -#: gui/Gtk2Gui.c:785
126512 +#: gui/memcard-dlg.c:71
126513 msgid "Status"
126514 -msgstr "Estado"
126515 +msgstr "Estatus"
126516
126517 -#: gui/Gtk2Gui.c:794
126518 +#: gui/memcard-dlg.c:77
126519 msgid "ID"
126520 msgstr "ID"
126521
126522 -#: gui/Gtk2Gui.c:803
126523 +#: gui/memcard-dlg.c:83
126524 msgid "Name"
126525 msgstr "Nombre"
126526
126527 -#: gui/Gtk2Gui.c:874 gui/Gtk2Gui.c:1307
126528 +#: gui/memcard-dlg.c:147
126529 +#: gui/memcard-dlg.c:556
126530 msgid "Deleted"
126531 msgstr "Borrado"
126532
126533 -#: gui/Gtk2Gui.c:875 gui/Gtk2Gui.c:878 gui/Gtk2Gui.c:1308 gui/Gtk2Gui.c:1311
126534 +#: gui/memcard-dlg.c:149
126535 +#: gui/memcard-dlg.c:153
126536 +#: gui/memcard-dlg.c:557
126537 +#: gui/memcard-dlg.c:560
126538 msgid "Free"
126539 msgstr "Libre"
126540
126541 -#: gui/Gtk2Gui.c:877 gui/Gtk2Gui.c:1310
126542 +#: gui/memcard-dlg.c:151
126543 +#: gui/memcard-dlg.c:559
126544 msgid "Used"
126545 msgstr "Usado"
126546
126547 -#: gui/Gtk2Gui.c:994
126548 -msgid "Select Memory Card"
126549 -msgstr "Seleccione la Tarjeta de Memoria"
126550 -
126551 -#: gui/Gtk2Gui.c:1059
126552 +#: gui/memcard-dlg.c:259
126553 msgid "Format this Memory Card?"
126554 -msgstr "¿Borra esta Tarjeta de Memoria?"
126555 +msgstr "Formatear esta Tarjeta de Memoria?"
126556
126557 -#: gui/Gtk2Gui.c:1062
126558 -msgid "If you format the memory card, the contents will be overwritten."
126559 -msgstr "Si borra la tarjeta de memoria, el contenido sobrescribirá."
126560 +#: gui/memcard-dlg.c:262
126561 +msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
126562 +msgstr "Si formateas la tarjeta de memoria, la tarjeta será vaciada y se sobreescribirán los datos existentes."
126563
126564 -#: gui/Gtk2Gui.c:1066
126565 +#: gui/memcard-dlg.c:266
126566 msgid "Format card"
126567 -msgstr "Borra tarjeta"
126568 -
126569 -#: gui/Gtk2Gui.c:1148
126570 -msgid "Paste this selection?"
126571 -msgstr "¿Pega esta selección?"
126572 +msgstr "Formatear tarjeta"
126573
126574 -#: gui/Gtk2Gui.c:1151
126575 -msgid "Are you sure you want to paste this selection?"
126576 -msgstr "¿Cierto quería pegar esta selección?"
126577 +#: gui/memcard-dlg.c:348
126578 +msgid "No free space on memory card"
126579 +msgstr "No hay espacio libre en la tarjeta de memoria."
126580
126581 -#: gui/Gtk2Gui.c:1155 data/pcsx.glade2:2844
126582 -msgid "Paste"
126583 -msgstr "Pega"
126584 +#: gui/memcard-dlg.c:349
126585 +msgid "There are no free slots available on the target memory card. Please delete a slot first."
126586 +msgstr "No hay espacios libres en la tarjeta de memoria. Borre un espacio primero."
126587
126588 -#: gui/Gtk2Gui.c:1362
126589 +#: gui/memcard-dlg.c:608
126590 msgid "Memory Card Manager"
126591 -msgstr "Gerente de Tarjetas de Memoria"
126592 +msgstr "Administrador de Tarjetas de Memoria"
126593
126594 -#: gui/Gtk2Gui.c:1662
126595 -msgid "This plugin doesn't need to be configured."
126596 -msgstr "Esta enchufe no necesita ser configurado."
126597 +#: gui/pcsx-main-win.c:179
126598 +msgid "PCSX-df"
126599 +msgstr "PCSX-df"
126600
126601 -#: gui/Gtk2Gui.c:1689
126602 -msgid "This plugin reports that it should work correctly."
126603 -msgstr "Esta enchufe informa que debe trabajar correctamente."
126604 +#: gui/pcsx-main-win.h:32
126605 +msgid "_File"
126606 +msgstr "_Archivo"
126607
126608 -#: gui/Gtk2Gui.c:1690
126609 -msgid "This plugin reports that it won't work correctly."
126610 -msgstr "Esta enchufe informa que no trabaja correctamente"
126611 +#: gui/pcsx-main-win.h:33
126612 +msgid "_Emulator"
126613 +msgstr "_Emulador"
126614
126615 -#: gui/Gtk2Gui.c:1867 data/pcsx.glade2:688
126616 -msgid "Configure PCSX"
126617 -msgstr "Configura PCSX"
126618 +#: gui/pcsx-main-win.h:34
126619 +msgid "_Configuration"
126620 +msgstr "_Configuración"
126621
126622 -#: gui/Gtk2Gui.c:2031 gui/Gtk2Gui.c:2077 gui/Gtk2Gui.c:2160 gui/Gtk2Gui.c:2226
126623 -#: gui/Gtk2Gui.c:2251 gui/Gtk2Gui.c:2305
126624 -#, c-format
126625 -msgid "Could not open directory: '%s'\n"
126626 -msgstr "No puede abrir el directorio: '%s'\n"
126627 +#: gui/pcsx-main-win.h:35
126628 +msgid "_Help"
126629 +msgstr "_Ayuda"
126630
126631 -#: gui/Gtk2Gui.c:2220
126632 -msgid "Internal HLE Bios"
126633 -msgstr "HLE BIOS Interno"
126634 -
126635 -#: gui/Gtk2Gui.c:2361
126636 -msgid "Notice"
126637 -msgstr "Aviso"
126638 -
126639 -#: gui/LnxMain.c:81
126640 -msgid ""
126641 -" pcsx [options] [file]\n"
126642 -"\toptions:\n"
126643 -"\t-runcd\t\tRuns CD-ROM\n"
126644 -"\t-runcdbios\tRuns CD-ROM through BIOS\n"
126645 -"\t-nogui\t\tDon't open the GTK GUI\n"
126646 -"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
126647 -"\t-psxout\t\tEnable PSX output\n"
126648 -"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
126649 -"\t-h -help\tDisplay this message\n"
126650 -"\tfile\t\tLoads file\n"
126651 -msgstr ""
126652 -" pcsx [opciónes] [fichero]\n"
126653 -"\topciónes:\n"
126654 -"\t-runcd\t\tEjecuta el CD-ROM\n"
126655 -"\t-runcdbios\tEjecuta el CD-ROM por el BIOS\n"
126656 -"\t-nogui\t\tNo abre la GUI de GTK\n"
126657 -"\t-cfg FICHERO\tCarga el fichero que es querido (por omisión: ~/.pcsx/pcsx."
126658 -"cfg)\n"
126659 -"\t-psxout\t\tHabilita salida de PSX\n"
126660 -"\t-load ESTADONUM\tCarga estado de ESTADONUM1-5)\n"
126661 -"\t-h -help\tMuestra esta mensaje\n"
126662 -"\tfichero\t\tCarga fichero\n"
126663 +#: gui/pcsx-main-win.h:38
126664 +msgid "_Quit"
126665 +msgstr "_Salir"
126666
126667 -#: gui/LnxMain.c:96
126668 -msgid "Disabled"
126669 -msgstr "Desactivado"
126670 +#: gui/pcsx-main-win.h:41
126671 +msgid "Load BIOS Screen"
126672 +msgstr "Correr pantalla de BIOS"
126673
126674 -#: gui/LnxMain.c:111
126675 -#, c-format
126676 -msgid ""
126677 -"PCSX cannot be configured without using the GUI -- you should restart "
126678 -"without -nogui.\n"
126679 -msgstr ""
126680 -"PCSX no podría configurar sin usar el GUI -- debe reiniciar sin -nogui.\n"
126681 +#: gui/pcsx-main-win.h:45
126682 +msgid "_Preferences"
126683 +msgstr "_Preferencias"
126684
126685 -#: gui/Plugin.c:93
126686 -#, c-format
126687 -msgid "Saved state %d!"
126688 -msgstr "Ahorró estado %d!"
126689 +#: gui/pcsx-main-win.h:46
126690 +msgid "Memory Cards"
126691 +msgstr "Tarjetas de Memoria"
126692
126693 -#: gui/Plugin.c:110
126694 -#, c-format
126695 -msgid "Loaded state %d!"
126696 -msgstr "Cargó estado %d!"
126697 +#: gui/pcsx-main-win.h:47
126698 +msgid "Debug"
126699 +msgstr "Depurar"
126700 +
126701 +#: gui/pcsx-main-win.h:51
126702 +msgid "About this application"
126703 +msgstr "Acerda de esta aplicación"
126704 +
126705 +#: gui/pcsx-main-win.h:59
126706 +msgid "Load PSX EXE"
126707 +msgstr "Cargar PSX EXE"
126708 +
126709 +#: gui/pcsx-main-win.h:60
126710 +msgid "Load State"
126711 +msgstr "Cargar Estado"
126712 +
126713 +#: gui/pcsx-main-win.h:61
126714 +msgid "Load ISO/Image"
126715 +msgstr "Cargar imagen/ISO"
126716 +
126717 +#: gui/pcsx-main-win.h:62
126718 +msgid "Start Emulation"
126719 +msgstr "Iniciar Emulación"
126720
126721 -#: gui/Plugin.c:120 data/pcsx.glade2:1738
126722 +#: gui/Plugin.c:220
126723 +#: data/pcsx_config.glade:627
126724 #, c-format
126725 msgid "SIO IRQ Always Enabled"
126726 -msgstr "SIO IRQ Siempre Habilitado"
126727 +msgstr "IRQ SIO Siempre Habilitado"
126728
126729 -#: gui/Plugin.c:121
126730 +#: gui/Plugin.c:221
126731 #, c-format
126732 msgid "SIO IRQ Not Always Enabled"
126733 -msgstr "SIO IRQ No Siempre Habilitado"
126734 +msgstr "IRQ SIO NO Siempre Habilitado"
126735
126736 -#: gui/Plugin.c:127
126737 +#: gui/Plugin.c:229
126738 #, c-format
126739 msgid "Black & White Mdecs Only Enabled"
126740 -msgstr "Negro y Blanco Mdecs Solamente Habilitado"
126741 +msgstr "Solo Mdecs Negro y Blanco Habilitado"
126742
126743 -#: gui/Plugin.c:128
126744 +#: gui/Plugin.c:230
126745 #, c-format
126746 msgid "Black & White Mdecs Only Disabled"
126747 -msgstr "Negro y Blanco Mdecs Solamente Desactivado"
126748 +msgstr "Solo Mdecs Negro y Blanco Deshabilitado"
126749
126750 -#: gui/Plugin.c:134
126751 +#: gui/Plugin.c:238
126752 #, c-format
126753 msgid "XA Enabled"
126754 msgstr "XA Habilitado"
126755
126756 -#: gui/Plugin.c:135
126757 +#: gui/Plugin.c:239
126758 #, c-format
126759 msgid "XA Disabled"
126760 -msgstr "XA Desactivado"
126761 -
126762 -#: gui/Plugin.c:205
126763 -msgid "Error opening CD-ROM plugin!"
126764 -msgstr "Error mientras abrir el enchufe de CD-ROM!"
126765 +msgstr "XA Deshabilitado"
126766
126767 -#: gui/Plugin.c:207
126768 +#: gui/Plugin.c:358
126769 msgid "Error opening SPU plugin!"
126770 -msgstr "Error mientras abrir el enchufe de SPU!"
126771 +msgstr "Error abriendo el plugin SPU!"
126772
126773 -#: gui/Plugin.c:210
126774 +#: gui/Plugin.c:361
126775 msgid "Error opening GPU plugin!"
126776 -msgstr "Error mientras abrir el enchufe de GPU!"
126777 +msgstr "Error abriendo el plugin GPU!"
126778
126779 -#: gui/Plugin.c:212
126780 +#: gui/Plugin.c:363
126781 msgid "Error opening Controller 1 plugin!"
126782 -msgstr "Error mientras abrir el enchufe de Controlador 1!"
126783 +msgstr "Error abriendo el plugin del Control 1!"
126784
126785 -#: gui/Plugin.c:214
126786 +#: gui/Plugin.c:365
126787 msgid "Error opening Controller 2 plugin!"
126788 -msgstr "Error mientras abrir el enchufe de Controlador 2!"
126789 +msgstr "Error abriendo el plugin del Control 2!"
126790
126791 -#: gui/Plugin.c:295
126792 +#: gui/Plugin.c:456
126793 msgid "Error closing CD-ROM plugin!"
126794 -msgstr "Error mientras cerrar el enchufe de CD-ROM!"
126795 +msgstr "Error cerrando el plugin del CD-ROM!"
126796
126797 -#: gui/Plugin.c:297
126798 +#: gui/Plugin.c:458
126799 msgid "Error closing SPU plugin!"
126800 -msgstr "Error mientras cerrar el enchufe de SPU!"
126801 +msgstr "Error cerrando el plugin SPU!"
126802
126803 -#: gui/Plugin.c:299
126804 +#: gui/Plugin.c:460
126805 msgid "Error closing Controller 1 Plugin!"
126806 -msgstr "Error mientras cerrar el enchufe de Controlador 1!"
126807 +msgstr "Error cerrando el plugin del Control 1!"
126808
126809 -#: gui/Plugin.c:301
126810 +#: gui/Plugin.c:462
126811 msgid "Error closing Controller 2 plugin!"
126812 -msgstr "Error mientras cerrar el enchufe de Controlador 2!"
126813 +msgstr "Error cerrando el plugin del Control 2!"
126814
126815 -#: gui/Plugin.c:303
126816 +#: gui/Plugin.c:464
126817 msgid "Error closing GPU plugin!"
126818 -msgstr "Error mientras cerrar el enchufe de GPU!"
126819 +msgstr "Error cerrando el plugin GPU!"
126820
126821 -#: gui/Plugin.c:321 emulator/plugins.c:761
126822 -#, c-format
126823 -msgid "Error initializing CD-ROM plugin: %d"
126824 -msgstr "Error mientras iniciar el enchufe de CD-ROM: %d"
126825 +#: data/pcsx.glade2:9
126826 +#: plugins/dfinput/dfinput.glade2:135
126827 +msgid "PCSX"
126828 +msgstr "PCSX"
126829
126830 -#: gui/Plugin.c:323 emulator/plugins.c:763
126831 -#, c-format
126832 -msgid "Error initializing GPU plugin: %d"
126833 -msgstr "Error mientras iniciar el enchufe de GPU: %d"
126834 +#: data/pcsx.glade2:28
126835 +msgid "Configure NetPlay"
126836 +msgstr "Configurar NetPlay"
126837
126838 -#: gui/Plugin.c:325 emulator/plugins.c:765
126839 -#, c-format
126840 -msgid "Error initializing SPU plugin: %d"
126841 -msgstr "Error mientras iniciar el enchufe de SPU: %d"
126842 +#: data/pcsx.glade2:109
126843 +msgid "<b>NetPlay</b>"
126844 +msgstr "<b>NetPlay</b>"
126845
126846 -#: gui/Plugin.c:327 emulator/plugins.c:767
126847 -#, c-format
126848 -msgid "Error initializing Controller 1 plugin: %d"
126849 -msgstr "Error mientras iniciar el enchufe de Controlador 1: %d"
126850 +#: data/pcsx.glade2:153
126851 +msgid "Configure Memory Cards"
126852 +msgstr "Configurar Tarjetas de Memoria"
126853
126854 -#: gui/Plugin.c:329 emulator/plugins.c:769
126855 -#, c-format
126856 -msgid "Error initializing Controller 2 plugin: %d"
126857 -msgstr "Error mientras iniciar el enchufe de Controlador 2: %d"
126858 +#: data/pcsx.glade2:223
126859 +#: data/pcsx.glade2:586
126860 +msgid "Format"
126861 +msgstr "Formatear"
126862
126863 -#: gui/Plugin.c:332 emulator/plugins.c:772
126864 -#, c-format
126865 -msgid "Error initializing NetPlay plugin: %d"
126866 -msgstr "Error mientras iniciar el enchufe de NetJuega: %d"
126867 +#: data/pcsx.glade2:267
126868 +#: data/pcsx.glade2:630
126869 +msgid "Reload"
126870 +msgstr "Recargar"
126871
126872 -#: data/pcsx.glade2:10
126873 -msgid "PCSX"
126874 -msgstr "PCSX"
126875 +#: data/pcsx.glade2:308
126876 +msgid "<b>Memory Card 1</b>"
126877 +msgstr "<b>Tarjeta de Memoria 1</b>"
126878
126879 -#: data/pcsx.glade2:41
126880 -msgid "File"
126881 -msgstr "Fichero"
126882 -
126883 -#: data/pcsx.glade2:50
126884 -msgid "Run CD"
126885 -msgstr "Ejecutar CD"
126886 -
126887 -#: data/pcsx.glade2:72
126888 -msgid "Run CD Through BIOS"
126889 -msgstr "Ejecutar CD por BIOS"
126890 -
126891 -#: data/pcsx.glade2:94
126892 -msgid "Run EXE"
126893 -msgstr "Ejecutar EXE"
126894 -
126895 -#: data/pcsx.glade2:122
126896 -msgid "States"
126897 -msgstr "Estados"
126898 -
126899 -#: data/pcsx.glade2:143
126900 -msgid "Load"
126901 -msgstr "Cargar"
126902 -
126903 -#: data/pcsx.glade2:164 data/pcsx.glade2:261
126904 -msgid "Slot 1"
126905 -msgstr "Posición 1"
126906 -
126907 -#: data/pcsx.glade2:174 data/pcsx.glade2:271
126908 -msgid "Slot 2"
126909 -msgstr "Posición 2"
126910 -
126911 -#: data/pcsx.glade2:184 data/pcsx.glade2:281
126912 -msgid "Slot 3"
126913 -msgstr "Posición 3"
126914 -
126915 -#: data/pcsx.glade2:194 data/pcsx.glade2:291
126916 -msgid "Slot 4"
126917 -msgstr "Posición 4"
126918 -
126919 -#: data/pcsx.glade2:204 data/pcsx.glade2:301
126920 -msgid "Slot 5"
126921 -msgstr "Posición 5"
126922 -
126923 -#: data/pcsx.glade2:214 data/pcsx.glade2:311
126924 -msgid "Other..."
126925 -msgstr "Otra..."
126926 -
126927 -#: data/pcsx.glade2:240
126928 -msgid "Save"
126929 -msgstr "Ahorrar"
126930 -
126931 -#: data/pcsx.glade2:347
126932 -msgid "Exit"
126933 -msgstr "Salir"
126934 -
126935 -#: data/pcsx.glade2:373
126936 -msgid "Emulator"
126937 -msgstr "Emulador"
126938 -
126939 -#: data/pcsx.glade2:382
126940 -msgid "Run"
126941 -msgstr "Ejecutar"
126942 -
126943 -#: data/pcsx.glade2:403
126944 -msgid "Reset"
126945 -msgstr "Iniciar de Nuevo"
126946 -
126947 -#: data/pcsx.glade2:428
126948 -msgid "Configuration"
126949 -msgstr "Configuración"
126950 -
126951 -#: data/pcsx.glade2:437
126952 -msgid "Plugins & BIOS"
126953 -msgstr "Enchufes y BIOS"
126954 -
126955 -#: data/pcsx.glade2:465
126956 -msgid "Graphics"
126957 -msgstr "Grafícos"
126958 -
126959 -#: data/pcsx.glade2:486
126960 -msgid "Sound"
126961 -msgstr "Sonido"
126962 -
126963 -#: data/pcsx.glade2:507
126964 -msgid "CD-ROM"
126965 -msgstr "CD-ROM"
126966 -
126967 -#: data/pcsx.glade2:528
126968 -msgid "Controllers"
126969 -msgstr "Controladores"
126970 -
126971 -#: data/pcsx.glade2:555
126972 -msgid "NetPlay"
126973 -msgstr "NetJuega"
126974 -
126975 -#: data/pcsx.glade2:582
126976 -msgid "CPU"
126977 -msgstr "CPU"
126978 +#: data/pcsx.glade2:363
126979 +#: data/pcsx.glade2:407
126980 +msgid "Copy"
126981 +msgstr "Copiar"
126982
126983 -#: data/pcsx.glade2:603
126984 -msgid "Memory Cards"
126985 -msgstr "Tarjetas de Memoria"
126986 +#: data/pcsx.glade2:454
126987 +#: data/pcsx.glade2:501
126988 +msgid "Un/Delete"
126989 +msgstr "No/Borrar"
126990 +
126991 +#: data/pcsx.glade2:671
126992 +msgid "<b>Memory Card 2</b>"
126993 +msgstr "<b>Tarjeta de Memoria 2</b>"
126994 +
126995 +#: data/pcsx.glade2:724
126996 +msgid ""
126997 +"(C) 1999-2003 PCSX Team\n"
126998 +"(C) 2005-2006 Ryan Schultz\n"
126999 +"(C) 2005-2006 Andrew Burton\n"
127000 +"(C) 2008 Stefan Sikora"
127001 +msgstr ""
127002 +"(C) 1999-2003 PCSX Team\n"
127003 +"(C) 2005-2006 Ryan Schultz\n"
127004 +"(C) 2005-2006 Andrew Burton\n"
127005 +"(C) 2008 Stefan Sikora"
127006
127007 -#: data/pcsx.glade2:629
127008 -msgid "Help"
127009 -msgstr "Ayudar"
127010 -
127011 -#: data/pcsx.glade2:638
127012 -msgid "About PCSX"
127013 -msgstr "Acerca de PCSX"
127014 +#: data/pcsx.glade2:738
127015 +msgid ""
127016 +"Swedish: Daniel Nylander <yeager@lidkoping.net>\n"
127017 +"Chinese: Wei Mingzhi <whistler@openoffice.org>"
127018 +msgstr ""
127019 +"Swedish: Daniel Nylander <yeager@lidkoping.net>\n"
127020 +"Chinese: Wei Mingzhi <whistler@openoffice.org>\n"
127021 +"Spanish: Jose Valecillos <valecillosjg@gmail.com>"
127022 +
127023 +#: data/pcsx_config.glade:38
127024 +msgid "Path to Plugins:"
127025 +msgstr "Ruta de Plugins:"
127026 +
127027 +#: data/pcsx_config.glade:48
127028 +msgid "Select Folder to Search"
127029 +msgstr "Elija Carpeta a Buscar:"
127030
127031 -#: data/pcsx.glade2:805
127032 +#: data/pcsx_config.glade:93
127033 msgid "CD-ROM:"
127034 msgstr "CD-ROM:"
127035
127036 -#: data/pcsx.glade2:833
127037 +#: data/pcsx_config.glade:108
127038 msgid "Controller 2:"
127039 -msgstr "Controlador 2:"
127040 +msgstr "Control 2:"
127041
127042 -#: data/pcsx.glade2:861
127043 +#: data/pcsx_config.glade:123
127044 msgid "Controller 1: "
127045 -msgstr "Controlador 2:"
127046 +msgstr "Control 1:"
127047
127048 -#: data/pcsx.glade2:889
127049 +#: data/pcsx_config.glade:138
127050 msgid "Sound:"
127051 msgstr "Sonido:"
127052
127053 -#: data/pcsx.glade2:917
127054 +#: data/pcsx_config.glade:153
127055 msgid "Graphics:"
127056 -msgstr "Grafícos:"
127057 -
127058 -#: data/pcsx.glade2:1294
127059 -msgid "Search in:"
127060 -msgstr "Busca en:"
127061 -
127062 -#: data/pcsx.glade2:1322
127063 -msgid "Select Folder to Search"
127064 -msgstr "Sellecione Carpeta Ser Buscado"
127065 +msgstr "Gráficos:"
127066
127067 -#: data/pcsx.glade2:1467
127068 +#: data/pcsx_config.glade:479
127069 msgid "<b>Plugins</b>"
127070 -msgstr "<b>Enchufes</b>"
127071 +msgstr "<b>Plugins</b>"
127072
127073 -#: data/pcsx.glade2:1553
127074 -msgid "Select A File"
127075 -msgstr "Sellecione un Fichero"
127076 +#: data/pcsx_config.glade:511
127077 +msgid "Path to BIOS Files:"
127078 +msgstr "Ruta a archivo de BIOS:"
127079
127080 -#: data/pcsx.glade2:1574
127081 +#: data/pcsx_config.glade:546
127082 +msgid "Show BIOS screen when starting emulation"
127083 +msgstr "Mostrar pantalla de BIOS al comenzar emulación"
127084 +
127085 +#: data/pcsx_config.glade:563
127086 msgid "<b>BIOS</b>"
127087 msgstr "<b>BIOS</b>"
127088
127089 -#: data/pcsx.glade2:1613
127090 -msgid "Configure CPU"
127091 -msgstr "Configura CPU"
127092 -
127093 -#: data/pcsx.glade2:1694
127094 +#: data/pcsx_config.glade:597
127095 msgid "Disable XA Decoding"
127096 -msgstr "Desactiva Descodificando de XA"
127097 +msgstr "Deshabilitar Decodificación XA"
127098
127099 -#: data/pcsx.glade2:1716
127100 +#: data/pcsx_config.glade:611
127101 msgid "Disable CD Audio"
127102 -msgstr "Desactiva Sonido de CD"
127103 +msgstr "Deshabilitar audio de CD"
127104
127105 -#: data/pcsx.glade2:1760
127106 +#: data/pcsx_config.glade:643
127107 msgid "Enable Interpreter CPU"
127108 -msgstr "Habilita CPU Interpretado"
127109 +msgstr "Habilitar CPU Interpretador"
127110
127111 -#: data/pcsx.glade2:1782
127112 +#: data/pcsx_config.glade:661
127113 msgid "Enable Console Output"
127114 -msgstr "Habilita Salida de Término"
127115 +msgstr "Habilitar Salida por Consola"
127116
127117 -#: data/pcsx.glade2:1804
127118 +#: data/pcsx_config.glade:679
127119 msgid "Black & White Movies"
127120 -msgstr "Negro y Blanco Cines"
127121 +msgstr "Películas en Blanco y Negro"
127122
127123 -#: data/pcsx.glade2:1826
127124 +#: data/pcsx_config.glade:695
127125 msgid "SPU IRQ Always Enabled"
127126 -msgstr "SPU IRQ Siempte Habilitado"
127127 +msgstr "IRQ SPU Siempre Habilitado"
127128 +
127129 +#: data/pcsx_config.glade:711
127130 +msgid "Enable Debugger"
127131 +msgstr "Habilitar Depurador"
127132
127133 -#: data/pcsx.glade2:1855
127134 +#: data/pcsx_config.glade:731
127135 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
127136 -msgstr "Parasite Eve 2, Vandal Hearts Correción"
127137 +msgstr "Corrección Parasite Eve 2, Vandal Hearts 1/2"
127138
127139 -#: data/pcsx.glade2:1874
127140 +#: data/pcsx_config.glade:746
127141 msgid "InuYasha Sengoku Battle Fix"
127142 -msgstr "InuYasha Sengoku Battle Correción"
127143 +msgstr "Corrección InuYasha Sengoku Battle"
127144
127145 -#: data/pcsx.glade2:1894
127146 +#: data/pcsx_config.glade:762
127147 msgid "<b>Options</b>"
127148 -msgstr "<b>Opciónes</b>"
127149 +msgstr "<b>Opciones</b>"
127150
127151 -#: data/pcsx.glade2:1940
127152 +#: data/pcsx_config.glade:789
127153 msgid "Autodetect"
127154 -msgstr "Detecta Automáticamente"
127155 +msgstr "Autodetectar"
127156
127157 -#: data/pcsx.glade2:1959
127158 +#: data/pcsx_config.glade:802
127159 msgid ""
127160 "NTSC\n"
127161 "PAL"
127162 @@ -522,150 +549,768 @@ msgstr ""
127163 "NTSC\n"
127164 "PAL"
127165
127166 -#: data/pcsx.glade2:1976
127167 +#: data/pcsx_config.glade:816
127168 msgid "<b>System Type</b>"
127169 msgstr "<b>Tipo de Sistema</b>"
127170
127171 -#: data/pcsx.glade2:2015
127172 -msgid "Configure NetPlay"
127173 -msgstr "Configura NetJuega"
127174 -
127175 -#: data/pcsx.glade2:2188
127176 -msgid "<b>NetPlay</b>"
127177 -msgstr "<b>NetJuega</b>"
127178 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:8
127179 +msgid "Configure OpenGL Video"
127180 +msgstr "Configurar Video OpenGL"
127181 +
127182 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:37
127183 +msgid "Window X Size"
127184 +msgstr "Tamaño Ventana X"
127185 +
127186 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:72
127187 +msgid "Window Y Size"
127188 +msgstr "Tamaño Ventana Y"
127189 +
127190 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:103
127191 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:154
127192 +msgid "Fullscreen"
127193 +msgstr "Pantalla Completa"
127194 +
127195 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:121
127196 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:177
127197 +msgid "<b>Screen</b>"
127198 +msgstr "<b>Pantalla</b>"
127199 +
127200 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:148
127201 +msgid "Smooth displayed textures. Improves quality but may impact performance."
127202 +msgstr "Suaviza texturas mostradas. Mejora la calidad pero puede afectar el rendimiento."
127203 +
127204 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:149
127205 +msgid "Bilinear Filtering"
127206 +msgstr "Filtrado Bilinear"
127207 +
127208 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:164
127209 +msgid "Smooths the edges of lines. Improves quality but may impact performance."
127210 +msgstr "Suaviza los bordes de las lineas. Mejora la calidad pero puede afectar el rendimiento."
127211 +
127212 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:165
127213 +msgid "Antialiasing"
127214 +msgstr "Antialiasing"
127215 +
127216 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:181
127217 +msgid "Clearscreen"
127218 +msgstr "Clearscreen"
127219 +
127220 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:197
127221 +msgid "Display wireframes rather than textured graphics."
127222 +msgstr "Mostrar delineados en lugar que graficos texturizados."
127223 +
127224 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:198
127225 +msgid "Wireframe"
127226 +msgstr "Delineado"
127227 +
127228 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:214
127229 +msgid "Enable this if games are running too quickly."
127230 +msgstr "Habilitar si los juegos corren muy rápido."
127231 +
127232 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:215
127233 +msgid "Frame Limiting"
127234 +msgstr "Limitado de Cuadros."
127235 +
127236 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:235
127237 +msgid "Determines how many textures can be drawn at once."
127238 +msgstr "Determina cuantas texturas se pueden dibujar a la vez."
127239 +
127240 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:237
127241 +msgid "Maximum Textures"
127242 +msgstr "Texturas Máximas"
127243 +
127244 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:270
127245 +msgid "<b>Effects</b>"
127246 +msgstr "<b>Efectos</b>"
127247 +
127248 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:293
127249 +#: plugins/dfiso/dfiso.glade2:138
127250 +msgid "gtk-close"
127251 +msgstr "gtk-close"
127252 +
127253 +#: plugins/dfbinimage2/dfbinimage.glade2:7
127254 +msgid "Mooby2 configuration"
127255 +msgstr "Configuración Mooby2"
127256 +
127257 +#: plugins/dfbinimage2/dfbinimage.glade2:28
127258 +msgid "<b>Mooby2 configurations</b>"
127259 +msgstr "<b>Configuraciones Mooby2</b>"
127260 +
127261 +#: plugins/dfbinimage2/dfbinimage.glade2:50
127262 +msgid "Read subchannel data"
127263 +msgstr "Leer datos del subcanal"
127264 +
127265 +#: plugins/dfbinimage2/dfbinimage.glade2:64
127266 +msgid "Alternative caching mode"
127267 +msgstr "Modo de caching alternativo"
127268 +
127269 +#: plugins/dfbinimage2/dfbinimage.glade2:82
127270 +msgid "Automatically load this image:"
127271 +msgstr "Cargar automaticamente esta imagen:"
127272 +
127273 +#: plugins/dfbinimage2/dfbinimage.glade2:127
127274 +msgid "Repeat all"
127275 +msgstr "Repetir todo"
127276 +
127277 +#: plugins/dfbinimage2/dfbinimage.glade2:138
127278 +msgid "Repeat one"
127279 +msgstr "Repetir una vez"
127280 +
127281 +#: plugins/dfbinimage2/dfbinimage.glade2:153
127282 +msgid "Play one"
127283 +msgstr "Ejecutar una vez"
127284 +
127285 +#: plugins/dfbinimage2/dfbinimage.glade2:169
127286 +msgid "<b>CDDA repeat options</b>"
127287 +msgstr "<b>Opciones de repetición CDDA</b>"
127288 +
127289 +#: plugins/dfbinimage2/dfbinimage.glade2:207
127290 +msgid "<b>CDDA volume [%]</b>"
127291 +msgstr "<b>Volumen CDDA [%]</b>"
127292 +
127293 +#: plugins/dfbinimage2/dfbinimage.glade2:244
127294 +msgid "<b>Cache size [MiB]</b>"
127295 +msgstr "<b>Tamaño Cache [MiB]</b>"
127296 +
127297 +#: plugins/dfbinimage2/dfbinimage.glade2:277
127298 +#: plugins/dfbinimage2/dfbinimage.glade2:344
127299 +msgid "Compress"
127300 +msgstr "Compresión"
127301 +
127302 +#: plugins/dfbinimage2/dfbinimage.glade2:288
127303 +#: plugins/dfbinimage2/dfbinimage.glade2:355
127304 +msgid "Decompress"
127305 +msgstr "Descompresión"
127306 +
127307 +#: plugins/dfbinimage2/dfbinimage.glade2:298
127308 +#: plugins/dfbinimage2/dfbinimage.glade2:365
127309 +#: plugins/dfbinimage2/dfbinimage.glade2:457
127310 +msgid "Progress"
127311 +msgstr "Progreso"
127312 +
127313 +#: plugins/dfbinimage2/dfbinimage.glade2:311
127314 +msgid "<b>Compress bz</b>"
127315 +msgstr "<b>Compresión bz</b>"
127316 +
127317 +#: plugins/dfbinimage2/dfbinimage.glade2:378
127318 +msgid "<b>Compress Z</b>"
127319 +msgstr "<b>Compresión Z</b>"
127320
127321 -#: data/pcsx.glade2:2227
127322 -msgid "Configure Memory Cards"
127323 -msgstr "Configura Tarjetas de Memoria"
127324 -
127325 -#: data/pcsx.glade2:2380 data/pcsx.glade2:3129
127326 -msgid "Select"
127327 -msgstr "Selleciona"
127328 -
127329 -#: data/pcsx.glade2:2455 data/pcsx.glade2:3204
127330 -msgid "Format"
127331 -msgstr "Borra"
127332 +#: plugins/dfbinimage2/dfbinimage.glade2:406
127333 +msgid ""
127334 +"Warning: Original image will be overwritten.\n"
127335 +"Old file will be saved as \"filename.backup\" when removing CDDA.\n"
127336 +"Only .bin format is supported for removal of CDDA-data for now, \n"
127337 +"however ripping works in all formats.\n"
127338 +"\n"
127339 +"Please see OGG_README.txt for details regardning the OGG files."
127340 +msgstr ""
127341 +"Aviso: La imagen original será sobreescrita.\n"
127342 +"El archivo antiguo se guardará como \"filename.backup\" al remover el CDDA.\n"
127343 +"Solo el formato .bin soporta remoción de datos CDDA por ahora,\n"
127344 +"sin embargo la extraccón funciona en todos los formatos.\n"
127345 +"\n"
127346 +"Leer OGG_README.txt para mas detalles sobre archivos OGG."
127347 +
127348 +#: plugins/dfbinimage2/dfbinimage.glade2:433
127349 +msgid "Rip WAV"
127350 +msgstr "Extraer WAV"
127351 +
127352 +#: plugins/dfbinimage2/dfbinimage.glade2:442
127353 +msgid "Remove CDDA"
127354 +msgstr "Remover CDDA"
127355 +
127356 +#: plugins/dfbinimage2/dfbinimage.glade2:476
127357 +msgid "<b>Compress CDDA as Ogg / Rip WAV</b>"
127358 +msgstr "<b>Comprimir CDDA como Ogg / Extraer WAV</b>"
127359 +
127360 +#: plugins/dfbinimage2/dfbinimage.glade2:502
127361 +msgid "gtk-ok"
127362 +msgstr "gtk-ok"
127363 +
127364 +#: plugins/dfcdrom/cfgCdr.glade:9
127365 +msgid "CDR configuration"
127366 +msgstr "Configuración CDR"
127367 +
127368 +#: plugins/dfcdrom/cfgCdr.glade:89
127369 +msgid "chose yor cdrom device or type its path if it's not listed"
127370 +msgstr "elije tu unidad de cdrom o escribe la ruta si no está listada"
127371 +
127372 +#: plugins/dfcdrom/cfgCdr.glade:96
127373 +msgid "*"
127374 +msgstr "*"
127375 +
127376 +#: plugins/dfcdrom/cfgCdr.glade:113
127377 +msgid "Select cdrom device"
127378 +msgstr "Elije unidad de cdrom"
127379 +
127380 +#: plugins/dfcdrom/cfgCdr.glade:159
127381 +msgid "Select read mode:"
127382 +msgstr "Elije modo de lectura:"
127383 +
127384 +#: plugins/dfcdrom/cfgCdr.glade:190
127385 +msgid "Normal (No Cache)"
127386 +msgstr "Normal (Sin cache)"
127387 +
127388 +#: plugins/dfcdrom/cfgCdr.glade:198
127389 +msgid "Threaded - Faster (With Cache)"
127390 +msgstr "Con hilos - Más rápido (Con Cache)"
127391 +
127392 +#: plugins/dfcdrom/cfgCdr.glade:240
127393 +msgid "Cache Size (Def. 64): "
127394 +msgstr "Tamaño de la Cache (Def. 64):"
127395 +
127396 +#: plugins/dfcdrom/cfgCdr.glade:305
127397 +msgid "Cdrom Speed (Def. 0 = MAX): "
127398 +msgstr "Velocidad Cdrom (Def. 0 = MAX):"
127399 +
127400 +#: plugins/dfcdrom/cfgCdr.glade:353
127401 +msgid "hseparator"
127402 +msgstr "hseparator"
127403 +
127404 +#: plugins/dfcdrom/cfgCdr.glade:368
127405 +msgid "Enable subQ read"
127406 +msgstr "Habilitar lectura subQ"
127407 +
127408 +#: plugins/dfcdrom/cfgCdr.glade:387
127409 +msgid "Options"
127410 +msgstr "Opciones"
127411 +
127412 +#: plugins/dfcdrom/cfgCdr.glade:425
127413 +msgid "About CDR"
127414 +msgstr "Acerca de CDR"
127415 +
127416 +#: plugins/dfcdrom/cfgCdr.glade:475
127417 +msgid "<span size=\"xx-large\"><b>CDR plugin</b></span>"
127418 +msgstr "<span size=\"xx-large\"><b>Plugin CDR</b></span>"
127419
127420 -#: data/pcsx.glade2:2530 data/pcsx.glade2:3279
127421 -msgid "Reload"
127422 -msgstr "Iniciar de Nuevo"
127423 +#: plugins/dfcdrom/cfgCdr.glade:496
127424 +msgid ""
127425 +"linux CDR plugin for Pcsx\n"
127426 +"\n"
127427 +msgstr ""
127428 +"plugin CDR linux para Pcsx\n"
127429 +"\n"
127430
127431 -#: data/pcsx.glade2:2595
127432 -msgid "<b>Memory Card 1</b>"
127433 -msgstr "<b>Tarjeta de Memoria 1</b>"
127434 +#: plugins/dfcdrom/cfgCdr.glade:519
127435 +msgid ""
127436 +"<small>(c) linuzappz linuzappz@hotmail.com\n"
127437 +" xobro _xobro_@tin.it</small>\n"
127438 +msgstr ""
127439 +"<small>(c) linuzappz linuzappz@hotmail.com\n"
127440 +" xobro _xobro_@tin.it</small>\n"
127441
127442 -#: data/pcsx.glade2:2694 data/pcsx.glade2:2769
127443 -msgid "Copy"
127444 -msgstr "Copia"
127445 +#: plugins/dfinput/dfinput.glade2:8
127446 +msgid "Configure Gamepad/Keyboard"
127447 +msgstr "Configurar Gamepad/Teclado"
127448 +
127449 +#: plugins/dfinput/dfinput.glade2:45
127450 +msgid "Pad number:"
127451 +msgstr "Número de Pad:"
127452 +
127453 +#: plugins/dfinput/dfinput.glade2:71
127454 +msgid "1"
127455 +msgstr "1"
127456 +
127457 +#: plugins/dfinput/dfinput.glade2:90
127458 +msgid "2"
127459 +msgstr "2"
127460 +
127461 +#: plugins/dfinput/dfinput.glade2:109
127462 +msgid "Emulation:"
127463 +msgstr "Emulación:"
127464 +
127465 +#: plugins/dfinput/dfinput.glade2:154
127466 +msgid "ePSXe"
127467 +msgstr "ePSXe"
127468 +
127469 +#: plugins/dfinput/dfinput.glade2:187
127470 +msgid "Device file:"
127471 +msgstr "Archivo de dispositivo:"
127472 +
127473 +#: plugins/dfinput/dfinput.glade2:246
127474 +msgid "Multi-threaded"
127475 +msgstr "Multi-Hilo"
127476 +
127477 +#: plugins/dfinput/dfinput.glade2:265
127478 +msgid "Analog"
127479 +msgstr "Analogo"
127480 +
127481 +#: plugins/dfinput/dfinput.glade2:317
127482 +msgid "<b>Button Configuration</b>"
127483 +msgstr "<b>Configuración de Botones</b>"
127484 +
127485 +#: plugins/dfinput/dfinput.glade2:394
127486 +msgid "dfinput"
127487 +msgstr "dfinput"
127488 +
127489 +#: plugins/dfinput/dfinput.glade2:395
127490 +msgid "Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com)"
127491 +msgstr "Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com)"
127492 +
127493 +#: plugins/dfiso/dfiso.glade2:7
127494 +msgid "CDR ISO Configuration"
127495 +msgstr "Configuración CDR ISO"
127496 +
127497 +#: plugins/dfiso/dfiso.glade2:21
127498 +msgid "<b>Configuration Options</b>"
127499 +msgstr "<b>Opciones de Configuración</b>"
127500 +
127501 +#: plugins/dfiso/dfiso.glade2:43
127502 +msgid "Automatically load an ISO file"
127503 +msgstr "Cargar un archivo ISO automaticamente"
127504 +
127505 +#: plugins/dfiso/dfiso.glade2:60
127506 +msgid "Automatically load this file:"
127507 +msgstr "Cargar automaticamente este archivo:"
127508 +
127509 +#: plugins/dfiso/dfiso.glade2:99
127510 +msgid "Device:"
127511 +msgstr "Dispositivo:"
127512 +
127513 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:9
127514 +msgid "Configure Sound"
127515 +msgstr "Configurar Sonido"
127516 +
127517 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:62
127518 +msgid "Volume:"
127519 +msgstr "Volumen:"
127520 +
127521 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:90
127522 +msgid "Interpolation:"
127523 +msgstr "Interpolación:"
127524 +
127525 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:118
127526 +msgid "Reverb:"
127527 +msgstr "Reverberación:"
127528
127529 -#: data/pcsx.glade2:2919 data/pcsx.glade2:2994
127530 -msgid "Un/Delete"
127531 -msgstr "No/Borra"
127532 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:146
127533 +msgid ""
127534 +"Low\n"
127535 +"Medium\n"
127536 +"Loud\n"
127537 +"Loudest"
127538 +msgstr ""
127539 +"Bajo\n"
127540 +"Medio\n"
127541 +"Alto\n"
127542 +"Altisimo"
127543
127544 -#: data/pcsx.glade2:3344
127545 -msgid "<b>Memory Card 2</b>"
127546 -msgstr "<b>Tarjeta de Memoria 2</b>"
127547 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:165
127548 +msgid ""
127549 +"Off\n"
127550 +"Simple\n"
127551 +"Playstation"
127552 +msgstr ""
127553 +"Apagado\n"
127554 +"Simple\n"
127555 +"Playstation"
127556
127557 -#: data/pcsx.glade2:3391
127558 -msgid "PCSX 1.7df"
127559 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
127560 +msgid ""
127561 +"None\n"
127562 +"Simple\n"
127563 +"Gaussian\n"
127564 +"Cubic"
127565 msgstr ""
127566 +"Ninguno\n"
127567 +"Simple\n"
127568 +"Gaussiano\n"
127569 +"Cubico"
127570 +
127571 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:208
127572 +msgid "<b>General</b>"
127573 +msgstr "<b>General</b>"
127574 +
127575 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:264
127576 +msgid "Enable or disable XA music."
127577 +msgstr "Habilitar o deshabilitar musica XA"
127578 +
127579 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:266
127580 +msgid "Enable XA"
127581 +msgstr "Habilitar XA"
127582 +
127583 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:284
127584 +msgid "Choose this if XA music is played too quickly."
127585 +msgstr "Elejir si la música XA se escucha muy rápida."
127586 +
127587 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:286
127588 +msgid "Adjust XA speed"
127589 +msgstr "Ajustar velocidad XA"
127590 +
127591 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:308
127592 +msgid "<b>XA Music</b>"
127593 +msgstr "<b>Música XA</b>"
127594 +
127595 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:364
127596 +msgid "Use the asynchronous SPU interface."
127597 +msgstr "Usar la interfaz SPU asincrónica."
127598 +
127599 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:366
127600 +msgid "High compatibility mode"
127601 +msgstr "Modo de alta compatibilidad"
127602 +
127603 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:384
127604 +msgid "Wait for CPU; only useful for some games."
127605 +msgstr "Esperar CPU; solo útil en algunos juegos."
127606 +
127607 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:386
127608 +msgid "SPU IRQ Wait"
127609 +msgstr "Esperar IRQ SPU"
127610 +
127611 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:404
127612 +msgid "Play only one channel for a performance boost."
127613 +msgstr "Jugar sólo un canal para un aumento de rendimiento."
127614 +
127615 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:406
127616 +msgid "Single channel sound"
127617 +msgstr "Un solo canal de sonido"
127618 +
127619 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:428
127620 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:664
127621 +msgid "<b>Compatibility</b>"
127622 +msgstr "<b>Compatibilidad</b>"
127623 +
127624 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:486
127625 +msgid "About Sound Plugin"
127626 +msgstr "Acerca del Sonido Plugin"
127627 +
127628 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:516
127629 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:714
127630 +msgid "Coded by: Pete Bernert and the P.E.Op.S. team"
127631 +msgstr "Codificado por: Pete Bernert y el equipo P.E.Op.S."
127632 +
127633 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:541
127634 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:725
127635 +msgid "Homepage: http://home.t-online.de/home/PeteBernert/"
127636 +msgstr "Página principal: http://home.t-online.de/home/PeteBernert/"
127637 +
127638 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:566
127639 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:737
127640 +msgid "EMail: BlackDove@addcom.de"
127641 +msgstr "EMail: BlackDove@addcom.de"
127642 +
127643 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:592
127644 +msgid "Version: 1.6"
127645 +msgstr "Versión: 1.6"
127646 +
127647 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:617
127648 +msgid "Release date: 05.04.2003"
127649 +msgstr "Realizado: 05.04.2003"
127650 +
127651 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:642
127652 +msgid "<b>PCSX-df Sound Plugin Adaption</b>"
127653 +msgstr "<b>Adaptación del Plugin de Sonido PCSX-df</b>"
127654 +
127655 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
127656 +msgid "Configure X11 Video"
127657 +msgstr "Configurar Video X11"
127658 +
127659 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:39
127660 +msgid "Initial Window Size:"
127661 +msgstr "Tamaño inicial de la ventana:"
127662 +
127663 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:50
127664 +msgid "Stretching:"
127665 +msgstr "Estirar:"
127666 +
127667 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:63
127668 +msgid "Dithering:"
127669 +msgstr "interpolación:"
127670
127671 -#: data/pcsx.glade2:3392
127672 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:76
127673 msgid ""
127674 -"(C) 1999-2003 PCSX Team\n"
127675 -"(C) 2005-2006 Ryan Schultz\n"
127676 -"(C) 2005-2006 Andrew Burton"
127677 +"320x240\n"
127678 +"640x480\n"
127679 +"800x600\n"
127680 +"1024x768\n"
127681 +"1152x864\n"
127682 +"1280x1024\n"
127683 +"1600x1200"
127684 msgstr ""
127685 -"C) 1999-2003 PCSX Equipo\n"
127686 -"(C) 2005-2006 Ryan Schultz\n"
127687 -"(C) 2005-2006 Andrew Burton"
127688 +"320x240\n"
127689 +"640x480\n"
127690 +"800x600\n"
127691 +"1024x768\n"
127692 +"1152x864\n"
127693 +"1280x1024\n"
127694 +"1600x1200"
127695
127696 -#: data/pcsx.glade2:3395
127697 -msgid "A Playstation emulator for GNU/Linux."
127698 -msgstr "Un emulador de Playstation para GNU/Linux."
127699 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:95
127700 +msgid ""
127701 +"0: None\n"
127702 +"1: 2xSai\n"
127703 +"2: 2xSuperSai\n"
127704 +"3: SuperEagle\n"
127705 +"4: Scale2x\n"
127706 +"5: Scale3x\n"
127707 +"6: HQ2X\n"
127708 +"7: HQ3X"
127709 +msgstr ""
127710 +"0: Ninguna\n"
127711 +"1: 2xSai\n"
127712 +"2: 2xSuperSai\n"
127713 +"3: SuperEagle\n"
127714 +"4: Scale2x\n"
127715 +"5: Scale3x\n"
127716 +"6: HQ2X\n"
127717 +"7: HQ3X"
127718
127719 -#: data/pcsx.glade2:3396
127720 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:117
127721 msgid ""
127722 -"PCSX is licensed under the GNU GPL; see the included COPYING file for more "
127723 -"detail."
127724 +"0: Off (fastest)\n"
127725 +"1: Game dependant\n"
127726 +"2: Always"
127727 msgstr ""
127728 -"PCSX tiene la licencia de GNU GPL; ve la fichero de COPYING para busca mas "
127729 -"detalles."
127730 +"0: Apagado (más rápido)\n"
127731 +"1: Dependiendo del juego\n"
127732 +"2: Siempre"
127733
127734 -#: data/pcsx.glade2:3399
127735 -msgid "PCSX-df Development"
127736 -msgstr "Desarollo de PCSX-df"
127737 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:139
127738 +msgid "Maintain 4:3 Aspect Ratio"
127739 +msgstr "Mantener relación de aspecto 4:3"
127740
127741 -#: data/pcsx.glade2:3405
127742 -msgid "translator-credits"
127743 -msgstr "translator-credits"
127744 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:153
127745 +msgid "Toggle windowed/fullscreen mode."
127746 +msgstr "Cambiar modo ventana/pantalla completa."
127747 +
127748 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:203
127749 +msgid "Toggle whether the FPS will be shown."
127750 +msgstr "Cambiar si los FPS se mostrarán"
127751 +
127752 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:204
127753 +msgid "Show FPS"
127754 +msgstr "Ver FPS"
127755 +
127756 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:218
127757 +msgid "Enable this if games display too quickly."
127758 +msgstr "Habilitar si los juegos se ven muy rápido."
127759 +
127760 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:219
127761 +msgid "Autodetect FPS limit"
127762 +msgstr "Autodetectar limite de FPS"
127763 +
127764 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:235
127765 +msgid "Skip frames when rendering."
127766 +msgstr "Saltar cuadros al renderizar."
127767 +
127768 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
127769 +msgid "Enable frame skipping"
127770 +msgstr "Habilitar salto de cuadros"
127771
127772 -#: emulator/Misc.c:350
127773 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:257
127774 +msgid "Set FPS"
127775 +msgstr "Establecer FPS"
127776 +
127777 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:272
127778 +msgid "200.0"
127779 +msgstr "200.0"
127780 +
127781 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:295
127782 +msgid "<b>Framerate</b>"
127783 +msgstr "<b>Tasa de cuadros</b>"
127784 +
127785 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:324
127786 +msgid "Use game fixes"
127787 +msgstr "Usar correcciones de juegos"
127788 +
127789 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:348
127790 +msgid "better g-colors, worse textures"
127791 +msgstr "mejores g-colors, peores texturas"
127792 +
127793 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:363
127794 +msgid "Needed by Dark Forces"
127795 +msgstr "Necesario para Dark Forces"
127796 +
127797 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:378
127798 +msgid "Draw quads with triangles"
127799 +msgstr "Dibujar cuadriláteros con triángulos"
127800 +
127801 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
127802 +msgid "Repeated flat tex triangles"
127803 +msgstr "Triángulos de texturas planas repetidos"
127804 +
127805 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
127806 +msgid "Disable CPU Saving"
127807 +msgstr "Deshabilitar Ahorro de CPU"
127808 +
127809 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
127810 +msgid "Odd/even bit hack"
127811 +msgstr "Hack del bit Par/Impar"
127812 +
127813 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:440
127814 +msgid "For precise framerate"
127815 +msgstr "Para precisión de tasa de cuadros"
127816 +
127817 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:455
127818 +msgid "Better FPS limit in some"
127819 +msgstr "Mejor FPS límite en algunos"
127820 +
127821 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:470
127822 +msgid "PC FPS calculation"
127823 +msgstr "Cálculo de FPS del PC"
127824 +
127825 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
127826 +msgid "Pandemonium 2"
127827 +msgstr "Pandemonium 2"
127828 +
127829 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:501
127830 +msgid "Lazy screen update"
127831 +msgstr "Refresco de pantalla lento"
127832 +
127833 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
127834 +msgid "Skip every second frame"
127835 +msgstr "Saltar cada segundo cuadro"
127836 +
127837 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:532
127838 +msgid "Old frame skipping"
127839 +msgstr "Antiguo salto de cuadros"
127840 +
127841 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
127842 +msgid "Expand screen width"
127843 +msgstr "Ampliar el ancho de la pantalla"
127844 +
127845 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
127846 +msgid "Ignore brightness color"
127847 +msgstr "Ignorar luminosidad del color"
127848 +
127849 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
127850 +msgid "Disable coordinate check"
127851 +msgstr "Deshabilitar chequeo coordinado"
127852 +
127853 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
127854 +msgid "Chrono Cross"
127855 +msgstr "Chrono Cross"
127856 +
127857 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:609
127858 +msgid "Capcom fighting games"
127859 +msgstr "Juegos de pelea Capcom"
127860 +
127861 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:624
127862 +msgid "Black screens in Lunar"
127863 +msgstr "Pantallas negras en Lunar"
127864 +
127865 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:639
127866 +msgid "Compatibility mode"
127867 +msgstr "Modo de Compatibilidad"
127868 +
127869 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:701
127870 +msgid "About X11 Video Plugin"
127871 +msgstr "Acerca del Plugin de Video X11"
127872 +
127873 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:750
127874 +msgid "Version: 1.15"
127875 +msgstr "Versión: 1.15"
127876 +
127877 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:762
127878 +msgid "Release date: 2003"
127879 +msgstr "Realizado: 2003"
127880 +
127881 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:774
127882 +msgid "<b>PCSX-df Video Plugin Adaption</b>"
127883 +msgstr "<b>Adaptación del Plugin de Sonido PCSX-df</b>"
127884 +
127885 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:787
127886 +msgid "XVideo Support: Stephen Chao"
127887 +msgstr "Soporte XVideo: Stephen Chao"
127888 +
127889 +#: libpcsxcore/misc.c:366
127890 #, c-format
127891 -msgid "Error opening file: %s!"
127892 -msgstr "¡Error mientras abrir la fichero: %s!"
127893 +msgid "Error opening file: %s"
127894 +msgstr "Error abriendo el archivo: %s"
127895
127896 -#: emulator/Misc.c:365
127897 -msgid "CPE files not supported!"
127898 -msgstr "¡Ficheros de CPE no funciona!"
127899 +#: libpcsxcore/misc.c:384
127900 +msgid "CPE files not supported."
127901 +msgstr "Archivos CPE no soportados."
127902
127903 -#: emulator/Misc.c:368
127904 -msgid "COFF files not supported!"
127905 -msgstr "¡Ficheros de COFF no funciona!"
127906 +#: libpcsxcore/misc.c:388
127907 +msgid "COFF files not supported."
127908 +msgstr "Archivos COFF no soportados."
127909
127910 -#: emulator/Misc.c:371
127911 -msgid "This file does not appear to be a valid PSX file!"
127912 -msgstr "¡Esto no parece ser un fichero válido de PSX!"
127913 +#: libpcsxcore/misc.c:392
127914 +msgid "This file does not appear to be a valid PSX file."
127915 +msgstr "El archivo no parece ser un archivo de PlayStation válido."
127916
127917 -#: emulator/PsxMem.c:39
127918 +#: libpcsxcore/psxmem.c:70
127919 msgid "Error allocating memory!"
127920 -msgstr "¡Error mientras ubicar memoria!"
127921 +msgstr "Error de asignación de memoria!"
127922
127923 -#: emulator/PsxMem.c:77
127924 +#: libpcsxcore/psxmem.c:109
127925 #, c-format
127926 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
127927 -msgstr "No podr¡a abrir BIOSs\"%s\". Usando HLE BIOS!\n"
127928 +msgstr "No se pudo abrir la BIOS:\"%s\". Habilitando Bios HLE!\n"
127929
127930 -#: emulator/Sio.c:108
127931 +#: libpcsxcore/sio.c:99
127932 msgid "Connection closed!\n"
127933 -msgstr "¡Conexión es cerrado!\n"
127934 +msgstr "Conexión cerrada!\n"
127935
127936 -#: emulator/Sio.c:346
127937 +#: libpcsxcore/sio.c:341
127938 #, c-format
127939 msgid "Memory card %s failed to load!\n"
127940 -msgstr "¡Tarjeta de memoria %s falla cargar!\n"
127941 +msgstr "Tarjeta de Memoria %s falló al cargar!\n"
127942
127943 -#: emulator/plugins.c:31
127944 +#: libpcsxcore/plugins.c:29
127945 #, c-format
127946 msgid "Error loading %s: %s"
127947 -msgstr "Error mientras cargando %s: %s"
127948 +msgstr "Error cargando %s: %s"
127949
127950 -#: emulator/plugins.c:162
127951 +#: libpcsxcore/plugins.c:158
127952 #, c-format
127953 msgid "Could not load GPU plugin %s!"
127954 -msgstr "¡No podría cargar el enchufe de GPU %s!"
127955 +msgstr "No es posible cargar el plugin de GPU %s!"
127956
127957 -#: emulator/plugins.c:224
127958 +#: libpcsxcore/plugins.c:221
127959 #, c-format
127960 msgid "Could not load CD-ROM plugin %s!"
127961 -msgstr "¡No podría cargar el enchufe de CD-ROM %s!"
127962 +msgstr "No es posible cargar el plugin de CD-ROM %s!"
127963
127964 -#: emulator/plugins.c:462
127965 +#: libpcsxcore/plugins.c:460
127966 #, c-format
127967 msgid "Could not load SPU plugin %s!"
127968 -msgstr "¡No podría cargar el enchufe de SPU %s!"
127969 +msgstr "No es posible cargar el plugin de SPU %s!"
127970
127971 -#: emulator/plugins.c:610
127972 +#: libpcsxcore/plugins.c:608
127973 #, c-format
127974 msgid "Could not load Controller 1 plugin %s!"
127975 -msgstr "¡No podría cargar el enchufe de Controlador 1 %s!"
127976 +msgstr "No es posible cargar el plugin del Control 1 %s!"
127977
127978 -#: emulator/plugins.c:664
127979 +#: libpcsxcore/plugins.c:662
127980 #, c-format
127981 msgid "Could not load Controller 2 plugin %s!"
127982 -msgstr "¡No podría cargar el enchufe de Controlador 2 %s!"
127983 +msgstr "No es posible cargar el plugin del Control 2 %s!"
127984
127985 -#: emulator/plugins.c:707
127986 +#: libpcsxcore/plugins.c:705
127987 #, c-format
127988 msgid "Could not load NetPlay plugin %s!"
127989 -msgstr "¡No podría cargar el enchufe de NetJuega %s!"
127990 +msgstr "No es posible cargar el plugin de NetPlay %s!"
127991 +
127992 +#: libpcsxcore/plugins.c:760
127993 +#, c-format
127994 +msgid "Error initializing CD-ROM plugin: %d"
127995 +msgstr "Error al inicializar el plugin del CD-ROM: %d"
127996 +
127997 +#: libpcsxcore/plugins.c:762
127998 +#, c-format
127999 +msgid "Error initializing GPU plugin: %d"
128000 +msgstr "Error al inicializar el plugin de GPU: %d"
128001 +
128002 +#: libpcsxcore/plugins.c:764
128003 +#, c-format
128004 +msgid "Error initializing SPU plugin: %d"
128005 +msgstr "Error al inicializar el plugin del SPU: %d"
128006 +
128007 +#: libpcsxcore/plugins.c:766
128008 +#, c-format
128009 +msgid "Error initializing Controller 1 plugin: %d"
128010 +msgstr "Error al inicializar el plugin del Control 1: %d"
128011 +
128012 +#: libpcsxcore/plugins.c:768
128013 +#, c-format
128014 +msgid "Error initializing Controller 2 plugin: %d"
128015 +msgstr "Error al inicializar el plugin del Control 2: %d"
128016 +
128017 +#: libpcsxcore/plugins.c:772
128018 +#, c-format
128019 +msgid "Error initializing NetPlay plugin: %d"
128020 +msgstr "Error al inicializar el plugin de NetPlay: %d"
128021 +
128022 diff -rupN original/po/insert-header.sin new/po/insert-header.sin
128023 --- original/po/insert-header.sin 1969-12-31 20:00:00.000000000 -0400
128024 +++ new/po/insert-header.sin 2007-10-08 17:13:28.000000000 -0400
128025 @@ -0,0 +1,23 @@
128026 +# Sed script that inserts the file called HEADER before the header entry.
128027 +#
128028 +# At each occurrence of a line starting with "msgid ", we execute the following
128029 +# commands. At the first occurrence, insert the file. At the following
128030 +# occurrences, do nothing. The distinction between the first and the following
128031 +# occurrences is achieved by looking at the hold space.
128032 +/^msgid /{
128033 +x
128034 +# Test if the hold space is empty.
128035 +s/m/m/
128036 +ta
128037 +# Yes it was empty. First occurrence. Read the file.
128038 +r HEADER
128039 +# Output the file's contents by reading the next line. But don't lose the
128040 +# current line while doing this.
128041 +g
128042 +N
128043 +bb
128044 +:a
128045 +# The hold space was nonempty. Following occurrences. Do nothing.
128046 +x
128047 +:b
128048 +}
128049 Los ficheros binarios original/po/ja.gmo y new/po/ja.gmo son distintos
128050 diff -rupN original/po/otros new/po/otros
128051 --- original/po/otros 1969-12-31 20:00:00.000000000 -0400
128052 +++ new/po/otros 2009-04-11 11:09:09.000000000 -0430
128053 @@ -0,0 +1,26 @@
128054 +gui/configure-dlg.c
128055 +gui/Gtk2Gui.c
128056 +gui/hdebug.c
128057 +gui/LnxMain.c
128058 +gui/memcard-dlg.c
128059 +gui/pcsx-main-win.c
128060 +gui/pcsx-main-win.h
128061 +gui/pcsx-memcard-handler.c
128062 +gui/Plugin.c
128063 +gui/plugin-file-handler.c
128064 +data/pcsx.desktop.in
128065 +libpcsxcore/misc.c
128066 +libpcsxcore/psxmem.c
128067 +libpcsxcore/sio.c
128068 +libpcsxcore/plugins.c
128069 +tmp/cfgCdr.glade.h
128070 +tmp/dfiso.glade2.h
128071 +tmp/dfxvideo.glade2.h
128072 +tmp/dfbinimage.glade2.h
128073 +tmp/dfopengl.glade2.h
128074 +tmp/pcsx.glade2.h
128075 +tmp/dfinput.glade2.h
128076 +tmp/dfsound.glade2.h
128077 +tmp/pcsx_config.glade.h
128078 +
128079 +
128080 diff -rupN original/po/pcsx-df.pot new/po/pcsx-df.pot
128081 --- original/po/pcsx-df.pot 1969-12-31 20:00:00.000000000 -0400
128082 +++ new/po/pcsx-df.pot 2009-04-11 11:16:45.000000000 -0430
128083 @@ -0,0 +1,1251 @@
128084 +# SOME DESCRIPTIVE TITLE.
128085 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
128086 +# This file is distributed under the same license as the PACKAGE package.
128087 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
128088 +#
128089 +#, fuzzy
128090 +msgid ""
128091 +msgstr ""
128092 +"Project-Id-Version: PACKAGE VERSION\n"
128093 +"Report-Msgid-Bugs-To: \n"
128094 +"POT-Creation-Date: 2009-04-11 11:16-0430\n"
128095 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
128096 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
128097 +"Language-Team: LANGUAGE <LL@li.org>\n"
128098 +"MIME-Version: 1.0\n"
128099 +"Content-Type: text/plain; charset=UTF-8\n"
128100 +"Content-Transfer-Encoding: 8bit\n"
128101 +
128102 +#: gui/configure-dlg.c:419 gui/Gtk2Gui.c:1249
128103 +msgid "No configuration required"
128104 +msgstr ""
128105 +
128106 +#: gui/configure-dlg.c:419 gui/Gtk2Gui.c:1249
128107 +msgid "This plugin doesn't need to be configured."
128108 +msgstr ""
128109 +
128110 +#: gui/configure-dlg.c:476
128111 +msgid "No About information"
128112 +msgstr ""
128113 +
128114 +#: gui/configure-dlg.c:476
128115 +msgid "This plugin does not provide any About information."
128116 +msgstr ""
128117 +
128118 +#: gui/configure-dlg.c:818 gui/Gtk2Gui.c:368 data/pcsx_config.glade:7
128119 +msgid "Configure PCSX"
128120 +msgstr ""
128121 +
128122 +#: gui/Gtk2Gui.c:360 gui/Gtk2Gui.c:1063
128123 +msgid "Error: Glade interface could not be loaded!"
128124 +msgstr ""
128125 +
128126 +#: gui/Gtk2Gui.c:476
128127 +msgid "Plugins could not be loaded"
128128 +msgstr ""
128129 +
128130 +#: gui/Gtk2Gui.c:477
128131 +msgid "The plugins could not be loaded"
128132 +msgstr ""
128133 +
128134 +#: gui/Gtk2Gui.c:487
128135 +msgid "CD ROM failed"
128136 +msgstr ""
128137 +
128138 +#: gui/Gtk2Gui.c:488
128139 +msgid "The CD does not appear to be a valid Playstation CD"
128140 +msgstr ""
128141 +
128142 +#: gui/Gtk2Gui.c:497 gui/Gtk2Gui.c:793
128143 +msgid "Could not load CD-ROM!"
128144 +msgstr ""
128145 +
128146 +#: gui/Gtk2Gui.c:498
128147 +msgid "The CD ROM could not be loaded"
128148 +msgstr ""
128149 +
128150 +#: gui/Gtk2Gui.c:552
128151 +msgid "Not a valid PSX file"
128152 +msgstr ""
128153 +
128154 +#: gui/Gtk2Gui.c:553
128155 +msgid "The file does not appear to be a valid Playstation executable"
128156 +msgstr ""
128157 +
128158 +#: gui/Gtk2Gui.c:623
128159 +#, c-format
128160 +msgid ""
128161 +"The Playstation CD that is currently in use is %s (%s). It is not the same "
128162 +"CD as that used when saving the state file. The state file is looking for %s "
128163 +"(%s)."
128164 +msgstr ""
128165 +
128166 +#: gui/Gtk2Gui.c:628 gui/Gtk2Gui.c:892
128167 +msgid "The CD does not match the state file"
128168 +msgstr ""
128169 +
128170 +#: gui/Gtk2Gui.c:659 gui/Gtk2Gui.c:905
128171 +#, c-format
128172 +msgid "Error loading state %s!"
128173 +msgstr ""
128174 +
128175 +#: gui/Gtk2Gui.c:665 gui/Gtk2Gui.c:900
128176 +#, c-format
128177 +msgid "Loaded state %s."
128178 +msgstr ""
128179 +
128180 +#: gui/Gtk2Gui.c:680
128181 +msgid "Select PSX EXE File"
128182 +msgstr ""
128183 +
128184 +#: gui/Gtk2Gui.c:690
128185 +msgid "Playstation Executable Files"
128186 +msgstr ""
128187 +
128188 +#: gui/Gtk2Gui.c:695
128189 +msgid "All Files"
128190 +msgstr ""
128191 +
128192 +#: gui/Gtk2Gui.c:720 gui/Plugin.c:253
128193 +msgid "Select CD image file"
128194 +msgstr ""
128195 +
128196 +#: gui/Gtk2Gui.c:889
128197 +#, c-format
128198 +msgid ""
128199 +"The Playstation CD that is currently in use is %s. It is not the same CD as "
128200 +"that used when saving the state file. The state file is looking for %s."
128201 +msgstr ""
128202 +
128203 +#: gui/Gtk2Gui.c:917
128204 +#, c-format
128205 +msgid "Saved state %s."
128206 +msgstr ""
128207 +
128208 +#: gui/Gtk2Gui.c:919
128209 +#, c-format
128210 +msgid "Error saving state %s!"
128211 +msgstr ""
128212 +
128213 +#: gui/Gtk2Gui.c:954 gui/Gtk2Gui.c:983
128214 +msgid "Select State File"
128215 +msgstr ""
128216 +
128217 +#: gui/Gtk2Gui.c:1276
128218 +msgid "This plugin reports that it should work correctly."
128219 +msgstr ""
128220 +
128221 +#: gui/Gtk2Gui.c:1277
128222 +msgid "This plugin reports that it won't work correctly."
128223 +msgstr ""
128224 +
128225 +#: gui/Gtk2Gui.c:1495 data/pcsx.glade2:730
128226 +msgid "PCSX-df Development"
128227 +msgstr ""
128228 +
128229 +#: gui/Gtk2Gui.c:1500 plugins/dfinput/dfinput.glade2:399
128230 +msgid "translator-credits"
128231 +msgstr ""
128232 +
128233 +#: gui/Gtk2Gui.c:1501 data/pcsx.glade2:728
128234 +msgid "A Playstation emulator for GNU/Linux."
128235 +msgstr ""
128236 +
128237 +#: gui/Gtk2Gui.c:1503 data/pcsx.glade2:731
128238 +msgid ""
128239 +"PCSX is licensed under the GNU GPL; see the included COPYING file for more "
128240 +"detail."
128241 +msgstr ""
128242 +
128243 +#: gui/Gtk2Gui.c:1577 gui/Gtk2Gui.c:1778
128244 +msgid "Internal HLE Bios"
128245 +msgstr ""
128246 +
128247 +#: gui/Gtk2Gui.c:1578
128248 +msgid "HLE"
128249 +msgstr ""
128250 +
128251 +#: gui/Gtk2Gui.c:1620 gui/Gtk2Gui.c:1823
128252 +#, c-format
128253 +msgid "Could not open directory: '%s'\n"
128254 +msgstr ""
128255 +
128256 +#: gui/Gtk2Gui.c:1680
128257 +#, c-format
128258 +msgid "Could not open BIOS directory: '%s'\n"
128259 +msgstr ""
128260 +
128261 +#: gui/Gtk2Gui.c:1722 gui/plugin-file-handler.c:115
128262 +#, c-format
128263 +msgid "Could not open plugins directory: '%s'\n"
128264 +msgstr ""
128265 +
128266 +#: gui/Gtk2Gui.c:1888
128267 +msgid "An error has occurred during emulation"
128268 +msgstr ""
128269 +
128270 +#: gui/LnxMain.c:97
128271 +msgid "Disabled"
128272 +msgstr ""
128273 +
128274 +#: gui/memcard-dlg.c:59
128275 +msgid "Icon"
128276 +msgstr ""
128277 +
128278 +#: gui/memcard-dlg.c:65
128279 +msgid "Title"
128280 +msgstr ""
128281 +
128282 +#: gui/memcard-dlg.c:71
128283 +msgid "Status"
128284 +msgstr ""
128285 +
128286 +#: gui/memcard-dlg.c:77
128287 +msgid "ID"
128288 +msgstr ""
128289 +
128290 +#: gui/memcard-dlg.c:83
128291 +msgid "Name"
128292 +msgstr ""
128293 +
128294 +#: gui/memcard-dlg.c:147 gui/memcard-dlg.c:556
128295 +msgid "Deleted"
128296 +msgstr ""
128297 +
128298 +#: gui/memcard-dlg.c:149 gui/memcard-dlg.c:153 gui/memcard-dlg.c:557
128299 +#: gui/memcard-dlg.c:560
128300 +msgid "Free"
128301 +msgstr ""
128302 +
128303 +#: gui/memcard-dlg.c:151 gui/memcard-dlg.c:559
128304 +msgid "Used"
128305 +msgstr ""
128306 +
128307 +#: gui/memcard-dlg.c:259
128308 +msgid "Format this Memory Card?"
128309 +msgstr ""
128310 +
128311 +#: gui/memcard-dlg.c:262
128312 +msgid ""
128313 +"If you format the memory card, the card will be empty, and any existing data "
128314 +"overwritten."
128315 +msgstr ""
128316 +
128317 +#: gui/memcard-dlg.c:266
128318 +msgid "Format card"
128319 +msgstr ""
128320 +
128321 +#: gui/memcard-dlg.c:348
128322 +msgid "No free space on memory card"
128323 +msgstr ""
128324 +
128325 +#: gui/memcard-dlg.c:349
128326 +msgid ""
128327 +"There are no free slots available on the target memory card. Please delete a "
128328 +"slot first."
128329 +msgstr ""
128330 +
128331 +#: gui/memcard-dlg.c:608
128332 +msgid "Memory Card Manager"
128333 +msgstr ""
128334 +
128335 +#: gui/pcsx-main-win.c:179
128336 +msgid "PCSX-df"
128337 +msgstr ""
128338 +
128339 +#: gui/pcsx-main-win.h:32
128340 +msgid "_File"
128341 +msgstr ""
128342 +
128343 +#: gui/pcsx-main-win.h:33
128344 +msgid "_Emulator"
128345 +msgstr ""
128346 +
128347 +#: gui/pcsx-main-win.h:34
128348 +msgid "_Configuration"
128349 +msgstr ""
128350 +
128351 +#: gui/pcsx-main-win.h:35
128352 +msgid "_Help"
128353 +msgstr ""
128354 +
128355 +#: gui/pcsx-main-win.h:38
128356 +msgid "_Quit"
128357 +msgstr ""
128358 +
128359 +#: gui/pcsx-main-win.h:41
128360 +msgid "Load BIOS Screen"
128361 +msgstr ""
128362 +
128363 +#: gui/pcsx-main-win.h:45
128364 +msgid "_Preferences"
128365 +msgstr ""
128366 +
128367 +#: gui/pcsx-main-win.h:46
128368 +msgid "Memory Cards"
128369 +msgstr ""
128370 +
128371 +#: gui/pcsx-main-win.h:47
128372 +msgid "Debug"
128373 +msgstr ""
128374 +
128375 +#: gui/pcsx-main-win.h:51
128376 +msgid "About this application"
128377 +msgstr ""
128378 +
128379 +#: gui/pcsx-main-win.h:59
128380 +msgid "Load PSX EXE"
128381 +msgstr ""
128382 +
128383 +#: gui/pcsx-main-win.h:60
128384 +msgid "Load State"
128385 +msgstr ""
128386 +
128387 +#: gui/pcsx-main-win.h:61
128388 +msgid "Load ISO/Image"
128389 +msgstr ""
128390 +
128391 +#: gui/pcsx-main-win.h:62
128392 +msgid "Start Emulation"
128393 +msgstr ""
128394 +
128395 +#: gui/Plugin.c:220 data/pcsx_config.glade:627
128396 +#, c-format
128397 +msgid "SIO IRQ Always Enabled"
128398 +msgstr ""
128399 +
128400 +#: gui/Plugin.c:221
128401 +#, c-format
128402 +msgid "SIO IRQ Not Always Enabled"
128403 +msgstr ""
128404 +
128405 +#: gui/Plugin.c:229
128406 +#, c-format
128407 +msgid "Black & White Mdecs Only Enabled"
128408 +msgstr ""
128409 +
128410 +#: gui/Plugin.c:230
128411 +#, c-format
128412 +msgid "Black & White Mdecs Only Disabled"
128413 +msgstr ""
128414 +
128415 +#: gui/Plugin.c:238
128416 +#, c-format
128417 +msgid "XA Enabled"
128418 +msgstr ""
128419 +
128420 +#: gui/Plugin.c:239
128421 +#, c-format
128422 +msgid "XA Disabled"
128423 +msgstr ""
128424 +
128425 +#: gui/Plugin.c:358
128426 +msgid "Error opening SPU plugin!"
128427 +msgstr ""
128428 +
128429 +#: gui/Plugin.c:361
128430 +msgid "Error opening GPU plugin!"
128431 +msgstr ""
128432 +
128433 +#: gui/Plugin.c:363
128434 +msgid "Error opening Controller 1 plugin!"
128435 +msgstr ""
128436 +
128437 +#: gui/Plugin.c:365
128438 +msgid "Error opening Controller 2 plugin!"
128439 +msgstr ""
128440 +
128441 +#: gui/Plugin.c:456
128442 +msgid "Error closing CD-ROM plugin!"
128443 +msgstr ""
128444 +
128445 +#: gui/Plugin.c:458
128446 +msgid "Error closing SPU plugin!"
128447 +msgstr ""
128448 +
128449 +#: gui/Plugin.c:460
128450 +msgid "Error closing Controller 1 Plugin!"
128451 +msgstr ""
128452 +
128453 +#: gui/Plugin.c:462
128454 +msgid "Error closing Controller 2 plugin!"
128455 +msgstr ""
128456 +
128457 +#: gui/Plugin.c:464
128458 +msgid "Error closing GPU plugin!"
128459 +msgstr ""
128460 +
128461 +#: data/pcsx.glade2:9 plugins/dfinput/dfinput.glade2:135
128462 +msgid "PCSX"
128463 +msgstr ""
128464 +
128465 +#: data/pcsx.glade2:28
128466 +msgid "Configure NetPlay"
128467 +msgstr ""
128468 +
128469 +#: data/pcsx.glade2:109
128470 +msgid "<b>NetPlay</b>"
128471 +msgstr ""
128472 +
128473 +#: data/pcsx.glade2:153
128474 +msgid "Configure Memory Cards"
128475 +msgstr ""
128476 +
128477 +#: data/pcsx.glade2:223 data/pcsx.glade2:586
128478 +msgid "Format"
128479 +msgstr ""
128480 +
128481 +#: data/pcsx.glade2:267 data/pcsx.glade2:630
128482 +msgid "Reload"
128483 +msgstr ""
128484 +
128485 +#: data/pcsx.glade2:308
128486 +msgid "<b>Memory Card 1</b>"
128487 +msgstr ""
128488 +
128489 +#: data/pcsx.glade2:363 data/pcsx.glade2:407
128490 +msgid "Copy"
128491 +msgstr ""
128492 +
128493 +#: data/pcsx.glade2:454 data/pcsx.glade2:501
128494 +msgid "Un/Delete"
128495 +msgstr ""
128496 +
128497 +#: data/pcsx.glade2:671
128498 +msgid "<b>Memory Card 2</b>"
128499 +msgstr ""
128500 +
128501 +#: data/pcsx.glade2:724
128502 +msgid ""
128503 +"(C) 1999-2003 PCSX Team\n"
128504 +"(C) 2005-2006 Ryan Schultz\n"
128505 +"(C) 2005-2006 Andrew Burton\n"
128506 +"(C) 2008 Stefan Sikora"
128507 +msgstr ""
128508 +
128509 +#: data/pcsx.glade2:738
128510 +msgid ""
128511 +"Swedish: Daniel Nylander <yeager@lidkoping.net>\n"
128512 +"Chinese: Wei Mingzhi <whistler@openoffice.org>"
128513 +msgstr ""
128514 +
128515 +#: data/pcsx_config.glade:38
128516 +msgid "Path to Plugins:"
128517 +msgstr ""
128518 +
128519 +#: data/pcsx_config.glade:48
128520 +msgid "Select Folder to Search"
128521 +msgstr ""
128522 +
128523 +#: data/pcsx_config.glade:93
128524 +msgid "CD-ROM:"
128525 +msgstr ""
128526 +
128527 +#: data/pcsx_config.glade:108
128528 +msgid "Controller 2:"
128529 +msgstr ""
128530 +
128531 +#: data/pcsx_config.glade:123
128532 +msgid "Controller 1: "
128533 +msgstr ""
128534 +
128535 +#: data/pcsx_config.glade:138
128536 +msgid "Sound:"
128537 +msgstr ""
128538 +
128539 +#: data/pcsx_config.glade:153
128540 +msgid "Graphics:"
128541 +msgstr ""
128542 +
128543 +#: data/pcsx_config.glade:479
128544 +msgid "<b>Plugins</b>"
128545 +msgstr ""
128546 +
128547 +#: data/pcsx_config.glade:511
128548 +msgid "Path to BIOS Files:"
128549 +msgstr ""
128550 +
128551 +#: data/pcsx_config.glade:546
128552 +msgid "Show BIOS screen when starting emulation"
128553 +msgstr ""
128554 +
128555 +#: data/pcsx_config.glade:563
128556 +msgid "<b>BIOS</b>"
128557 +msgstr ""
128558 +
128559 +#: data/pcsx_config.glade:597
128560 +msgid "Disable XA Decoding"
128561 +msgstr ""
128562 +
128563 +#: data/pcsx_config.glade:611
128564 +msgid "Disable CD Audio"
128565 +msgstr ""
128566 +
128567 +#: data/pcsx_config.glade:643
128568 +msgid "Enable Interpreter CPU"
128569 +msgstr ""
128570 +
128571 +#: data/pcsx_config.glade:661
128572 +msgid "Enable Console Output"
128573 +msgstr ""
128574 +
128575 +#: data/pcsx_config.glade:679
128576 +msgid "Black & White Movies"
128577 +msgstr ""
128578 +
128579 +#: data/pcsx_config.glade:695
128580 +msgid "SPU IRQ Always Enabled"
128581 +msgstr ""
128582 +
128583 +#: data/pcsx_config.glade:711
128584 +msgid "Enable Debugger"
128585 +msgstr ""
128586 +
128587 +#: data/pcsx_config.glade:731
128588 +msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
128589 +msgstr ""
128590 +
128591 +#: data/pcsx_config.glade:746
128592 +msgid "InuYasha Sengoku Battle Fix"
128593 +msgstr ""
128594 +
128595 +#: data/pcsx_config.glade:762
128596 +msgid "<b>Options</b>"
128597 +msgstr ""
128598 +
128599 +#: data/pcsx_config.glade:789
128600 +msgid "Autodetect"
128601 +msgstr ""
128602 +
128603 +#: data/pcsx_config.glade:802
128604 +msgid ""
128605 +"NTSC\n"
128606 +"PAL"
128607 +msgstr ""
128608 +
128609 +#: data/pcsx_config.glade:816
128610 +msgid "<b>System Type</b>"
128611 +msgstr ""
128612 +
128613 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:8
128614 +msgid "Configure OpenGL Video"
128615 +msgstr ""
128616 +
128617 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:37
128618 +msgid "Window X Size"
128619 +msgstr ""
128620 +
128621 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:72
128622 +msgid "Window Y Size"
128623 +msgstr ""
128624 +
128625 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:103
128626 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:154
128627 +msgid "Fullscreen"
128628 +msgstr ""
128629 +
128630 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:121
128631 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:177
128632 +msgid "<b>Screen</b>"
128633 +msgstr ""
128634 +
128635 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:148
128636 +msgid "Smooth displayed textures. Improves quality but may impact performance."
128637 +msgstr ""
128638 +
128639 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:149
128640 +msgid "Bilinear Filtering"
128641 +msgstr ""
128642 +
128643 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:164
128644 +msgid ""
128645 +"Smooths the edges of lines. Improves quality but may impact performance."
128646 +msgstr ""
128647 +
128648 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:165
128649 +msgid "Antialiasing"
128650 +msgstr ""
128651 +
128652 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:181
128653 +msgid "Clearscreen"
128654 +msgstr ""
128655 +
128656 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:197
128657 +msgid "Display wireframes rather than textured graphics."
128658 +msgstr ""
128659 +
128660 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:198
128661 +msgid "Wireframe"
128662 +msgstr ""
128663 +
128664 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:214
128665 +msgid "Enable this if games are running too quickly."
128666 +msgstr ""
128667 +
128668 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:215
128669 +msgid "Frame Limiting"
128670 +msgstr ""
128671 +
128672 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:235
128673 +msgid "Determines how many textures can be drawn at once."
128674 +msgstr ""
128675 +
128676 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:237
128677 +msgid "Maximum Textures"
128678 +msgstr ""
128679 +
128680 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:270
128681 +msgid "<b>Effects</b>"
128682 +msgstr ""
128683 +
128684 +#: plugins/dfOpenGL/gpucfg-0.1df/dfopengl.glade2:293
128685 +#: plugins/dfiso/dfiso.glade2:138
128686 +msgid "gtk-close"
128687 +msgstr ""
128688 +
128689 +#: plugins/dfbinimage2/dfbinimage.glade2:7
128690 +msgid "Mooby2 configuration"
128691 +msgstr ""
128692 +
128693 +#: plugins/dfbinimage2/dfbinimage.glade2:28
128694 +msgid "<b>Mooby2 configurations</b>"
128695 +msgstr ""
128696 +
128697 +#: plugins/dfbinimage2/dfbinimage.glade2:50
128698 +msgid "Read subchannel data"
128699 +msgstr ""
128700 +
128701 +#: plugins/dfbinimage2/dfbinimage.glade2:64
128702 +msgid "Alternative caching mode"
128703 +msgstr ""
128704 +
128705 +#: plugins/dfbinimage2/dfbinimage.glade2:82
128706 +msgid "Automatically load this image:"
128707 +msgstr ""
128708 +
128709 +#: plugins/dfbinimage2/dfbinimage.glade2:127
128710 +msgid "Repeat all"
128711 +msgstr ""
128712 +
128713 +#: plugins/dfbinimage2/dfbinimage.glade2:138
128714 +msgid "Repeat one"
128715 +msgstr ""
128716 +
128717 +#: plugins/dfbinimage2/dfbinimage.glade2:153
128718 +msgid "Play one"
128719 +msgstr ""
128720 +
128721 +#: plugins/dfbinimage2/dfbinimage.glade2:169
128722 +msgid "<b>CDDA repeat options</b>"
128723 +msgstr ""
128724 +
128725 +#: plugins/dfbinimage2/dfbinimage.glade2:207
128726 +msgid "<b>CDDA volume [%]</b>"
128727 +msgstr ""
128728 +
128729 +#: plugins/dfbinimage2/dfbinimage.glade2:244
128730 +msgid "<b>Cache size [MiB]</b>"
128731 +msgstr ""
128732 +
128733 +#: plugins/dfbinimage2/dfbinimage.glade2:277
128734 +#: plugins/dfbinimage2/dfbinimage.glade2:344
128735 +msgid "Compress"
128736 +msgstr ""
128737 +
128738 +#: plugins/dfbinimage2/dfbinimage.glade2:288
128739 +#: plugins/dfbinimage2/dfbinimage.glade2:355
128740 +msgid "Decompress"
128741 +msgstr ""
128742 +
128743 +#: plugins/dfbinimage2/dfbinimage.glade2:298
128744 +#: plugins/dfbinimage2/dfbinimage.glade2:365
128745 +#: plugins/dfbinimage2/dfbinimage.glade2:457
128746 +msgid "Progress"
128747 +msgstr ""
128748 +
128749 +#: plugins/dfbinimage2/dfbinimage.glade2:311
128750 +msgid "<b>Compress bz</b>"
128751 +msgstr ""
128752 +
128753 +#: plugins/dfbinimage2/dfbinimage.glade2:378
128754 +msgid "<b>Compress Z</b>"
128755 +msgstr ""
128756 +
128757 +#: plugins/dfbinimage2/dfbinimage.glade2:406
128758 +msgid ""
128759 +"Warning: Original image will be overwritten.\n"
128760 +"Old file will be saved as \"filename.backup\" when removing CDDA.\n"
128761 +"Only .bin format is supported for removal of CDDA-data for now, \n"
128762 +"however ripping works in all formats.\n"
128763 +"\n"
128764 +"Please see OGG_README.txt for details regardning the OGG files."
128765 +msgstr ""
128766 +
128767 +#: plugins/dfbinimage2/dfbinimage.glade2:433
128768 +msgid "Rip WAV"
128769 +msgstr ""
128770 +
128771 +#: plugins/dfbinimage2/dfbinimage.glade2:442
128772 +msgid "Remove CDDA"
128773 +msgstr ""
128774 +
128775 +#: plugins/dfbinimage2/dfbinimage.glade2:476
128776 +msgid "<b>Compress CDDA as Ogg / Rip WAV</b>"
128777 +msgstr ""
128778 +
128779 +#: plugins/dfbinimage2/dfbinimage.glade2:502
128780 +msgid "gtk-ok"
128781 +msgstr ""
128782 +
128783 +#: plugins/dfcdrom/cfgCdr.glade:9
128784 +msgid "CDR configuration"
128785 +msgstr ""
128786 +
128787 +#: plugins/dfcdrom/cfgCdr.glade:89
128788 +msgid "chose yor cdrom device or type its path if it's not listed"
128789 +msgstr ""
128790 +
128791 +#: plugins/dfcdrom/cfgCdr.glade:96
128792 +msgid "*"
128793 +msgstr ""
128794 +
128795 +#: plugins/dfcdrom/cfgCdr.glade:113
128796 +msgid "Select cdrom device"
128797 +msgstr ""
128798 +
128799 +#: plugins/dfcdrom/cfgCdr.glade:159
128800 +msgid "Select read mode:"
128801 +msgstr ""
128802 +
128803 +#: plugins/dfcdrom/cfgCdr.glade:190
128804 +msgid "Normal (No Cache)"
128805 +msgstr ""
128806 +
128807 +#: plugins/dfcdrom/cfgCdr.glade:198
128808 +msgid "Threaded - Faster (With Cache)"
128809 +msgstr ""
128810 +
128811 +#: plugins/dfcdrom/cfgCdr.glade:240
128812 +msgid "Cache Size (Def. 64): "
128813 +msgstr ""
128814 +
128815 +#: plugins/dfcdrom/cfgCdr.glade:305
128816 +msgid "Cdrom Speed (Def. 0 = MAX): "
128817 +msgstr ""
128818 +
128819 +#: plugins/dfcdrom/cfgCdr.glade:353
128820 +msgid "hseparator"
128821 +msgstr ""
128822 +
128823 +#: plugins/dfcdrom/cfgCdr.glade:368
128824 +msgid "Enable subQ read"
128825 +msgstr ""
128826 +
128827 +#: plugins/dfcdrom/cfgCdr.glade:387
128828 +msgid "Options"
128829 +msgstr ""
128830 +
128831 +#: plugins/dfcdrom/cfgCdr.glade:425
128832 +msgid "About CDR"
128833 +msgstr ""
128834 +
128835 +#: plugins/dfcdrom/cfgCdr.glade:475
128836 +msgid "<span size=\"xx-large\"><b>CDR plugin</b></span>"
128837 +msgstr ""
128838 +
128839 +#: plugins/dfcdrom/cfgCdr.glade:496
128840 +msgid ""
128841 +"linux CDR plugin for Pcsx\n"
128842 +"\n"
128843 +msgstr ""
128844 +
128845 +#: plugins/dfcdrom/cfgCdr.glade:519
128846 +msgid ""
128847 +"<small>(c) linuzappz linuzappz@hotmail.com\n"
128848 +" xobro _xobro_@tin.it</small>\n"
128849 +msgstr ""
128850 +
128851 +#: plugins/dfinput/dfinput.glade2:8
128852 +msgid "Configure Gamepad/Keyboard"
128853 +msgstr ""
128854 +
128855 +#: plugins/dfinput/dfinput.glade2:45
128856 +msgid "Pad number:"
128857 +msgstr ""
128858 +
128859 +#: plugins/dfinput/dfinput.glade2:71
128860 +msgid "1"
128861 +msgstr ""
128862 +
128863 +#: plugins/dfinput/dfinput.glade2:90
128864 +msgid "2"
128865 +msgstr ""
128866 +
128867 +#: plugins/dfinput/dfinput.glade2:109
128868 +msgid "Emulation:"
128869 +msgstr ""
128870 +
128871 +#: plugins/dfinput/dfinput.glade2:154
128872 +msgid "ePSXe"
128873 +msgstr ""
128874 +
128875 +#: plugins/dfinput/dfinput.glade2:187
128876 +msgid "Device file:"
128877 +msgstr ""
128878 +
128879 +#: plugins/dfinput/dfinput.glade2:246
128880 +msgid "Multi-threaded"
128881 +msgstr ""
128882 +
128883 +#: plugins/dfinput/dfinput.glade2:265
128884 +msgid "Analog"
128885 +msgstr ""
128886 +
128887 +#: plugins/dfinput/dfinput.glade2:317
128888 +msgid "<b>Button Configuration</b>"
128889 +msgstr ""
128890 +
128891 +#: plugins/dfinput/dfinput.glade2:394
128892 +msgid "dfinput"
128893 +msgstr ""
128894 +
128895 +#: plugins/dfinput/dfinput.glade2:395
128896 +msgid "Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com)"
128897 +msgstr ""
128898 +
128899 +#: plugins/dfiso/dfiso.glade2:7
128900 +msgid "CDR ISO Configuration"
128901 +msgstr ""
128902 +
128903 +#: plugins/dfiso/dfiso.glade2:21
128904 +msgid "<b>Configuration Options</b>"
128905 +msgstr ""
128906 +
128907 +#: plugins/dfiso/dfiso.glade2:43
128908 +msgid "Automatically load an ISO file"
128909 +msgstr ""
128910 +
128911 +#: plugins/dfiso/dfiso.glade2:60
128912 +msgid "Automatically load this file:"
128913 +msgstr ""
128914 +
128915 +#: plugins/dfiso/dfiso.glade2:99
128916 +msgid "Device:"
128917 +msgstr ""
128918 +
128919 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:9
128920 +msgid "Configure Sound"
128921 +msgstr ""
128922 +
128923 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:62
128924 +msgid "Volume:"
128925 +msgstr ""
128926 +
128927 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:90
128928 +msgid "Interpolation:"
128929 +msgstr ""
128930 +
128931 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:118
128932 +msgid "Reverb:"
128933 +msgstr ""
128934 +
128935 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:146
128936 +msgid ""
128937 +"Low\n"
128938 +"Medium\n"
128939 +"Loud\n"
128940 +"Loudest"
128941 +msgstr ""
128942 +
128943 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:165
128944 +msgid ""
128945 +"Off\n"
128946 +"Simple\n"
128947 +"Playstation"
128948 +msgstr ""
128949 +
128950 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
128951 +msgid ""
128952 +"None\n"
128953 +"Simple\n"
128954 +"Gaussian\n"
128955 +"Cubic"
128956 +msgstr ""
128957 +
128958 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:208
128959 +msgid "<b>General</b>"
128960 +msgstr ""
128961 +
128962 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:264
128963 +msgid "Enable or disable XA music."
128964 +msgstr ""
128965 +
128966 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:266
128967 +msgid "Enable XA"
128968 +msgstr ""
128969 +
128970 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:284
128971 +msgid "Choose this if XA music is played too quickly."
128972 +msgstr ""
128973 +
128974 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:286
128975 +msgid "Adjust XA speed"
128976 +msgstr ""
128977 +
128978 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:308
128979 +msgid "<b>XA Music</b>"
128980 +msgstr ""
128981 +
128982 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:364
128983 +msgid "Use the asynchronous SPU interface."
128984 +msgstr ""
128985 +
128986 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:366
128987 +msgid "High compatibility mode"
128988 +msgstr ""
128989 +
128990 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:384
128991 +msgid "Wait for CPU; only useful for some games."
128992 +msgstr ""
128993 +
128994 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:386
128995 +msgid "SPU IRQ Wait"
128996 +msgstr ""
128997 +
128998 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:404
128999 +msgid "Play only one channel for a performance boost."
129000 +msgstr ""
129001 +
129002 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:406
129003 +msgid "Single channel sound"
129004 +msgstr ""
129005 +
129006 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:428
129007 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:664
129008 +msgid "<b>Compatibility</b>"
129009 +msgstr ""
129010 +
129011 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:486
129012 +msgid "About Sound Plugin"
129013 +msgstr ""
129014 +
129015 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:516
129016 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:714
129017 +msgid "Coded by: Pete Bernert and the P.E.Op.S. team"
129018 +msgstr ""
129019 +
129020 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:541
129021 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:725
129022 +msgid "Homepage: http://home.t-online.de/home/PeteBernert/"
129023 +msgstr ""
129024 +
129025 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:566
129026 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:737
129027 +msgid "EMail: BlackDove@addcom.de"
129028 +msgstr ""
129029 +
129030 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:592
129031 +msgid "Version: 1.6"
129032 +msgstr ""
129033 +
129034 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:617
129035 +msgid "Release date: 05.04.2003"
129036 +msgstr ""
129037 +
129038 +#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:642
129039 +msgid "<b>PCSX-df Sound Plugin Adaption</b>"
129040 +msgstr ""
129041 +
129042 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
129043 +msgid "Configure X11 Video"
129044 +msgstr ""
129045 +
129046 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:39
129047 +msgid "Initial Window Size:"
129048 +msgstr ""
129049 +
129050 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:50
129051 +msgid "Stretching:"
129052 +msgstr ""
129053 +
129054 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:63
129055 +msgid "Dithering:"
129056 +msgstr ""
129057 +
129058 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:76
129059 +msgid ""
129060 +"320x240\n"
129061 +"640x480\n"
129062 +"800x600\n"
129063 +"1024x768\n"
129064 +"1152x864\n"
129065 +"1280x1024\n"
129066 +"1600x1200"
129067 +msgstr ""
129068 +
129069 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:95
129070 +msgid ""
129071 +"0: None\n"
129072 +"1: 2xSai\n"
129073 +"2: 2xSuperSai\n"
129074 +"3: SuperEagle\n"
129075 +"4: Scale2x\n"
129076 +"5: Scale3x\n"
129077 +"6: HQ2X\n"
129078 +"7: HQ3X"
129079 +msgstr ""
129080 +
129081 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:117
129082 +msgid ""
129083 +"0: Off (fastest)\n"
129084 +"1: Game dependant\n"
129085 +"2: Always"
129086 +msgstr ""
129087 +
129088 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:139
129089 +msgid "Maintain 4:3 Aspect Ratio"
129090 +msgstr ""
129091 +
129092 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:153
129093 +msgid "Toggle windowed/fullscreen mode."
129094 +msgstr ""
129095 +
129096 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:203
129097 +msgid "Toggle whether the FPS will be shown."
129098 +msgstr ""
129099 +
129100 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:204
129101 +msgid "Show FPS"
129102 +msgstr ""
129103 +
129104 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:218
129105 +msgid "Enable this if games display too quickly."
129106 +msgstr ""
129107 +
129108 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:219
129109 +msgid "Autodetect FPS limit"
129110 +msgstr ""
129111 +
129112 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:235
129113 +msgid "Skip frames when rendering."
129114 +msgstr ""
129115 +
129116 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
129117 +msgid "Enable frame skipping"
129118 +msgstr ""
129119 +
129120 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:257
129121 +msgid "Set FPS"
129122 +msgstr ""
129123 +
129124 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:272
129125 +msgid "200.0"
129126 +msgstr ""
129127 +
129128 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:295
129129 +msgid "<b>Framerate</b>"
129130 +msgstr ""
129131 +
129132 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:324
129133 +msgid "Use game fixes"
129134 +msgstr ""
129135 +
129136 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:348
129137 +msgid "better g-colors, worse textures"
129138 +msgstr ""
129139 +
129140 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:363
129141 +msgid "Needed by Dark Forces"
129142 +msgstr ""
129143 +
129144 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:378
129145 +msgid "Draw quads with triangles"
129146 +msgstr ""
129147 +
129148 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
129149 +msgid "Repeated flat tex triangles"
129150 +msgstr ""
129151 +
129152 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
129153 +msgid "Disable CPU Saving"
129154 +msgstr ""
129155 +
129156 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
129157 +msgid "Odd/even bit hack"
129158 +msgstr ""
129159 +
129160 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:440
129161 +msgid "For precise framerate"
129162 +msgstr ""
129163 +
129164 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:455
129165 +msgid "Better FPS limit in some"
129166 +msgstr ""
129167 +
129168 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:470
129169 +msgid "PC FPS calculation"
129170 +msgstr ""
129171 +
129172 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
129173 +msgid "Pandemonium 2"
129174 +msgstr ""
129175 +
129176 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:501
129177 +msgid "Lazy screen update"
129178 +msgstr ""
129179 +
129180 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
129181 +msgid "Skip every second frame"
129182 +msgstr ""
129183 +
129184 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:532
129185 +msgid "Old frame skipping"
129186 +msgstr ""
129187 +
129188 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
129189 +msgid "Expand screen width"
129190 +msgstr ""
129191 +
129192 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
129193 +msgid "Ignore brightness color"
129194 +msgstr ""
129195 +
129196 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
129197 +msgid "Disable coordinate check"
129198 +msgstr ""
129199 +
129200 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
129201 +msgid "Chrono Cross"
129202 +msgstr ""
129203 +
129204 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:609
129205 +msgid "Capcom fighting games"
129206 +msgstr ""
129207 +
129208 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:624
129209 +msgid "Black screens in Lunar"
129210 +msgstr ""
129211 +
129212 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:639
129213 +msgid "Compatibility mode"
129214 +msgstr ""
129215 +
129216 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:701
129217 +msgid "About X11 Video Plugin"
129218 +msgstr ""
129219 +
129220 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:750
129221 +msgid "Version: 1.15"
129222 +msgstr ""
129223 +
129224 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:762
129225 +msgid "Release date: 2003"
129226 +msgstr ""
129227 +
129228 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:774
129229 +msgid "<b>PCSX-df Video Plugin Adaption</b>"
129230 +msgstr ""
129231 +
129232 +#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:787
129233 +msgid "XVideo Support: Stephen Chao"
129234 +msgstr ""
129235 +
129236 +#: libpcsxcore/misc.c:366
129237 +#, c-format
129238 +msgid "Error opening file: %s"
129239 +msgstr ""
129240 +
129241 +#: libpcsxcore/misc.c:384
129242 +msgid "CPE files not supported."
129243 +msgstr ""
129244 +
129245 +#: libpcsxcore/misc.c:388
129246 +msgid "COFF files not supported."
129247 +msgstr ""
129248 +
129249 +#: libpcsxcore/misc.c:392
129250 +msgid "This file does not appear to be a valid PSX file."
129251 +msgstr ""
129252 +
129253 +#: libpcsxcore/psxmem.c:70
129254 +msgid "Error allocating memory!"
129255 +msgstr ""
129256 +
129257 +#: libpcsxcore/psxmem.c:109
129258 +#, c-format
129259 +msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
129260 +msgstr ""
129261 +
129262 +#: libpcsxcore/sio.c:99
129263 +msgid "Connection closed!\n"
129264 +msgstr ""
129265 +
129266 +#: libpcsxcore/sio.c:341
129267 +#, c-format
129268 +msgid "Memory card %s failed to load!\n"
129269 +msgstr ""
129270 +
129271 +#: libpcsxcore/plugins.c:29
129272 +#, c-format
129273 +msgid "Error loading %s: %s"
129274 +msgstr ""
129275 +
129276 +#: libpcsxcore/plugins.c:158
129277 +#, c-format
129278 +msgid "Could not load GPU plugin %s!"
129279 +msgstr ""
129280 +
129281 +#: libpcsxcore/plugins.c:221
129282 +#, c-format
129283 +msgid "Could not load CD-ROM plugin %s!"
129284 +msgstr ""
129285 +
129286 +#: libpcsxcore/plugins.c:460
129287 +#, c-format
129288 +msgid "Could not load SPU plugin %s!"
129289 +msgstr ""
129290 +
129291 +#: libpcsxcore/plugins.c:608
129292 +#, c-format
129293 +msgid "Could not load Controller 1 plugin %s!"
129294 +msgstr ""
129295 +
129296 +#: libpcsxcore/plugins.c:662
129297 +#, c-format
129298 +msgid "Could not load Controller 2 plugin %s!"
129299 +msgstr ""
129300 +
129301 +#: libpcsxcore/plugins.c:705
129302 +#, c-format
129303 +msgid "Could not load NetPlay plugin %s!"
129304 +msgstr ""
129305 +
129306 +#: libpcsxcore/plugins.c:760
129307 +#, c-format
129308 +msgid "Error initializing CD-ROM plugin: %d"
129309 +msgstr ""
129310 +
129311 +#: libpcsxcore/plugins.c:762
129312 +#, c-format
129313 +msgid "Error initializing GPU plugin: %d"
129314 +msgstr ""
129315 +
129316 +#: libpcsxcore/plugins.c:764
129317 +#, c-format
129318 +msgid "Error initializing SPU plugin: %d"
129319 +msgstr ""
129320 +
129321 +#: libpcsxcore/plugins.c:766
129322 +#, c-format
129323 +msgid "Error initializing Controller 1 plugin: %d"
129324 +msgstr ""
129325 +
129326 +#: libpcsxcore/plugins.c:768
129327 +#, c-format
129328 +msgid "Error initializing Controller 2 plugin: %d"
129329 +msgstr ""
129330 +
129331 +#: libpcsxcore/plugins.c:772
129332 +#, c-format
129333 +msgid "Error initializing NetPlay plugin: %d"
129334 +msgstr ""
129335 diff -rupN original/po/quot.sed new/po/quot.sed
129336 --- original/po/quot.sed 1969-12-31 20:00:00.000000000 -0400
129337 +++ new/po/quot.sed 2007-10-08 17:13:28.000000000 -0400
129338 @@ -0,0 +1,6 @@
129339 +s/"\([^"]*\)"/“\1”/g
129340 +s/`\([^`']*\)'/‘\1’/g
129341 +s/ '\([^`']*\)' / ‘\1’ /g
129342 +s/ '\([^`']*\)'$/ ‘\1’/g
129343 +s/^'\([^`']*\)' /‘\1’ /g
129344 +s/“”/""/g
129345 diff -rupN original/po/remove-potcdate.sin new/po/remove-potcdate.sin
129346 --- original/po/remove-potcdate.sin 1969-12-31 20:00:00.000000000 -0400
129347 +++ new/po/remove-potcdate.sin 2007-10-08 17:13:28.000000000 -0400
129348 @@ -0,0 +1,19 @@
129349 +# Sed script that remove the POT-Creation-Date line in the header entry
129350 +# from a POT file.
129351 +#
129352 +# The distinction between the first and the following occurrences of the
129353 +# pattern is achieved by looking at the hold space.
129354 +/^"POT-Creation-Date: .*"$/{
129355 +x
129356 +# Test if the hold space is empty.
129357 +s/P/P/
129358 +ta
129359 +# Yes it was empty. First occurrence. Remove the line.
129360 +g
129361 +d
129362 +bb
129363 +:a
129364 +# The hold space was nonempty. Following occurrences. Do nothing.
129365 +x
129366 +:b
129367 +}
129368 Los ficheros binarios original/po/sv.gmo y new/po/sv.gmo son distintos
129369 diff -rupN original/po/zh_CN.po new/po/zh_CN.po
129370 --- original/po/zh_CN.po 1969-12-31 20:00:00.000000000 -0400
129371 +++ new/po/zh_CN.po 2008-07-05 09:44:37.000000000 -0430
129372 @@ -0,0 +1,689 @@
129373 +# Simplified Chinese translation of pcsx-df.
129374 +# Copyright (C) 2008 Wei Mingzhi
129375 +# This file is distributed under the same license as the pcsx-df package.
129376 +# Wei Mingzhi <whistler@openoffice.org>, 2008.
129377 +#
129378 +msgid ""
129379 +msgstr ""
129380 +"Project-Id-Version: pcsx-df 1.7\n"
129381 +"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
129382 +"POT-Creation-Date: 2006-05-24 20:52+1000\n"
129383 +"PO-Revision-Date: 2008-06-15 22:30+0700\n"
129384 +"Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
129385 +"Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
129386 +"MIME-Version: 1.0\n"
129387 +"Content-Type: text/plain; charset=utf-8\n"
129388 +"Content-Transfer-Encoding: 8bit\n"
129389 +
129390 +#: gui/Gtk2Gui.c:327
129391 +msgid "Select PSX EXE File"
129392 +msgstr "选择 PS EXE 文件"
129393 +
129394 +#: gui/Gtk2Gui.c:381
129395 +#: gui/LnxMain.c:192
129396 +#, c-format
129397 +msgid "Could not load CD-ROM!\n"
129398 +msgstr "无法加载光盘。\n"
129399 +
129400 +#: gui/Gtk2Gui.c:468
129401 +#, c-format
129402 +msgid "Loaded state %d."
129403 +msgstr "已读取存档 %d。"
129404 +
129405 +#: gui/Gtk2Gui.c:469
129406 +#: gui/Plugin.c:111
129407 +#, c-format
129408 +msgid "Error loading state %d!"
129409 +msgstr "读取存档 %d 时出错。"
129410 +
129411 +#: gui/Gtk2Gui.c:504
129412 +#, c-format
129413 +msgid "Saved state %d."
129414 +msgstr "已保存存档 %d。"
129415 +
129416 +#: gui/Gtk2Gui.c:505
129417 +#: gui/Plugin.c:94
129418 +#, c-format
129419 +msgid "Error saving state %d!"
129420 +msgstr "保存存档 %d 时出错。"
129421 +
129422 +#: gui/Gtk2Gui.c:526
129423 +#: gui/Gtk2Gui.c:578
129424 +msgid "Select State File"
129425 +msgstr "选择存档文件"
129426 +
129427 +#: gui/Gtk2Gui.c:553
129428 +#, c-format
129429 +msgid "Loaded state: %s"
129430 +msgstr "已读取存档: %s"
129431 +
129432 +#: gui/Gtk2Gui.c:554
129433 +#, c-format
129434 +msgid "Error loading state: %s"
129435 +msgstr "读取存档 %s 时出错。"
129436 +
129437 +#: gui/Gtk2Gui.c:604
129438 +#, c-format
129439 +msgid "Saved state %s."
129440 +msgstr "已保存存档 %s"
129441 +
129442 +#: gui/Gtk2Gui.c:606
129443 +#, c-format
129444 +msgid "Error saving state %s!"
129445 +msgstr "保存存档 %s 时出错。"
129446 +
129447 +#: gui/Gtk2Gui.c:718
129448 +#: gui/Gtk2Gui.c:1859
129449 +msgid "Error: Glade interface could not be loaded!"
129450 +msgstr "错误：无法加载 Glade 界面!"
129451 +
129452 +#: gui/Gtk2Gui.c:767
129453 +msgid "Icon"
129454 +msgstr "图标"
129455 +
129456 +#: gui/Gtk2Gui.c:776
129457 +msgid "Title"
129458 +msgstr "标题"
129459 +
129460 +#: gui/Gtk2Gui.c:785
129461 +msgid "Status"
129462 +msgstr "状态"
129463 +
129464 +#: gui/Gtk2Gui.c:794
129465 +msgid "ID"
129466 +msgstr "ID"
129467 +
129468 +#: gui/Gtk2Gui.c:803
129469 +msgid "Name"
129470 +msgstr "名称"
129471 +
129472 +#: gui/Gtk2Gui.c:874
129473 +#: gui/Gtk2Gui.c:1307
129474 +msgid "Deleted"
129475 +msgstr "已删除"
129476 +
129477 +#: gui/Gtk2Gui.c:875
129478 +#: gui/Gtk2Gui.c:878
129479 +#: gui/Gtk2Gui.c:1308
129480 +#: gui/Gtk2Gui.c:1311
129481 +msgid "Free"
129482 +msgstr "空闲"
129483 +
129484 +#: gui/Gtk2Gui.c:877
129485 +#: gui/Gtk2Gui.c:1310
129486 +msgid "Used"
129487 +msgstr "已使用"
129488 +
129489 +#: gui/Gtk2Gui.c:994
129490 +msgid "Select Memory Card"
129491 +msgstr "请选择存储卡"
129492 +
129493 +#: gui/Gtk2Gui.c:1059
129494 +msgid "Format this Memory Card?"
129495 +msgstr "格式化此存储卡?"
129496 +
129497 +#: gui/Gtk2Gui.c:1062
129498 +msgid "If you format the memory card, the contents will be overwritten."
129499 +msgstr "如您选择格式化存储卡，卡中的内容将被清空。"
129500 +
129501 +#: gui/Gtk2Gui.c:1066
129502 +msgid "Format card"
129503 +msgstr "格式化存储卡"
129504 +
129505 +#: gui/Gtk2Gui.c:1148
129506 +msgid "Paste this selection?"
129507 +msgstr "粘贴此选中内容?"
129508 +
129509 +#: gui/Gtk2Gui.c:1151
129510 +msgid "Are you sure you want to paste this selection?"
129511 +msgstr "是否确认粘贴此选中内容?"
129512 +
129513 +#: gui/Gtk2Gui.c:1155
129514 +#: data/pcsx.glade2:2844
129515 +msgid "Paste"
129516 +msgstr "粘贴"
129517 +
129518 +#: gui/Gtk2Gui.c:1362
129519 +msgid "Memory Card Manager"
129520 +msgstr "存储卡管理器"
129521 +
129522 +#: gui/Gtk2Gui.c:1662
129523 +msgid "This plugin doesn't need to be configured."
129524 +msgstr "此插件需要被配置。"
129525 +
129526 +#: gui/Gtk2Gui.c:1689
129527 +msgid "This plugin reports that it should work correctly."
129528 +msgstr "此插件报告其可正常工作。"
129529 +
129530 +#: gui/Gtk2Gui.c:1690
129531 +msgid "This plugin reports that it won't work correctly."
129532 +msgstr "此插件报告其不可正常工作。"
129533 +
129534 +#: gui/Gtk2Gui.c:1867
129535 +#: data/pcsx.glade2:688
129536 +msgid "Configure PCSX"
129537 +msgstr "配置 PCSX"
129538 +
129539 +#: gui/Gtk2Gui.c:2031
129540 +#: gui/Gtk2Gui.c:2077
129541 +#: gui/Gtk2Gui.c:2160
129542 +#: gui/Gtk2Gui.c:2226
129543 +#: gui/Gtk2Gui.c:2251
129544 +#: gui/Gtk2Gui.c:2305
129545 +#, c-format
129546 +msgid "Could not open directory: '%s'\n"
129547 +msgstr "无法打开目录: \"%s\"\n"
129548 +
129549 +#: gui/Gtk2Gui.c:2220
129550 +msgid "Internal HLE Bios"
129551 +msgstr "内部 HLE-Bios"
129552 +
129553 +#: gui/Gtk2Gui.c:2361
129554 +msgid "Notice"
129555 +msgstr "警告"
129556 +
129557 +#: gui/LnxMain.c:81
129558 +msgid ""
129559 +" pcsx [options] [file]\n"
129560 +"\toptions:\n"
129561 +"\t-runcd\t\tRuns CD-ROM\n"
129562 +"\t-runcdbios\tRuns CD-ROM through BIOS\n"
129563 +"\t-nogui\t\tDon't open the GTK GUI\n"
129564 +"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
129565 +"\t-psxout\t\tEnable PSX output\n"
129566 +"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
129567 +"\t-h -help\tDisplay this message\n"
129568 +"\tfile\t\tLoads file\n"
129569 +msgstr ""
129570 +
129571 +#: gui/LnxMain.c:96
129572 +msgid "Disabled"
129573 +msgstr "禁用"
129574 +
129575 +#: gui/LnxMain.c:111
129576 +#, c-format
129577 +msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
129578 +msgstr "PCSX 不能在字符界面下配置 -- 请不使用 -nogui 参数重新启动程序\n"
129579 +
129580 +#: gui/Plugin.c:93
129581 +#, c-format
129582 +msgid "Saved state %d!"
129583 +msgstr "存档 %d 已保存!"
129584 +
129585 +#: gui/Plugin.c:110
129586 +#, c-format
129587 +msgid "Loaded state %d!"
129588 +msgstr "存档 %d 已读取!"
129589 +
129590 +#: gui/Plugin.c:120
129591 +#: data/pcsx.glade2:1738
129592 +#, c-format
129593 +msgid "SIO IRQ Always Enabled"
129594 +msgstr "SIO IRQ 总是启用"
129595 +
129596 +#: gui/Plugin.c:121
129597 +#, c-format
129598 +msgid "SIO IRQ Not Always Enabled"
129599 +msgstr "SIO IRQ 不总是启用"
129600 +
129601 +#: gui/Plugin.c:127
129602 +#, c-format
129603 +msgid "Black & White Mdecs Only Enabled"
129604 +msgstr "Black & White Mdecs Only 启用"
129605 +
129606 +#: gui/Plugin.c:128
129607 +#, c-format
129608 +msgid "Black & White Mdecs Only Disabled"
129609 +msgstr "Black & White Mdecs Only 禁用"
129610 +
129611 +#: gui/Plugin.c:134
129612 +#, c-format
129613 +msgid "XA Enabled"
129614 +msgstr "XA 已启用"
129615 +
129616 +#: gui/Plugin.c:135
129617 +#, c-format
129618 +msgid "XA Disabled"
129619 +msgstr "XA 已禁用"
129620 +
129621 +#: gui/Plugin.c:205
129622 +msgid "Error opening CD-ROM plugin!"
129623 +msgstr "无法打开 CD-ROM 插件!"
129624 +
129625 +#: gui/Plugin.c:207
129626 +msgid "Error opening SPU plugin!"
129627 +msgstr "无法打开 SPU 插件!"
129628 +
129629 +#: gui/Plugin.c:210
129630 +msgid "Error opening GPU plugin!"
129631 +msgstr "无法打开 GPU 插件!"
129632 +
129633 +#: gui/Plugin.c:212
129634 +msgid "Error opening Controller 1 plugin!"
129635 +msgstr "无法打开 \"控制器 1\" 插件!"
129636 +
129637 +#: gui/Plugin.c:214
129638 +msgid "Error opening Controller 2 plugin!"
129639 +msgstr "无法打开 \"控制器 2\" 插件!"
129640 +
129641 +#: gui/Plugin.c:295
129642 +msgid "Error closing CD-ROM plugin!"
129643 +msgstr "无法关闭 CD-ROM 插件!"
129644 +
129645 +#: gui/Plugin.c:297
129646 +msgid "Error closing SPU plugin!"
129647 +msgstr "无法关闭 SPU 插件!"
129648 +
129649 +#: gui/Plugin.c:299
129650 +msgid "Error closing Controller 1 Plugin!"
129651 +msgstr "无法关闭 \"控制器 1\" 插件!"
129652 +
129653 +#: gui/Plugin.c:301
129654 +msgid "Error closing Controller 2 plugin!"
129655 +msgstr "无法关闭 \"控制器 2\" 插件!"
129656 +
129657 +#: gui/Plugin.c:303
129658 +msgid "Error closing GPU plugin!"
129659 +msgstr "无法关闭 GPU 插件!"
129660 +
129661 +#: gui/Plugin.c:321
129662 +#: emulator/plugins.c:761
129663 +#, c-format
129664 +msgid "Error initializing CD-ROM plugin: %d"
129665 +msgstr "CD-ROM 插件初始化错误: %d"
129666 +
129667 +#: gui/Plugin.c:323
129668 +#: emulator/plugins.c:763
129669 +#, c-format
129670 +msgid "Error initializing GPU plugin: %d"
129671 +msgstr "GPU 插件初始化错误: %d"
129672 +
129673 +#: gui/Plugin.c:325
129674 +#: emulator/plugins.c:765
129675 +#, c-format
129676 +msgid "Error initializing SPU plugin: %d"
129677 +msgstr "SPU 插件初始化错误: %d"
129678 +
129679 +#: gui/Plugin.c:327
129680 +#: emulator/plugins.c:767
129681 +#, c-format
129682 +msgid "Error initializing Controller 1 plugin: %d"
129683 +msgstr "\"控制器1\" 插件初始化错误: %d"
129684 +
129685 +#: gui/Plugin.c:329
129686 +#: emulator/plugins.c:769
129687 +#, c-format
129688 +msgid "Error initializing Controller 2 plugin: %d"
129689 +msgstr "\"控制器2\" 插件初始化错误: %d"
129690 +
129691 +#: gui/Plugin.c:332
129692 +#: emulator/plugins.c:772
129693 +#, c-format
129694 +msgid "Error initializing NetPlay plugin: %d"
129695 +msgstr "联网游戏插件初始化错误: %d"
129696 +
129697 +#: data/pcsx.glade2:10
129698 +msgid "PCSX"
129699 +msgstr "PCSX"
129700 +
129701 +#: data/pcsx.glade2:41
129702 +msgid "File"
129703 +msgstr "文件"
129704 +
129705 +#: data/pcsx.glade2:50
129706 +msgid "Run CD"
129707 +msgstr "运行光碟"
129708 +
129709 +#: data/pcsx.glade2:72
129710 +msgid "Run CD Through BIOS"
129711 +msgstr "使用 BIOS 运行光碟"
129712 +
129713 +#: data/pcsx.glade2:94
129714 +msgid "Run EXE"
129715 +msgstr "运行 EXE"
129716 +
129717 +#: data/pcsx.glade2:122
129718 +msgid "States"
129719 +msgstr "存档"
129720 +
129721 +#: data/pcsx.glade2:143
129722 +msgid "Load"
129723 +msgstr "读取"
129724 +
129725 +#: data/pcsx.glade2:164
129726 +#: data/pcsx.glade2:261
129727 +msgid "Slot 1"
129728 +msgstr "存档 1"
129729 +
129730 +#: data/pcsx.glade2:174
129731 +#: data/pcsx.glade2:271
129732 +msgid "Slot 2"
129733 +msgstr "存档 2"
129734 +
129735 +#: data/pcsx.glade2:184
129736 +#: data/pcsx.glade2:281
129737 +msgid "Slot 3"
129738 +msgstr "存档 3"
129739 +
129740 +#: data/pcsx.glade2:194
129741 +#: data/pcsx.glade2:291
129742 +msgid "Slot 4"
129743 +msgstr "存档 4"
129744 +
129745 +#: data/pcsx.glade2:204
129746 +#: data/pcsx.glade2:301
129747 +msgid "Slot 5"
129748 +msgstr "存档 5"
129749 +
129750 +#: data/pcsx.glade2:214
129751 +#: data/pcsx.glade2:311
129752 +msgid "Other..."
129753 +msgstr "其它..."
129754 +
129755 +#: data/pcsx.glade2:240
129756 +msgid "Save"
129757 +msgstr "保存"
129758 +
129759 +#: data/pcsx.glade2:347
129760 +msgid "Exit"
129761 +msgstr "退出"
129762 +
129763 +#: data/pcsx.glade2:373
129764 +msgid "Emulator"
129765 +msgstr "模拟器"
129766 +
129767 +#: data/pcsx.glade2:382
129768 +msgid "Run"
129769 +msgstr "运行"
129770 +
129771 +#: data/pcsx.glade2:403
129772 +msgid "Reset"
129773 +msgstr "复位"
129774 +
129775 +#: data/pcsx.glade2:428
129776 +msgid "Configuration"
129777 +msgstr "配置"
129778 +
129779 +#: data/pcsx.glade2:437
129780 +msgid "Plugins & BIOS"
129781 +msgstr "插件及 BIOS"
129782 +
129783 +#: data/pcsx.glade2:465
129784 +msgid "Graphics"
129785 +msgstr "图像"
129786 +
129787 +#: data/pcsx.glade2:486
129788 +msgid "Sound"
129789 +msgstr "声音"
129790 +
129791 +#: data/pcsx.glade2:507
129792 +msgid "CD-ROM"
129793 +msgstr "CD-ROM"
129794 +
129795 +#: data/pcsx.glade2:528
129796 +msgid "Controllers"
129797 +msgstr "控制器"
129798 +
129799 +#: data/pcsx.glade2:555
129800 +msgid "NetPlay"
129801 +msgstr "联网游戏"
129802 +
129803 +#: data/pcsx.glade2:582
129804 +msgid "CPU"
129805 +msgstr "CPU"
129806 +
129807 +#: data/pcsx.glade2:603
129808 +msgid "Memory Cards"
129809 +msgstr "存储卡"
129810 +
129811 +#: data/pcsx.glade2:629
129812 +msgid "Help"
129813 +msgstr "帮助"
129814 +
129815 +#: data/pcsx.glade2:638
129816 +msgid "About PCSX"
129817 +msgstr "关于 PCSX"
129818 +
129819 +#: data/pcsx.glade2:805
129820 +msgid "CD-ROM:"
129821 +msgstr "CD-ROM:"
129822 +
129823 +#: data/pcsx.glade2:833
129824 +msgid "Controller 2:"
129825 +msgstr "控制器 2:"
129826 +
129827 +#: data/pcsx.glade2:861
129828 +msgid "Controller 1: "
129829 +msgstr "控制器 1:"
129830 +
129831 +#: data/pcsx.glade2:889
129832 +msgid "Sound:"
129833 +msgstr "声音:"
129834 +
129835 +#: data/pcsx.glade2:917
129836 +msgid "Graphics:"
129837 +msgstr "图像:"
129838 +
129839 +#: data/pcsx.glade2:1294
129840 +msgid "Search in:"
129841 +msgstr "在这里查找:"
129842 +
129843 +#: data/pcsx.glade2:1322
129844 +msgid "Select Folder to Search"
129845 +msgstr "选择要查找的文件夹"
129846 +
129847 +#: data/pcsx.glade2:1467
129848 +msgid "<b>Plugins</b>"
129849 +msgstr "<b>插件</b>"
129850 +
129851 +#: data/pcsx.glade2:1553
129852 +msgid "Select A File"
129853 +msgstr "选择一个文件"
129854 +
129855 +#: data/pcsx.glade2:1574
129856 +msgid "<b>BIOS</b>"
129857 +msgstr "<b>BIOS</b>"
129858 +
129859 +#: data/pcsx.glade2:1613
129860 +msgid "Configure CPU"
129861 +msgstr "配置 CPU"
129862 +
129863 +#: data/pcsx.glade2:1694
129864 +msgid "Disable XA Decoding"
129865 +msgstr "禁用 XA 解码"
129866 +
129867 +#: data/pcsx.glade2:1716
129868 +msgid "Disable CD Audio"
129869 +msgstr "禁用 CD 音频"
129870 +
129871 +#: data/pcsx.glade2:1760
129872 +msgid "Enable Interpreter CPU"
129873 +msgstr "启用解释执行 CPU"
129874 +
129875 +#: data/pcsx.glade2:1782
129876 +msgid "Enable Console Output"
129877 +msgstr "启用控制台输出"
129878 +
129879 +#: data/pcsx.glade2:1804
129880 +msgid "Black & White Movies"
129881 +msgstr "黑白电影"
129882 +
129883 +#: data/pcsx.glade2:1826
129884 +msgid "SPU IRQ Always Enabled"
129885 +msgstr "SPU IRQ 总是启用"
129886 +
129887 +#: data/pcsx.glade2:1855
129888 +msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
129889 +msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
129890 +
129891 +#: data/pcsx.glade2:1874
129892 +msgid "InuYasha Sengoku Battle Fix"
129893 +msgstr "InuYasha Sengoku 战斗修正"
129894 +
129895 +#: data/pcsx.glade2:1894
129896 +msgid "<b>Options</b>"
129897 +msgstr "<b>选项</b>"
129898 +
129899 +#: data/pcsx.glade2:1940
129900 +msgid "Autodetect"
129901 +msgstr "自动检测"
129902 +
129903 +#: data/pcsx.glade2:1959
129904 +msgid ""
129905 +"NTSC\n"
129906 +"PAL"
129907 +msgstr ""
129908 +"NTSC\n"
129909 +"PAL"
129910 +
129911 +#: data/pcsx.glade2:1976
129912 +msgid "<b>System Type</b>"
129913 +msgstr "<b>系统类型</b>"
129914 +
129915 +#: data/pcsx.glade2:2015
129916 +msgid "Configure NetPlay"
129917 +msgstr "配置联网游戏"
129918 +
129919 +#: data/pcsx.glade2:2188
129920 +msgid "<b>NetPlay</b>"
129921 +msgstr "<b>联网游戏</b>"
129922 +
129923 +#: data/pcsx.glade2:2227
129924 +msgid "Configure Memory Cards"
129925 +msgstr "配置存储卡"
129926 +
129927 +#: data/pcsx.glade2:2380
129928 +#: data/pcsx.glade2:3129
129929 +msgid "Select"
129930 +msgstr "选择"
129931 +
129932 +#: data/pcsx.glade2:2455
129933 +#: data/pcsx.glade2:3204
129934 +msgid "Format"
129935 +msgstr "格式化"
129936 +
129937 +#: data/pcsx.glade2:2530
129938 +#: data/pcsx.glade2:3279
129939 +msgid "Reload"
129940 +msgstr "重新加载"
129941 +
129942 +#: data/pcsx.glade2:2595
129943 +msgid "<b>Memory Card 1</b>"
129944 +msgstr "<b>存储卡 1</b>"
129945 +
129946 +#: data/pcsx.glade2:2694
129947 +#: data/pcsx.glade2:2769
129948 +msgid "Copy"
129949 +msgstr "复制"
129950 +
129951 +#: data/pcsx.glade2:2919
129952 +#: data/pcsx.glade2:2994
129953 +msgid "Un/Delete"
129954 +msgstr "删除/恢复"
129955 +
129956 +#: data/pcsx.glade2:3344
129957 +msgid "<b>Memory Card 2</b>"
129958 +msgstr "<b>存储卡 2</b>"
129959 +
129960 +#: data/pcsx.glade2:3391
129961 +msgid "PCSX 1.7df"
129962 +msgstr "PCSX 1.7df"
129963 +
129964 +#: data/pcsx.glade2:3392
129965 +msgid ""
129966 +"(C) 1999-2003 PCSX Team\n"
129967 +"(C) 2005-2006 Ryan Schultz\n"
129968 +"(C) 2005-2006 Andrew Burton"
129969 +msgstr ""
129970 +"(C) 1999-2003 PCSX 开发组\n"
129971 +"(C) 2005-2006 Ryan Schultz\n"
129972 +"(C) 2005-2006 Andrew Burton"
129973 +
129974 +#: data/pcsx.glade2:3395
129975 +msgid "A Playstation emulator for GNU/Linux."
129976 +msgstr "一个 GNU/Linux 系统下的 PlayStation 模拟器。"
129977 +
129978 +#: data/pcsx.glade2:3396
129979 +msgid "PCSX is licensed under the GNU GPL; see the included COPYING file for more detail."
129980 +msgstr "PCSX 在 GNU GPL 条款下发布；请参看包含的 COPYING 文件。"
129981 +
129982 +#: data/pcsx.glade2:3399
129983 +msgid "PCSX-df Development"
129984 +msgstr "PCSX-df 开发"
129985 +
129986 +#: data/pcsx.glade2:3405
129987 +msgid "translator-credits"
129988 +msgstr "Wei Mingzhi <whistler@openoffice.org>"
129989 +
129990 +#: emulator/Misc.c:350
129991 +#, c-format
129992 +msgid "Error opening file: %s!"
129993 +msgstr "打开文件错误: %s!"
129994 +
129995 +#: emulator/Misc.c:365
129996 +msgid "CPE files not supported!"
129997 +msgstr "CPE 文件不被支持!"
129998 +
129999 +#: emulator/Misc.c:368
130000 +msgid "COFF files not supported!"
130001 +msgstr "COFF 文件不被支持!"
130002 +
130003 +#: emulator/Misc.c:371
130004 +msgid "This file does not appear to be a valid PSX file!"
130005 +msgstr "此文件不是一个合法的 PSX 文件。"
130006 +
130007 +#: emulator/PsxMem.c:39
130008 +msgid "Error allocating memory!"
130009 +msgstr "分配内存错误!"
130010 +
130011 +#: emulator/PsxMem.c:77
130012 +#, c-format
130013 +msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
130014 +msgstr "无法打开 BIOS: \"%s\"。使用内部 HLE Bios。\n"
130015 +
130016 +#: emulator/Sio.c:108
130017 +msgid "Connection closed!\n"
130018 +msgstr "连接被关闭!\n"
130019 +
130020 +#: emulator/Sio.c:346
130021 +#, c-format
130022 +msgid "Memory card %s failed to load!\n"
130023 +msgstr "存储卡 %s 读取失败!\n"
130024 +
130025 +#: emulator/plugins.c:31
130026 +#, c-format
130027 +msgid "Error loading %s: %s"
130028 +msgstr "无法加载 %s: %s"
130029 +
130030 +#: emulator/plugins.c:162
130031 +#, c-format
130032 +msgid "Could not load GPU plugin %s!"
130033 +msgstr "无法加载 GPU 插件 %s!"
130034 +
130035 +#: emulator/plugins.c:224
130036 +#, c-format
130037 +msgid "Could not load CD-ROM plugin %s!"
130038 +msgstr "无法加载 CD-ROM 插件 %s!"
130039 +
130040 +#: emulator/plugins.c:462
130041 +#, c-format
130042 +msgid "Could not load SPU plugin %s!"
130043 +msgstr "无法加载 SPU 插件 %s!"
130044 +
130045 +#: emulator/plugins.c:610
130046 +#, c-format
130047 +msgid "Could not load Controller 1 plugin %s!"
130048 +msgstr "无法加载 \"控制器1\" 插件 %s!"
130049 +
130050 +#: emulator/plugins.c:664
130051 +#, c-format
130052 +msgid "Could not load Controller 2 plugin %s!"
130053 +msgstr "无法加载 \"控制器2\" 插件 %s!"
130054 +
130055 +#: emulator/plugins.c:707
130056 +#, c-format
130057 +msgid "Could not load NetPlay plugin %s!"
130058 +msgstr "无法加载联网游戏插件 %s!"
130059 +
130060 +
130061 +
AUR mirror